From c4cad4508229bf6e1b93ea51ffb6af985d965513 Mon Sep 17 00:00:00 2001
From: Sergei Khoma <srghma@gmail.com>
Date: Sun, 3 Jun 2018 20:03:34 +0300
Subject: [PATCH 0001/1065] fix typo

based on https://www.ec2instances.info/
---
 nixos/modules/virtualisation/amazon-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 6cb9e07ae82..b0354009a7f 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -60,7 +60,7 @@ let cfg = config.ec2; in
     # Mount all formatted ephemeral disks and activate all swap devices.
     # We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options
     # because the set of devices is dependent on the instance type
-    # (e.g. "m1.large" has one ephemeral filesystem and one swap device,
+    # (e.g. "m1.small" has one ephemeral filesystem and one swap device,
     # while "m1.large" has two ephemeral filesystems and no swap
     # devices).  Also, put /tmp and /var on /disk0, since it has a lot
     # more space than the root device.  Similarly, "move" /nix to /disk0
-- 
GitLab


From 7469e68ddaf9efa67467586574996f9e00c138a3 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Fri, 7 Sep 2018 19:52:54 +0200
Subject: [PATCH 0002/1065] nixos/wavemon: create module

---
 nixos/modules/module-list.nix      |  1 +
 nixos/modules/programs/wavemon.nix | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 nixos/modules/programs/wavemon.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2b14f769ae4..0a8f24cebf9 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -125,6 +125,7 @@
   ./programs/udevil.nix
   ./programs/venus.nix
   ./programs/vim.nix
+  ./programs/wavemon.nix
   ./programs/way-cooler.nix
   ./programs/wireshark.nix
   ./programs/xfs_quota.nix
diff --git a/nixos/modules/programs/wavemon.nix b/nixos/modules/programs/wavemon.nix
new file mode 100644
index 00000000000..ac665fe4a02
--- /dev/null
+++ b/nixos/modules/programs/wavemon.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.wavemon;
+in {
+  options = {
+    programs.wavemon = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to add wavemon to the global environment and configure a
+          setcap wrapper for it.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [ wavemon ];
+    security.wrappers.wavemon = {
+      source = "${pkgs.wavemon}/bin/wavemon";
+      capabilities = "cap_net_admin+ep";
+    };
+  };
+}
-- 
GitLab


From bbffdfcf7296388f9022c2bf1eae305bd3163f96 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 30 Oct 2017 18:42:16 +0100
Subject: [PATCH 0003/1065] Document make-channel.nix

---
 nixos/lib/make-channel.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix
index fd805f7f943..0db4a46151d 100644
--- a/nixos/lib/make-channel.nix
+++ b/nixos/lib/make-channel.nix
@@ -1,3 +1,7 @@
+/* Build a channel tarball. These contain, in addition to the nixpkgs
+ * expressions themselves, files that indicate the version of nixpkgs
+ * that they represent. This only seems to be used by Travis.
+ */
 { pkgs, nixpkgs, version, versionSuffix }:
 
 pkgs.releaseTools.makeSourceTarball {
-- 
GitLab


From 1ece5041a465c2372f15c85541220ac20d6d698e Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 23 Sep 2018 15:55:39 +0000
Subject: [PATCH 0004/1065] nixos/networking: simplify `/etc/hosts` generation,
 add asserts

Since `networking.hosts` is properly typed all of that magic `/etc/hosts` generator
does can be dropped. People that disagree with the value of `networking.hosts` can
simply `mkForce`.
---
 nixos/modules/config/networking.nix | 59 ++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 1ef5313d3fd..a1ee6a4304a 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -16,6 +16,13 @@ let
   resolvconfOptions = cfg.resolvconfOptions
     ++ optional cfg.dnsSingleRequest "single-request"
     ++ optional cfg.dnsExtensionMechanism "edns0";
+
+
+  localhostMapped4 = cfg.hosts ? "127.0.0.1" && elem "localhost" cfg.hosts."127.0.0.1";
+  localhostMapped6 = cfg.hosts ? "::1"       && elem "localhost" cfg.hosts."::1";
+
+  localhostMultiple = any (elem "localhost") (attrValues (removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]));
+
 in
 
 {
@@ -23,8 +30,7 @@ in
   options = {
 
     networking.hosts = lib.mkOption {
-      type = types.attrsOf ( types.listOf types.str );
-      default = {};
+      type = types.attrsOf (types.listOf types.str);
       example = literalExample ''
         {
           "127.0.0.1" = [ "foo.bar.baz" ];
@@ -192,6 +198,27 @@ in
 
   config = {
 
+    assertions = [{
+      assertion = localhostMapped4;
+      message = ''`networking.hosts` doesn't map "127.0.0.1" to "localhost"'';
+    } {
+      assertion = !cfg.enableIPv6 || localhostMapped6;
+      message = ''`networking.hosts` doesn't map "::1" to "localhost"'';
+    } {
+      assertion = !localhostMultiple;
+      message = ''
+        `networking.hosts` maps "localhost" to something other than "127.0.0.1"
+        or "::1". This will break some applications. Please use
+        `networking.extraHosts` if you really want to add such a mapping.
+      '';
+    }];
+
+    networking.hosts = {
+      "127.0.0.1" = [ "localhost" ];
+    } // optionalAttrs cfg.enableIPv6 {
+      "::1" = [ "localhost" ];
+    };
+
     environment.etc =
       { # /etc/services: TCP/UDP port assignments.
         "services".source = pkgs.iana-etc + "/etc/services";
@@ -203,25 +230,13 @@ in
         "rpc".source = pkgs.glibc.out + "/etc/rpc";
 
         # /etc/hosts: Hostname-to-IP mappings.
-        "hosts".text =
-          let oneToString = set : ip : ip + " " + concatStringsSep " " ( getAttr ip set );
-              allToString = set : concatMapStringsSep "\n" ( oneToString set ) ( attrNames set );
-              userLocalHosts = optionalString
-                ( builtins.hasAttr "127.0.0.1" cfg.hosts )
-                ( concatStringsSep " " ( remove "localhost" cfg.hosts."127.0.0.1" ));
-              userLocalHosts6 = optionalString
-                ( builtins.hasAttr "::1" cfg.hosts )
-                ( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" ));
-              otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]);
-          in
-          ''
-            127.0.0.1 ${userLocalHosts} localhost
-            ${optionalString cfg.enableIPv6 ''
-              ::1 ${userLocalHosts6} localhost
-            ''}
-            ${otherHosts}
-            ${cfg.extraHosts}
-          '';
+        "hosts".text = let
+          oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip};
+          allToString = set: concatMapStringsSep "\n" (oneToString set) (attrNames set);
+        in ''
+          ${allToString cfg.hosts}
+          ${cfg.extraHosts}
+        '';
 
         # /etc/host.conf: resolver configuration file
         "host.conf".text = cfg.hostConf;
@@ -296,4 +311,4 @@ in
 
   };
 
-  }
+}
-- 
GitLab


From c57892462bf22e537a2cd5ee5e6f88b0b59a2d33 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 23 Sep 2018 15:55:39 +0000
Subject: [PATCH 0005/1065] nixos/networking: add hostname to `/etc/hosts` by
 default

We use `127.0.1.1` instead of `127.0.0.1` because some applications will fail if
`127.0.0.1` resolves to something other than `localhost`.

Debian does the same.

See #1248 and #36261.
---
 nixos/modules/config/networking.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index a1ee6a4304a..1eb6fb43604 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -215,6 +215,8 @@ in
 
     networking.hosts = {
       "127.0.0.1" = [ "localhost" ];
+    } // optionalAttrs (cfg.hostName != "") {
+      "127.0.1.1" = [ cfg.hostName ];
     } // optionalAttrs cfg.enableIPv6 {
       "::1" = [ "localhost" ];
     };
-- 
GitLab


From 04bbb2ab6b7faf595e60fedc4da2cd5010d0d616 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 3 Oct 2018 16:08:39 +0800
Subject: [PATCH 0006/1065] firejail: override files should be in /etc/firejail

---
 pkgs/os-specific/linux/firejail/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 568e474f444..553b3804a03 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -37,6 +37,14 @@ stdenv.mkDerivation {
     sed -e "s@/etc/@$out/etc/@g" -e "/chmod u+s/d" -i Makefile
   '';
 
+  # We need to set the directory for the .local override files back to
+  # /etc/firejail so we can actually override them
+  postInstall = ''
+    sed -E -e 's@^include (.*)(/firejail/.*.local)$@include /etc\2@g' -i $out/etc/firejail/*.profile
+  '';
+
+  enableParallelBuilding = true;
+
   meta = {
     inherit (s) version;
     description = ''Namespace-based sandboxing tool for Linux'';
-- 
GitLab


From e80324c6259fdc462b6efbb373d36c82797f1681 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Fri, 5 Oct 2018 18:00:15 +0900
Subject: [PATCH 0007/1065] linux: inside nix-shell, allow make menuconfig

Use stdenv.lib.inNixShell to check for nix-shell and potentially bring pkgconfig/ncurses.
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 5e602358208..1d280647c5a 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -1,4 +1,5 @@
 { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
+, pkgconfig ? null, ncurses ? null
 , libelf
 , utillinux
 , writeTextFile
@@ -265,6 +266,7 @@ 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" ];
-- 
GitLab


From d3ba32e1171256039864f64051c7b92c19ea14b8 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 19 May 2018 12:51:30 -0400
Subject: [PATCH 0008/1065] openssl: don't autodetect platform on armv6/7l

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

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 87751188a03..2ad4b8d904b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -51,6 +51,8 @@ let
     configureScript = {
         "x86_64-darwin"  = "./Configure darwin64-x86_64-cc";
         "x86_64-solaris" = "./Configure solaris64-x86_64-gcc";
+        "armv6l-linux" = "./Configure linux-armv4 -march=armv6";
+        "armv7l-linux" = "./Configure linux-armv4 -march=armv7-a";
       }.${stdenv.hostPlatform.system} or (
         if stdenv.hostPlatform == stdenv.buildPlatform
           then "./config"
-- 
GitLab


From 056c03aeb38cf474240d8b10fcb00a4c84d20695 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Fri, 28 Sep 2018 02:04:21 -0700
Subject: [PATCH 0009/1065] konqueror: init at 18.08

---
 pkgs/applications/kde/default.nix   |  1 +
 pkgs/applications/kde/konqueror.nix | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/kde/konqueror.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 072b66e5563..16c3a47431c 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -129,6 +129,7 @@ let
       kontact = callPackage ./kontact.nix {};
       kontactinterface = callPackage ./kontactinterface.nix {};
       konquest = callPackage ./konquest.nix {};
+      konqueror = callPackage ./konqueror.nix {};
       korganizer = callPackage ./korganizer.nix {};
       kpimtextedit = callPackage ./kpimtextedit.nix {};
       ksmtp = callPackage ./ksmtp {};
diff --git a/pkgs/applications/kde/konqueror.nix b/pkgs/applications/kde/konqueror.nix
new file mode 100644
index 00000000000..e6442fea2f9
--- /dev/null
+++ b/pkgs/applications/kde/konqueror.nix
@@ -0,0 +1,20 @@
+{ lib
+, mkDerivation
+, extra-cmake-modules, kdoctools
+, kdelibs4support, kcmutils, khtml, kdesu
+, qtwebkit, qtwebengine, qtx11extras, qtscript, qtwayland
+}:
+
+mkDerivation {
+  name = "konqueror";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kdelibs4support kcmutils khtml kdesu
+    qtwebkit qtwebengine qtx11extras qtscript qtwayland
+  ];
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ ];
+  };
+}
+
-- 
GitLab


From e2e23ddd89f613d456fb54398ff8291d1f8ace9c Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Mon, 8 Oct 2018 22:21:09 +0900
Subject: [PATCH 0010/1065] gnome3.mutter: fix crash on startup with nvidia
 drivers

---
 pkgs/desktops/gnome-3/core/mutter/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index a08e0fd3cd1..34830117b77 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,7 +1,7 @@
 { 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 }:
+, pipewire, libgudev, libwacom, xwayland, autoreconfHook, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "mutter-${version}";
@@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
     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"
-- 
GitLab


From 46427a1b0bbafdcb3911495fde4e45454193cbac Mon Sep 17 00:00:00 2001
From: "RAPHAEL BACHER raphael.bacher@univ-grenoble-alpes.fr"
 <bacherap@luke.u-ga.fr>
Date: Mon, 15 Oct 2018 16:09:45 +0200
Subject: [PATCH 0011/1065] szip: fix url (previous ftp is now private)

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

diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
index b74c58a2e38..6577ebeae28 100644
--- a/pkgs/development/libraries/szip/default.nix
+++ b/pkgs/development/libraries/szip/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   name = "szip-${version}";
   version = "2.1.1";
   src = fetchurl {
-    url = "ftp://ftp.hdfgroup.org/lib-external/szip/${version}/src/szip-${version}.tar.gz";
-    sha256 = "1a8415a7xifagb22aq9dmy7b2s5l0y6diany3b4qigylw6adlzc9";
+    url = "https://support.hdfgroup.org/ftp/lib-external/szip/${version}/src/szip-${version}.tar.gz";
+    sha256 = "04nlhkzzf1gihvrfbzc6rq4kc13p92ly39dzrb4y4jrd9y5rbvi1";
   };
 
   meta = {
-- 
GitLab


From 16f67637ba6a27cb61e2f334afc6050114073369 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 8 Oct 2018 23:24:36 +0200
Subject: [PATCH 0012/1065] nixos/syncthing: move configuration to condigDir

fixes #47513 following the upstream recommended settings:
https://github.com/syncthing/syncthing/issues/3434#issuecomment-235401876
---
 nixos/doc/manual/release-notes/rl-1903.xml      | 10 ++++++++++
 nixos/modules/services/networking/syncthing.nix | 14 +++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 163819194ec..29520a0188d 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -97,6 +97,16 @@
        start org.nixos.nix-daemon</command>.
       </para>
      </listitem>
+     <listitem>
+      <para>
+        The Syncthing state and configuration data has been moved from
+        <varname>services.syncthing.dataDir</varname> to the newly defined
+        <varname>services.syncthing.configDir</varname>, which default to
+        <literal>/var/lib/syncthing/.config/syncthing</literal>.
+        This change makes possible to share synced directories using ACLs
+        without Syncthing resetting the permission on every start.
+      </para>
+     </listitem>
     </itemizedlist>
    </listitem>
    <listitem>
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index fd31b2a6768..b2ef1885a95 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -62,9 +62,21 @@ in {
       dataDir = mkOption {
         type = types.path;
         default = "/var/lib/syncthing";
+        description = ''
+          Path where synced directories will exist.
+        '';
+      };
+
+      configDir = mkOption {
+        type = types.path;
         description = ''
           Path where the settings and keys will exist.
         '';
+        default =
+          let
+            nixos = config.system.stateVersion;
+            cond  = versionAtLeast nixos "19.03";
+          in cfg.dataDir + (optionalString cond "/.config/syncthing");
       };
 
       openDefaultPorts = mkOption {
@@ -144,7 +156,7 @@ in {
             ${cfg.package}/bin/syncthing \
               -no-browser \
               -gui-address=${cfg.guiAddress} \
-              -home=${cfg.dataDir}
+              -home=${cfg.configDir}
           '';
         };
       };
-- 
GitLab


From adf826119217c23dc4c52c8da892d30df54b02ad Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sun, 14 May 2017 23:32:45 -0400
Subject: [PATCH 0013/1065] nixos/salt-minion: Remove trailing whitespace

---
 nixos/modules/services/admin/salt/minion.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/admin/salt/minion.nix b/nixos/modules/services/admin/salt/minion.nix
index 9ecefb32cfa..be2c5e2f83d 100644
--- a/nixos/modules/services/admin/salt/minion.nix
+++ b/nixos/modules/services/admin/salt/minion.nix
@@ -28,8 +28,8 @@ in
         default = {};
         description = ''
           Salt minion configuration as Nix attribute set.
-          See <link xlink:href="https://docs.saltstack.com/en/latest/ref/configuration/minion.html"/>                                                                                                 
-          for details.          
+          See <link xlink:href="https://docs.saltstack.com/en/latest/ref/configuration/minion.html"/>
+          for details.
         '';
       };
     };
-- 
GitLab


From 37c9915340357226d2c9090425e9566feb7bb159 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sun, 14 May 2017 23:29:32 -0400
Subject: [PATCH 0014/1065] nixos/salt-minion: Fix salt-call without `-c`

---
 nixos/modules/services/admin/salt/minion.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/admin/salt/minion.nix b/nixos/modules/services/admin/salt/minion.nix
index be2c5e2f83d..254ff7bb899 100644
--- a/nixos/modules/services/admin/salt/minion.nix
+++ b/nixos/modules/services/admin/salt/minion.nix
@@ -15,7 +15,6 @@ let
     # Default is in /etc/salt/pki/minion
     pki_dir = "/var/lib/salt/pki/minion";
   } cfg.configuration;
-  configDir = pkgs.writeTextDir "minion" (builtins.toJSON fullConfig);
 
 in
 
@@ -36,7 +35,16 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [ salt ];
+    environment = {
+      # Set this up in /etc/salt/minion so `salt-call`, etc. work.
+      # The alternatives are
+      # - passing --config-dir to all salt commands, not just the minion unit,
+      # - setting aglobal environment variable.
+      etc."salt/minion".source = pkgs.writeText "minion" (
+        builtins.toJSON fullConfig
+      );
+      systemPackages = with pkgs; [ salt ];
+    };
     systemd.services.salt-minion = {
       description = "Salt Minion";
       wantedBy = [ "multi-user.target" ];
@@ -45,7 +53,7 @@ in
         utillinux
       ];
       serviceConfig = {
-        ExecStart = "${pkgs.salt}/bin/salt-minion --config-dir=${configDir}";
+        ExecStart = "${pkgs.salt}/bin/salt-minion";
         LimitNOFILE = 8192;
         Type = "notify";
         NotifyAccess = "all";
-- 
GitLab


From a962d538068cdf00025e73181d17572492f68008 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 18 Sep 2018 09:30:22 -0700
Subject: [PATCH 0015/1065] salt: Restart on config changes

---
 nixos/modules/services/admin/salt/master.nix | 3 +++
 nixos/modules/services/admin/salt/minion.nix | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/nixos/modules/services/admin/salt/master.nix b/nixos/modules/services/admin/salt/master.nix
index 165580b9783..c6b1b0cc0bd 100644
--- a/nixos/modules/services/admin/salt/master.nix
+++ b/nixos/modules/services/admin/salt/master.nix
@@ -53,6 +53,9 @@ in
         Type = "notify";
         NotifyAccess = "all";
       };
+      restartTriggers = [
+        config.environment.etc."salt/master".source
+      ];
     };
   };
 
diff --git a/nixos/modules/services/admin/salt/minion.nix b/nixos/modules/services/admin/salt/minion.nix
index 254ff7bb899..c8fa9461a20 100644
--- a/nixos/modules/services/admin/salt/minion.nix
+++ b/nixos/modules/services/admin/salt/minion.nix
@@ -58,6 +58,9 @@ in
         Type = "notify";
         NotifyAccess = "all";
       };
+      restartTriggers = [
+        config.environment.etc."salt/minion".source
+      ];
     };
   };
 }
-- 
GitLab


From b249bcc7b4e27f0d9b8a954500ed723c74c1a62e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 16 Oct 2018 00:31:09 -0700
Subject: [PATCH 0016/1065] clamav: 0.100.1 -> 0.100.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/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 82599393724..5ab46a1d5e1 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.1";
+  version = "0.100.2";
 
   src = fetchurl {
     url = "https://www.clamav.net/downloads/production/${name}.tar.gz";
-    sha256 = "17x5b2gh84b167h6ip9hw05w809p009yx13i4gkps92ja5jjdq44";
+    sha256 = "1mkd41sxbjkfjinpx5b9kb85q529gj2s3d0klysssqhysh64ybja";
   };
 
   # don't install sample config files into the absolute sysconfdir folder
-- 
GitLab


From 1758ef04e868fc0cc7c59634c5cfef7f17154441 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 15 Oct 2018 22:03:17 +0200
Subject: [PATCH 0017/1065] ttyplot: init at 1.0

---
 pkgs/tools/misc/ttyplot/default.nix | 30 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/misc/ttyplot/default.nix

diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix
new file mode 100644
index 00000000000..9fdac0b8b9c
--- /dev/null
+++ b/pkgs/tools/misc/ttyplot/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+stdenv.mkDerivation rec {
+  name = "ttyplot-${version}";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "tenox7";
+    repo = "ttyplot";
+    rev = version;
+    sha256 = "1i54hw7fad42gdlrlqg7s0vhsq01yxzdi2s0r3svwbb1sr7ynzn1";
+  };
+
+  buildInputs = [ ncurses ];
+
+  buildPhase = ''
+   ${stdenv.cc}/bin/cc ./ttyplot.c -lncurses -o ttyplot
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ttyplot $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    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 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aaa8da74333..dae3b77f5e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5739,6 +5739,8 @@ with pkgs;
 
   tty-clock = callPackage ../tools/misc/tty-clock { };
 
+  ttyplot = callPackage ../tools/misc/ttyplot { };
+
   ttyrec = callPackage ../tools/misc/ttyrec { };
 
   ttylog = callPackage ../tools/misc/ttylog { };
-- 
GitLab


From 360a753939c3b9201debaf23c5cd799ffffa5e50 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 16 Oct 2018 04:19:39 -0700
Subject: [PATCH 0018/1065] aws-sdk-cpp: 1.5.17 -> 1.6.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/aws-sdk-cpp/versions
---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 9afb03e0d0c..a7c918ee01a 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -15,13 +15,13 @@ let
         else throw "Unsupported system!";
 in stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.5.17";
+  version = "1.6.20";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "0mmzf3js6090kk9vdwrmib5cjny43mqf044iynkhkglzvwhadc8z";
+    sha256 = "0b6ahy748i29jqzzrjh8vybk7dv8qda3ir277mqflg4a8xxg9bj1";
   };
 
   # FIXME: might be nice to put different APIs in different outputs
-- 
GitLab


From 51e511130a6532bf25b1f3ad2f2d5cce78a578ac Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 16 Oct 2018 10:42:45 -0500
Subject: [PATCH 0019/1065] z3: 4.7.1 -> 4.8.1

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

diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 1cbe914779e..f7d67d82cbc 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.7.1";
+  version = "4.8.1";
 
   src = fetchFromGitHub {
     owner  = "Z3Prover";
     repo   = "z3";
-    rev    = "3b1b82bef05a1b5fd69ece79c80a95fb6d72a990";
-    sha256 = "1s850r6qifwl83zzgvrb5l0jigvmymzpv18ph71hg2bcpk7kjw3d";
+    rev    = name;
+    sha256 = "1vr57bwx40sd5riijyrhy70i2wnv9xrdihf6y5zdz56yq88rl48f";
   };
 
   buildInputs = [ python fixDarwinDylibNames ];
-- 
GitLab


From ba8b54fa4a91cd94e8c42095d4f82d4a93cd01d1 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 27 Sep 2018 18:21:26 +0200
Subject: [PATCH 0020/1065] Add Nixpkgs functions for adding overlays ad-hoc

This is something that I have found useful in tests. In practice
I recommend that people call Nixpkgs once for performance and
simplicity. The inline documentation mentions this too.
---
 pkgs/top-level/stage.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index d0fb885dc74..37724a870a3 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -56,7 +56,7 @@
 , # A list of overlays (Additional `self: super: { .. }` customization
   # functions) to be fixed together in the produced package set
   overlays
-}:
+} @args:
 
 let
   stdenvAdapters = self: super:
@@ -159,6 +159,19 @@ let
         };
       };
     };
+
+    # Extend the package set with zero or more overlays. This preserves
+    # preexisting overlays. Prefer to initialize with the right overlays
+    # in one go when calling Nixpkgs, for performance and simplicity.
+    appendOverlays = extraOverlays:
+      import ./stage.nix (args // { overlays = args.overlays ++ extraOverlays; });
+
+    # Extend the package set with a single overlay. This preserves
+    # preexisting overlays. Prefer to initialize with the right overlays
+    # in one go when calling Nixpkgs, for performance and simplicity.
+    # Prefer appendOverlays if used repeatedly.
+    extend = f: self.appendOverlays [f];
+
   };
 
   # The complete chain of package set builders, applied from top to bottom.
-- 
GitLab


From 9b7654f6ff326a7e35b48ce3c54d7f8bb71d9a13 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 15 Oct 2018 13:47:36 +0200
Subject: [PATCH 0021/1065] nixpkgs docs: Point to pkgs.extend,
 pkgs.appendOverlays and improve override section

---
 doc/functions/overrides.xml | 15 +++++++++++++--
 doc/overlays.xml            |  8 +++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/doc/functions/overrides.xml b/doc/functions/overrides.xml
index 99e2a63631a..30cc6f3f6b1 100644
--- a/doc/functions/overrides.xml
+++ b/doc/functions/overrides.xml
@@ -6,8 +6,16 @@
 
  <para>
   Sometimes one wants to override parts of <literal>nixpkgs</literal>, e.g.
-  derivation attributes, the results of derivations or even the whole package
-  set.
+  derivation attributes, the results of derivations.
+ </para>
+
+ <para>
+  These overriding functions let you focus on one part of Nixpkgs and give you
+  back the requested variation. This is orthogonal but related to overlays and
+  the extending functions. Those also let you make modifications but return the
+  whole package set instead of just what you modified. When used together, the
+  override functions make the changes and overlays or extending functions add
+  those changes to the package sets.
  </para>
 
  <section xml:id="sec-pkg-override">
@@ -25,6 +33,9 @@
   <para>
    Example usages:
 <programlisting>pkgs.foo.override { arg1 = val1; arg2 = val2; ... }</programlisting>
+<!-- TODO: move below programlisting to a new section about extending and overlays
+           and reference it
+  -->
 <programlisting>
 import pkgs.path { overlays = [ (self: super: {
   foo = super.foo.override { barSupport = true ; };
diff --git a/doc/overlays.xml b/doc/overlays.xml
index 2decf9febe8..af1ab26b5e9 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -30,10 +30,16 @@
       itself is given, then that is used.
      </para>
      <para>
-      This can be passed explicitly when importing nipxkgs, for example
+      This can be passed explicitly when importing nixpkgs, for example
       <literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ];
       }</literal>.
      </para>
+     <para>
+      Further overlays can be added by calling the
+      <literal>pkgs.extend</literal> or <literal>pkgs.appendOverlays</literal>,
+      although it is often preferable to avoid these functions, because they
+      recompute the Nixpkgs fixpoint, which is somewhat expensive to do.
+     </para>
     </listitem>
     <listitem>
      <para>
-- 
GitLab


From 3c2ae189c2af388812d82596770df74ac8f839ee Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 18 Oct 2018 14:01:06 +0200
Subject: [PATCH 0022/1065] doc: Improve overrides and overlays documentation

---
 doc/functions/overrides.xml |   9 +-
 doc/overlays.xml            | 197 ++++++++++++++++++++----------------
 2 files changed, 114 insertions(+), 92 deletions(-)

diff --git a/doc/functions/overrides.xml b/doc/functions/overrides.xml
index 30cc6f3f6b1..5532951d1a7 100644
--- a/doc/functions/overrides.xml
+++ b/doc/functions/overrides.xml
@@ -10,12 +10,9 @@
  </para>
 
  <para>
-  These overriding functions let you focus on one part of Nixpkgs and give you
-  back the requested variation. This is orthogonal but related to overlays and
-  the extending functions. Those also let you make modifications but return the
-  whole package set instead of just what you modified. When used together, the
-  override functions make the changes and overlays or extending functions add
-  those changes to the package sets.
+  These functions are used to make changes to packages, returning only single
+  packages. Overlays, on the other hand, can be used to combine the overridden
+  packages across the entire package set of Nixpkgs.
  </para>
 
  <section xml:id="sec-pkg-override">
diff --git a/doc/overlays.xml b/doc/overlays.xml
index af1ab26b5e9..90dd163072d 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -17,97 +17,122 @@
   <title>Installing overlays</title>
 
   <para>
-   The list of overlays is determined as follows.
+   The list of overlays can be set either explicitly in a Nix expression, or
+   through <literal>&lt;nixpkgs-overlays></literal> or user configuration
+   files.
   </para>
 
-  <para>
-   If the <varname>overlays</varname> argument is not provided explicitly, we
-   look for overlays in a path. The path is determined as follows:
-   <orderedlist>
-    <listitem>
-     <para>
-      First, if an <varname>overlays</varname> argument to the nixpkgs function
-      itself is given, then that is used.
-     </para>
-     <para>
-      This can be passed explicitly when importing nixpkgs, for example
-      <literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ];
-      }</literal>.
-     </para>
-     <para>
-      Further overlays can be added by calling the
-      <literal>pkgs.extend</literal> or <literal>pkgs.appendOverlays</literal>,
-      although it is often preferable to avoid these functions, because they
-      recompute the Nixpkgs fixpoint, which is somewhat expensive to do.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Otherwise, if the Nix path entry <literal>&lt;nixpkgs-overlays></literal>
-      exists, we look for overlays at that path, as described below.
-     </para>
-     <para>
-      See the section on <literal>NIX_PATH</literal> in the Nix manual for more
-      details on how to set a value for
-      <literal>&lt;nixpkgs-overlays>.</literal>
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and
-      <filename>~/.config/nixpkgs/overlays/</filename> exists, then we look for
-      overlays at that path, as described below. It is an error if both exist.
-     </para>
-    </listitem>
-   </orderedlist>
-  </para>
+  <section xml:id="sec-overlays-argument">
+   <title>Set overlays in NixOS or Nix expressions</title>
 
-  <para>
-   If we are looking for overlays at a path, then there are two cases:
-   <itemizedlist>
-    <listitem>
-     <para>
-      If the path is a file, then the file is imported as a Nix expression and
-      used as the list of overlays.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      If the path is a directory, then we take the content of the directory,
-      order it lexicographically, and attempt to interpret each as an overlay
-      by:
-      <itemizedlist>
-       <listitem>
-        <para>
-         Importing the file, if it is a <literal>.nix</literal> file.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         Importing a top-level <filename>default.nix</filename> file, if it is
-         a directory.
-        </para>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
+   <para>
+    On a NixOS system the value of the <literal>nixpkgs.overlays</literal>
+    option, if present, is passed to the system Nixpkgs directly as an
+    argument. Note that this does not affect the overlays for non-NixOS
+    operations (e.g. <literal>nix-env</literal>), which are
+    <link xlink:href="#sec-overlays-lookup">looked</link> up independently.
+   </para>
 
-  <para>
-   On a NixOS system the value of the <literal>nixpkgs.overlays</literal>
-   option, if present, is passed to the system Nixpkgs directly as an argument.
-   Note that this does not affect the overlays for non-NixOS operations (e.g.
-   <literal>nix-env</literal>), which are looked up independently.
-  </para>
+   <para>
+    The list of overlays can be passed explicitly when importing nixpkgs, for
+    example <literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ];
+    }</literal>.
+   </para>
 
-  <para>
-   The <filename>overlays.nix</filename> option therefore provides a convenient
-   way to use the same overlays for a NixOS system configuration and user
-   configuration: the same file can be used as
-   <filename>overlays.nix</filename> and imported as the value of
-   <literal>nixpkgs.overlays</literal>.
-  </para>
+   <para>
+    Further overlays can be added by calling the <literal>pkgs.extend</literal>
+    or <literal>pkgs.appendOverlays</literal>, although it is often preferable
+    to avoid these functions, because they recompute the Nixpkgs fixpoint,
+    which is somewhat expensive to do.
+   </para>
+  </section>
+
+  <section xml:id="sec-overlays-lookup">
+   <title>Install overlays via configuration lookup</title>
+
+   <para>
+    The list of overlays is determined as follows.
+   </para>
+
+   <para>
+    <orderedlist>
+     <listitem>
+      <para>
+       First, if an
+       <link xlink:href="#sec-overlays-argument"><varname>overlays</varname>
+       argument</link> to the nixpkgs function itself is given, then that is
+       used and no path lookup will be performed.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       Otherwise, if the Nix path entry
+       <literal>&lt;nixpkgs-overlays></literal> exists, we look for overlays at
+       that path, as described below.
+      </para>
+      <para>
+       See the section on <literal>NIX_PATH</literal> in the Nix manual for
+       more details on how to set a value for
+       <literal>&lt;nixpkgs-overlays>.</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and
+       <filename>~/.config/nixpkgs/overlays/</filename> exists, then we look
+       for overlays at that path, as described below. It is an error if both
+       exist.
+      </para>
+     </listitem>
+    </orderedlist>
+   </para>
+
+   <para>
+    If we are looking for overlays at a path, then there are two cases:
+    <itemizedlist>
+     <listitem>
+      <para>
+       If the path is a file, then the file is imported as a Nix expression and
+       used as the list of overlays.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       If the path is a directory, then we take the content of the directory,
+       order it lexicographically, and attempt to interpret each as an overlay
+       by:
+       <itemizedlist>
+        <listitem>
+         <para>
+          Importing the file, if it is a <literal>.nix</literal> file.
+         </para>
+        </listitem>
+        <listitem>
+         <para>
+          Importing a top-level <filename>default.nix</filename> file, if it is
+          a directory.
+         </para>
+        </listitem>
+       </itemizedlist>
+      </para>
+     </listitem>
+    </itemizedlist>
+   </para>
+
+   <para>
+    Because overlays that are set in NixOS configuration do not affect
+    non-NixOS operations such as <literal>nix-env</literal>, the
+    <filename>overlays.nix</filename> option provides a convenient way to use
+    the same overlays for a NixOS system configuration and user configuration:
+    the same file can be used as <filename>overlays.nix</filename> and imported
+    as the value of <literal>nixpkgs.overlays</literal>.
+   </para>
+
+<!-- TODO: Example of sharing overlays between NixOS configuration
+     and configuration lookup. Also reference the example
+     from the sec-overlays-argument paragraph about NixOS.
+ -->
+  </section>
  </section>
 <!--============================================================-->
  <section xml:id="sec-overlays-definition">
-- 
GitLab


From 69c15c0c250193f4d212bbcad4a5093da7f5fe8e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 18 Oct 2018 16:28:45 -0500
Subject: [PATCH 0023/1065] libinput-gestures: 2.33 -> 2.38

---
 pkgs/tools/inputmethods/libinput-gestures/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix
index 31a7098e08d..e63decd7a4e 100644
--- a/pkgs/tools/inputmethods/libinput-gestures/default.nix
+++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix
@@ -5,14 +5,14 @@
 }:
 stdenv.mkDerivation rec {
   pname = "libinput-gestures";
-  version = "2.33";
+  version = "2.38";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "bulletmark";
     repo = "libinput-gestures";
     rev = version;
-    sha256 = "0a4zq880da1rn0mxn1sq4cp6zkw4bfslr0vjczkbj4immjrj422j";
+    sha256 = "1nxvlifag04v56grdwxc3l92kmf51c4w2lq42a3w76yc6p4nxw1m";
   };
   patches = [
     ./0001-hardcode-name.patch
-- 
GitLab


From 72f31fbc196775eae551c1ce7f8b56b819ab96e0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 18 Oct 2018 16:40:01 -0500
Subject: [PATCH 0024/1065] libinput-gestures: update patches

Don't bother skipping the version check,
keep diff against upstream simple.
---
 .../0001-hardcode-name.patch                  |  2 +-
 .../libinput-gestures/0002-paths.patch        | 34 ++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch b/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch
index b694fcabbd0..4655879149d 100644
--- a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch
+++ b/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch
@@ -1,5 +1,5 @@
 diff --git a/libinput-gestures b/libinput-gestures
-index f337ba3..fe56d66 100755
+index 66479b6..aca94ac 100755
 --- a/libinput-gestures
 +++ b/libinput-gestures
 @@ -6,7 +6,7 @@ from collections import OrderedDict
diff --git a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch b/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch
index c6ee123db8b..407450c8bcc 100644
--- a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch
+++ b/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch
@@ -1,29 +1,28 @@
 diff --git a/libinput-gestures b/libinput-gestures
-index f337ba3..5f5b05d 100755
+index aca94ac..c2f03ca 100755
 --- a/libinput-gestures
 +++ b/libinput-gestures
-@@ -75,17 +75,13 @@ def get_libinput_vers():
+@@ -77,7 +77,7 @@ def get_libinput_vers():
      'Return the libinput installed version number string'
      # Try to use newer libinput interface then fall back to old
      # (depreciated) interface.
 -    res = run(('libinput', '--version'), check=False)
 +    res = run(('@libinput@', '--version'), check=False)
-     return res.strip() if res else run(('libinput-list-devices', '--version'))
+     return res.strip() if res else \
+             run(('libinput-list-devices', '--version'), check=False)
  
- # Libinput changed the way in which it's utilities are called
- libvers = get_libinput_vers()
--if Version(libvers) >= Version('1.8'):
+@@ -87,8 +87,8 @@ if not libvers:
+     sys.exit('libinput helper tools do not seem to be installed?')
+ 
+ if Version(libvers) >= Version('1.8'):
 -    cmd_debug_events = 'libinput debug-events'
 -    cmd_list_devices = 'libinput list-devices'
--else:
--    cmd_debug_events = 'libinput-debug-events'
--    cmd_list_devices = 'libinput-list-devices'
-+cmd_debug_events = '@libinput@ debug-events'
-+cmd_list_devices = '@libinput@ list-devices'
- 
- def get_devices_list():
-     'Get list of devices and their attributes (as a dict) from libinput'
-@@ -187,7 +183,7 @@ class COMMAND_internal(COMMAND):
++    cmd_debug_events = '@libinput@ debug-events'
++    cmd_list_devices = '@libinput@ list-devices'
+ else:
+     cmd_debug_events = 'libinput-debug-events'
+     cmd_list_devices = 'libinput-list-devices'
+@@ -199,7 +199,7 @@ class COMMAND_internal(COMMAND):
  
      def run(self):
          'Get list of current workspaces and select next one'
@@ -32,7 +31,7 @@ index f337ba3..5f5b05d 100755
          if not stdout:
              # This command can fail on GNOME when you have only a single
              # dynamic workspace using Xorg (probably a GNOME bug) so let's
-@@ -220,7 +216,7 @@ class COMMAND_internal(COMMAND):
+@@ -233,7 +233,7 @@ class COMMAND_internal(COMMAND):
  
          # Switch to desired workspace
          if index >= minindex and index < maxindex:
@@ -41,3 +40,6 @@ index f337ba3..5f5b05d 100755
  
  # Table of gesture handlers
  handlers = OrderedDict()
+-- 
+2.19.1
+
-- 
GitLab


From f58fcf849e848515403c6db2d443eee1ba4e7a56 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 18 Oct 2018 16:45:26 -0500
Subject: [PATCH 0025/1065] libinput-gestures: entry point is a python script,
 add dep

Otherwise we have a raw shebang that doesn't work :(
---
 pkgs/tools/inputmethods/libinput-gestures/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix
index e63decd7a4e..77eae2c55e1 100644
--- a/pkgs/tools/inputmethods/libinput-gestures/default.nix
+++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, makeWrapper,
-  libinput, wmctrl,
+  libinput, wmctrl, python3,
   xdotool ? null,
   extraUtilsPath ? lib.optional (xdotool != null) xdotool
 }:
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ python3 ];
 
   postPatch =
     ''
-- 
GitLab


From 241230d0518c961140537d274608b28c47d4ac08 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 19 Oct 2018 09:11:45 +0200
Subject: [PATCH 0026/1065] skaffold: init at 0.16.0

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/skaffold/default.nix | 32 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/tools/skaffold/default.nix

diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
new file mode 100644
index 00000000000..56d290dd724
--- /dev/null
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -0,0 +1,32 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "skaffold-${version}";
+  version = "0.16.0";
+  # rev is the 0.16.0 commit, mainly for skaffold version command output
+  rev = "78e443973ee7475ee66d227431596351cf5e2caf";
+
+  goPackagePath = "github.com/GoogleContainerTools/skaffold";
+  subPackages = ["cmd/skaffold"];
+
+  buildFlagsArray = let t = "${goPackagePath}/pkg/skaffold"; in  ''
+    -ldflags=
+      -X ${t}/version.version=v${version}
+      -X ${t}/version.gitCommit=${rev}
+      -X ${t}/version.buildDate=unknown
+  '';
+
+  src = fetchFromGitHub {
+    owner = "GoogleContainerTools";
+    repo = "skaffold";
+    rev = "v${version}";
+    sha256 = "0vpjxyqppyj4zs02n8b0k0qd8zidrrcks60x6qd5a4bbqa0c1zld";
+  };
+
+  meta = {
+    description = "Easy and Repeatable Kubernetes Development";
+    homepage = https://github.com/GoogleContainerTools/skaffold;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ vdemeester ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0ac63a3e97..6e2024f0f56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12164,6 +12164,8 @@ with pkgs;
 
   shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { };
 
+  skaffold = callPackage ../development/tools/skaffold { };
+
   skalibs = skawarePackages.skalibs;
 
   skawarePackages = recurseIntoAttrs {
-- 
GitLab


From 2ebc3034d3cc9d98478074a9d1d2f1ab6b2658fb Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Fri, 19 Oct 2018 04:27:12 -0400
Subject: [PATCH 0027/1065] haskellPackages.cabal-helper: Jailbreak restrictive
 bounds. [Fixes #45515]

---
 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 e05f19609ea..f792332ded3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1159,4 +1159,7 @@ self: super: {
   # https://github.com/danfran/cabal-macosx/issues/13
   cabal-macosx = dontCheck super.cabal-macosx;
 
+  # https://github.com/DanielG/cabal-helper/issues/59
+  cabal-helper = doJailbreak super.cabal-helper;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
-- 
GitLab


From bc56701020265f86ae2007f4aab2eff8e8e34896 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Fri, 19 Oct 2018 04:49:56 -0400
Subject: [PATCH 0028/1065] haskell.lib.buildFromSdist: Allow overrideCabal
 [Fixes #45018]

---
 pkgs/development/haskell-modules/lib.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 6155e158e9d..f4ebe549c50 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -245,12 +245,13 @@ rec {
      on hackage. This can be used as a test for the source distribution,
      assuming the build fails when packaging mistakes are in the cabal file.
    */
-  buildFromSdist = pkg: lib.overrideDerivation pkg (drv: {
-    unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in ''
-      echo "Source tarball is at ${src}/${tarname}.tar.gz"
-      tar xf ${src}/${tarname}.tar.gz
-      cd ${pkg.pname}-*
-    '';
+  buildFromSdist = pkg: overrideCabal pkg (drv: {
+    src = "${sdistTarball pkg}/${pkg.pname}-${pkg.version}.tar.gz";
+
+    # Revising and jailbreaking the cabal file has been handled in sdistTarball
+    revision = null;
+    editedCabalFile = null;
+    jailbreak = false;
   });
 
   /* Build the package in a strict way to uncover potential problems.
-- 
GitLab


From a5c4642ddf03f792c29764c53725f9b04e06decd Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 19 Oct 2018 12:25:17 +0200
Subject: [PATCH 0029/1065] doc: Add link from overrides to overlays

---
 doc/functions/overrides.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/functions/overrides.xml b/doc/functions/overrides.xml
index 5532951d1a7..4ba861bd1a4 100644
--- a/doc/functions/overrides.xml
+++ b/doc/functions/overrides.xml
@@ -11,8 +11,9 @@
 
  <para>
   These functions are used to make changes to packages, returning only single
-  packages. Overlays, on the other hand, can be used to combine the overridden
-  packages across the entire package set of Nixpkgs.
+  packages. <link xlink:href="#chap-overlays">Overlays</link>, on the other
+  hand, can be used to combine the overridden packages across the entire
+  package set of Nixpkgs.
  </para>
 
  <section xml:id="sec-pkg-override">
-- 
GitLab


From 1917c7de875bcf9a13c50c40d16671c886940d6c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 7 Jul 2018 08:49:11 -0400
Subject: [PATCH 0030/1065] gsignond: init at 2018-10-04

---
 .../development/libraries/gsignond/conf.patch | 12 ++++
 .../libraries/gsignond/default.nix            | 69 +++++++++++++++++++
 .../libraries/gsignond/plugin-load-env.patch  | 35 ++++++++++
 .../libraries/gsignond/wrapper.nix            | 23 +++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 5 files changed, 143 insertions(+)
 create mode 100644 pkgs/development/libraries/gsignond/conf.patch
 create mode 100644 pkgs/development/libraries/gsignond/default.nix
 create mode 100644 pkgs/development/libraries/gsignond/plugin-load-env.patch
 create mode 100644 pkgs/development/libraries/gsignond/wrapper.nix

diff --git a/pkgs/development/libraries/gsignond/conf.patch b/pkgs/development/libraries/gsignond/conf.patch
new file mode 100644
index 00000000000..0aa2034e399
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/conf.patch
@@ -0,0 +1,12 @@
+diff --git a/meson.build b/meson.build
+index cb1e0df..d90c85c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -95,6 +95,6 @@ endif
+ configure_file(
+     input: 'gsignond.conf.in',
+     configuration: conf_data,
+-    install_dir: sysconf_dir,
++    install_dir: 'etc/',
+     output: 'gsignond.conf'
+ )
diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix
new file mode 100644
index 00000000000..11dcc2a2ee9
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking
+, sqlite, gobjectIntrospection, vala, gtk-doc, libsecret, docbook_xsl
+, docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper
+, symlinkJoin, gsignondPlugins, plugins }:
+
+let
+unwrapped = stdenv.mkDerivation rec {
+  pname = "gsignond";
+  version = "39022c86ddb5062a10fb0503ad9d81a8e532d527";
+
+  name = "${pname}-2018-10-04";
+
+  outputs = [ "out" "dev" "devdoc" ];
+
+  src = fetchFromGitLab {
+    owner = "accounts-sso";
+    repo = pname;
+    rev = version;
+    sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff";
+  };
+
+  nativeBuildInputs = [
+    docbook_xml_dtd_43
+    docbook_xml_dtd_45
+    docbook_xsl
+    glibcLocales
+    gobjectIntrospection
+    gtk-doc
+    meson
+    ninja
+    pkgconfig
+    vala
+  ];
+
+  buildInputs = [
+    glib
+    glib-networking
+    libsecret
+  ];
+
+  propagatedBuildInputs = [ sqlite ];
+
+  mesonFlags = [
+    "-Dbus_type=session"
+    "-Dextension=desktop"
+  ];
+
+  LC_ALL = "en_US.UTF-8";
+
+  patches = [
+    ./conf.patch
+    ./plugin-load-env.patch
+  ];
+
+  meta = with stdenv.lib; {
+    description = "D-Bus service which performs user authentication on behalf of its clients";
+    homepage = https://gitlab.com/accounts-sso/gsignond;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms = platforms.linux;
+  };
+};
+
+in if plugins == [] then unwrapped
+    else import ./wrapper.nix {
+      inherit stdenv makeWrapper symlinkJoin gsignondPlugins plugins;
+      gsignond = unwrapped;
+    }
+
diff --git a/pkgs/development/libraries/gsignond/plugin-load-env.patch b/pkgs/development/libraries/gsignond/plugin-load-env.patch
new file mode 100644
index 00000000000..5da2b4c157e
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugin-load-env.patch
@@ -0,0 +1,35 @@
+diff --git a/src/gplugind/gsignond-plugin-loader.c b/src/gplugind/gsignond-plugin-loader.c
+index 5497b32..979e1b4 100644
+--- a/src/gplugind/gsignond-plugin-loader.c
++++ b/src/gplugind/gsignond-plugin-loader.c
+@@ -38,11 +38,10 @@ gsignond_load_plugin (
+     gchar *plugin_filename;
+     GSignondPlugin *plugin;
+ 
+-#   ifdef ENABLE_DEBUG
+     const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
+     if (env_val)
+         plugin_path = env_val;
+-#   endif
++
+     plugin_filename = g_module_build_path (plugin_path, plugin_type);
+     plugin = gsignond_load_plugin_with_filename (plugin_type,
+                                                  plugin_filename);
+diff --git a/src/gplugind/main.c b/src/gplugind/main.c
+index 1c6cdb6..c85c623 100644
+--- a/src/gplugind/main.c
++++ b/src/gplugind/main.c
+@@ -93,11 +93,11 @@ _install_sighandlers (GMainLoop *main_loop)
+ static const gchar* _plugin_path(void)
+ {
+     const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR;
+-#   ifdef ENABLE_DEBUG
++
+     const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
+     if (env_val)
+         plugin_path = env_val;
+-#   endif
++
+     return plugin_path;
+ }
+ 
diff --git a/pkgs/development/libraries/gsignond/wrapper.nix b/pkgs/development/libraries/gsignond/wrapper.nix
new file mode 100644
index 00000000000..a5df6bbeafb
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/wrapper.nix
@@ -0,0 +1,23 @@
+{ stdenv, makeWrapper, symlinkJoin, gsignond, gsignondPlugins, plugins }:
+
+symlinkJoin {
+  name = "gsignond-with-plugins-${gsignond.version}";
+
+  paths = [ gsignond ] ++ plugins;
+
+  buildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    wrapProgram $out/bin/gsignond \
+      --set SSO_GPLUGINS_DIR "$out/lib/gsignond/gplugins"
+
+    rm $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service
+    rm $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service
+
+    substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service \
+      --replace ${gsignond} $out
+
+    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
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5495b34960d..5c243290ead 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12766,6 +12766,10 @@ with pkgs;
 
   zziplib = callPackage ../development/libraries/zziplib { };
 
+  gsignond = callPackage ../development/libraries/gsignond {
+    plugins = [];
+  };
+
   ### DEVELOPMENT / LIBRARIES / AGDA
 
   agda = callPackage ../build-support/agda {
-- 
GitLab


From 3522d66f5a402c84a9fe1bcec609454a2033e1f4 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 17 Aug 2018 08:38:09 -0400
Subject: [PATCH 0031/1065] gsignondPlugins.sasl: init at 2017-11-11

---
 .../libraries/gsignond/plugins/sasl.nix       | 45 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/libraries/gsignond/plugins/sasl.nix

diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix
new file mode 100644
index 00000000000..25f20557906
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, gsasl, check
+, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "gsignond-plugin-sasl-${version}";
+  version = "2018-10-15";
+
+  src = fetchFromGitLab {
+    owner = "accounts-sso";
+    repo = "gsignond-plugin-sasl";
+    rev = "b304c70b7dad9368b23b1205122d10de684c896a";
+    sha256 = "0knzw7c2fm2kzs1gxbrm4kk67522w9cpwqj7xvn86473068k90va";
+  };
+
+  nativeBuildInputs = [
+    check
+    docbook_xml_dtd_43
+    docbook_xml_dtd_45
+    docbook_xsl
+    glibcLocales
+    gobjectIntrospection
+    gtk-doc
+    meson
+    ninja
+    pkgconfig
+  ];
+
+  buildInputs = [
+    glib
+    gsasl
+    gsignond
+  ];
+
+  LC_ALL = "en_US.UTF-8";
+
+  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.";
+    homepage = https://gitlab.com/accounts-sso/gsignond-plugin-sasl;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c243290ead..23b9359ce84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12770,6 +12770,10 @@ with pkgs;
     plugins = [];
   };
 
+  gsignondPlugins = {
+    sasl = callPackage ../development/libraries/gsignond/plugins/sasl.nix { };
+  };
+
   ### DEVELOPMENT / LIBRARIES / AGDA
 
   agda = callPackage ../build-support/agda {
-- 
GitLab


From 0bcd20e3d8d168661c09d36eb95998a20f789b77 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 17 Aug 2018 08:41:08 -0400
Subject: [PATCH 0032/1065] gsignondPlugins.oauth: init at 2018-10-04

---
 .../libraries/gsignond/plugins/oauth.nix      | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/libraries/gsignond/plugins/oauth.nix

diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix
new file mode 100644
index 00000000000..ee45430122c
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix
@@ -0,0 +1,48 @@
+{ 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 }:
+
+stdenv.mkDerivation rec {
+  name = "gsignond-plugin-oauth-${version}";
+  version = "2018-10-15";
+
+  src = fetchFromGitLab {
+    owner = "accounts-sso";
+    repo = "gsignond-plugin-oa";
+    rev = "d471cebfd7c50567b1244277a9559f18f8d58691";
+    sha256 = "00axl8wwp2arc6h4bpr4m3ik2hy8an0lbm48q2a9r94krmq56hnx";
+  };
+
+  nativeBuildInputs = [
+    check
+    docbook_xml_dtd_43
+    docbook_xml_dtd_45
+    docbook_xsl
+    glibcLocales
+    gobjectIntrospection
+    gtk-doc
+    meson
+    ninja
+    pkgconfig
+  ];
+
+  buildInputs = [
+    glib
+    gnutls
+    gsignond
+    json-glib
+    libsoup
+  ];
+
+  LC_ALL = "en_US.UTF-8";
+
+  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.";
+    homepage = https://gitlab.com/accounts-sso/gsignond-plugin-oa;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23b9359ce84..0d38203ed5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12772,6 +12772,7 @@ with pkgs;
 
   gsignondPlugins = {
     sasl = callPackage ../development/libraries/gsignond/plugins/sasl.nix { };
+    oauth = callPackage ../development/libraries/gsignond/plugins/oauth.nix { };
   };
 
   ### DEVELOPMENT / LIBRARIES / AGDA
-- 
GitLab


From 95210447eeaf489af115e94118f2815f9ea847f3 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 17 Aug 2018 10:52:40 -0400
Subject: [PATCH 0033/1065] gsignondPlugins.lastfm: init at 2018-05-07

---
 .../libraries/gsignond/plugins/lastfm.nix     | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/gsignond/plugins/lastfm.nix

diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
new file mode 100644
index 00000000000..a23c1487881
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "gsignond-plugin-lastfm-${version}";
+  version = "2018-05-07";
+
+  src = fetchFromGitLab {
+    owner = "accounts-sso";
+    repo = "gsignond-plugin-lastfm";
+    rev = "0a7a5f8511282e45cfe35987b81f27f158f0648c";
+    sha256 = "0ay6ir9zg9l0264x5xwd7c6j8qmwlhrifkkkjd1yrjh9sqxyfj7f";
+  };
+
+  nativeBuildInputs = [
+    gobjectIntrospection
+    meson
+    ninja
+    pkgconfig
+    vala
+  ];
+
+  buildInputs = [
+    glib
+    gsignond
+    json-glib
+    libsoup
+  ];
+
+  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.";
+    homepage = https://gitlab.com/accounts-sso/gsignond-plugin-lastfm;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d38203ed5f..8c47824ccb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12773,6 +12773,7 @@ with pkgs;
   gsignondPlugins = {
     sasl = callPackage ../development/libraries/gsignond/plugins/sasl.nix { };
     oauth = callPackage ../development/libraries/gsignond/plugins/oauth.nix { };
+    lastfm = callPackage ../development/libraries/gsignond/plugins/lastfm.nix { };
   };
 
   ### DEVELOPMENT / LIBRARIES / AGDA
-- 
GitLab


From 518e7eb8c22eeaca4fe6355cd75502564c09c806 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 17 Aug 2018 13:35:57 -0400
Subject: [PATCH 0034/1065] gsignondPlugins.mail: init at 2018-10-04

---
 .../libraries/gsignond/plugins/mail.nix       | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/gsignond/plugins/mail.nix

diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix
new file mode 100644
index 00000000000..763e76c9cc9
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugins/mail.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "gsignond-plugin-mail-${version}";
+  version = "2018-10-04";
+
+  src = fetchFromGitLab {
+    owner = "accounts-sso";
+    repo = "gsignond-plugin-mail";
+    rev = "fbc6f34b246fec4ad2b37c696f8de7fdb9bde346";
+    sha256 = "1wvwz7qiwvj8iixprip3qd8lplzfnwcjfrbg2vd8xfsvid2zbviw";
+  };
+
+  nativeBuildInputs = [
+    gobjectIntrospection
+    meson
+    ninja
+    pkgconfig
+    vala
+  ];
+
+  buildInputs = [
+    glib
+    gsignond
+  ];
+
+  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.";
+    homepage = https://gitlab.com/accounts-sso/gsignond-plugin-mail;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c47824ccb3..684d354125a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12774,6 +12774,7 @@ with pkgs;
     sasl = callPackage ../development/libraries/gsignond/plugins/sasl.nix { };
     oauth = callPackage ../development/libraries/gsignond/plugins/oauth.nix { };
     lastfm = callPackage ../development/libraries/gsignond/plugins/lastfm.nix { };
+    mail = callPackages ../development/libraries/gsignond/plugins/mail.nix { };
   };
 
   ### DEVELOPMENT / LIBRARIES / AGDA
-- 
GitLab


From 4f4e20bc79346708379bd235e30a90e61d1a499a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sun, 19 Aug 2018 17:57:54 -0400
Subject: [PATCH 0035/1065] nixos/gsignond: init

---
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/desktops/gsignond.nix | 43 ++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 nixos/modules/services/desktops/gsignond.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 261de6955ec..253199de574 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -233,6 +233,7 @@
   ./services/desktops/dleyna-server.nix
   ./services/desktops/flatpak.nix
   ./services/desktops/geoclue2.nix
+  ./services/desktops/gsignond.nix
   ./services/desktops/pipewire.nix
   ./services/desktops/gnome3/at-spi2-core.nix
   ./services/desktops/gnome3/chrome-gnome-shell.nix
diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixos/modules/services/desktops/gsignond.nix
new file mode 100644
index 00000000000..cf26e05d5c1
--- /dev/null
+++ b/nixos/modules/services/desktops/gsignond.nix
@@ -0,0 +1,43 @@
+# Accounts-SSO gSignOn daemon
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  package = pkgs.gsignond.override { plugins = config.services.gsignond.plugins; };
+in
+{
+
+  ###### interface
+
+  options = {
+
+    services.gsignond = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable gSignOn daemon, a DBus service
+          which performs user authentication on behalf of its clients.
+        '';
+      };
+
+      plugins = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        description = ''
+          What plugins to use with the gSignOn daemon.
+        '';
+      };
+    };
+  };
+
+  ###### implementation
+  config = mkIf config.services.gsignond.enable {
+    environment.etc."gsignond.conf".source = "${package}/etc/gsignond.conf";
+    services.dbus.packages = [ package ];
+  };
+
+}
-- 
GitLab


From 5ec27f30339c265e1a109d2f1ce80fc4c4c12e23 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Mon, 1 Oct 2018 00:00:00 +0000
Subject: [PATCH 0036/1065] firefoxPackages: cleanup

Misc cleanups, but mainly this:

Before:
- `version` could mean either Firefox or TorBrowser version,
- `configureFlags` was hacky.

Now:
- `ffversion` is Firefox version, `tbversion` is TorBrowser version,
- `configureFlags` is much less hacky.
---
 .../networking/browsers/firefox/common.nix    | 79 ++++++++++---------
 .../networking/browsers/firefox/packages.nix  | 61 +++++++-------
 2 files changed, 71 insertions(+), 69 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index bfdb5fcc010..b72e3703ef7 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -1,7 +1,7 @@
-{ pname, version, updateScript ? null
-, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? []
-, overrides ? {}, extraNativeBuildInputs ? [], meta
-, isTorBrowserLike ? false }:
+{ pname, ffversion, meta, updateScript ? null
+, src, unpackPhase ? null, patches ? []
+, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? []
+, isTorBrowserLike ? false, tbversion ? null }:
 
 { lib, stdenv, pkgconfig, pango, perl, python2, zip, libIDL
 , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
@@ -19,7 +19,7 @@
 , alsaSupport ? stdenv.isLinux, alsaLib
 , pulseaudioSupport ? true, libpulseaudio
 , ffmpegSupport ? true, gstreamer, gst-plugins-base
-, gtk3Support ? !isTorBrowserLike, gtk2, gtk3, wrapGAppsHook
+, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
 , gssSupport ? true, kerberos
 
 ## privacy-related options
@@ -31,7 +31,7 @@
 
 # webrtcSupport breaks the aarch64 build on version >= 60.
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1434589
-, webrtcSupport ? (if lib.versionAtLeast version "60" && stdenv.isAarch64 then false else !privacySupport)
+, webrtcSupport ? (if lib.versionAtLeast ffversion "60" && stdenv.isAarch64 then false else !privacySupport)
 , geolocationSupport ? !privacySupport
 , googleAPISupport ? geolocationSupport
 , crashreporterSupport ? false
@@ -80,23 +80,24 @@ let
   browserName = if stdenv.isDarwin then "Firefox" else "firefox";
 in
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "${pname}-unwrapped-${version}";
+  version = if !isTorBrowserLike then ffversion else tbversion;
 
-  inherit src patches meta;
+  inherit src unpackPhase patches meta;
 
   buildInputs = [
     gtk2 perl zip libIDL libjpeg zlib bzip2
     dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor
     xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
-    nspr libnotify xorg.pixman yasm libGLU_combined
+    libnotify xorg.pixman yasm libGLU_combined
     xorg.libXScrnSaver xorg.scrnsaverproto
     xorg.libXext xorg.xextproto sqlite unzip makeWrapper
     libevent libstartup_notification libvpx /* cairo */
     icu libpng jemalloc glib
   ]
-  ++ lib.optionals (!isTorBrowserLike) [ nss ]
-  ++ lib.optional (lib.versionOlder version "61") hunspell
+  ++ lib.optionals (!isTorBrowserLike) [ nspr nss ]
+  ++ lib.optional (lib.versionOlder ffversion "61") hunspell
   ++ lib.optional  alsaSupport alsaLib
   ++ lib.optional  pulseaudioSupport libpulseaudio # only headers are needed
   ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ]
@@ -106,12 +107,17 @@ stdenv.mkDerivation (rec {
                                      AVFoundation MediaToolbox CoreLocation
                                      Foundation libobjc AddressBook cups ];
 
-  NIX_CFLAGS_COMPILE = [ "-I${nspr.dev}/include/nspr"
-                         "-I${nss.dev}/include/nss"
-                         "-I${glib.dev}/include/gio-unix-2.0" ]
-                      ++ lib.optional stdenv.isDarwin [
-                         "-isystem ${llvmPackages.libcxx}/include/c++/v1"
-                         "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10" ];
+  NIX_CFLAGS_COMPILE = [
+    "-I${glib.dev}/include/gio-unix-2.0"
+  ]
+  ++ lib.optionals (!isTorBrowserLike) [
+    "-I${nspr.dev}/include/nspr"
+    "-I${nss.dev}/include/nss"
+  ]
+  ++ lib.optional stdenv.isDarwin [
+    "-isystem ${llvmPackages.libcxx}/include/c++/v1"
+    "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10"
+  ];
 
   postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace js/src/jsmath.cpp --replace 'defined(HAVE___SINCOS)' 0
@@ -128,14 +134,14 @@ stdenv.mkDerivation (rec {
     rm -f configure
     rm -f js/src/configure
     rm -f .mozconfig*
-  '' + (if lib.versionAtLeast version "58"
+  '' + (if lib.versionAtLeast ffversion "58"
   # this will run autoconf213
   then ''
     configureScript="$(realpath ./mach) configure"
   '' else ''
     make -f client.mk configure-files
     configureScript="$(realpath ./configure)"
-  '') + lib.optionalString (!isTorBrowserLike && lib.versionAtLeast version "53") ''
+  '') + lib.optionalString (lib.versionAtLeast ffversion "53") ''
     export MOZCONFIG=$(pwd)/mozconfig
 
     # Set C flags for Rust's bindgen program. Unlike ordinary C
@@ -158,7 +164,7 @@ stdenv.mkDerivation (rec {
     # please get your own set of keys.
     echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga
     configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga")
-  '' + lib.optionalString (lib.versionOlder version "58") ''
+  '' + lib.optionalString (lib.versionOlder ffversion "58") ''
     cd obj-*
   '';
 
@@ -185,37 +191,29 @@ stdenv.mkDerivation (rec {
     "--disable-gconf"
     "--enable-default-toolkit=${default-toolkit}"
   ]
-  ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast version "61") "--disable-xcode-checks"
-  ++ lib.optional (lib.versionOlder version "61") "--enable-system-hunspell"
-  ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [
+  ++ 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" && !stdenv.hostPlatform.isi686) [
     # on i686-linux: --with-libclang-path is not available in this configuration
     "--with-libclang-path=${llvmPackages.libclang}/lib"
     "--with-clang-path=${llvmPackages.clang}/bin/clang"
   ]
-  ++ lib.optionals (lib.versionAtLeast version "57") [
+  ++ lib.optionals (lib.versionAtLeast ffversion "57") [
     "--enable-webrender=build"
   ]
 
   # TorBrowser patches these
   ++ lib.optionals (!isTorBrowserLike) [
-    "--with-system-nss"
     "--with-system-nspr"
+    "--with-system-nss"
   ]
 
   # and wants these
   ++ lib.optionals isTorBrowserLike ([
-    "--with-tor-browser-version=${version}"
+    "--with-tor-browser-version=${tbversion}"
     "--enable-signmar"
     "--enable-verify-mar"
-
-    # We opt out of TorBrowser's nspr because that patch is useless on
-    # anything but Windows and produces zero fingerprinting
-    # possibilities on other platforms.
-    # Lets save some space instead.
-    "--with-system-nspr"
-  ] ++ flag geolocationSupport "mozril-geoloc"
-    ++ flag safeBrowsingSupport "safe-browsing"
-  )
+  ])
 
   ++ flag alsaSupport "alsa"
   ++ flag pulseaudioSupport "pulseaudio"
@@ -226,6 +224,11 @@ stdenv.mkDerivation (rec {
   ++ flag crashreporterSupport "crashreporter"
   ++ lib.optional drmSupport "--enable-eme=widevine"
 
+  ++ lib.optionals (lib.versionOlder ffversion "60") ([]
+    ++ flag geolocationSupport "mozril-geoloc"
+    ++ flag safeBrowsingSupport "safe-browsing"
+  )
+
   ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
                     else [ "--disable-debug" "--enable-release"
                            "--enable-optimize"
@@ -239,11 +242,11 @@ stdenv.mkDerivation (rec {
   # top level and then run `make` in obj-*. (We can also run the
   # `make` at the top level in 58, but then we would have to `cd` to
   # `make install` anyway. This is ugly, but simple.)
-  postConfigure = lib.optionalString (lib.versionAtLeast version "58") ''
+  postConfigure = lib.optionalString (lib.versionAtLeast ffversion "58") ''
     cd obj-*
   '';
 
-  preBuild = lib.optionalString (enableOfficialBranding && isTorBrowserLike) ''
+  preBuild = lib.optionalString isTorBrowserLike ''
     buildFlagsArray=("MOZ_APP_DISPLAYNAME=Tor Browser")
   '';
 
@@ -302,4 +305,4 @@ stdenv.mkDerivation (rec {
     inherit browserName;
   } // lib.optionalAttrs gtk3Support { inherit gtk3; };
 
-} // overrides)
+}
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 369b18d5ead..086521e55b3 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -2,7 +2,7 @@
 
 let
 
-  common = opts: callPackage (import ./common.nix opts);
+  common = opts: callPackage (import ./common.nix opts) {};
 
   nixpkgsPatches = [
     ./env_var_for_system_dir.patch
@@ -20,9 +20,9 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "62.0.3";
+    ffversion = "62.0.3";
     src = fetchurl {
-      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
+      url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
       sha512 = "0kvb664s47bmmdq2ppjsnyqy8yaiig1xj81r25s36c3i8igfq3zxvws10k2dlmmmrwyc5k4g9i9imgkxj7r3xwwqxc72dl429wvfys8";
     };
 
@@ -42,13 +42,13 @@ rec {
     updateScript = callPackage ./update.nix {
       attrPath = "firefox-unwrapped";
     };
-  } {};
+  };
 
   firefox-esr-52 = common rec {
     pname = "firefox-esr";
-    version = "52.9.0esr";
+    ffversion = "52.9.0esr";
     src = fetchurl {
-      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
+      url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
       sha512 = "bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9";
     };
 
@@ -64,15 +64,15 @@ rec {
     };
     updateScript = callPackage ./update.nix {
       attrPath = "firefox-esr-52-unwrapped";
-      versionSuffix = "esr";
+      ffversionSuffix = "esr";
     };
-  } {};
+  };
 
   firefox-esr-60 = common rec {
     pname = "firefox-esr";
-    version = "60.2.2esr";
+    ffversion = "60.2.2esr";
     src = fetchurl {
-      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
+      url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
       sha512 = "2h2naaxx4lv90bjpcrsma4sdhl4mvsisx3zi09vakjwv2lad91gy41cmcpqprpcbsmlvpqf8yiv52ah4d02a8d9335xhw2ajw6asjc1";
     };
 
@@ -91,13 +91,15 @@ rec {
       attrPath = "firefox-esr-60-unwrapped";
       versionSuffix = "esr";
     };
-  } {};
+  };
 
 } // (let
 
-  commonAttrs = {
-    overrides = {
-      unpackPhase = ''
+  tbcommon = args: common (args // {
+    pname = "tor-browser";
+    isTorBrowserLike = true;
+
+    unpackPhase = ''
         # fetchFromGitHub produces ro sources, root dir gets a name that
         # is too long for shebangs. fixing
         cp -a $src tor-browser
@@ -106,8 +108,9 @@ rec {
 
         # set times for xpi archives
         find . -exec touch -d'2010-01-01 00:00' {} \;
-      '';
-    };
+    '';
+
+    patches = nixpkgsPatches;
 
     meta = {
       description = "A web browser built from TorBrowser source tree";
@@ -142,14 +145,13 @@ rec {
       platforms = lib.platforms.linux;
       license = lib.licenses.bsd3;
     };
-  };
+  });
 
 in rec {
 
-  tor-browser-7-5 = common (rec {
-    pname = "tor-browser";
-    version = "7.5.6";
-    isTorBrowserLike = true;
+  tor-browser-7-5 = (tbcommon rec {
+    ffversion = "52.9.0esr";
+    tbversion = "7.5.6";
 
     # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
     src = fetchFromGitHub {
@@ -159,14 +161,13 @@ in rec {
       rev   = "95bb92d552876a1f4260edf68fda5faa3eb36ad8";
       sha256 = "1ykn3yg4s36g2cpzxbz7s995c33ij8kgyvghx38z4i8siaqxdddy";
     };
+  }).override {
+    gtk3Support = false;
+  };
 
-    patches = nixpkgsPatches;
-  } // commonAttrs) {};
-
-  tor-browser-8-0 = common (rec {
-    pname = "tor-browser";
-    version = "8.0.1";
-    isTorBrowserLike = true;
+  tor-browser-8-0 = tbcommon rec {
+    ffversion = "52.8.0esr";
+    tbversion = "8.0.1";
 
     # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
     src = fetchFromGitHub {
@@ -176,9 +177,7 @@ in rec {
       rev   = "5d7e9e1cacbf70840f8f1a9aafe99f354f9ad0ca";
       sha256 = "0cwxwwc4m7331bbp3id694ffwxar0j5kfpgpn9l1z36rmgv92n21";
     };
-
-    patches = nixpkgsPatches;
-  } // commonAttrs) {};
+  };
 
   tor-browser = tor-browser-7-5;
 
-- 
GitLab


From b21b9bbd6c4dfd578cf67d89d44193b584f76a96 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Mon, 1 Oct 2018 00:00:00 +0000
Subject: [PATCH 0037/1065] firefoxPackages: indent

---
 .../networking/browsers/firefox/packages.nix     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 086521e55b3..aff2d61aeb5 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -100,14 +100,14 @@ rec {
     isTorBrowserLike = true;
 
     unpackPhase = ''
-        # fetchFromGitHub produces ro sources, root dir gets a name that
-        # is too long for shebangs. fixing
-        cp -a $src tor-browser
-        chmod -R +w tor-browser
-        cd tor-browser
-
-        # set times for xpi archives
-        find . -exec touch -d'2010-01-01 00:00' {} \;
+      # fetchFromGitHub produces ro sources, root dir gets a name that
+      # is too long for shebangs. fixing
+      cp -a $src tor-browser
+      chmod -R +w tor-browser
+      cd tor-browser
+
+      # set times for xpi archives
+      find . -exec touch -d'2010-01-01 00:00' {} \;
     '';
 
     patches = nixpkgsPatches;
-- 
GitLab


From bd7c0c8a6c597673509c7633da651f2069163e16 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Mon, 1 Oct 2018 00:00:00 +0000
Subject: [PATCH 0038/1065] firefoxPackages.tor-browser: 7.5.6 -> 8.0.2

Mostly usable now.
---
 .../networking/browsers/firefox/packages.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index aff2d61aeb5..b35408dee58 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -166,19 +166,19 @@ in rec {
   };
 
   tor-browser-8-0 = tbcommon rec {
-    ffversion = "52.8.0esr";
-    tbversion = "8.0.1";
+    ffversion = "60.2.1esr";
+    tbversion = "8.0.2";
 
     # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
     src = fetchFromGitHub {
       owner = "SLNOS";
       repo  = "tor-browser";
-      # branch "tor-browser-52.8.0esr-8.0-1-slnos";
-      rev   = "5d7e9e1cacbf70840f8f1a9aafe99f354f9ad0ca";
-      sha256 = "0cwxwwc4m7331bbp3id694ffwxar0j5kfpgpn9l1z36rmgv92n21";
+      # branch "tor-browser-60.2.1esr-8.0-1-slnos"
+      rev   = "4f71403a3e6203baa349a8f81d8664782c5ea548";
+      sha256 = "0zxdi162gpnfca7g77hc0rw4wkmxhfzp9hfmw6dpn97d5kn1zqq3";
     };
   };
 
-  tor-browser = tor-browser-7-5;
+  tor-browser = tor-browser-8-0;
 
 })
-- 
GitLab


From d984c553832fad99ee48e512252c0f2f27632789 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sat, 20 Oct 2018 22:23:58 +1100
Subject: [PATCH 0039/1065] lib.isStorePath: fix `false` result when passed a
 path object

Since `isStorePath` relies on comparing against builtins.storeDir
(a string), we need to convert the input into a string as well.
---
 lib/strings.nix    | 9 ++++++---
 lib/tests/misc.nix | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 0c4095bb55c..99399459bb4 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -502,9 +502,12 @@ rec {
        => false
   */
   isStorePath = x:
-       isCoercibleToString x
-    && builtins.substring 0 1 (toString x) == "/"
-    && dirOf x == builtins.storeDir;
+    if isCoercibleToString x then
+      let str = toString x; in
+      builtins.substring 0 1 str == "/"
+      && dirOf str == builtins.storeDir
+    else
+      false;
 
   /* Convert string to int
      Obviously, it is a bit hacky to use fromJSON that way.
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 853d911cdc8..1604fbb39cb 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -112,7 +112,7 @@ runTests {
         storePathAppendix = isStorePath
           "${goodPath}/bin/python";
         nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath)));
-        asPath = isStorePath goodPath;
+        asPath = isStorePath (/. + goodPath);
         otherPath = isStorePath "/something/else";
         otherVals = {
           attrset = isStorePath {};
-- 
GitLab


From af1a28501701f56b7289e8e3d855e638272d2a3d Mon Sep 17 00:00:00 2001
From: qolii <qoli@protonmail.com>
Date: Fri, 19 Oct 2018 17:36:38 -0700
Subject: [PATCH 0040/1065] nixos/eternal-terminal: init new module.

---
 nixos/modules/module-list.nix                 |  1 +
 .../services/networking/eternal-terminal.nix  | 96 +++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 nixos/modules/services/networking/eternal-terminal.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index fb6b4262568..6305b0fa9eb 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -504,6 +504,7 @@
   ./services/networking/dnsmasq.nix
   ./services/networking/ejabberd.nix
   ./services/networking/epmd.nix
+  ./services/networking/eternal-terminal.nix
   ./services/networking/fakeroute.nix
   ./services/networking/ferm.nix
   ./services/networking/firefox/sync-server.nix
diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixos/modules/services/networking/eternal-terminal.nix
new file mode 100644
index 00000000000..aa9d399a4a3
--- /dev/null
+++ b/nixos/modules/services/networking/eternal-terminal.nix
@@ -0,0 +1,96 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.eternal-terminal;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.eternal-terminal = {
+
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable the Eternal Terminal server.
+        '';
+      };
+
+      port = mkOption {
+        default = null;
+        type = types.nullOr types.int;
+        description = ''
+          The port the server should listen on. Will use the server's default (2022) if not specified.
+        '';
+      };
+
+      verbosity = mkOption {
+        default = 0;
+        type = types.int;
+        description = ''
+          The verbosity level (0-9).
+        '';
+      };
+
+      silence = mkOption {
+        default = 0;
+        type = types.int;
+        description = ''
+          Silence.
+        '';
+      };
+
+      logSize = mkOption {
+        default = 20971520;
+        type = types.int;
+        description = ''
+          The maximum log size.
+        '';
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    # We need to ensure the et package is fully installed because
+    # the (remote) et client runs the `etterminal` binary when it
+    # connects.
+    environment.systemPackages = [ pkgs.eternal-terminal ];
+
+    systemd.services = {
+      eternal-terminal = {
+        description = "Eternal Terminal server.";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "syslog.target" "network.target" ];
+        serviceConfig = {
+          Type = "forking";
+          ExecStart = "${pkgs.eternal-terminal}/bin/etserver --daemon --cfgfile=${pkgs.writeText "et.cfg" ''
+            ; et.cfg : Config file for Eternal Terminal
+            ;
+
+            ${optionalString (cfg.port != null) ''
+              [Networking]
+              port = ${toString cfg.port}
+            ''}
+            [Debug]
+            verbose = ${toString cfg.verbosity}
+            silent = ${toString cfg.silence}
+            logsize = ${toString cfg.logSize}
+          ''}";
+          Restart = "on-failure";
+          KillMode = "process";
+        };
+      };
+    };
+  };
+}
-- 
GitLab


From ee0444576ff01d40fe734137c298104cac8ca705 Mon Sep 17 00:00:00 2001
From: qolii <qoli@protonmail.com>
Date: Sat, 20 Oct 2018 13:44:13 -0700
Subject: [PATCH 0041/1065] Address review feedback.

---
 .../services/networking/eternal-terminal.nix  | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixos/modules/services/networking/eternal-terminal.nix
index aa9d399a4a3..1d2dc5d23b9 100644
--- a/nixos/modules/services/networking/eternal-terminal.nix
+++ b/nixos/modules/services/networking/eternal-terminal.nix
@@ -16,17 +16,11 @@ in
 
     services.eternal-terminal = {
 
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          Enable the Eternal Terminal server.
-        '';
-      };
+      enable = mkEnableOption "Eternal Terminal server";
 
       port = mkOption {
-        default = null;
-        type = types.nullOr types.int;
+        default = 2022;
+        type = types.int;
         description = ''
           The port the server should listen on. Will use the server's default (2022) if not specified.
         '';
@@ -34,17 +28,17 @@ in
 
       verbosity = mkOption {
         default = 0;
-        type = types.int;
+        type = types.enum (lib.range 0 9);
         description = ''
           The verbosity level (0-9).
         '';
       };
 
-      silence = mkOption {
-        default = 0;
-        type = types.int;
+      silent = mkOption {
+        default = false;
+        type = types.bool;
         description = ''
-          Silence.
+          If enabled, disables all logging.
         '';
       };
 
@@ -78,13 +72,12 @@ in
             ; et.cfg : Config file for Eternal Terminal
             ;
 
-            ${optionalString (cfg.port != null) ''
-              [Networking]
-              port = ${toString cfg.port}
-            ''}
+            [Networking]
+            port = ${toString cfg.port}
+
             [Debug]
             verbose = ${toString cfg.verbosity}
-            silent = ${toString cfg.silence}
+            silent = ${if cfg.silent then "true" else "false"}
             logsize = ${toString cfg.logSize}
           ''}";
           Restart = "on-failure";
-- 
GitLab


From 956a4b2bb691da64934a73509dc98a6cb9b7e9bc Mon Sep 17 00:00:00 2001
From: Unknown <zraexy@gmail.com>
Date: Sat, 20 Oct 2018 14:17:22 -0800
Subject: [PATCH 0042/1065] marble: Fix include install to dev output

---
 pkgs/applications/kde/marble.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index ea140cad5ee..b02e29e3351 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -14,4 +14,7 @@ mkDerivation {
     qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts
     knewstuff gpsd
   ];
+  preConfigure = ''
+    cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include"
+  '';
 }
-- 
GitLab


From 1a3405c2286e83894459f769461ae6d5b78394e5 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Wed, 17 Oct 2018 13:29:47 +0000
Subject: [PATCH 0043/1065] pythonPackages.txaio: 18.7.1 -> 18.8.1

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

diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index 2bfdbae918a..01d7b04b3dd 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "txaio";
-  version = "18.7.1";
+  version = "18.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "701de939e90bb80f7e085357081552437526752199def5541dddfc34c0b0593f";
+    sha256 = "1zmpdph6zddgrnkkcykh6qk5s46l7s5mzfqrh82m4b5iffn61qv7";
   };
 
   checkInputs = [ pytest mock ];
-- 
GitLab


From c61ba4d3def0ca701674eb1e87aa279069856a61 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Wed, 17 Oct 2018 13:30:07 +0000
Subject: [PATCH 0044/1065] pythonPackages.autobahn: 18.8.2 -> 18.9.2

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

diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 01922f98c40..4105a5d965f 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -4,11 +4,11 @@
 }:
 buildPythonPackage rec {
   pname = "autobahn";
-  version = "18.8.2";
+  version = "18.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "448df2e241011ea2948799918930042d81e63d26b01912c472f5a9a37f42f319";
+    sha256 = "1mhj64rsnbi6rc0hskmllw280rvd99z045p6dq8h0mw60r7r52yr";
   };
 
   propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++
-- 
GitLab


From f0d6b61ab5687a7846c6f965c2be19f6e0e9dcd8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 21 Oct 2018 09:51:26 -0500
Subject: [PATCH 0045/1065] redis: 4.0.11 -> 5.0.0

---
 pkgs/servers/nosql/redis/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index ab2ff85939f..afa0c6c0f93 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 = "4.0.11";
+  version = "5.0.0";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "1fqvxlpaxr80iykyvpf1fia8rxh4zz8paf5nnjncsssqwwxfflzw";
+    sha256 = "194rvj3wzdil2rny93vq9g9vlqnb7gv4vnwaklybgcj00qnqpjbh";
   };
 
   buildInputs = [ lua ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://redis.io;
     description = "An open source, advanced key-value store";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     platforms = platforms.unix;
     maintainers = [ maintainers.berdario ];
   };
-- 
GitLab


From 0e3df42d64b2392852e33bdb8f34a6d4f8f4c214 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Mon, 1 Oct 2018 00:00:00 +0000
Subject: [PATCH 0046/1065] firefoxPackages.tor-browser-8-0: apply a fix from
 bugzilla

---
 .../networking/browsers/firefox/packages.nix      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index b35408dee58..bd42cf2d9d0 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -9,9 +9,15 @@ let
   ];
 
   firefox60_aarch64_skia_patch = fetchpatch {
-      name = "aarch64-skia.patch";
-      url = https://src.fedoraproject.org/rpms/firefox/raw/8cff86d95da3190272d1beddd45b41de3148f8ef/f/build-aarch64-skia.patch;
-      sha256 = "11acb0ms4jrswp7268nm2p8g8l4lv8zc666a5bqjbb09x9k6b78k";
+    name = "aarch64-skia.patch";
+    url = https://src.fedoraproject.org/rpms/firefox/raw/8cff86d95da3190272d1beddd45b41de3148f8ef/f/build-aarch64-skia.patch;
+    sha256 = "11acb0ms4jrswp7268nm2p8g8l4lv8zc666a5bqjbb09x9k6b78k";
+  };
+
+  firefox60_triplet_patch = fetchpatch {
+    name = "triplet.patch";
+    url = https://hg.mozilla.org/releases/mozilla-release/raw-rev/bc651d3d910c;
+    sha256 = "0iybkadsgsf6a3pq3jh8z1p110vmpkih8i35jfj8micdkhxzi89g";
   };
 
 in
@@ -110,7 +116,8 @@ rec {
       find . -exec touch -d'2010-01-01 00:00' {} \;
     '';
 
-    patches = nixpkgsPatches;
+    patches = nixpkgsPatches
+      ++ lib.optional (args.tbversion == "8.0.2") firefox60_triplet_patch;
 
     meta = {
       description = "A web browser built from TorBrowser source tree";
-- 
GitLab


From 1902adb4375d3df5a231e41676c3157ebd571beb Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 21 Oct 2018 14:39:59 -0500
Subject: [PATCH 0047/1065] ova: add cloneConfigExtra option

Customize virtualbox ovas to contain a clone config option giving some
useful hints.

Fixes #38429
---
 nixos/modules/installer/virtualbox-demo.nix | 38 +++++++++++++++++++++
 nixos/modules/profiles/clone-config.nix     |  9 +++++
 2 files changed, 47 insertions(+)

diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index 8ca3592f380..2e1b4b3998b 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -22,4 +22,42 @@ with lib;
 
   powerManagement.enable = false;
   system.stateVersion = mkDefault "18.03";
+
+  installer.cloneConfigExtra = ''
+  # Let demo build as a trusted user.
+  # nix.trustedUsers = [ "demo" ];
+
+  # Mount a VirtualBox shared folder.
+  # This is configurable in the VirtualBox menu at
+  # Machine / Settings / Shared Folders.
+  # fileSystems."/mnt" = {
+  #   fsType = "vboxsf";
+  #   device = "nameofdevicetomount";
+  #   options = [ "rw" ];
+  # };
+
+  # By default, the NixOS VirtualBox demo image includes SDDM and Plasma.
+  # If you prefer another desktop manager or display manager, you may want
+  # to disable the default.
+  # services.xserver.desktopManager.plasma5.enable = lib.mkForce false;
+  # services.xserver.displayManager.sddm.enable = lib.mkForce false;
+
+  # Enable GDM/GNOME by uncommenting above two lines and two lines below.
+  # services.xserver.displayManager.gdm.enable = true;
+  # services.xserver.desktopManager.gnome3.enable = true;
+
+  # Set your time zone.
+  # time.timeZone = "Europe/Amsterdam";
+
+  # List packages installed in system profile. To search, run:
+  # \$ nix search wget
+  # environment.systemPackages = with pkgs; [
+  #   wget vim
+  # ];
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  system.stateVersion = mkDefault "18.03";
+  '';
 }
diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix
index 99d4774584f..3f669ba7d2e 100644
--- a/nixos/modules/profiles/clone-config.nix
+++ b/nixos/modules/profiles/clone-config.nix
@@ -48,6 +48,8 @@ let
 
       {
         imports = [ ${toString config.installer.cloneConfigIncludes} ];
+
+        ${config.installer.cloneConfigExtra}
       }
     '';
 
@@ -73,6 +75,13 @@ in
       '';
     };
 
+    installer.cloneConfigExtra = mkOption {
+      default = "";
+      description = ''
+        Extra text to include in the cloned configuration.nix included in this
+        installer.
+      '';
+    };
   };
 
   config = {
-- 
GitLab


From 8d7870d6c536ac3e5024db5749d26cb3d2890eed Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 21 Oct 2018 21:55:26 +0200
Subject: [PATCH 0048/1065] samba: remove defunct infiniband support

Even if infiniband support is enabled the option
is ignored by the configure script and no depencies
to libibverbs.so or librdmacm.so is contained in
the output.
---
 pkgs/servers/samba/4.x.nix      | 5 +----
 pkgs/top-level/all-packages.nix | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 385674c12a8..9b4c320ceb2 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -3,10 +3,8 @@
 , docbook_xml_dtd_42, readline, talloc
 , popt, iniparser, libbsd, libarchive, libiconv, gettext
 , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
-, gnutls
-, ncurses, libunwind, libibverbs, librdmacm, systemd
+, gnutls, ncurses, libunwind, systemd
 
-, enableInfiniband ? false
 , enableLDAP ? false
 , enablePrinting ? false
 , enableMDNS ? false
@@ -47,7 +45,6 @@ stdenv.mkDerivation rec {
       libbsd libarchive zlib fam libiconv gettext libunwind krb5Full
     ]
     ++ optionals stdenv.isLinux [ libaio systemd ]
-    ++ optionals (enableInfiniband && stdenv.isLinux) [ libibverbs librdmacm ]
     ++ optional enableLDAP openldap
     ++ optional (enablePrinting && stdenv.isLinux) cups
     ++ optional enableMDNS avahi
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acf4c885fee..91da508966d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13648,7 +13648,6 @@ with pkgs;
   });
 
   samba4Full = lowPrio (samba4.override {
-    enableInfiniband = true;
     enableLDAP = true;
     enablePrinting = true;
     enableMDNS = true;
@@ -18595,7 +18594,7 @@ with pkgs;
   rclone = callPackage ../applications/networking/sync/rclone { };
 
   rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { };
-  
+
   rcs = callPackage ../applications/version-management/rcs { };
 
   rdesktop = callPackage ../applications/networking/remote/rdesktop { };
-- 
GitLab


From 52352ab959daa05981b57257008d4739431b6968 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Wed, 17 Oct 2018 00:54:52 +0200
Subject: [PATCH 0049/1065] nvidia_x11: 390.87 -> 410.66 for x86_64

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 492b268610f..02d77000559 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, fetchurl }:
+{ lib, callPackage, fetchurl, stdenv }:
 
 let
   generic = args: callPackage (import ./generic.nix args) { };
@@ -16,7 +16,17 @@ let
 in
 rec {
   # Policy: use the highest stable version as the default (on our master).
-  stable = generic {
+  stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_410 else stable_390;
+
+  stable_410 = generic {
+    version = "410.66";
+    sha256_64bit = "05xjzvj0fgmkpz36dbd7hy2vzl6xxiflzx7kml3k7ad9gy2svdlg";
+    settingsSha256 = "1nsxz1byshgjs3c03lyx6ya36dp0f2vg2l0d9pkh1i6cpzkp53kz";
+    persistencedSha256 = "0m4wdpb8w4y323d8py105p9hizwmf2ai8frkl7h77sn3ski17zw6";
+  };
+
+  # Last one supporting x86
+  stable_390 = generic {
     version = "390.87";
     sha256_32bit = "0rlr1f4lnpb8c4qz4w5r8xw5gdy9bzz26qww45qyl1qav3wwaaaw";
     sha256_64bit = "07k1kq8lkgbvjyr2dnbxcz6nppcwpq17wf925w8kfq78345hla9q";
-- 
GitLab


From 10e029829c66d34e387836dfd67e25ec67f7b894 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Mon, 22 Oct 2018 07:37:45 +0200
Subject: [PATCH 0050/1065] kube-prompt: init at 1.0.4

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 .../development/tools/kube-prompt/default.nix |  25 ++
 pkgs/development/tools/kube-prompt/deps.nix   | 309 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 336 insertions(+)
 create mode 100644 pkgs/development/tools/kube-prompt/default.nix
 create mode 100644 pkgs/development/tools/kube-prompt/deps.nix

diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/development/tools/kube-prompt/default.nix
new file mode 100644
index 00000000000..2ea69a0c56b
--- /dev/null
+++ b/pkgs/development/tools/kube-prompt/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "kube-prompt-${version}";
+  version = "1.0.4";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/c-bata/kube-prompt";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "c-bata";
+    repo = "kube-prompt";
+    sha256 = "09c2kjsk8cl7qgxbr1s7qd9br5shf7gccxvbf7nyi6wjiass9yg5";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = {
+  description = "An interactive kubernetes client featuring auto-complete using go-prompt";
+    license = lib.licenses.mit;
+    homepage = https://github.com/c-bata/kube-prompt;
+    maintainers = [ lib.maintainers.vdemeester ];
+  };
+}
diff --git a/pkgs/development/tools/kube-prompt/deps.nix b/pkgs/development/tools/kube-prompt/deps.nix
new file mode 100644
index 00000000000..393b69a2a33
--- /dev/null
+++ b/pkgs/development/tools/kube-prompt/deps.nix
@@ -0,0 +1,309 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "cloud.google.com/go";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/gocloud";
+      rev =  "aad3f485ee528456e0768f20397b4d9dd941e755";
+      sha256 = "1cgabmg76axkbpm7zip3ym2mym6kwgc9cw9kil0inmckkh3x1ky8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/c-bata/go-prompt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/c-bata/go-prompt";
+      rev =  "c52492ff1b386e5c0ba5271b5eaad165fab09eca";
+      sha256 = "14k8anchf0rcpxfbb2acrajdqrfspscbkn47m4py1zh5rkk6b9p9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/ghodss/yaml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ghodss/yaml";
+      rev =  "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
+      sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev =  "636bf0302bc95575d69441b25a2603156ffdddf1";
+      sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/glog";
+      rev =  "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
+      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/btree";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/btree";
+      rev =  "e89373fe6b4a7413d7acd6da1725b83ef713e6e4";
+      sha256 = "0jlkjjlf8ilifgsb2bv0jfgl4cxl1bypx7a6pjkwz3xf6k8jd7mj";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/gofuzz";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/gofuzz";
+      rev =  "24818f796faf91cd76ec7bddd72458fbced7a6c1";
+      sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/googleapis/gnostic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/googleapis/gnostic";
+      rev =  "7c663266750e7d82587642f65e60bc4083f1f84e";
+      sha256 = "0yh3ckd7m0r9h50wmxxvba837d0wb1k5yd439zq4p1kpp4390z12";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gregjones/httpcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gregjones/httpcache";
+      rev =  "9cad4c3443a7200dd6400aef47183728de563a38";
+      sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s";
+    };
+  }
+  {
+    goPackagePath  = "github.com/imdario/mergo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/imdario/mergo";
+      rev =  "9316a62528ac99aaecb4e47eadd6dc8aa6533d58";
+      sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb";
+    };
+  }
+  {
+    goPackagePath  = "github.com/json-iterator/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/json-iterator/go";
+      rev =  "ab8a2e0c74be9d3be70b3184d9acc634935ded82";
+      sha256 = "1x3wz44p1238gpyzkiiilvvrq9q8dwjdm9kdidq65yjq0zcn0sq4";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev =  "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
+      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev =  "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
+      sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev =  "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
+      sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-tty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-tty";
+      rev =  "931426f7535ac39720c8909d70ece5a41a2502a6";
+      sha256 = "00cb07v13xrfqm39m1j2h2zvj684gl9fzr51591i9a52a9m6xlj5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/modern-go/concurrent";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/concurrent";
+      rev =  "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94";
+      sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/modern-go/reflect2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/reflect2";
+      rev =  "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd";
+      sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49";
+    };
+  }
+  {
+    goPackagePath  = "github.com/petar/GoLLRB";
+    fetch = {
+      type = "git";
+      url = "https://github.com/petar/GoLLRB";
+      rev =  "53be0d36a84c2a886ca057d34b6aa4468df9ccb4";
+      sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/peterbourgon/diskv";
+    fetch = {
+      type = "git";
+      url = "https://github.com/peterbourgon/diskv";
+      rev =  "5f041e8faa004a95c88a202771f4cc3e991971e6";
+      sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pkg/term";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/term";
+      rev =  "cda20d4ac917ad418d86e151eff439648b06185b";
+      sha256 = "08frhz411dwyli5spfxn32d3ni9mrgdav51lmg8a1wpdmw0r0wwp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev =  "583c0c0531f06d5278b7d917446061adc344b5cd";
+      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9";
+      sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1";
+      sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev =  "ef147856a6ddbb60760db74283d2424e98c87bff";
+      sha256 = "1q1vm1z40fx1grlrm7az4rln6v5pj9xi5n1cjqg5xgq4dsk9132y";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "ac767d655b305d4e9612f5f6e33120b9176c4ad4";
+      sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev =  "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/time";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/time";
+      rev =  "fbb02b2291d28baffd63558aa44b4b56f178d650";
+      sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev =  "b1f26356af11148e710935ed1ac8a7f5702c7612";
+      sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/inf.v0";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-inf/inf";
+      rev =  "d2d2541c53f18d2a059457998ce2876cc8e67cbf";
+      sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/api";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/api";
+      rev =  "072894a440bdee3a891dea811fe42902311cd2a3";
+      sha256 = "1hlbfwak4adwkj74jdiw8kmapri9rqmmjssncqiq0xnwlkcyn0ig";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/apimachinery";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/apimachinery";
+      rev =  "103fd098999dc9c0c88536f5c9ad2e5da39373ae";
+      sha256 = "04navnpm59d75dhlz07rmay7m2izrf4m0i9xklxzqg7mlk9g20jc";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/client-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/client-go";
+      rev =  "7d04d0e2a0a1a4d4a1cd6baa432a2301492e4e65";
+      sha256 = "06rszpgckx9gmqz9gbq8wnl39d1dnl28wdgrygj2fhz5prhj0x4s";
+    };
+  }
+]
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3d1b06feff..45416b4cd37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8571,6 +8571,8 @@ with pkgs;
 
   kubectx = callPackage ../development/tools/kubectx { };
 
+  kube-prompt = callPackage ../development/tools/kube-prompt { };
+
   kustomize = callPackage ../development/tools/kustomize { };
 
   kythe = callPackage ../development/tools/kythe { };
-- 
GitLab


From 57430a1ae54e318633da1eeaabbb2d47001c6a1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Mon, 22 Oct 2018 07:38:49 +0200
Subject: [PATCH 0051/1065] openal: 1.19.0 -> 1.19.1

Changes: https://github.com/kcat/openal-soft/blob/master/ChangeLog

Also fetch from kcat's openal-soft official GitHub repository, since
upstream's website http://kcat.strangesoft.net/openal.html is down.
---
 pkgs/development/libraries/openal-soft/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index aad6911036e..3835822673c 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake
+{ stdenv, fetchFromGitHub, cmake
 , alsaSupport ? !stdenv.isDarwin, alsaLib ? null
 , pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null
 , CoreServices, AudioUnit, AudioToolbox
@@ -10,12 +10,14 @@ assert alsaSupport -> alsaLib != null;
 assert pulseSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
-  version = "1.19.0";
+  version = "1.19.1";
   name = "openal-soft-${version}";
 
-  src = fetchurl {
-    url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2";
-    sha256 = "1mhf5bsb58s1xk6hvxl7ly7rd4rpl9z8h07xl1q94brywykg7bgi";
+  src = fetchFromGitHub {
+    owner = "kcat";
+    repo = "openal-soft";
+    rev = name;
+    sha256 = "0b0g0q1c36nfb289xcaaj3cmyfpiswvvgky3qyalsf9n4dj7vnzi";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From f7d4bc2c7147755d764c792af6f51bc2ffdb71dc Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Mon, 22 Oct 2018 08:42:01 +0000
Subject: [PATCH 0052/1065] cedille: Apply patch which unbreaks the options
 file

See https://github.com/cedille/cedille/issues/29
---
 pkgs/applications/science/logic/cedille/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix
index 5b99a47bb41..b3055688d23 100644
--- a/pkgs/applications/science/logic/cedille/default.nix
+++ b/pkgs/applications/science/logic/cedille/default.nix
@@ -1,5 +1,13 @@
 { stdenv, lib, fetchFromGitHub, alex, happy, Agda, agdaIowaStdlib,
-  buildPlatform, buildPackages, ghcWithPackages }:
+  buildPlatform, buildPackages, ghcWithPackages, fetchpatch }:
+let
+  options-patch =
+    fetchpatch {
+      url = https://github.com/cedille/cedille/commit/ee62b0fabde6c4f7299a3778868519255cc4a64f.patch;
+      name = "options.patch";
+      sha256 = "19xzn9sqpfnfqikqy1x9lb9mb6722kbgvrapl6cf8ckcw8cfj8cz";
+      };
+in
 stdenv.mkDerivation rec {
   version = "1.0.0";
   name = "cedille-${version}";
@@ -11,6 +19,8 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [ alex happy Agda (ghcWithPackages (ps: [ps.ieee])) ];
 
+  patches = [options-patch];
+
   LANG = "en_US.UTF-8";
   LOCALE_ARCHIVE =
     lib.optionalString (buildPlatform.libc == "glibc")
-- 
GitLab


From 08e5ef20d806c9da8a2471c6417619fd34177399 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Mon, 22 Oct 2018 08:43:07 +0000
Subject: [PATCH 0053/1065] cedille: Make a seperate output for the base
 library

For now, for normal usage you need to add `${cedille.lib}` to
the `~/.cedille/options` file so that cedille will find the base
libraries. There is no option to pass options by the command line.
---
 pkgs/applications/science/logic/cedille/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix
index b3055688d23..0817ebe0654 100644
--- a/pkgs/applications/science/logic/cedille/default.nix
+++ b/pkgs/applications/science/logic/cedille/default.nix
@@ -32,9 +32,12 @@ stdenv.mkDerivation rec {
     chmod -R 755 ial
   '';
 
+  outputs = ["out" "lib"];
+
   installPhase = ''
     mkdir -p $out/bin
     mv cedille $out/bin/cedille
+    mv lib $lib
   '';
 
   meta = {
-- 
GitLab


From bf39304e533fe6a7823bf521d7f393d611801256 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Sun, 21 Oct 2018 12:03:55 +0300
Subject: [PATCH 0054/1065] sqlite-replication: initialize at
 3.24.0+replication3

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfbc6687f9d..0d83483a709 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12308,6 +12308,27 @@ with pkgs;
 
   sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { };
 
+  sqlite-replication = sqlite.overrideAttrs (oldAttrs: rec {
+    name = "sqlite-${version}";
+    version = "3.24.0+replication3";
+    src = pkgs.fetchFromGitHub {
+      owner = "CanonicalLtd";
+      repo = "sqlite";
+      rev = "version-${version}";
+      sha256 = "19557b7aick1pxk0gw013cf5jy42i7539qn1ziza8dzy16a6zs8b";
+    };
+    nativeBuildInputs = [ pkgs.tcl ];
+    configureFlags = oldAttrs.configureFlags ++ [
+      "--enable-replication"
+      "--disable-amalgamation"
+      "--disable-tcl"
+    ];
+    preConfigure = ''
+      echo "D 2018-08-01T13:22:18" > manifest
+      echo -n "c94dbda1a570c1ab180e7694afd3cc7116268c06" > manifest.uuid
+    '';
+  });
+
   sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher {
     readline = null;
     ncurses = null;
-- 
GitLab


From 891277e6a9d659d4a270e3b36fc838098720f1de Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Sun, 21 Oct 2018 12:04:34 +0300
Subject: [PATCH 0055/1065] dqlite: initialize at 0.2.4

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

diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
new file mode 100644
index 00000000000..8cc7a0bba62
--- /dev/null
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libuv, sqlite-replication }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "dqlite-${version}";
+  version = "0.2.4";
+
+  src = fetchFromGitHub {
+    owner = "CanonicalLtd";
+    repo = "dqlite";
+    rev = "v${version}";
+    sha256 = "03dikhjppraagyvjx4zbp7f5jfg74jivighxkwrbzrcy0g8pmcvd";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  buildInputs = [ libuv sqlite-replication ];
+
+  meta = {
+    description = "Expose a SQLite database over the network and replicate it across a cluster of peers";
+    homepage = https://github.com/CanonicalLtd/dqlite/;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ joko ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d83483a709..ae00a7f2331 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12329,6 +12329,8 @@ with pkgs;
     '';
   });
 
+  dqlite = callPackage ../development/libraries/dqlite { };
+
   sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher {
     readline = null;
     ncurses = null;
-- 
GitLab


From ab62fe910883dd6322dc75190cb86ea9a185ebd3 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Sat, 13 Oct 2018 12:44:54 +0300
Subject: [PATCH 0056/1065] lxd: 3.0.0 -> 3.0.2

---
 pkgs/tools/admin/lxd/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index 2fbfff287cb..09c29517af4 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -1,16 +1,17 @@
 { stdenv, pkgconfig, lxc, buildGoPackage, fetchurl
 , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
-, squashfsTools, iproute, iptables, ebtables
+, squashfsTools, iproute, iptables, ebtables, libcap, dqlite
+, sqlite-replication
 }:
 
 buildGoPackage rec {
-  name = "lxd-3.0.0";
+  name = "lxd-3.0.2";
 
   goPackagePath = "github.com/lxc/lxd";
 
   src = fetchurl {
     url = "https://github.com/lxc/lxd/releases/download/${name}/${name}.tar.gz";
-    sha256 = "0m5prdf9sk8k5bws1zva4n9ycggmy76wnjr6wb423066pszz24ww";
+    sha256 = "1ha8ijzblf15p0kcpgwshswz6s2rdd2b4qnzjw3l72ww620hr84j";
   };
 
   preBuild = ''
@@ -22,6 +23,8 @@ buildGoPackage rec {
     popd
   '';
 
+  buildFlags = [ "-tags libsqlite3" ];
+
   postInstall = ''
     # binaries from test/
     rm $bin/bin/{deps,macaroon-identity}
@@ -32,7 +35,7 @@ buildGoPackage rec {
   '';
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
-  buildInputs = [ lxc acl ];
+  buildInputs = [ lxc acl libcap dqlite sqlite-replication ];
 
   meta = with stdenv.lib; {
     description = "Daemon based on liblxc offering a REST API to manage containers";
-- 
GitLab


From 896ae4974e68f8b11b14b2a49888f2fba211b2d8 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 22 Oct 2018 13:36:18 +0200
Subject: [PATCH 0057/1065] jackett: 0.10.304 -> 0.10.365

---
 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 4f9cfa46e71..100bc4709bf 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.304";
+  version = "0.10.365";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "15v9xyvcdx9kbarilq7d7nm8ac8mljw641nrr3mnk8ij3gjdgb38";
+    sha256 = "1wq4by10wxhcz72fappb7isw0850laf2yk5bgpx8nrjxigmv4ik0";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From db75fe73138cadea7011b59afda7b684321075d7 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 22 Oct 2018 14:51:03 +0200
Subject: [PATCH 0058/1065] sage: fix doctest

The test is depending on the "py2" tag always being added. I patched
that recently to make it possible to test sagedoc individually. Somehow
I missed this doctest.
---
 ...py3-optional-tests-when-all-of-sage-is.patch | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
index 2a7dc13756d..8cd80281d0e 100644
--- a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
+++ b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
@@ -1,14 +1,14 @@
-From c8edfefbbec87ca776d3cf84ee895aac200dda40 Mon Sep 17 00:00:00 2001
+From 8218bd4fdeb4c92de8af0d3aabec55980fc4fb3d Mon Sep 17 00:00:00 2001
 From: Timo Kaufmann <timokau@zoho.com>
 Date: Sun, 21 Oct 2018 17:52:40 +0200
 Subject: [PATCH] Only test py2/py3 optional tests when all of sage is tested
 
 ---
- src/sage/doctest/control.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ src/sage/doctest/control.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py
-index bf18df8b2b..b04af0e2e8 100644
+index bf18df8b2b..935c67abf7 100644
 --- a/src/sage/doctest/control.py
 +++ b/src/sage/doctest/control.py
 @@ -362,7 +362,8 @@ class DocTestController(SageObject):
@@ -21,6 +21,15 @@ index bf18df8b2b..b04af0e2e8 100644
  
          self.options = options
  
+@@ -765,7 +766,7 @@ class DocTestController(SageObject):
+             sage: DC = DocTestController(DD, [dirname])
+             sage: DC.expand_files_into_sources()
+             sage: sorted(DC.sources[0].options.optional)  # abs tol 1
+-            ['guava', 'magma', 'py2']
++            ['guava', 'magma']
+ 
+         We check that files are skipped appropriately::
+ 
 -- 
 2.18.1
 
-- 
GitLab


From 9512841e89e298e40815eea7779973c7905f7a1f Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 22 Oct 2018 13:26:13 +0200
Subject: [PATCH 0059/1065] pythonPackages.cypari2: 1.2.1 -> 1.3.1

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

diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index 6df19e4c94b..a77e98dae4c 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -11,11 +11,12 @@
 
 buildPythonPackage rec {
   pname = "cypari2";
-  version = "1.2.1";
+  # upgrade may break sage, please test the sage build or ping @timokau on upgrade
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0v2kikwf0advq8j76nwzhlacwj1yys9cvajm4fqgmasjdsnf1q4k";
+    sha256 = "04f00xp8aaz37v00iqg1mv5wjq00a5qhk8cqa93s13009s9x984r";
   };
 
   # This differs slightly from the default python installPhase in that it pip-installs
-- 
GitLab


From 2bb68c7017a105c0c1e4d6460c8a625dc7ac92cf Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 22 Oct 2018 09:40:14 -0400
Subject: [PATCH 0060/1065] linux: Add 4.19

---
 pkgs/os-specific/linux/kernel/linux-4.19.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.19.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
new file mode 100644
index 00000000000..5aa033348d4
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
+
+with stdenv.lib;
+
+buildLinux (args // rec {
+  version = "4.19";
+
+  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
+  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
+
+  # branchVersion needs to be x.y
+  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "18a92z17alh5kkvjv7l9z8wk5jgdb6raawdfkpwx9bi8amjzas0c";
+  };
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfbc6687f9d..07075bdefcd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14218,6 +14218,16 @@ with pkgs;
       ];
   };
 
+  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
+      ];
+  };
+
   linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
@@ -14410,7 +14420,7 @@ with pkgs;
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = linuxPackages_4_18;
+  linuxPackages_latest = linuxPackages_4_19;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -14421,6 +14431,7 @@ with pkgs;
   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!
 
   # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
-- 
GitLab


From 01fcaf8d29b74fe163d34328b15edbbb828577d6 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 22 Oct 2018 18:06:21 +0200
Subject: [PATCH 0061/1065] libmd: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix
index 2da8e5ebf73..de8baa7ad19 100644
--- a/pkgs/development/libraries/libmd/default.nix
+++ b/pkgs/development/libraries/libmd/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "libmd";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchurl {
     url = "https://archive.hadrons.org/software/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "1iv45npzv0gncjgcpx5m081861zdqxw667ysghqb8721yrlyl6pj";
+    sha256 = "0waclg2d5qin3r26gy5jvy4584ik60njc8pqbzwk0lzq3j9ynkp1";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
GitLab


From 67e9be79904742fa16932d307c6f6a1a15ef257a Mon Sep 17 00:00:00 2001
From: Herman Fries <h.fries@nyris.io>
Date: Mon, 22 Oct 2018 18:10:27 +0200
Subject: [PATCH 0062/1065] nvidia_x11_beta: Set to nvidia_x11

There is currently no beta active
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 02d77000559..44598588db9 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -36,12 +36,8 @@ rec {
     patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch;
   };
 
-  beta = generic {
-    version = "410.57";
-    sha256_64bit = "08534rv3wcmzslbwq11kd3s7cxm72p48dia6540c0586xwgjwg2w";
-    settingsSha256 = "1phhhzlc8n3rqdhrn757mnlqmsp616d079a6h1qjpa6jba9z9915";
-    persistencedSha256 = "1z7c1ff0y486yp9i5w0siwh9dnprml22x2avarbjfgqwm4f652lw";
-  };
+  # No active beta right now
+  beta = stable;
 
   legacy_340 = generic {
     version = "340.104";
-- 
GitLab


From 2a164f598cabdc231127c6fba08eada7a3c1abc4 Mon Sep 17 00:00:00 2001
From: Victor SENE <victor@sene.ovh>
Date: Mon, 8 Oct 2018 11:59:47 +0200
Subject: [PATCH 0063/1065] nixos/nextcloud: extend documentation for nginx
 configuration

Co-authored-by: Robin Gloster <mail@glob.in>
---
 nixos/modules/services/web-apps/nextcloud.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index db4c8e1a3d8..797d410dbeb 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -70,7 +70,15 @@ in {
       '';
     };
 
-    nginx.enable = mkEnableOption "nginx vhost management";
+    nginx.enable = mkOption {
+      type = types.bool;
+      default = false;
+      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.
+      '';
+    };
 
     webfinger = mkOption {
       type = types.bool;
-- 
GitLab


From fa388534e4a74f4055643e5ed85c95ee4148eda4 Mon Sep 17 00:00:00 2001
From: Drew Hess <src@drewhess.com>
Date: Mon, 22 Oct 2018 13:57:32 -0400
Subject: [PATCH 0064/1065] dovecot: dovenull user should have its own group.

Quoting from https://wiki.dovecot.org/UserIds#dovenulluser:

"It should belong to its own private dovenull group where no one else
belongs to..."
---
 nixos/modules/misc/ids.nix              | 2 +-
 nixos/modules/services/mail/dovecot.nix | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0b4ed6d3b62..5c30e512a1b 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -385,7 +385,7 @@
       virtuoso = 44;
       #rtkit = 45; # unused
       dovecot2 = 46;
-      #dovenull = 47; # unused
+      dovenull2 = 47;
       prayer = 49;
       mpd = 50;
       clamav = 51;
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index e6091182b2a..30ad7d82fb8 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -311,7 +311,7 @@ in
       { name = "dovenull";
         uid = config.ids.uids.dovenull2;
         description = "Dovecot user for untrusted logins";
-        group = cfg.group;
+        group = "dovenull";
       }
     ] ++ optional (cfg.user == "dovecot2")
          { name = "dovecot2";
@@ -332,6 +332,10 @@ in
       }
     ++ optional (cfg.createMailUser && cfg.mailGroup != null)
       { name = cfg.mailGroup;
+      }
+    ++ singleton
+      { name = "dovenull";
+        gid = config.ids.gids.dovenull2;
       };
 
     environment.etc."dovecot/modules".source = modulesDir;
-- 
GitLab


From 4ca86a844b3abef3a040cc83696e711ac223afd8 Mon Sep 17 00:00:00 2001
From: Demyan Rogozhin <demyan.rogozhin@gmail.com>
Date: Mon, 22 Oct 2018 21:44:02 +0200
Subject: [PATCH 0065/1065] particl-core: 0.16.2.0 -> 0.17.0.2

Update version. Disabled tests and benchmartk to speed up Hydra build.
---
 pkgs/applications/altcoins/particl/particl-core.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix
index a06f373683a..3be2d296d39 100644
--- a/pkgs/applications/altcoins/particl/particl-core.nix
+++ b/pkgs/applications/altcoins/particl/particl-core.nix
@@ -16,11 +16,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "particl-core-${version}";
-  version     = "0.16.2.0";
+  version     = "0.17.0.2";
 
   src = fetchurl {
     url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz";
-    sha256 = "1d2vvg7avlhsg0rcpd5pbzafnk1w51a2y29xjjkpafi6iqs2l617";
+    sha256 = "0bkxdayl0jrfhgz8qzqqpwzv0yavz3nwsn6c8k003jnbcw65fkhx";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
@@ -29,12 +29,17 @@ stdenv.mkDerivation rec {
     unixtools.hexdump
   ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
+  configureFlags = [
+    "--disable-bench"
+    "--enable-tests=no"
+    "--with-boost-libdir=${boost.out}/lib"
+  ];
 
   meta = {
     description = "Privacy-Focused Marketplace & Decentralized Application Platform";
     longDescription= ''
       An open source, decentralized privacy platform built for global person to person eCommerce.
+      RPC daemon and CLI client only.
     '';
     homepage = https://particl.io/;
     maintainers = with maintainers; [ demyanrogozhin ];
-- 
GitLab


From 9f72791516f0f4a3f9ef5a24259f7e4a06896ec5 Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Sun, 21 Oct 2018 11:40:20 +0200
Subject: [PATCH 0066/1065] nixos/containers: Introduce several tweaks to
 systemd-nspawn from upstream systemd

* Lets container@.service  be activated by machines.target instead of
  multi-user.target

  According to the systemd manpages, all containers that are registered
  by machinectl, should be inside machines.target for easy stopping
  and starting container units altogether

* make sure container@.service and container.slice instances are
  actually located in machine.slice

  https://plus.google.com/112206451048767236518/posts/SYAueyXHeEX
  See original commit: https://github.com/NixOS/systemd/commit/45d383a3b8

* Enable Cgroup delegation for nixos-containers

  Delegate=yes should be set for container scopes where a systemd instance
  inside the container shall manage the hierarchies below its own cgroup
  and have access to all controllers.

  This is equivalent to enabling all accounting options on the systemd
  process inside the system container.  This means that systemd inside
  the container is responsible for managing Cgroup resources for
  unit files that enable accounting options inside.  Without this
  option, units that make use of cgroup features within system
  containers might misbehave

  See original commit: https://github.com/NixOS/systemd/commit/a931ad47a8

  from the manpage:
    Turns on delegation of further resource control partitioning to
    processes of the unit. Units where this is enabled may create and
    manage their own private subhierarchy of control groups below the
    control group of the unit itself. For unprivileged services (i.e.
    those using the User= setting) the unit's control group will be made
    accessible to the relevant user. When enabled the service manager
    will refrain from manipulating control groups or moving processes
    below the unit's control group, so that a clear concept of ownership
    is established: the control group tree above the unit's control
    group (i.e. towards the root control group) is owned and managed by
    the service manager of the host, while the control group tree below
    the unit's control group is owned and managed by the unit itself.
    Takes either a boolean argument or a list of control group
    controller names. If true, delegation is turned on, and all
    supported controllers are enabled for the unit, making them
    available to the unit's processes for management. If false,
    delegation is turned off entirely (and no additional controllers are
    enabled). If set to a list of controllers, delegation is turned on,
    and the specified controllers are enabled for the unit. Note that
    additional controllers than the ones specified might be made
    available as well, depending on configuration of the containing
    slice unit or other units contained in it. Note that assigning the
    empty string will enable delegation, but reset the list of
    controllers, all assignments prior to this will have no effect.
    Defaults to false.

    Note that controller delegation to less privileged code is only safe
    on the unified control group hierarchy. Accordingly, access to the
    specified controllers will not be granted to unprivileged services
    on the legacy hierarchy, even when requested.

    The following controller names may be specified: cpu, cpuacct, io,
    blkio, memory, devices, pids. Not all of these controllers are
    available on all kernels however, and some are specific to the
    unified hierarchy while others are specific to the legacy hierarchy.
    Also note that the kernel might support further controllers, which
    aren't covered here yet as delegation is either not supported at all
    for them or not defined cleanly.
---
 nixos/modules/system/boot/systemd-nspawn.nix | 1 +
 nixos/modules/virtualisation/containers.nix  | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix
index f4fa0969453..4f538ccdbbe 100644
--- a/nixos/modules/system/boot/systemd-nspawn.nix
+++ b/nixos/modules/system/boot/systemd-nspawn.nix
@@ -112,6 +112,7 @@ in {
 
       environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] [];
 
+      systemd.targets."multi-user".wants = [ "machines.target "];
   };
 
 }
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 8fe59badd33..9d1359322d1 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -243,6 +243,9 @@ let
 
     Restart = "on-failure";
 
+    Slice = "machine.slice";
+    Delegate = true;
+
     # Hack: we don't want to kill systemd-nspawn, since we call
     # "machinectl poweroff" in preStop to shut down the
     # container cleanly. But systemd requires sending a signal
@@ -657,6 +660,8 @@ in
       serviceConfig = serviceDirectives dummyConfig;
     };
   in {
+    systemd.targets."multi-user".wants = [ "machines.target" ];
+
     systemd.services = listToAttrs (filter (x: x.value != null) (
       # The generic container template used by imperative containers
       [{ name = "container@"; value = unit; }]
@@ -680,7 +685,7 @@ in
           } // (
           if config.autoStart then
             {
-              wantedBy = [ "multi-user.target" ];
+              wantedBy = [ "machines.target" ];
               wants = [ "network.target" ];
               after = [ "network.target" ];
               restartTriggers = [ config.path ];
-- 
GitLab


From 7615027fadea92ca1757c6c40d2bb1c2e9ef824f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 22 Oct 2018 13:43:11 -0700
Subject: [PATCH 0067/1065] libowfat: 0.31 -> 0.32 (#48414)

* libowfat: 0.31 -> 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/libowfat/versions

* libowfat: keep headers under include directory

0.32 wanted to move them under include/libowfat/
but it breaks gatling and opentracker
---
 .../development/libraries/libowfat/default.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix
index 1304aff9e3b..8c0094a3152 100644
--- a/pkgs/development/libraries/libowfat/default.nix
+++ b/pkgs/development/libraries/libowfat/default.nix
@@ -1,17 +1,29 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libowfat-0.31";
+  name = "libowfat-0.32";
 
   src = fetchurl {
     url = "https://www.fefe.de/libowfat/${name}.tar.xz";
-    sha256 = "04lagr62bd2cr0k8h59qfnx2klh2cf73k5kxsx8xrdybzhfarr6i";
+    sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl";
   };
 
+  # Dirty patch because 0.32 "moved headers to <libowfat/> upon install"
+  # but it breaks gatling-0.15 and opentracker-2018-05-26 ...
+  postPatch = ''
+    substituteInPlace GNUmakefile --replace \
+      'install -d $(DESTDIR)$(INCLUDEDIR)/libowfat' \
+      'install -d $(DESTDIR)$(INCLUDEDIR)'
+    substituteInPlace GNUmakefile --replace \
+      'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)/libowfat' \
+      'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)'
+  '';
+
   makeFlags = "prefix=$(out)";
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.fefe.de/libowfat/;
+    homepage = https://www.fefe.de/libowfat/;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
-- 
GitLab


From f4615bef063265001f47ee7e8e351aa1708f773a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 22 Oct 2018 22:51:10 +0200
Subject: [PATCH 0068/1065] wlroots: 2018-03-16 -> 0.1

Keep "meta.broken = true" but update the package to keep track of
upstream changes and prepare the "reintegration" into nixpkgs.
---
 .../development/libraries/wlroots/default.nix | 75 +++++++++++++++----
 1 file changed, 59 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index a4c2b329714..f724ae00995 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -1,39 +1,82 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
+{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig
 , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
 , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu
+, libpng, ffmpeg_4
+, python3Packages # TODO: Temporary
 }:
 
-let pname = "wlroots";
-    version = "unstable-2018-03-16";
+let
+  pname = "wlroots";
+  version = "0.1";
+  meson480 = meson.overrideAttrs (oldAttrs: rec {
+    name = pname + "-" + version;
+    pname = "meson";
+    version = "0.48.0";
+
+    src = python3Packages.fetchPypi {
+      inherit pname version;
+      sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc";
+    };
+    patches = builtins.filter # Remove gir-fallback-path.patch
+      (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str))
+      oldAttrs.patches;
+  });
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "wlroots";
-    rev = "9cc875429b40e2567b219f8e9ffd23316d136204";
-    sha256 = "1prhic3pyf9n65qfg5akzkc9qv2z3ab60dpcacr7wgr9nxrvnsdq";
+    rev = version;
+    sha256 = "0xfipgg2qh2xcf3a1pzx8pyh1aqpb9rijdyi0as4s6fhgy4w269c";
   };
 
-  # $out for the library and $bin for rootston
-  outputs = [ "out" "bin" ];
+  patches = [ (fetchpatch { # TODO: Only required for version 0.1
+    url = https://github.com/swaywm/wlroots/commit/be6210cf8216c08a91e085dac0ec11d0e34fb217.patch;
+    sha256 = "0njv7mr4ark603w79cxcsln29galh87vpzsx2dzkrl1x5x4i6cj5";
+  }) ];
+
+  # $out for the library, $bin for rootston, and $examples for the example
+  # programs (in examples) AND rootston
+  outputs = [ "out" "bin" "examples" ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
+  nativeBuildInputs = [ meson480 ninja pkgconfig ];
 
   buildInputs = [
     wayland libGL wayland-protocols libinput libxkbcommon pixman
     xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu
+    libpng ffmpeg_4
+  ];
+
+  mesonFlags = [
+    "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled"
+    "-Dxcb-icccm=enabled" "-Dxcb-xkb=enabled" "-Dxcb-errors=enabled"
   ];
 
-  # Install rootston (the reference compositor) to $bin
   postInstall = ''
-    mkdir -p $bin/bin
-    cp rootston/rootston $bin/bin/
-    mkdir $bin/lib
-    cp libwlroots* $bin/lib/
-    patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston
-    mkdir $bin/etc
-    cp ../rootston/rootston.ini.example $bin/etc/rootston.ini
+    # Install rootston (the reference compositor) to $bin and $examples
+    for output in "$bin" "$examples"; do
+      mkdir -p $output/bin
+      cp rootston/rootston $output/bin/
+      mkdir $output/lib
+      cp libwlroots* $output/lib/
+      patchelf \
+        --set-rpath "$output/lib:${stdenv.lib.makeLibraryPath buildInputs}" \
+        $output/bin/rootston
+      mkdir $output/etc
+      cp ../rootston/rootston.ini.example $output/etc/rootston.ini
+    done
+    # Install ALL example programs to $examples:
+    # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
+    # screenshot output-layout multi-pointer rotation tablet touch pointer
+    # simple
+    mkdir -p $examples/bin
+    for binary in $(find ./examples -executable -type f | grep -vE '\.so'); do
+      patchelf \
+        --set-rpath "$examples/lib:${stdenv.lib.makeLibraryPath buildInputs}" \
+        "$binary"
+      cp "$binary" $examples/bin/
+    done
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From f65afcb4c326b91ad1bce7fea4bdf7dc732c35e4 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Mon, 22 Oct 2018 17:13:46 -0400
Subject: [PATCH 0069/1065] pythonPackages.bitarray: init at 0.8.3

---
 .../bitarray/0001-Buffer-Protocol-Py3.patch   | 106 ++++++++++++++++++
 .../python-modules/bitarray/default.nix       |  21 ++++
 pkgs/top-level/python-packages.nix            |   2 +
 3 files changed, 129 insertions(+)
 create mode 100644 pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch
 create mode 100644 pkgs/development/python-modules/bitarray/default.nix

diff --git a/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch b/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch
new file mode 100644
index 00000000000..e1019115ac7
--- /dev/null
+++ b/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch
@@ -0,0 +1,106 @@
+From c636f0cc386c9ded9f31947bbd74affccc93c21a Mon Sep 17 00:00:00 2001
+From: yoch <yoch.melka@gmail.com>
+Date: Mon, 14 May 2018 21:55:00 +0300
+Subject: [PATCH] Adding buffer protocol support for Python 3
+
+---
+ bitarray/_bitarray.c      | 12 ++++++++++--
+ bitarray/test_bitarray.py | 14 +++++++-------
+ 2 files changed, 17 insertions(+), 9 deletions(-)
+
+diff --git a/bitarray/_bitarray.c b/bitarray/_bitarray.c
+index d2c19cb..be6b379 100644
+--- a/bitarray/_bitarray.c
++++ b/bitarray/_bitarray.c
+@@ -48,7 +48,7 @@ int PyIndex_Check(PyObject *o)
+ #define Py_SIZE(ob)   (((PyVarObject *) (ob))->ob_size)
+ #endif
+ 
+-#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7
++#if PY_MAJOR_VERSION == 3 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7)
+ /* (new) buffer protocol */
+ #define WITH_BUFFER
+ #endif
+@@ -2787,6 +2787,8 @@ static PyTypeObject BitarrayIter_Type = {
+ 
+ /********************* Bitarray Buffer Interface ************************/
+ #ifdef WITH_BUFFER
++
++#if PY_MAJOR_VERSION == 2
+ static Py_ssize_t
+ bitarray_buffer_getreadbuf(bitarrayobject *self,
+                            Py_ssize_t index, const void **ptr)
+@@ -2831,6 +2833,8 @@ bitarray_buffer_getcharbuf(bitarrayobject *self,
+     return Py_SIZE(self);
+ }
+ 
++#endif
++
+ static int
+ bitarray_getbuffer(bitarrayobject *self, Py_buffer *view, int flags)
+ {
+@@ -2857,14 +2861,18 @@ bitarray_releasebuffer(bitarrayobject *self, Py_buffer *view)
+ }
+ 
+ static PyBufferProcs bitarray_as_buffer = {
++#if PY_MAJOR_VERSION == 2   // old buffer protocol
+     (readbufferproc) bitarray_buffer_getreadbuf,
+     (writebufferproc) bitarray_buffer_getwritebuf,
+     (segcountproc) bitarray_buffer_getsegcount,
+     (charbufferproc) bitarray_buffer_getcharbuf,
++#endif
+     (getbufferproc) bitarray_getbuffer,
+     (releasebufferproc) bitarray_releasebuffer,
+ };
++
+ #endif  /* WITH_BUFFER */
++
+ /************************** Bitarray Type *******************************/
+ 
+ static PyTypeObject Bitarraytype = {
+@@ -2898,7 +2906,7 @@ static PyTypeObject Bitarraytype = {
+     0,                                        /* tp_as_buffer */
+ #endif
+     Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_WEAKREFS
+-#ifdef WITH_BUFFER
++#if defined(WITH_BUFFER) && PY_MAJOR_VERSION == 2
+     | Py_TPFLAGS_HAVE_NEWBUFFER
+ #endif
+     ,                                         /* tp_flags */
+diff --git a/bitarray/test_bitarray.py b/bitarray/test_bitarray.py
+index 44de2f0..b72b554 100644
+--- a/bitarray/test_bitarray.py
++++ b/bitarray/test_bitarray.py
+@@ -2113,10 +2113,10 @@ def test_read1(self):
+         a = bitarray('01000001' '01000010' '01000011', endian='big')
+         v = memoryview(a)
+         self.assertEqual(len(v), 3)
+-        self.assertEqual(v[0], 'A')
+-        self.assertEqual(v[:].tobytes(), 'ABC')
++        #self.assertEqual(v[0], 'A')
++        self.assertEqual(v[:].tobytes(), b'ABC')
+         a[13] = 1
+-        self.assertEqual(v[:].tobytes(), 'AFC')
++        self.assertEqual(v[:].tobytes(), b'AFC')
+ 
+     def test_read2(self):
+         a = bitarray([randint(0, 1) for d in range(8000)])
+@@ -2131,14 +2131,14 @@ def test_write(self):
+         a.setall(0)
+         v = memoryview(a)
+         self.assertFalse(v.readonly)
+-        v[50000] = '\xff'
++        v[50000] = 255 if is_py3k else '\xff'
+         self.assertEqual(a[399999:400009], bitarray('0111111110'))
+         a[400003] = 0
+         self.assertEqual(a[399999:400009], bitarray('0111011110'))
+-        v[30001:30004] = 'ABC'
+-        self.assertEqual(a[240000:240040].tobytes(), '\x00ABC\x00')
++        v[30001:30004] = b'ABC'
++        self.assertEqual(a[240000:240040].tobytes(), b'\x00ABC\x00')
+ 
+-if sys.version_info[:2] == (2, 7):
++if sys.version_info[:2] >= (2, 7):
+     tests.append(BufferInterfaceTests)
+ 
+ # ---------------------------------------------------------------------------
diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix
new file mode 100644
index 00000000000..c413303dd21
--- /dev/null
+++ b/pkgs/development/python-modules/bitarray/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  version = "0.8.3";
+  pname = "bitarray";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0pl9p4j3dhlyffsqra6h28q7jph6v3hgppg786lkmnqdh45x6305";
+  };
+
+  # Delete once https://github.com/ilanschnell/bitarray/pull/55 is merged
+  patches = [ ./0001-Buffer-Protocol-Py3.patch ];
+
+  meta = with lib; {
+    description = "Efficient arrays of booleans";
+    homepage = https://github.com/ilanschnell/bitarray;
+    license = licenses.psfl;
+    maintainers = [ maintainers.bhipple ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c5870b529c..22c822a2441 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -250,6 +250,8 @@ in {
 
   bayespy = callPackage ../development/python-modules/bayespy { };
 
+  bitarray = callPackage ../development/python-modules/bitarray { };
+
   bitcoinlib = callPackage ../development/python-modules/bitcoinlib { };
 
   bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { };
-- 
GitLab


From f76a9eb52674e6f8941a774954dc5ba3f1faceae Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Mon, 22 Oct 2018 23:58:12 +0200
Subject: [PATCH 0070/1065] nixos/ddclient: make RuntimeDirectory private

ddclient will raise a warning if /run/ddclient/ is world-readable
---
 nixos/modules/services/networking/ddclient.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index 9a2e13e9553..77a9af058c7 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -182,6 +182,7 @@ with lib;
       serviceConfig = rec {
         DynamicUser = true;
         RuntimeDirectory = StateDirectory;
+        RuntimeDirectoryMode = "0750";
         StateDirectory = builtins.baseNameOf dataDir;
         Type = "oneshot";
         ExecStartPre = "!${lib.getBin pkgs.coreutils}/bin/install -m666 ${cfg.configFile} /run/${RuntimeDirectory}/ddclient.conf";
-- 
GitLab


From 0b520bd26d23dbc8bf0590e80f913b04edcbb035 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 22 Oct 2018 18:27:35 -0400
Subject: [PATCH 0071/1065] zstd: 1.3.6 -> 1.3.7

---
 pkgs/tools/compression/zstd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 53aaf100490..85b2c280b8f 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -5,10 +5,10 @@
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "1.3.6";
+  version = "1.3.7";
 
   src = fetchFromGitHub {
-    sha256 = "1x4a8r4m68m93q52ffxvaip9nnwx9yqvd1m90v80777c11s20a4n";
+    sha256 = "04pdim2bgbbryalim6y8fflm9njpbzxh7148hi4pa828rn9p0jim";
     rev = "v${version}";
     repo = "zstd";
     owner = "facebook";
-- 
GitLab


From 8a7cd0059700fa3f8de6086b87fa298a2c7af5d1 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 22 Oct 2018 15:31:06 -0700
Subject: [PATCH 0072/1065] wabt: Allow building on Darwin as well

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

diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix
index 20c9a71aadd..dade09ee5f6 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/pkgs/development/tools/wabt/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/WebAssembly/wabt;
     license = licenses.asl20;
     maintainers = with maintainers; [ ekleog ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From ab5380ec82f4740bef1cc522674c49917a8d1f44 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Tue, 23 Oct 2018 00:43:41 +0200
Subject: [PATCH 0073/1065] nixos/ddclient: make configFile private

/run/ddclient/ddclient.conf should be installed in mode 660 (readable and writeable only by ddclient.service user and group)
---
 nixos/modules/services/networking/ddclient.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index 77a9af058c7..a70967820b3 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -185,7 +185,7 @@ with lib;
         RuntimeDirectoryMode = "0750";
         StateDirectory = builtins.baseNameOf dataDir;
         Type = "oneshot";
-        ExecStartPre = "!${lib.getBin pkgs.coreutils}/bin/install -m666 ${cfg.configFile} /run/${RuntimeDirectory}/ddclient.conf";
+        ExecStartPre = "!${lib.getBin pkgs.coreutils}/bin/install -m660 ${cfg.configFile} /run/${RuntimeDirectory}/ddclient.conf";
         ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -file /run/${RuntimeDirectory}/ddclient.conf";
       };
     };
-- 
GitLab


From c3fe5bd0885f4bc1e2b7249c9a4351cb2efc756d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 21 Oct 2018 18:42:02 -0300
Subject: [PATCH 0074/1065] dde-daemon: init at 3.2.24.7

---
 pkgs/desktops/deepin/dde-daemon/default.nix |  90 +++++++++++++++++
 pkgs/desktops/deepin/dde-daemon/deps.nix    | 102 ++++++++++++++++++++
 pkgs/desktops/deepin/default.nix            |   1 +
 3 files changed, 193 insertions(+)
 create mode 100644 pkgs/desktops/deepin/dde-daemon/default.nix
 create mode 100644 pkgs/desktops/deepin/dde-daemon/deps.nix

diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
new file mode 100644
index 00000000000..fe2c5f8f55a
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -0,0 +1,90 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig,
+  dbus-factory, go-dbus-factory, go-gir-generator, go-lib,
+  deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl,
+  librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3,
+  python3Packages, hicolor-icon-theme, go }:
+
+buildGoPackage rec {
+  name = "${pname}-${version}";
+  pname = "dde-daemon";
+  version = "3.2.24.7";
+
+  goPackagePath = "pkg.deepin.io/dde/daemon";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "17dvhqrw0dqy3d0wd9ailb18y2rg7575g3ffy0d5rg9m3y65y1y6";
+  };
+
+  patches = [
+    # https://github.com/linuxdeepin/dde-daemon/issues/51
+    (fetchpatch {
+      name = "dde-daemon_3.2.3.patch";
+      url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.2.3.patch;
+      sha256 = "0a3xb15czpfl2vajpf7ycw37vr7fbw2png1a67mvjjkgx7d1k7dg";
+    })
+  ];
+
+  goDeps = ./deps.nix;
+
+  outputs = [ "out" ];
+
+  nativeBuildInputs = [
+    pkgconfig
+    dbus-factory
+    go-dbus-factory
+    go-gir-generator
+    go-lib
+    deepin-gettext-tools
+    dde-api
+    linux-pam
+    networkmanager
+    networkmanager.dev
+    python3Packages.python
+  ];
+
+  buildInputs = [
+    alsaLib
+    glib
+    gnome3.libgudev
+    gtk3
+    hicolor-icon-theme
+    libinput
+    libnl
+    librsvg
+    pulseaudio
+  ];
+
+  postPatch = ''
+    patchShebangs .
+
+    sed -i network/nm_generator/Makefile -e 's,/usr/share/gir-1.0/NM-1.0.gir,${networkmanager.dev}/share/gir-1.0/NM-1.0.gir,'
+
+    sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile
+    sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile
+    sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile
+
+    find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} +
+  '';
+
+  buildPhase = ''
+    make -C go/src/${goPackagePath}
+    # compilation of the nm module is failing
+    #make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code
+  '';
+
+  installPhase = ''
+    make install PREFIX="$out" -C go/src/${goPackagePath}
+    remove-references-to -t ${go} $out/lib/deepin-daemon/*
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Daemon for handling Deepin Desktop Environment session settings";
+    homepage = https://github.com/linuxdeepin/dde-daemon;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix
new file mode 100644
index 00000000000..5ffecc28882
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-daemon/deps.nix
@@ -0,0 +1,102 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+    };
+  }
+  {
+    goPackagePath = "github.com/axgle/mahonia";
+    fetch = {
+      type = "git";
+      url = "https://github.com/axgle/mahonia";
+      rev = "3358181d7394e26beccfae0ffde05193ef3be33a";
+      sha256 = "0b8wsrxmv8a0cqbnsg55lpf29pxy2zw8azvgh3ck664lqpcfybhq";
+    };
+  }
+  {
+    goPackagePath = "github.com/cryptix/wav";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cryptix/wav";
+      rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44";
+      sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6";
+    };
+  }
+  {
+    goPackagePath = "github.com/linuxdeepin/go-x11-client";
+    fetch = {
+      type = "git";
+      url = "https://github.com/linuxdeepin/go-x11-client";
+      rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3";
+      sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d";
+    };
+  }
+  {
+    goPackagePath = "github.com/msteinert/pam";
+    fetch = {
+      type = "git";
+      url = "https://github.com/msteinert/pam";
+      rev = "f4cd9f5e29232537a12db1678f48c702ad6896b7";
+      sha256 = "1vjawxswy3f23v4d72kk95y3b557580670ai9ffvrwy6wy85qync";
+    };
+  }
+  {
+    goPackagePath = "github.com/nfnt/resize";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nfnt/resize";
+      rev = "83c6a9932646f83e3267f353373d47347b6036b2";
+      sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/image";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/image";
+      rev = "991ec62608f3c0da01d400756917825d1e2fd528";
+      sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "04a2e542c03f1d053ab3e4d6e5abcd4b66e2be8e";
+      sha256 = "040i9f6ymj4z25957h20id9kfmlrcp35y4sfd99hngw9li50ihql";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "4d1c5fb19474adfe9562c9847ba425e7da817e81";
+      sha256 = "1y4rf9cmjyf8r56khr1sz0chbq1v0ynaj63i2z1mq6k6h6ww45da";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/alecthomas/kingpin.v2";
+      rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+    };
+  }
+]
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 86e5fc37fa5..a6163cd32e2 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -6,6 +6,7 @@ let
     dbus-factory = callPackage ./dbus-factory { };
     dde-api = callPackage ./dde-api { };
     dde-calendar = callPackage ./dde-calendar { };
+    dde-daemon = callPackage ./dde-daemon { };
     dde-polkit-agent = callPackage ./dde-polkit-agent { };
     dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
     dde-session-ui = callPackage ./dde-session-ui { };
-- 
GitLab


From 38bb70413729ddfcf62df2848112a069e3814201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 21 Oct 2018 18:42:39 -0300
Subject: [PATCH 0075/1065] dbus-factory: fix instalation directory for source

---
 pkgs/desktops/deepin/dbus-factory/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix
index 66d28cbcaf3..610e367b09f 100644
--- a/pkgs/desktops/deepin/dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/dbus-factory/default.nix
@@ -18,7 +18,11 @@ stdenv.mkDerivation rec {
     go-dbus-generator
   ];
 
-  makeFlags = [ "GOPATH=$(out)/share/gocode" ];
+  makeFlags = [ "GOPATH=$(out)/share/go" ];
+
+  postPatch = ''
+    sed -i -e 's:/share/gocode:/share/go:' Makefile
+  '';
 
   meta = with stdenv.lib; {
     description = "Generates static DBus bindings for Golang and QML at build-time";
-- 
GitLab


From fffd13e5e0de80dcf922d5bbc07be26df1975d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 21 Oct 2018 18:58:03 -0300
Subject: [PATCH 0076/1065] go-dbus-factory: fix instalation directory for
 source

---
 pkgs/desktops/deepin/go-dbus-factory/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix
index a488bd7202c..b9b3aa59a0b 100644
--- a/pkgs/desktops/deepin/go-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
     sha256 = "0gj2xxv45gh7wr5ry3mcsi46kdsyq9nbd7znssn34kapiv40ixcx";
   };
 
-  makeFlags = [
-    "PREFIX=$(out)"
-  ];
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  postPatch = ''
+    sed -i -e 's:/share/gocode:/share/go:' Makefile
+  '';
 
   meta = with stdenv.lib; {
     description = "GoLang DBus factory for the Deepin Desktop Environment";
-- 
GitLab


From 6b087a3d21fc1054c69f45509919638e3f66a290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 21 Oct 2018 19:06:23 -0300
Subject: [PATCH 0077/1065] go-lib: fix instalation directory for source

---
 pkgs/desktops/deepin/go-dbus-generator/default.nix | 3 +--
 pkgs/desktops/deepin/go-lib/default.nix            | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix
index 2933c58f8d9..fa38e650c3a 100644
--- a/pkgs/desktops/deepin/go-dbus-generator/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix
@@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "PREFIX=$(out)"
-    "GOPATH=$(GGOPATH):${go-lib}/share/gocode"
-    "HOME=$(TMP)"
+    "GOCACHE=off"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix
index 44de8889df2..f1504500aa0 100644
--- a/pkgs/desktops/deepin/go-lib/default.nix
+++ b/pkgs/desktops/deepin/go-lib/default.nix
@@ -22,7 +22,10 @@ stdenv.mkDerivation rec {
     mobile-broadband-provider-info
   ];
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [
+    "PREFIX=$(out)"
+    "GOSITE_DIR=$(out)/share/go"
+  ];
 
   meta = with stdenv.lib; {
     description = "Go bindings for Deepin Desktop Environment development";
-- 
GitLab


From 3c1395073364310c9cdf4f5357740e285e47d193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 21 Oct 2018 19:48:44 -0300
Subject: [PATCH 0078/1065] go-lib: 1.2.16.1 -> 1.2.16.3

---
 pkgs/desktops/deepin/go-lib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix
index f1504500aa0..ff9394425e0 100644
--- a/pkgs/desktops/deepin/go-lib/default.nix
+++ b/pkgs/desktops/deepin/go-lib/default.nix
@@ -5,13 +5,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "go-lib";
-  version = "1.2.16.1";
+  version = "1.2.16.3";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "0nl35dm0bdca38qhnzdpsv6b0vds9ccvm4c86rs42a7c6v655b1q";
+    sha256 = "0dk6k53in3ffwwvkr0sazfk83rf4fyc6rvb6k8fi2n3qj4gp8xd2";
   };
 
   buildInputs = [
-- 
GitLab


From 444ce2dbdf9932d563ac4be0c634b7c3a8997f91 Mon Sep 17 00:00:00 2001
From: midchildan <midchildan+git@gmail.com>
Date: Mon, 1 Oct 2018 20:45:53 +0900
Subject: [PATCH 0079/1065] sourcetrail: init at 2018.3.55

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

diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix
new file mode 100644
index 00000000000..2182f8697aa
--- /dev/null
+++ b/pkgs/development/tools/sourcetrail/default.nix
@@ -0,0 +1,75 @@
+{ stdenv, fetchurl, autoPatchelfHook
+, icu, zlib, expat, dbus, libheimdal, openssl}:
+
+stdenv.mkDerivation rec {
+  name = "sourcetrail-${version}";
+  version = "2018.3.55";
+
+  src = fetchurl {
+    name = "sourtrail.tar.gz";
+    url = "https://www.sourcetrail.com/downloads/${version}/linux/64bit";
+    sha256 = "6f5fbbecc221e7165ecbf1c4d208e302dade4feea9d43eb3265521efc0a376e2";
+  };
+
+  nativeBuildInputs = [ autoPatchelfHook ];
+  buildInputs = [ zlib expat dbus stdenv.cc.cc openssl ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/opt
+
+    mv -v setup/share $out
+    mv -v data/gui/icon/logo_1024_1024.png $out/share/icons/sourcetrail.png
+    mv -v data/gui/icon/project_256_256.png $out/share/icons/project-sourcetrail.png
+
+    mkdir -p $out/share/sourcetrail/doc
+    mv -v README EULA.txt $out/share/sourcetrail/doc
+    mv -v plugin $out/share/sourcetrail
+
+    cp -rv . $out/opt
+
+    rm $out/opt/lib/libssl.so
+    rm $out/opt/lib/platforms/{libqeglfs.so,libqwebgl.so}
+    ln -s ${openssl}/lib/libssl.so $out/opt/lib/libssl.so
+
+    substituteInPlace \
+      $out/share/applications/sourcetrail.desktop \
+      --replace /usr/bin/ $out/bin/
+
+    cat <<EOF > $out/bin/sourcetrail
+      #! ${stdenv.shell} -e
+
+      # XXX: Sourcetrail somehow copies the initial config files into the home
+      # directory without write permissions. We currently just copy them
+      # ourselves to work around this problem.
+      setup_config() {
+        local src dst
+
+        [ ! -d ~/.config/sourcetrail ] && mkdir -p ~/.config/sourcetrail
+        for src in $out/opt/data/fallback/*; do
+          dst=~/.config/sourcetrail/"\$(basename "\$src")"
+          if [ ! -e "\$dst" ]; then
+            cp -r "\$src" "\$dst"
+          fi
+        done
+
+        chmod -R u+w ~/.config/sourcetrail
+      }
+
+      [ -d "\$HOME" ] && setup_config
+      exec "$out/opt/Sourcetrail.sh" "\$@"
+    EOF
+    chmod +x $out/bin/sourcetrail
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://www.sourcetrail.com;
+    description = "A cross-platform source explorer for C/C++ and Java";
+    platforms = [ "x86_64-linux" ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ midchildan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfbc6687f9d..c494c5d634c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18930,6 +18930,8 @@ with pkgs;
     apiKey = config.libspotify.apiKey or null;
   };
 
+  sourcetrail = callPackage ../development/tools/sourcetrail { };
+
   spotifywm = callPackage ../applications/audio/spotifywm { };
 
   squeezelite = callPackage ../applications/audio/squeezelite { };
-- 
GitLab


From 12e6483d0764aa4e9a6ba29d405c8b4427be552c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 22 Oct 2018 23:16:56 -0700
Subject: [PATCH 0080/1065] zimg: 2.7.5 -> 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/zimg/versions
---
 pkgs/development/libraries/zimg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index 9d006527717..12fb076d946 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec{
   name = "zimg-${version}";
-  version = "2.7.5";
+  version = "2.8";
 
   src = fetchFromGitHub {
     owner  = "sekrit-twc";
     repo   = "zimg";
     rev    = "release-${version}";
-    sha256 = "1f4iv99w1sn7kp8xlv2vr20m6qif7c8km1vqjfs9kf2305z5lxww";
+    sha256 = "0s4n1swg1hgv81l8hvf0ny0fn305vf6l6dakbj452304p6ihxd83";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
GitLab


From 3eeecc0988117b30c9e1340f2e264ae4ebd75a06 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 6 Oct 2018 21:57:39 +0800
Subject: [PATCH 0081/1065] snapcast: 0.14.0 -> 0.15.0

---
 pkgs/applications/audio/snapcast/default.nix | 56 ++++++++++++--------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index 3afd73493b0..5730dec6b99 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -1,49 +1,61 @@
 { stdenv, lib, fetchFromGitHub, cmake, pkgconfig
-, asio, alsaLib, avahi, libogg, libvorbis, flac }:
+, alsaLib, asio, avahi, flac, libogg, libvorbis }:
 
 let
 
-  popl = stdenv.mkDerivation rec {
-    name = "popl-${version}";
-    version = "1.1.0";
+  dependency = { name, version, sha256 }:
+  stdenv.mkDerivation {
+    name = "${name}-${version}";
 
     src = fetchFromGitHub {
       owner = "badaix";
-      repo = "popl";
-      rev = "v${version}";
-      sha256 = "1zgjgcingyi1xw61azxxasaidbgqidncml5c2y2cj90mz23yam1i";
+      repo  = name;
+      rev   = "v${version}";
+      inherit sha256;
     };
+
     nativeBuildInputs = [ cmake ];
   };
 
-  aixlog = stdenv.mkDerivation rec {
-    name = "aixlog-${version}";
+  aixlog = dependency {
+    name    = "aixlog";
     version = "1.2.1";
+    sha256  = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr";
+  };
 
-    src = fetchFromGitHub {
-      owner = "badaix";
-      repo = "aixlog";
-      rev = "v${version}";
-      sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr";
-    };
-    nativeBuildInputs = [ cmake ];
+  popl = dependency {
+    name    = "popl";
+    version = "1.2.0";
+    sha256  = "1z6z7fwffs3d9h56mc2m24d5gp4fc5bi8836zyfb276s6fjyfcai";
   };
 
 in
 
 stdenv.mkDerivation rec {
   name = "snapcast-${version}";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
-    owner = "badaix";
-    repo = "snapcast";
-    rev = "v${version}";
-    sha256 = "14f5jrsarjdk2mixmznmighrh22j6flp7y47r9j3qzxycmm1mcf6";
+    owner  = "badaix";
+    repo   = "snapcast";
+    rev    = "v${version}";
+    sha256 = "11rnpy6w3wm240qgmkp74k5w8wh5b7hzfx05qrnh6l7ng7m25ky2";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ asio popl aixlog alsaLib avahi libogg libvorbis flac ];
+  # snapcast also supports building against tremor but as we have libogg, that's
+  # not needed
+  buildInputs = [
+    alsaLib asio avahi flac libogg libvorbis
+    aixlog popl
+  ];
+
+  # Upstream systemd unit files are pretty awful, so we provide our own in a
+  # NixOS module. It might make sense to get that upstreamed...
+  postInstall = ''
+    install -d $out/share/doc/snapcast
+    cp -r ../doc/* ../*.md $out/share/doc/snapcast
+  '';
 
   meta = with lib; {
     description = "Synchronous multi-room audio player";
-- 
GitLab


From ef0a9f42a6bdf0d2f9293b422944641bc8dbd641 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Tue, 23 Oct 2018 10:31:05 +0300
Subject: [PATCH 0082/1065] skim: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix
index 54a6500f779..f1df0691205 100644
--- a/pkgs/tools/misc/skim/default.nix
+++ b/pkgs/tools/misc/skim/default.nix
@@ -2,23 +2,21 @@
 
 rustPlatform.buildRustPackage rec {
   name = "skim-${version}";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "lotabout";
     repo = "skim";
     rev = "v${version}";
-    sha256 = "1k7l93kvf5ad07yn69vjfv6znwb9v38d53xa1ij195x4img9f34j";
+    sha256 = "1b3l0h69cm70669apsgzp7qw1k5fi2gbk9176hjr9iypbdiwjyir";
   };
 
   outputs = [ "out" "vim" ];
 
-  cargoSha256 = "18lgjh1b1wfm9xsd6y6slfj1i3dwrvzkzszdzk3lmqx1f8515gx7";
+  cargoSha256 = "0ksxyivdrrs3z5laxkqzq4lql6w0hqf92daazanxkw8vfcksbzsm";
 
   patchPhase = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
-    # fix Cargo.lock version
-    sed -i -e '168s|0.4.0|0.5.1|' Cargo.lock
   '';
 
   postInstall = ''
@@ -36,7 +34,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Fuzzy Finder in rust!";
+    description = "Command-line fuzzy finder written in Rust";
     homepage = https://github.com/lotabout/skim;
     license = licenses.mit;
     maintainers = with maintainers; [ dywedir ];
-- 
GitLab


From 2fb21f220ede612747e44e45788bb4b811d7ae14 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 00:49:54 -0700
Subject: [PATCH 0083/1065] wavebox: 4.3.0 -> 4.4.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/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 ac58d4f39d6..8297304e55c 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.3.0";
+  version = "4.4.0";
 
   desktopItem = makeDesktopItem rec {
     name = "Wavebox";
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
   name = "wavebox-${version}";
   src = fetchurl {
     url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}";
-    sha256 = "0kdg5q9rv8nxlg5jhmdfy5vv7gkdswzhy49af29d3zf57z69187c";
+    sha256 = "0g77clrxks1ivldq496bg14hv57hm0kjh4g1askxyck69yf8illn";
   };
 
   # don't remove runtime deps
-- 
GitLab


From 8a9b6bc6076b3cc7a17d99ce0799ba2b4014c08a Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 23 Oct 2018 09:05:50 +0200
Subject: [PATCH 0084/1065] nss: 3.38 -> 3.39

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

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 3089e6da23a..8a3de28b784 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.38";
+  version = "3.39";
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_3_38_RTM/src/${name}.tar.gz";
-    sha256 = "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c";
+    url = "mirror://mozilla/security/nss/releases/NSS_3_39_RTM/src/${name}.tar.gz";
+    sha256 = "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb";
   };
 
   buildInputs = [ perl zlib sqlite ]
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
   preConfigure = "cd nss";
 
   makeFlags = [
-    "NSPR_INCLUDE_DIR=${nspr.dev}/include/nspr"
+    "NSPR_INCLUDE_DIR=${nspr.dev}/include"
     "NSPR_LIB_DIR=${nspr.out}/lib"
     "NSDISTMODE=copy"
     "BUILD_OPT=1"
-- 
GitLab


From 277da59e47134dd51c2a5e0c6c426748f67e81d8 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 23 Oct 2018 09:16:43 +0200
Subject: [PATCH 0085/1065] firefox: 62.0.3 -> 63.0

---
 pkgs/applications/networking/browsers/firefox/common.nix   | 5 ++++-
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index b72e3703ef7..16c9b548325 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -10,6 +10,7 @@
 , hunspell, libevent, libstartup_notification, libvpx
 , icu, libpng, jemalloc, glib
 , autoconf213, which, gnused, cargo, rustc, llvmPackages
+, rust-cbindgen, nodejs
 , debugBuild ? false
 
 ### optionals
@@ -111,7 +112,6 @@ stdenv.mkDerivation rec {
     "-I${glib.dev}/include/gio-unix-2.0"
   ]
   ++ lib.optionals (!isTorBrowserLike) [
-    "-I${nspr.dev}/include/nspr"
     "-I${nss.dev}/include/nss"
   ]
   ++ lib.optional stdenv.isDarwin [
@@ -121,12 +121,15 @@ stdenv.mkDerivation rec {
 
   postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace js/src/jsmath.cpp --replace 'defined(HAVE___SINCOS)' 0
+  '' + lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) ''
+    substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h'
   '';
 
   nativeBuildInputs =
     [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ]
     ++ lib.optional gtk3Support wrapGAppsHook
     ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ]
+    ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ]
     ++ extraNativeBuildInputs;
 
   preConfigure = ''
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index bd42cf2d9d0..826956eb564 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -26,10 +26,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    ffversion = "62.0.3";
+    ffversion = "63.0";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "0kvb664s47bmmdq2ppjsnyqy8yaiig1xj81r25s36c3i8igfq3zxvws10k2dlmmmrwyc5k4g9i9imgkxj7r3xwwqxc72dl429wvfys8";
+      sha512 = "095nn50g72l4ihbv26qqqs2jg4ahnmd54vxvm7nxwrnkx901aji7pph6c91zfpf7df26ib1b0pqyir9vsac40sdxc8yrzm6d0lyl1m2";
     };
 
     patches = nixpkgsPatches ++ [
-- 
GitLab


From 5137c04770d173c8f3d08dc66f72a10a4f885ae9 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 23 Oct 2018 09:20:09 +0200
Subject: [PATCH 0086/1065] firefox-bin: 62.0.3 -> 63.0

---
 .../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 6c6e05133bd..54b588fb097 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "62.0.3";
+  version = "63.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ach/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ach/firefox-63.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "bcf519e0080aca1cf232ec327ea65973e71230dd60204bc1fef3284dd94fa123f4a60421b647a3f64352829b1ef3b0e0b689a1fa7a06f6b1848c5acb1d33b917";
+      sha512 = "0557937473fe8758371d21ec4b0d983ac2db59e8b9d3d627a318d3adf9a0cd0712f3e9b375f0cd6d9acf3f39b0c42fbcdb31364c5973916c7287f618a5f074ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/af/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/af/firefox-63.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "5b145ab068216846169303dd75ad3b5a40e82129234cee35cd7a559cde0dcbc6abb1d6ce50680b9a8180828db82f3c23d62e9dc46015a88b0a3c75eb164c17df";
+      sha512 = "4b0d715ba2a7edd648bcc2c396ea764e8a29fce69d526803e6621053f3886df44d758fdbf2c8af8a9e3acd307e10dcdcf3e13eff0e60bce28885b699cf2426d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/an/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/an/firefox-63.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "92a7b8eda43a1d6323e058d285e5b599b14ff8a7275d8e900d9ad8d5dc8160ddbfeb8134b877cbd078b3e3ce9919c2906f4cf7f9224f807f6c0ebf0c6e906be3";
+      sha512 = "79665a9586e0fceacb0a49560d0fc2a72a76187799563b0f8ef972043020744dafc971cb94b52b30df6056673aea4e0885f994d55c99c7976f9f7805c30e5796";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ar/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ar/firefox-63.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "2592b6808abd04054ab6d71b8f44d94eb040c92f53c755b2258e4a10a3c8cd80241dedc2e57924e9410717cc8943947248b27c753c6223aa57352b0a08cd64dd";
+      sha512 = "d338b5fdf1dc4bb920bd372ba69934ddf39bdc7e37b725a010fbc9fd71ff487181d898e863c7ce9a21039d51d256c4ec1ca2cdcf0da078788243e867b0bc151f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/as/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/as/firefox-63.0.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "224c3d09c1122f2444d2bc75833d6db60a7cbdacc819d16d40a3d5e6537e275a5720f1b6d4616ed318868683b99547d03aedc21175781eab0b32ec8c6be87495";
+      sha512 = "2022a993455456d0c900ddaf8e6a74a3d5478edec456df0cba627dfa1ad41f0274053c21b9c1ca4ca6b640e26993d60ffcc2f879c68143699f6e31d43f7acc19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ast/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ast/firefox-63.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "26b316efd6d4d238726e5a1fef3a6ad00af3f42cd45846598e4562b9c5b2d35af3372e283efd30713464c440715de82ce49ce3d73569ff528d90ec479264110b";
+      sha512 = "1eca2ca8385215a886a16de77988d76e41b7257a41fceacd3df18e21ba82c8c67df045aa8201a2b18032f1690997b4b8bfb55a80c47341335aab45cbb15eefd1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/az/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/az/firefox-63.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "29935c406c955692a469762a9c53762d6a8f7ccd4555b53c31283f4767db2547a17819f7e55aafd011b3570c30839e350dfe74a52d322047647ddaae58b23919";
+      sha512 = "3788f68a69a8605e3185e5e776edf3339a650e010fc4810f574e5c0a62c9aaf30c84151ea169c005c1f381c3eaa4c3a8f6758c336a9423cfeaffb83aef96dc73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/be/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/be/firefox-63.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "e4a438ff8a9100126f0fac456bd6aa7d0713bf2e22e7ce6490c4f3ec5643087b668bb5d8d867c9466a289a964f957ce958dd9545ada53b207bf026f3f8200373";
+      sha512 = "f538b9f8d566f7f3c5bc92a24127966d618b47dd368ecbb4fae0e5c90045bb75cb1b921edd865227ca6c34e3e2e037acb81d9f7368cfdee59cbdcf6ff2798ffe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bg/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bg/firefox-63.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "3b17536b1bd6cbb94548b7b2b0d05ced711ef116acc4687309c3392f77ec0b51cb4814efbeee26ceb51328a4ae5b5ee1c4d8e69e57c2580be8cb1989bb082cba";
+      sha512 = "497a95b4309e60093ec3f1b0a72ac05d1b9a47d78799ca33492394c7bf0b81e64e60103218c479b4ff3a3b2acfcf95493f43be23feb89fbdfebe42ec8a124132";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bn-BD/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bn-BD/firefox-63.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "d9969a8d0fda1bc4d108f0c24e934235186420734df1be38db9608e303d7928b45007b40857681d0b29826bc26628b3b86388c81925059ebb23b6ccbeb80f375";
+      sha512 = "3c2123b34ebb2e3c6def220c679069b31b3d7a2110ec2eadea88a930b6582fcab0452bce97f0302a39af324ca1b58ec49ed49aa865ade7d814152bf16fd1cadc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bn-IN/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bn-IN/firefox-63.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "7e449679b8bece1eed95ca5e3bfbe1a303d9dfa8bd4b9e53d14f99198e01a4dc4367112de48ad50b61c3cc54eaaba8caf143c36336da3c86c2815828ca5a2a80";
+      sha512 = "55fdb9a3efe54db994706fb8345918f5c19f1a24f77107e6819dd1272a09900ef3534897c1d3b38c331c94813446694b2422356ae6ca2356338d6253e15a37e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/br/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/br/firefox-63.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "328deff7045bfa2187c19a66ca03a0c8f25e266eb6ea9c19715c201702245a0c338458254297974aa18466350231dc800f20b72c552f4633d5eea176f45adf80";
+      sha512 = "c35e40bfd6b1fb06c8426c6f9f834f8a6d658ced8892c575079d852dbb2e24f09657b1f37bc8af3588cc2c8b9ba1924cf5a85c7be0d6db4334c592f03abeb142";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bs/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/bs/firefox-63.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "20f85e5ca5f7a7be5079778b426e252c98112550849fb6e16e3b0d52a15570e638c8a664976a9252891a2254be59fe436dcda0d65b1f9ad5cdbe0cc5636cb93f";
+      sha512 = "ea63659f3a930b4d0a8add69cd8ca1a3d98e015aab1b6bc607c8e0fbd610de8fdc49ac290c61bcd762092d4f56554f70f029a18be4bcf426cafffc6fe9677699";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ca/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ca/firefox-63.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "7abd7b7220c6a5b1cbb4c8f9ee6c55d15682bba5bc1e1356a038f9b1ae7ec351c57ef4dd19a02f8216f6789342d5d91cf76a00ecf13e71c8fad0f1fbc315e775";
+      sha512 = "10993691fe9072706f1c092199dadea2f1ffbcfecede53771326dd03b88387133aa23e75f96bebe7117eb02ea2775e5758c36064c5ddd72f7aab441feca659e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cak/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cak/firefox-63.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "2a8070bcd971261d994ae2ded0366b9e07961e1b98aa76c117d1e949a8f9990a22ba461ebda223b76f33c7ca94e1862a888b000642a4f874b8b92d2b5f470736";
+      sha512 = "0413afe78e4c8ca1af3edad09c801607c73069366a255d4d1d9e6d4589ba3757c732a2cd691b8f223ab10cc99cdcc322e98d8daca49b3107082a8cb41cd278ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cs/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cs/firefox-63.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "8beb5c0ee3a0b2a556b455e41887dda126a0892df50aba4e283f0db819c99c4601427370c70c09d176f1a6ee8d629e1ec5f8b803d51b9444237e56c7a273cc0a";
+      sha512 = "d4ee0844c1587ed0d65d40a444fd130022f99831749f721523b0f594d4967e723fd8af10c363f53b4fdca91f676962882e93327dd5b1529d3d66c27f17bf29a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cy/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/cy/firefox-63.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "ec1a4fb0c8f753454aea88fdcfb3a340d0328d9c059653d9390a71841098573d667c2329c0c8dc88a2fc52eedfd8dbc584df2fe44fff273f8aeec8a3f1eaa0f6";
+      sha512 = "103177bdcb204d0da7dc8fbfcd82a52bbf3956b13f716de1547252a076d68b21f9bf4684ed63a62aa4635fa39cb776a64942d81333ebf41dfc5f12d6087261af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/da/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/da/firefox-63.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "79532e1cf94447797d9d816cdc342fe0f8c37915494ff000bbc7148c2d42a1adeb7226887d51999774b6068f62d71bbb54b0951bc606003a91df12e9f24e7691";
+      sha512 = "38cc06165c713ffdb5a2bcef9b8e6c7f55c2e821c4e4c87d30b613cd78aa6320761e709f3a784a0f55da283dd7088ab67d0e58a16a90bbd182985d29691bd50e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/de/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/de/firefox-63.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "5f0d10736912f6ad4bd38538601ceb8db10cf97dd414446366218ccb03ae010037114d688409cd724e194126524bdd442f71b1cf646f1f3ac46499afecc082d6";
+      sha512 = "076276ef8556922e80bf74aaf3624e6604eb904ec6dda35df7f91edf99c62015d1309ea1a5cc28d84ce96f9924dc908c81f959ecf93f2419156d07bb303fcbd9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/dsb/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/dsb/firefox-63.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "2cafc29c75b055e4c21e12fe2b2ca3c974ad53fed43c8b082e09323bd1854ae7179da13c7d33edf41f783fe0016053d52292bafbccdcff79cc69d8ffedf01ab9";
+      sha512 = "979013e2bc62db710891d95d8898857e51bc1a2073e3a56948af57c9676fdbc87b6a9d827177a5a1d7926f71d83e9df706c42ea98bca98fab998815daf50458d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/el/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/el/firefox-63.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "b1246b56eb0d61d5ac874383ee279d3c9dfe559127052c4d4403ab0009d702a76711d05f1ebb781f972d9cbe6cee9a6b3c1aea9cb74866e497f2569480a2cbf1";
+      sha512 = "1f4e5983ca94ecd9da6d65ec7c39ef7e01296f957cbe3812a20981bafdd9a2c0e07bb5814b5caab781ed1f2f6fb2ce2079557e3b9bbc1422b2fb7d882b921ffb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-CA/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-CA/firefox-63.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "8d344a08fce1be002b5710031250aa0f13d237bd38386cb31d5f6a75cc29ee17dffd01e1375e4a26b1a136d268db6ebaa591fc23789b3fbd7771f42a6bb59979";
+      sha512 = "77a9038b33a15a2f12db383039f89d29f1e855aad6354375517726d28c5e1984fe77993cb802f17975488441ef36ac143c1e4e2d29c7104143db511229e9b28a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-GB/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-GB/firefox-63.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "88899808190f9013eba157345adc740fbd1889fd1ac963209cf093e9bd9f1e9b3f35126e85c5d3a1590e02ff1da8c09fa390ec519bc0ab01bab7c37d9b5d4bed";
+      sha512 = "62f5374d07b90e80d9f67b04a647f68fc75af267e9b9c04674d754b0d023ed9d78241a693f11504d5b74902328c68414be394923493c17c551a62d06621edf4d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-US/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-US/firefox-63.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "577cdf1e1c4845e0b22c174833b0e20375443121e429a57d16f1f0e3af86533a6c27d35d8451ab25b3f7ba10ee9385d0f497866b50d4f37a81f9663137aa3395";
+      sha512 = "906376e344b9f01c5eca8a6e24386927a68613a74202062fe52de5bc1b9d1073103e9c59d19f40f33efabf0f5e4852210195691a73f1bd05db790e7c1eac5f28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-ZA/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/en-ZA/firefox-63.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "ee679b5bab64492bd069cd9b3b7509db7a5296a019d8712afd12a5b6ffeb1911fc4daaf63483b895b79652f67f9095b66be780a2b0dce3e7b9b57fb5fcda316a";
+      sha512 = "895f9dbd5ef281a48e5c3124dcb668b9fe4d6b41a3402850e68e138190b756ab10292bd002c36a1f8391ff3598c48a8623552ac35d18d0948dbe194b28684f81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/eo/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/eo/firefox-63.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "32e54f1a83e4b3cf8f7296fad200abedafb5c7d4bd409c7acd2806944a241b6923794a33a7999754e4d2010f2788ea3a3d08ee72a9354713b6cc2ee1dc73a665";
+      sha512 = "defe31badc0ce4c41785abf6aef543584778e5c6f373300c2fc3582c89daaa500cc9aedac55e1a1569abd8eb0de207268e31b9eae61565e76a43eecf41ef774f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-AR/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-AR/firefox-63.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "ce740d773ecc016eb89e9fe4370e199294f8c51c4f5f74bbe7f09a5ac060b374d23e80fd8a27b63c6149bcaec2b93d58a892ba7f53c08628c141b406838e2d58";
+      sha512 = "bfe81fbc669fa156c6741c62b00c9ebcf74fb2f49c92206c5ca79986358e7b8ec29d98d206c4d0e21e81a781ed8216fde5b072f0f1a19604ed7c3784b82829c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-CL/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-CL/firefox-63.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "9ea5c06200091975c98587627ca371bb492cef91ec200a52409b4b30092aeeda64360913b8950ce56031aef34e66364bea71bb071df5549736dc0900ac54f7f2";
+      sha512 = "cd3bc97552a30c9eabf8627ef97db2d4f48f2fbce4c72b5e6b41000a623ab1782f87ee8ac61dde5e3fccc59a91f87b4a3b279b90de3b08e90293329bc85976d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-ES/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-ES/firefox-63.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "df71790d420798b17e64aaeb007f7f8585037d48b7c8933f5760b75385c945ef16e815c84b5872cfef8a2ebafd3293cbb4910befc4844b166f16774947a9b32b";
+      sha512 = "1d761d479df22483c576598db8248b3ab6a7b838c518058c6903d7097452c4027b9c38cacd206063816669ce664501c138741044369de04eafcd40087ccc3688";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-MX/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/es-MX/firefox-63.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "02e0948d3f4855a9c9e502627cf5d199364c0f0a7ee7f4314d69c9977f8504e43c3dc1cb8e80c9aa6bb6f4d75609108f6aafa8c9acdac31aedb908b5df26e1a1";
+      sha512 = "934aabdcb204dcdc80d9e35cf19aaf83dc235f95d597f5b2a6302635275aa68245932f4b5f1b2725ec84711e8d0f2c830aaa45406ada91efa2d21c8b31995939";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/et/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/et/firefox-63.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "776bed6ba54f1ac29836681a99ec673741dd439501b7859a68c1d6645693f566fb3dbaf2e827cb23d3ab993ff4ca290008de7256aa28cc6e29625eda4048db27";
+      sha512 = "5b669b4adb7d14eb4550fcbcd05a1e7a1a186954bfba39d491248b177d057662227b672d2902273315c12e9d57bb944ea2df41d7cb35514fa00d79d235c178c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/eu/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/eu/firefox-63.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "7e95ac325fd4726def5aed67ee110693dbeb7953aa5672913c18cb1b91f8a884500e6096a5100e89d9266c28ede9d677be91fb00227944d379a946938ffc752e";
+      sha512 = "c8555e93e6cc7d4fe179ad68ad1b2fe3f0735134c8a30bb9911b0bf5475e169e07640eee85afa2c7193b27d96c8cebe2227d38e1ff7499b3470b68a04bff2953";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fa/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fa/firefox-63.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "6cc8d99ddd690f7dac9da19d23666e655aa65a576cf912b195ec3f83ece9b5a6677d656a1d187930897adfc021ee3d16e3113a8d8454fb9b4a9f878c615b49ab";
+      sha512 = "c607251f6b855fd86504fec3780ba66d8d451d76a16d0541fe5b96ba5b8d809ecd7d591209f3320bfb044463470b394862a6c0717cd9398048a154d6c2b93bad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ff/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ff/firefox-63.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "026976b48352d2c292d27b0df8f17f75f2bbdc0822d89b722bd1e58d9189ce35c925da6de287f0f89e18ac9f64134a1bf5dbd3b6da609da823686acfcea5b05b";
+      sha512 = "d9850e4d78d6bebb9d342898bea876d66a9811ac62ffcd56ab8ca662a4db6bd872a643ac233e02fdebb9dc107349d7f0f258ad790ac11bfdd791a2d8336197a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fi/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fi/firefox-63.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "8d7621858ba33c340248df277f3822c120b4beea5cfb9811afd61b85fc2b5dfdb100c475d0b291c9bedeffae4ba52bea653d925571af8c68bafae6c997beba74";
+      sha512 = "8be60c2bc3c175aedc3a1c062107c5368f503bbea245e87f5f269c9faed3832ff8c93f221815637b3947c474b44be31f3ea09955e7a87d2be67454dbb4d4e9b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fr/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fr/firefox-63.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "23f73a32cfa388bc21c1e202886d83a36c21a8b4fd83f7001ce72a911be800d9dd2d49e21cdd9d9cf48a82121d4684802dcaa7d97b3bb47b762ec4c95be49011";
+      sha512 = "ac559deff6caa20f40bb561e350129e765ba7f63ee8758dc01542fb5f685262c0bd6ec0d13fd65c196aecb352b72b62d10335d121edcca11500684fdb1be8be3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fy-NL/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/fy-NL/firefox-63.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "2d3c4d546d1d8f03ab407c2bf481e23bb4bf191b84e9e0da533b2b00a0c8f7cea7c5730fcadd777b909c9515981e61a1fef25fd1037d75bdab15901a877c9fb6";
+      sha512 = "c6a19730d2861a20a69ec8a7ded79377849554f21143e3b55ef0b009519b52d9ba2fa0f2e58ef592f3eba00305d0e2dcf44df958ed22043a83a86ed7fa72362a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ga-IE/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ga-IE/firefox-63.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "7f52631104ef48631d2d2d5434a50d1f62447b314329e9571915bf16b246c9910a8875500077474303806edc05993d79c72b60a2b6f3a64389446609092320d0";
+      sha512 = "28c68d871e4e025eb22f19fc1c4d786185934bd6254f03061b95eea8459776c9c28a903e30edbcd53f6e0cc5b24b6c65e2311a6483e18620b246ca8ce2fc5470";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gd/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gd/firefox-63.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "98b9275029ad64dbebebeb697ccfeb1dfd2b0d51e437899a8417292f2a14421a5a83f07164cd4158250aa08d5e45bbe4c97e1fc7ebf3fa02cf42d7dac740aa0d";
+      sha512 = "d6e9b226b893050925259a7de5dfc67104b6defc76778272adb8e5b41427a646549ddf6e38d58d9ee4bd27c476406ac9e65244fc57f78a3ef54d7c7bc758df80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gl/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gl/firefox-63.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "6abd8e3d990983094880056924fa60c14efb6c133f05ef129294c7cd83725df1e32a85bc08ddffc22f3e3d4414744345f67ca5f055af74a93a0eaf8838f38f8e";
+      sha512 = "3f73ec82235a8345c2e1e86b521f062a5f45bf0fdb884533c22f1661bff430c1a3c440c5fa5c209474c2eb542d1be25ab2c6a4aa50b872ffe34bb66ef2da6e0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gn/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gn/firefox-63.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "043471a8b62dc300f1c719ea33a6c8b3690f38876697cf57625e26bf1d66ec2a4b6f952c836359da19f9b346851c3fc20525fad32596c9e91b9f5b23ca1672d3";
+      sha512 = "4be814c72579653264990737b7eefed0ed7f332da1317bbff3a0a1d6f45aecdac12552eb0e6897ac0bae64f261de6b46b36588623a8523a51b880d1bde5d763c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gu-IN/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/gu-IN/firefox-63.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "ae849a0f9350fd0382e859ae9fde0217d73014c3fb7a7974b635b3bb2f7d62087c7b40c62707ff64eabd37ca700faa0f392e737b1ace15494d44fd6a87599b69";
+      sha512 = "00670cb7caec8f841f17e613a86554182512e0aa49ff7c8298c9d3c9d364d7fd391063b890461cc41966e5facde0a8a325ac97e08bd0bd9d25858b32c348fa81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/he/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/he/firefox-63.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "49a350f95858916d73aa71be60bc3f162bee24556c06524ccc5d10eb7658e91affe4c8945d92c7c6958eb7c8bb3879211d6096a1912bc4b50a9e35b465ddd219";
+      sha512 = "653538026ba533c7446108a2277dc7f87a2e519583d27c028be2b056c67299ceb9b2296dd83f94c3a043a2bb9fbb05de2260248d408f3279a7c8fc49e0e84416";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hi-IN/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hi-IN/firefox-63.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "a55d2647fa5ffe06fc479675676700edf460c7d7600fe18ae468fc3e13a8cb3cc025dd64bff244b61724ee213835a64c71e51e2d59a0ac2eaaca0a29a692dfaa";
+      sha512 = "a4989edea0edf4f509d4387b225340a4b67805b3f8cd7af67b575b1b3b5a8cc98f9a8d6d2a05ee878e15dd8ac2b0c35f43fae52917a8b667098f1812e361fbef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hr/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hr/firefox-63.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "6d961a7936c46dbdeb4d66a6ba91414a158593120a58f9f454ae77839cfedd5af2dc9d3dde02bd2d36e21f946b5ff9de0727abf44c2ea78f6e618cb84242892a";
+      sha512 = "b762c1bf922e72a9cd8570012962fb63c5658de25fa08ce4532c6c96b7b06c0e13bc71b2306219a6e0219a8ef7aef168a8523cf39b1cc1e6362198fac0696545";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hsb/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hsb/firefox-63.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "eba4e20491a61d9de7a25373bec43fac62b9ac3b461be5e593117ff4d31884acee63c2c6bbb56cc7eeef67bd36b7d3bfc748169fd7fc49877efdf7656813ee5d";
+      sha512 = "22ea6afb26555d88680cea7bc1fba6570aa7e0b8517b23f4f5a7d3f2fee285315e29e818954dacd29768642e62a57adea282fa35116a7733c1012d2578647bbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hu/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hu/firefox-63.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "d78c29d57143a3aa443ff79718afcc9c7ddd72b8f9fa3dfebcd6c19279947685a7560fbc4ba2de42589cdf4d9a71de94e335fd6641ce284fc60418e483895b97";
+      sha512 = "cbd0d026cfb693c7eda3f58f0954bad41ec260e307b8a4a9d4e774e2277786420f99c8afab9ee0fc9f7cf7f9e4542904c6d1c1b92c1c3bffa62f8dd9aedd8a73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hy-AM/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/hy-AM/firefox-63.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "e7239c2f90870322c16e9af03da9156d8d36b6ef5b71053006f78f94af9da068e81521eb155abfa74195a83a63f7181cafba270c9bda2d4bea63f9cedf9aabef";
+      sha512 = "59315b0561ccccfc031b240b699b019c3b6d2769cda6d816bd60c359ca1a4076c4fcd8342bbff6cd4cf66243dc5164e1c0066bc7821275cf5c11caff0e86a6e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ia/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ia/firefox-63.0.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "e614f2a89feb9b2555d2d3de019c1c6b74b6891eb4e9b7d9e055444ec923689442e6c7ec8f2d8605236e0556c79827a031a870989635234439e678eaf1846e39";
+      sha512 = "2addd61131770c825227639d5d7790bc0c9f0be430077fa31cb11cf74f6ec191f6dbdd88c4e0b2fc199eeee7ecc39c6dce8c790924224ab0603e0af41e082a63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/id/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/id/firefox-63.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "2e5e40dbe997459c14432f80d50075029ef79d1fbcf64fffa527bfffbd5c348ad84a2f2909045ddf98f2b268c26a20b1bec0c00ca753e64782a0e7dda972727a";
+      sha512 = "81a68f78f003685e1a06d242ca3c24df27b7a0b28d0a5df2f41cbe9b92e312b32a35608c7e094ca136d6f6356e523c62baded1cc027d19342ba44cf88b479843";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/is/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/is/firefox-63.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "77875a40aa36692f594ee0e714ad9cffcca0d036669f10dc31ce8492c1b372a885642b9a3f9cb85ab94833cd7accd425ea673535fbbcb93d3255ae74711b0ccf";
+      sha512 = "cabbb8d0f7b5009aa6e889c983046a5c806f1c077c8e27f7cd148b54a25c9cadb5010acb97b2cdbe6480463f205bd7a4edb966fae0a92a8380439082542dd9bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/it/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/it/firefox-63.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "6e737a1911bc5a97c6bc3ccdf33d72b5b964b2e155672ae583268393b3d9ec785765d55a0cbbdb0deb4fd4bd8bbd2bdd0849ed27ab782116f3d09293f441f40f";
+      sha512 = "8d3eb041fccf54dfe389566cd11b2dad4276fee3b902914bdb4a8cf06c6613a39f4ebe7d00d33a1873bcee32f398b0527d4807d08ee91e0accabb92205eff51f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ja/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ja/firefox-63.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "eb69cae70ef52c96b21f74fcf339ae031c4dde08817b211b4deed493d0ed63c87b28cea1d67123fc2f36ec4ff375f8d8a4f6eb07f0e55be87e1ae74d001dff77";
+      sha512 = "facf7aa7f639104956f44dd4f2a6f4064ac4474d3c3bf2e355f1934c68831bb774172b719b2f0685435e3f3cd56ed589980d06a1d2dbb6e405a5f5c32395136f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ka/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ka/firefox-63.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "87c7a6872de8829615834706fc76f1eb093c57f9c7866a45a4a43f2974288f05d7a98a3b563b65b2464e649c8a34972a9d779b6386bd904283db907981064f58";
+      sha512 = "c8d5407fd932d83fe6d55fa012c9fab70a4d67fc6043dc4c9e18c6f6e25bd4fb8feb0dba97ec7a8a3f1cccfa37c46cae482b9fab90ac29c34b57a35387742b66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kab/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kab/firefox-63.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "c65d155fcc48d9b57590bc09ccea6303b85c1a7bffb8ab6783e39408ea271c341f558ca6800eae145baef263af54ed19b882b0aa39ed75b38bfa8a4f5b3842a7";
+      sha512 = "0949d40892060b97c1fdf69d9777893b2456d5c936d29876832aa41492c01c1a07c88665fb669d53b8cb91f23757cd14636f87ecfae7aa112384658288afd4e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kk/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kk/firefox-63.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "2858283a1721fffac6af65505c26d3c761331df82a7a17d5e107d3b9151cb08e448cf7d80eb3bef29068b9a4d0bc2f268207f86e0afa692a50b8c9e6623bf835";
+      sha512 = "30d3e966ebad9eca27d255c20bf11bdc5c6073f0cec8954c568c4abda86f689e5a9c4c2f508cbe09687e0efdd2ea8f5f8ef5de781c3fde399f39bd9b229bd187";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/km/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/km/firefox-63.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "fb77850dbdbd2078ca6b7933fd630550d52ddc57615a789265756b460840cf6389dbe138be82136612762f48fcc8da2f8aecf94c3ffbf8962b6c1dd6f60cf52f";
+      sha512 = "f9514178a460bc3f1a6e56878f951208d6afe92de893ff1861e38ece04909535d9a5de8d59359b6de32f0bf4ad462c6958b0b881c3678da074cddcc5a6ad8150";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kn/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/kn/firefox-63.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "cea7b6c2c1c82b6d5ab14bbcd9345325c826600bb1c736ac898358e9a5d96f0e58eefdbc03190a51d21b4e3ecdc477e6b2e88f493e3a787219dab6970cc3eb40";
+      sha512 = "cc229a04e851f479f785d1abc0e2b486f20797ae0269d62cb64aa6bf8a3925958b9271bcbaf0acc3dcd7fe7f39b9077b1a8a7650055d2fceeb2ca6db676240e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ko/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ko/firefox-63.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "1f8b2af8a153d1b166ca62cdbb652e255653e8ecca33eb10d81b71007f5f6d3645cb33613f3def21f6384137ddd54697a880f9acf77908ab0b800a88b4420813";
+      sha512 = "6d7ccf3e6d062014af2c59abf03b3f9300a1045855cd6f6c37d8a9c9733ec7c2775fb702ce219b96d6c0aea4dc1121188805324e1f65e5b222190c5fe34a9fd9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lij/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lij/firefox-63.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "0806dce8a381741d7df769e87061c15df57b6839fe3230be30936be5406939d79502602b02202654d78fa45f284e33aaa88c1d62b4cead4230e7368737105761";
+      sha512 = "3ab2e904fd162bada37cb2536c928fb2f5bec09d8023556b42c9b0a77395f1288f65cec792d0bb6def19952e0d49dc6e3ae7a8398697ba2341750d7707c89fef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lt/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lt/firefox-63.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "5184b3525d094e80bb16acbacd9e8323f83f25a3a1652d82f0bad6a78f6750081140a6c007a4c2fad8c2955fad2aea07577642341dbef01bde1f7c06947a87c7";
+      sha512 = "3e821ba12956af86bedc0d179542cff85631fd20bec53c34c410f5e3315be076634548ea512041241d82c46a88387a830af483fcb35cc6a4d897f09f3fb93be8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lv/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/lv/firefox-63.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "49f878a62d140a6667a76e89b129f28cef1a56e02212aaadf6eaceed2c776e54f4ad23bbe58c6e013a16c29bf81c06ef942451c726b7372a20391cf75e08b1ae";
+      sha512 = "21d5e0fad3bd77c2e414044dae95e8464d33fa41badaa0049294a142b04ccdeb62708f209b5ad8c07d7eb5064479b6f4a58433b0ca7fd0436e62ccbb5ff52786";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mai/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mai/firefox-63.0.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "4b24b433fd5c695960476fff3ad678e094bab5d81f9e7cd2d1c6a3c56075f0bdbd4f24f6c6009e0ac5b5a4a25a7e72b2d566fca0f08e6cbada8131b9b5700be4";
+      sha512 = "c3e34de39bf5c77cf1c61d3e691b838ac4a560ce098540d6e58be13d7b1760a670f00aff505bbbb417b37190e494e48426bba73cee3e8e2454a73c15975465ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mk/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mk/firefox-63.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "2c500c446c3ba9aa6735df3fca9673e056d04b8d8a059ed50bcb4cd7b5819fb224e12fffde3d33d5658adab93eb9f53c296bb422556264eb3bdc08e4a386e238";
+      sha512 = "9a26b08ba538caf677e1a2f3f3c98e5c67e51e7dec72e73097036c6f34bbab2d5b77ec9bcc96679bd3ab7ae83c3bd94d2c3307843d82f8b1e9ea95455ec91308";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ml/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ml/firefox-63.0.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "3e743c899e60cea9010c28355f0b1d3f5f34da6c4865f7c284edfa81ae835bb8ba21e378c3aef36310cdecffcb1be3cc0d06b9e7c9ce2ff15482db3bfee93bcc";
+      sha512 = "924193b490fb8d65604fc7f61a6f00b79074b61ba437060fc35efdfa117d5014144c285ab149fe7b9dcdb75486ffe516ef1109eb751a6951c88e317d0c3bf222";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mr/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/mr/firefox-63.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "53864ac115e5f84f50b4f33103d549942b4c19286bdb4c236a794239bd9f40bceded9272c43aa808405eabc2a75ad36d2e643caaf30732a57bfa7d2de4c908a4";
+      sha512 = "163b3aee29777bef44bdfb56a637c3fd06c435acd05294818f3993f32f8062d0f1ae4fce96c48c05d99a9d97521e58230fa7ee7a9129b63956fd5522722b5c8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ms/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ms/firefox-63.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "8820b20add1fcfe14f30a4b54428008cf770feb321b0e9aa27a0896c94bfca84aa1b4d3c4c7acaa30ea5a615c94259837bc9539c0b96f6702a3a5b093842dcde";
+      sha512 = "7eb5b0f2d0b69e56e01c3aed184a995e3634853a267d30fb5149850269c3f1efcabdda8625a367ffd0b70282d5853158084e5890c1e79078818c19a94630d9e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/my/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/my/firefox-63.0.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "6a34963674a7448a2454e2b84cd732cf679b65db568f165d13c699651efaf1ca4804b0602181a9dbb301aad7e5dd39646b19fb3dc73469792d82f02220a7d9c7";
+      sha512 = "41eda41795d4db0198bf3b603ce097cafcab58e37bb58678aaef7ffad424fb6b9bf462801052a78c9d02092fef58a845cff5ab5640714efaf7eb94adeae2a669";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nb-NO/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nb-NO/firefox-63.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "cffe42d175570493c853044e0bf774155e1b7020d4d26aec7e578a6bc5cbaad057c125d30c7fe92f818bd9b2c982c775f19ac5535f606346b46bab095dd99b18";
+      sha512 = "d87d4b281238d8c54468196c3a3ac55a2774fc4d04a4e9939cb47f526c57fbc1366c2ffc590d01767bdb14448edf9a11a21e8e221044529d0b0bb83532476040";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ne-NP/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ne-NP/firefox-63.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "72ae1ef7e071b665abb92dd07add0b4023cefb64aeed09638768152a0c15d7370686849199771e7f19272b5df8042f72f76bb02e57f9a304c6dc930d49c2d04b";
+      sha512 = "3cb49431e5831d63dd849aec87affb63e170f4feabd6701d520fbebe9ca16aafe448152231b4823c494d0595d23eae81fa79e5b9778a1c1a08d5011e7ad25908";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nl/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nl/firefox-63.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "b290a26a41a6fa0b0d1d89076aa5beec4a250ad2ff053e83c19108164c95c78ccb50ad1fdc6e1091605bfdb1a829d108fdd4528747309682fbe472b1332ab741";
+      sha512 = "d29c06e0829eb07930605ac1c438175c65029f9635d0feda571c944e91e93332c99a697c47acd55f27f0adab49f46fae5f81955e783ae70cb1247029b0687de8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nn-NO/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/nn-NO/firefox-63.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "9f4ea82b06102744696c1c842cec65250e4361c6e37607ef5cb8e03abb31bf97ac8032de7120f369362199d4aaae1274563a09f61f04dec07d50aa94358e13b4";
+      sha512 = "2f9acb29eeba9aaff86ebec0de7e67a6b17ec48607b5bd1c9c9466d465fba2825d41c86e0ae7492873e093f7ac36ffaaf1c744a5e3ffe0f3b2b5ac468aa43c33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/oc/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/oc/firefox-63.0.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "e75d1a8c0af6424f7cb7575797c70b230919d840086f4bfef850febe36b863d9663d0dd45c6488528794f7f7356e0042c21dbac8e607689989d55b51cc64f3d8";
+      sha512 = "bad2f0d5f7a9a7013d74002ead12768d16cf949b7bb5ac3a130c5cfd1a8911a68da27d4682a7cfb31ba20f4d826ece3578aa46258c8773def49449e21d0bdbd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/or/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/or/firefox-63.0.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "563dc60168a9e686c6058117ec12ab84f55836ff442f606f0a7ae6af663cf73228956c8d12141a0dce0a80d75386623002ede2fdf89c07b6a00379c08d00b544";
+      sha512 = "aca0bdc501ca0d4de6f8036b3aa3670ac6044563d54aac931fdeb154f796b2814a420432644a53329d46677cf7b77d5d3a8e4a3f6aab5469708ef9e4364590ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pa-IN/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pa-IN/firefox-63.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "2fca31b8ec096191733a1a7ee6ecca37b3ce2acec56be01e23556f68ca7e6d3cc56fd1ff0a3dec7b2bb090d28606d545690f567d6432e25e8b335d7b238fd601";
+      sha512 = "e20d542fc62d4610f85c0c02737c294f4ffe14f88da9f15f557ae170c332f131900a59718cd725dccaf282fe29c22c85c8466267f6b0d16464f5992e9876b536";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pl/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pl/firefox-63.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "0c2f125b0aca823fb2a99567ede66e18ce9ebe1dfb649f9d6ef5bb4683c61813d9f9efe94c2224dc7ad441fe0f2b3136a3d090ac1335246ea4c4304229c106a0";
+      sha512 = "e3848d7706e78f36ff41ad10656976b11ca12c98285bd5b18afb13dae9cfd43f2a38378ccdbbd741b6a2603daa1b3ed72eda4e8f47153e2eedcb066cf073877e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pt-BR/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pt-BR/firefox-63.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "15563039e10ae5a6464ed0d20c0afab6d6a3bb5e54bea507db87fa03c48be22d7f325af22f776d052e49b9ebf9659c36ad77e92a22f884a0c443e3d49462b003";
+      sha512 = "9848181304658218d4bc0e2c21dbd878f40d3ec5a7d93d9ca6c7e1efc803f957e845344b15f697f347da0a743b7f25bce2e5b822a81c4e0f038380ea95509605";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pt-PT/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/pt-PT/firefox-63.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "93eb9f47254a1119074e462c892698de6339bf68ecb3c1f3d4ccc9c97758ee3a0ce54cc026b8084b50283f7ad7960245efa9f345761ec8a50b4363ec52d86aee";
+      sha512 = "8d9e9f52b80bd790a919442a970dc8e0f19f8ed5b64de22c4756fa9c0f7d1b72998a62aa249a9e8f3dc1caed1e74a07cc91ea15ee5b3f5ed1e5e340cf148eec7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/rm/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/rm/firefox-63.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "96295dfe17a2e066f838add7f3002e6307d1ef7e0212c0c3bc543bf7e3ae3be9da5a49bc6850b3c4b5f5bf46e112bc690824e528eb90f15864d43c7ab55d0eaa";
+      sha512 = "ea7cfa4dcf6b3cd3a483b73c8360b525d8002773a5c766887306320d99183b035f6acb9761384cd44cf5cf3391e3fc06d554e68cc95814ddd3548de5ff2e311b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ro/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ro/firefox-63.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "2782b44a49d116e8d15c0df9de710f432195a56cb46934e3d5659e9c91a190dfa49289cac64c738323fc2399058dd9e3bf607fb01d52cc9ee671499c4c29e10c";
+      sha512 = "97271af95125b146c4d3655daa99e59c2b3f1dba57e9c947b7337cfacebdda5517be62f14a5a3eda723bd1dbba6437c0825e0f5200f9895fe678ae80708b53ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ru/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ru/firefox-63.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "fec5ece757f19a19e5dd4d92a073c8e1fbde56757e12e038a7247edef11e4fc9daf27264b560ea9bf8f37008432df4d306f8209baf826c537360ed8c6ffbb538";
+      sha512 = "e8e3fefa17ae3ff51bec782b163049eb10398cb1a46b2fbc8124e9000ea0a37a0adaeb71794ef392fbad501bb4c04b0f98765cb94f90cdee4a46a30fa07dd925";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/si/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/si/firefox-63.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "cceac95143d3444e6b4a589d6685ef6740ece81b4ea26c0b31b4253a117b4ee239468d404bdd9caec9543e645e9e985304eb8a354000796e2124d71e23b74921";
+      sha512 = "d16d3ae7c5b5ef04b09b6c0afcf4fc55f8e47b20729bef33d2278bcf4727703710f27cfc610b78ebf8e9d45f80bdb3119f438da2598a4922a43cdd88967485f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sk/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sk/firefox-63.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "1e4b31480a5c75bdd350cc17b159e2e14fcb53ba39215d565510ed54cd7d12d4e9d6901b1ed0909140e03e31f7c1005ba8e1a48a3a2f6d91bca1e51490cb30d0";
+      sha512 = "3d23ce446b62314b5b6281aa4e8fa7e38ae3ea9ed7be7ae3d37d223b69ab8ab20a2e2d772d278538db8a572b839d59ebf4b7aa40211049f81641784c523e6fcc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sl/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sl/firefox-63.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "6ce2f2c338ac8481224518bfaae55ff66e8005ef40ca7a13cec294e1b797723b6c3874f96b6c2e4fb78ae526232ad267cfa407b8952d454fa5f4eb40bbcd19a8";
+      sha512 = "25e2bb9a9e92ebe5507ecea35302792acb7be4666fcbfe3dc7b0cd8ffe77ccfd514f92b9762346a5a71d55e28ed654ad55752b4ca82686d3e8fba97473afb6b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/son/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/son/firefox-63.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "24ad351629771a6f3ad8d381508bad99094ae441f6ffaff9ec19d8018fc711ab852a42b9d1d0f447e8a4da79c1fc177ee9368940f15b1e89344dc7beff49946f";
+      sha512 = "13f167d22fb355b90b02c4d8fd8f9aa38e7f6e626c633276a34088d5ea83e410cf3a0c00d33560c4ab48aac4613cb0d422751f8c8b7440c0fd59b8e8be0ef204";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sq/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sq/firefox-63.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "d8c80ea61e545f29a8a2b0bb4ee2be81650c131123693f1d6955d00364d67c4bd78ee6c85903d84d62c2405bc0df4f45f08301d1a13c30f6f33cb24ce4e9d7c6";
+      sha512 = "f57dc4ec2cd1b8a45ac114b7f838d34f766f4f1f4fa9308504e6c9bfce05fb977e2982c1d83f433a957098d9069b58dc0c578af948b38f3d5f53ed59ecd3ef24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sr/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sr/firefox-63.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "c9455bec9df85347e6aff71b252f57f4859bbb8f378d274010ce402da0ba6931d9bb0a6d0f2dfdd4d87700ac68b039ada9fe7f673f5fbc7d95aeff738980e68f";
+      sha512 = "89ab6e7a42ccc21b0a2c3c2a55b0e3920d0addb4505dcdb98ff6d93e995f18130b31dc92c55a0f72301c59cccbd142f439a24962e19ae24ee25af59c6611c668";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sv-SE/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/sv-SE/firefox-63.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "7b80caa0fafdd82fe1d0e1909656f894515439fe21f6c41a05455a06c89afcd72fed37c846c8168e874da47598d1eb87c676637ed9047943d0483322acb027ab";
+      sha512 = "e5e1e25d4c5d1c97e715bb984c0862237602329a786776b3b3a5407e585399fc3d5ea7c8e6927292f25b97924a568c95bcd758e23b74ce71cb7592877a5da3ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ta/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ta/firefox-63.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "47a13f1bb090ea5271aea1add660f765e330b351ea6c77edacb380c74d5dd1939428b98ddd4f4cceaed38af9ca99f6f499298289f44c5f5d7c78c9ee3fceb9d1";
+      sha512 = "4f9e44175061339559ee743528f4e7dbe4e9b0a3d92cc178879aa71f1a30fb260be307ff75722a2f69259e3fb13e509228ab86d4a6e9708564c3696ac3531afe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/te/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/te/firefox-63.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "7d0c21a749be9d7bdca8a7b6baae2044335244ce35932d913575cfba1eb63b4cc2a41ab79a5e19b6d3ef0607eaccb0e6303f57cfa9d44fa21deca86a34b52843";
+      sha512 = "99e52a537ec1048b63dd77a9a9ccd1e44e8a00af256ad8b0f61ecd4e2767591550a000e66cfc1b3db4819580cb05dd7a76f2d64a4839a9e72dc43e65940afb73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/th/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/th/firefox-63.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "d02a77da738db455e419fb2bc519650d911b4612e5d5e282c54100e719d8b119b5e3119cb458f652ae532128ca64afad1153cf4b3434bffecf2cdbdd67cfc029";
+      sha512 = "2db11524432184bff0646b86f665431cf71a1f3389185e1e85312af7cc75be26f55f0d899262405db411acc21a549a8d451b63d1c060fb892040c72b996c0b0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/tr/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/tr/firefox-63.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "87ec0311160aac012e601ed753599019b499b08e73f256d78c68a695ed6c1ecab53095ff16b007a4be08ffe54feb0dcdf31e7465271a3f48928abbcc5b80d5ac";
+      sha512 = "90b2543238e92f66981c0aa6cc0e563eb1bd623c7bfcc9a72aa3f158b52ddf8fc7c0b550312cdb279dbb192c3cb5d2f9019817435a17d79b31239564771ea644";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/uk/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/uk/firefox-63.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "d80c098d00c9681220c9ababf0f62b69607ab6b71ba34d177941332450ec51a5b9120e0c3e629e0eaef91c64beb9b10aaafce2fd094f931cb976a99266d63a10";
+      sha512 = "cc3973e6ebcc956a626292e09629a5041bdab89e92c94c4ef461e01f2384021b39057c04981d61deaae238bcfc6cbf0eda2ac19e271fb7fecc4c22f42808ed36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ur/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/ur/firefox-63.0.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "98d1553710997d61efa48c7d84fbad2fba5d730d0259b9213811b7a5f47ef1e4ca8940f4e17708e8dfb7949b4fd908bf80dd5e9faaa86b3e3d2c3a07b3a3d7e9";
+      sha512 = "0efd6d37984445601e5076cfd19e345c2f0d038d4eb88e4543c90b27c468164ee16bf7695fe8a8f1d6fc2fdec1c8ff6525886da5b84ccb8ee6ceee8d751884b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/uz/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/uz/firefox-63.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "7a6074c2d7f1d40c41a5969fb33839df065fb398e7161ca7bf4d6aabf22a87deaeec7d623f0d36f992f8907d696c5aa53136cdee33bb623dfed94cc402b1fc46";
+      sha512 = "61ff04342906c902710dae18b8c83e40e14120bba2276aa677543032bb0667b12ff7c9df70ed5e478eb3fe79fcc1ba306b738ec5ea2b3bed2728698f49f7b1c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/vi/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/vi/firefox-63.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "013c9210066a5b72f9640a5d7d647312391daeadf757e5b13484a035d5bffe2405f80d4fd750e7afe81990daf14baa49c6c4d77cce7e1a60a3483340aa115524";
+      sha512 = "615754da0770dc5ac5347f7fd3ab5d4ef7aad96167deb5e7b22714595ad96e59069794abb676bc553b8aff226fe37f3db84c63ee2f662a71bd3f9163698beb0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/xh/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/xh/firefox-63.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "b104815968385980a7bb297d83fea2dba4ec18bd853ecb70ac7065f30e0fcf5fd3708376f8202840d71c2d9e6bb3c48dcfa866594d334dc7a5ae3cbf3b83c888";
+      sha512 = "4f82fe26348a515871f1c5775dc0ef4b31fff9a3bf48944379d08aed499bab55b314227e354ca17fe644807f1d2b1f732b8204c3179907c05f9c6d168c7fca3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/zh-CN/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/zh-CN/firefox-63.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "7961e947a3c34343c54d06e62e522f503375d83c8fda6648197b1408ec0916e54dadf6da982650c99d4b7215889eba015b5f1c8e5ddc0a48b9aa6c0925286540";
+      sha512 = "2d13d782b2988389d2bbdb5560d494c77d2ef0ec479289ab683a3a7336200d2775577b2508f23587bcc8d3441693c07593c3f040fa767ea19a8adf29ed9b9b0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/zh-TW/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-x86_64/zh-TW/firefox-63.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "e09fdc1b84093c49fa8918310fc2a44b0285247548941bb5150a5a64ebff12c1ceacd6e8e397137da14ca6d8336bb2411dac9f4d1126c266da679d1214ba6974";
+      sha512 = "af0c5f6d98fa4cd4556c46740edbbaa76653630d1b8fe265e63caa54e51977e6eacfbe4523ab29d3b9c9af466775dae5f62b00468cc644d6e84332d59605d6e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ach/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ach/firefox-63.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "f0544809f924d264af750456abd6331af1b4116710ee9149604bbc11745070a76d84cb50f4810307a078e8ae4d2966b6771c318243215a3eef8ad957b8127414";
+      sha512 = "d4b255e6675e460c80df56aac8a81a531d90c4b6ebeab018a1c5d333da440d780a89ece811f2a24616949bd71e7471925059b13fd32a3376b636012b0b035f84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/af/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/af/firefox-63.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "3c96ed1cb9408d888478fdce554d577930d2d365d10dba7c3fb7ce93db8032df25ccfad1f055ae849dfc63428afb9935dde013ffdc737f364704d4b693d9d751";
+      sha512 = "61ce8c74d62b9b2e35d7a46e0b1284ffcc3837247b12e8e5ae0242049631b5c8050b353ea07ecf7a925e237dec111d10fe10c86e49fada11f007db0b3ef3c29d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/an/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/an/firefox-63.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "87038254a3f4a6e200b5de6b6269adc0eca198e9f2739bb810f00fb028f746a989b50b5433fe3577bf63250893b69b45bc7a5184d2a6c050818e86213b1b64be";
+      sha512 = "eeb42821c1e94ab24cb4438245aa018d44b84c89afcbbf271e4905929e6908ddc922768868b3c9bb4e6a83ccb266ea6b4f2d82f4a3a35c527130f3bb2aab88cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ar/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ar/firefox-63.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "a7f2231f026fa90f53952bb9cc7c36663226c87afc6629466fe1d15e379048bb9e464876b0d8c79382536bed850c2f806c1e8b06fbbbaa1c02551f778767ca89";
+      sha512 = "068310cf06b3149b8c54cbc8f56f4334eb1a5b0cab1ba5d7bcb899f507836240528d48c3762af4f37e4d5a9a1eb7bb0a5610d66e0911aba47c3e1ead3a0281b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/as/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/as/firefox-63.0.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "9a101cbb2d9b689d05b976035e524f2026154508a3c18a9f1e238e600be0924d36573a951ef3a54a28e62311f661008f66ca8438d40e985357e537bfb7b71d33";
+      sha512 = "1487c99d76cf37a4a53b6849501670fa8a80c6f7431f6b9503bd493dceb4786697685bb6d3970c4f47b121c8cf83299225112421217a314640ea7027cfc2c0bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ast/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ast/firefox-63.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "3305cd08c09726e04ee0d3a3f0228092e596641d1f80e5703c869ce5d3588fb37bec2d80a2db5690e5fee5517c8745f13e9bf723627a03b499e59c7672ce932e";
+      sha512 = "cd8205327bcef45ef0610c4c8e5010c6eb3b488401b776186350351f433a3dd3639f9c8c7a2fc26c3a3d578f85f49a1f3525a84b40a473443ca81d8d8823454a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/az/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/az/firefox-63.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "138b35496601a577752dc1362dab7a5c8dc8b3a78b0c252748dbd15b1bb1013e304aff8d8ef1a9f5138e4e26dee74149c7f66eef752fb77ea75a6dfb8d388895";
+      sha512 = "0a7f11ea5f476e0a45e70bf8a1c6779ba32b96f81bff2f88c8cfd6ff29b6951456dc9aba4146ff13faaa35481c1fdb26ca944709dbbc72e4c11d9854cfc2476e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/be/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/be/firefox-63.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "7f6608f932f96bd84f57902482b691aca966814f1475bbb0479356c792a16e4698a289f944d7462db71e77552f368df1dad3181280e3d0e07a5261ad90c2bf63";
+      sha512 = "8e34c1b191e2d2cae88c94d99dc3d5bf6afd8a658601fb723d1b0f75f3dc7dc85b9f3bb6ecf24bb75e94a411f82c56fc88dd8a548c670351f19fc4137ad77751";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bg/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bg/firefox-63.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "c284d6ddc03c3bcaf82756a8f9909e12ca193b9b2a21096f84383c71e1dd5ca7369a4eb6c02876ce741ee38e6418e45fec2ad4936e7c6d48ef270ea45ada462d";
+      sha512 = "b7ba0be703e7e52abd61e8e27a25ee7a8868c1872f4babf82b3b1775abfd073c4112f738eb1ff9f341c56a15bbce5d5663895f342618e7b81fea0cfa35f3ae2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bn-BD/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bn-BD/firefox-63.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "eb9b3e070e6a2882a6b43d2a0fa7792f2b8700df9f64ca70e6f616e6237e0cb15c5d5a642db8f7b236c7cb2f4392dbc553072c544e81e0223c8f4d6d85c36be1";
+      sha512 = "ccf789ace9b1e5b378a8e37fa8e1c68e52f70247305e369c536981424f6baa9d8bb132475b4af512780a6b881d5e2090ee985c9fc9481c0a0718b0028b516dd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bn-IN/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bn-IN/firefox-63.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "73c4c67bb9f4fbc47509c53820319456c614a74dabe8ba14d05b365a3ba9429d1d9ad9ebbc6d1edc7bf18f4a387ed9dd92850478268f2eea3541929558f14e6e";
+      sha512 = "4ca51c703f5a394b149e7c9fec038a84558fc2eab0f8ac7a2b7109e5e73207b94cfa998c9fa8f4d2ac4bec65e7f6ebdee804c5f0801bc815dc5aaa50aeda3db5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/br/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/br/firefox-63.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "78921d68f06c26f029f29fea01a15c5dd54f55f59150e08d38e05f640612355a494f72d88c0e80bbb2ea6f54ec26b3a5716c3249f1118202843c4ab1ef05f891";
+      sha512 = "750480cb435134377e0d09a1c0b342e104903bcec9c68ba08827ea20027754f55cde63b0d44bc248800f85f26747f5d5552bffb7f5344bd5848d6fd7d72d0269";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bs/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/bs/firefox-63.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "643d5ebb610d3e83a6ed85a3239a8631c150a86925ddfaf5a4adc87d0a8add022a5e35ed20fafe5e6f1a6835b3ec105ae1734cac6552d79d95b83bd34c1e73ce";
+      sha512 = "1d8fdd486341c623b46a93d36bce8ce71e92269348f7e344122b9f8908c6db882d79f5d46b2498e3177df73b5344747f809b6938ee5f59f4fee43a3e1b116624";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ca/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ca/firefox-63.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "ceb8f81f3fde233be921da104d993546b1200ee348b19340f43dc697685b87c80a4377d406dc72080701614896f7b1cdcc27f364a89a92e433639603e08a6611";
+      sha512 = "760d086dec533bd4bd98760a9de99557591c9916bfd930de061105bccf97420d2662b9286287f6d92d5d81f37a08bc30fa57874d992592eca0c531faa61f98eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cak/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cak/firefox-63.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "04f5dbdcfcfc2b996a912130335ed855612e5fd2f27bd4cc615a369be2fc2dad14ba43511dfb2bf47a9fde3d28b8b5913cefbbf34b89383eb36bfdcdb96cfb3a";
+      sha512 = "e6238a1dd0ce26d80b3237f70ee822bcde3ec9149a55a152f24d4f9a44021044b8e15a2a386f731a4d7b026391fa72f3a28055f1f02dcae11d6feff670581f00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cs/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cs/firefox-63.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "b82cfd9dc6b57e0bd147f508a38bf41bedbf8fd9c6725434fcbdc8871cf6f683898ff0507e0e2fc202077d234096cea252acce56e6faaca738e60512b3b9e1d7";
+      sha512 = "e96e451f5ad543bdcc44b87227190716f0e864408a006043dfebb37d6f5d464e08ace9c98c0fb9e51531c7aba364532a2b3147519bf6d521336d6950e4d54078";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cy/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/cy/firefox-63.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "8f9d4ea520c99d3595d8ebfbb8732e1bbb73b7d39ab707e0a3f86d3cb928231e1b7d84c7ef017d9f685a2d2893c0b486f27cd4a704f05cd7518465452010df97";
+      sha512 = "0ea943b9b5156f4e814e501c8b7a589d888e1a2f9340f0c064b134d2299e40fc766e5fb8ac89ba82e3c5c586b410af16cc86caeb71285b94efde9e171652f57f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/da/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/da/firefox-63.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "28ad6674fdb830d07837b826ead67503a943b7cb2330655b75ae7bdb5f348458f19af37ab775d820a0f0131a6f7d5dda52bdabdedb5b0deccc1605912e46b9c1";
+      sha512 = "6e2b71137d36912e6c4f28907b251a19bcb1f6a3f9d830b6c7b3e90fd28c5d4dfd5f31496ec45728141596b6b37c78b3c29fcf07b85fe0facf1e47c4953edf31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/de/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/de/firefox-63.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "b94ebbfaa81bea44e452d0ae69c3069bf100178c82bc28b3d2841ee14dfb4bc2c55b99d325fa4d8049afad93e674d24160f6bdc235e329e9575b49842c731d5a";
+      sha512 = "def2445efecbd7a998cf846c438e85e4b751655d36212b46227aa95483b474a78249e46e5d44beeb8a2ceb4baaf1e0ea84cb742993941fa2ec0f90f13f11f098";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/dsb/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/dsb/firefox-63.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "c292abb164b948ba76b13548c44fb41033ec9d394b3d3d710dadb72f666c56d16fa7d72dc5c3aa4543b81ccfd2ff76bd5e94cefaf88f537bfa7c8b16b9290f71";
+      sha512 = "3cf731e4247dfc99ac7eaf85001b70413447a5409518a8aa7791e8affe85efa703c607ee9b2c3896b1ab3c640e0d80610bcca3600b057c8d0c09cedcc9e3b93e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/el/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/el/firefox-63.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "35e01baea98785db080f801b911023c6ef3d5bc6c61d8e3a5e8ea1ecf7e51153e4f2646db7a8fd32dd1f778e1804cd2065efc28e8d79e8475105d9f12c9b0a7a";
+      sha512 = "8ac061359a5806661eabe8c5e22c30ce795b0e019abf6f2d6b673d37b2842887525a4ced40b6aecc6fb2f02ec841d309866fe638f105ffef8576af5d3fc6cb9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-CA/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-CA/firefox-63.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "ccf68a4f05f4c5b0dbaec25c69fe66eb9d1c23f3ad21e6fa2be14704fd5227fbfbac8d46dbd036a6e17f0e94b58a4fecbe91520da45d56a2901074bcd7031516";
+      sha512 = "9d62cfe7f055db10bdb8dd152d6dbbc40ce12b9ef4fe59086fe9818f87d95c9ea79092d25d3bf8a34cf2977b28a505f3ded4406a864d493a6f4bf2d625bf124e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-GB/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-GB/firefox-63.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "49eda2efa176054adc5579ec26a9da92df9903c16d989d761b8b566568740b135f851e5c2b983512b644e80074171895431b3c1689708dda9d86c757dd7d2599";
+      sha512 = "ce98acdad497391f8872ee0c41d2fed73a51c0d52e8e812aa7a426684bc0f39103f95cbda3bde1006aeb95d8662275211efd32cfe82609a344178089153db2bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-US/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-US/firefox-63.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "08e3ca5f859a531b2895a5442734112de9c450bc8bdc2eea9a8fe3231f3b97b8a243cfb408311c56c1703dce63fc2f5201026719fa01b9c76061a204d59942d4";
+      sha512 = "06d5c79c57ac5b46cbd452a3a095ff0b87ed9a4cdfdb02d73d90947c29a8ab4c34f2bfc3f537a0dc2e60c83350531aae07f58d1808a08bd57a79bf2881144ee5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-ZA/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/en-ZA/firefox-63.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "7629e33144c955d015a17bbed4d1e570ae74045511c6ea1db9131b711ac58c67e76748e22ecfaee5b594651f7c736cb0d6d87697ba9dca46705e5328bdfbdb2f";
+      sha512 = "a162dc2aaa5f2036849bd73bf0014f073235c853b3fab0e3571c08a85f6fefcbd9a7d3c033d5515126e72eb1cb54ad9f68241201ca9bbc786253f0c84f6e3590";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/eo/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/eo/firefox-63.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "13430d5a4462e8e00467f0d39d2ad03ac684e0cdebb21901cd0ee4f2411794794cf5024ec51d915e3917660de6077d6dfc08aef30fe6c342f5b8588f07883f33";
+      sha512 = "1639bf250506d4dc4aff272ab0517c76eff75cc3fb4e8e9fadd2028f877e204d0bf19e3eccd7107fe448f1372e3f6dd19c99ad2f8aa1891b1c3b2dbb4b8c34ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-AR/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-AR/firefox-63.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "44ca9daf57afbf9dccbb158712e9218d87db4254855838604250b8a4254fed7adadc266e3e1fd49d23b34ba0176dfe5f25fca42dd5fd6d1c322c857337de35b9";
+      sha512 = "b9afb2474208530ca83b4d8bbd59176f02558d21143227f695a8705a70b16e6089d86316105deff2c89b857fd14a5c5bbd6c057aa9b66e9ebaaaff763321a86a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-CL/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-CL/firefox-63.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "09e43c14a99c54ae123364ceea46ba7b1b38e30da8d15bdb734b873a63e37b6b4292edb6f8ec4ee731e97bd12194ea76ec35e710d29ebbdfcf7fb41b1997934e";
+      sha512 = "134eefbb975dc1ad3f98cf340b0c544f084bd2a1bd1432594bf228e0a23e402461e936e777ee3fe0c9a86bfc59947c35f6c6d7cd74deaf6cdbf1224c9fbdf4ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-ES/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-ES/firefox-63.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "cc1f5b4e421813c9b044c50f66a28f9204196f9ba2574ae537dc3040d04ffb6eafcdca971536387cf2d79c4c35de5ae3a5335f4796aed878aa5ba817dd7bb308";
+      sha512 = "66fac925408ea40d3348f207716e732f878bf5bf5837499a9a27a9b1e8e4a9210c3400fe90faf2807aa30d49f67dae2324e7b41d80a21daeb531e907bbdb35b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-MX/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/es-MX/firefox-63.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "5ca49c92ea11127ed80fc48c5699ef541287bb6f53ea7ac96df990e7a82854cf8bfa8c61f21d0bea2fa245a3b0ded7aa7b3afb662b1639c421525900f8e7d688";
+      sha512 = "e1dd051782b59f9b2601b051459e4f23bbf949b0d257dd70cd8bd171429f661274f3b7bd5d8d16a5daacf5a08a488db85b462c667c3c3ce0ea280648c5b2820c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/et/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/et/firefox-63.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "074986b9e80ccf1dea362bc7a28f7e44d2fcb9c19878a8456e63b64bb1e0abad293b6dceb6672bae200cff1aac1c774cc99faeb7ce52d7e6a4b3a154dccdf4ab";
+      sha512 = "9b46809e42acaa8dbbcdce1df8f7471d20cf40b0a84384edafaad1a0afd17a1f2385c6d41d7eb5b472205e80c528e3408282ba0d81cd19b8d92c7f0550c4a5a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/eu/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/eu/firefox-63.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "b823fa6c5aeced11c6e0878e11cba561a18893e531c28e9d7713e449905225ce8aed35e1240876976c4335e958e6a68d5e39037fdc59e9f0e900d5d822236c89";
+      sha512 = "790dcd461764cad902cba93054c35539d2aeb30bb5fd3a6f940ae125368944e20fdbdba9899f3b52b6774fd27fe73a13c0eed7e269b20a7b73dc4fa123122a1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fa/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fa/firefox-63.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "e842e26e5095f008fee36f7b84a9932cc9ab868e9145d92f8069d2f7f24017ecf538db7d0525f7233bc7cae8a2709fa2da8bade077e864cc05c1813ba4a1ff57";
+      sha512 = "4e0608da711a17faa10b5a043192b52e6d88360752d9c388e173bbee3de86bddf9693dfc75cba7ac42153e95a8056c6d0ba48141cde476b524d1fadfe3a3bc10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ff/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ff/firefox-63.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "0eb63c6a996dd29ade92ce88f2f9065da63737cea459d8b2e7c79356b51b43eddcb639af9efa85476f500885a249b77347964982ac297cb22adc501590dbb8f5";
+      sha512 = "1f50eae02bed18b0230c824c9768b13e2ede4c622e42120f6cc684f7cdfae4753eb31f867cfb272710b2fb2ad9e649a99d2187eeefa74a5afc1999e002b6cfaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fi/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fi/firefox-63.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "db4da21885411214805a45bf4279776144c3270845a6dba20da95a54ddc5cf3205132ce2762ee997895b7a6f83e2f31cc618c17668df4d4211646a1e3b24edf6";
+      sha512 = "5f089861d3a67b754e5ddad49858789d6d6ee309507baf9ff5198e011c26f970cef54ed37398458a3729beebfe9451fb16981ef32607cf1635cc40b7556a7f9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fr/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fr/firefox-63.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "12f3fbcd0f085f4547a4406b25d83858425a4653ea9bb2bd5700e21687c2d2ec8e1a032f76a242edd72be99813cabea3332c18921f16c54edd8c430a017e4948";
+      sha512 = "5f8963809cc8cc33dfce49b2ce7e44c8351d8a3d193766eea99c668533abdea89d53233ced42c9a8d57356195a3f31f549a486a42f9f06c8ee6d32720856ab1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fy-NL/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/fy-NL/firefox-63.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "033bc2ffed09faa76e67258bed77597bdebbe20eb0a8c17765c7f3261e9abb7cec558aeb8dc913344e4d0179b85928ad49c71979eb6f20c6a092fb7d68b9b8a6";
+      sha512 = "50e1a6c68daa2d330ce9f8b070413e100bfc29f7a0f1a7794c58473de04961ff62f776e2c343452ed6ddc3cb309f615ebdada91e4d259e60f066398068141e3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ga-IE/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ga-IE/firefox-63.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "5481287ee60e87e9f71baebe196254f30f6fd793be8b07e4c216bbb9af3d81c321f0cdf77d4459ef6e50c3fbcd7ea6929eaff38bdda2f8ec18acaf44495f7b9f";
+      sha512 = "42b2b796a5ab27137e5207ead28daec4d9a0a0fdd58336064c30a56f13a4389d49188c91b6d2101d49550b071584ebefb81d1c3fcc3d9948e2b14f00a7c0feb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gd/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gd/firefox-63.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "5ab61163854e8255e8cfef5ed8674f6de79cd084839c65b5e2758530135acea5dc159f7001f3ee26f9bbc6d931bf1fd0fbe360a3a570add9560493a8b7e18629";
+      sha512 = "794193059ee643092981491b0c32886e77be4faef7948c5db2b79a76e3ad4baf30dc149cc63d935a9210c02ccaa843521398e9274dacfa6f98ef4f49caf65c70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gl/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gl/firefox-63.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "ce59c0e9cef75ad9b762d9d8c31f5c3606c047736ef20fca91a12376ee15bd67a46016d0d84da7303af61e78f1ebb6be0d99f343dd2cced01cdbcac536b0fb87";
+      sha512 = "3a494f60eefef37ad8b62b30d1e32ce9e783bbea29e594668839bceb416d6cc16786a95f9cba06f31b027b4bd40528738ad26c955adac3a433ac083e49642b90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gn/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gn/firefox-63.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "c73b5e5b2ea49fc13f2acf0397d0f98d0178f25ee2ee303fc0647ee4f939eaa465d329affb2e3a41eb6a0d46f413918b01cb7e01b3776f42712d81472e1cb325";
+      sha512 = "ddc555b5f0aeefd9fd435442a457c7c37d4bf4e338b16bf10e1f1798735c52a758b30beab270f03d425dae187bf9d83f828afee627c7d0eb3dc7615bf22f684d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gu-IN/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/gu-IN/firefox-63.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "3a98d619ddfaaa94d0696d05b940d82d12c6696c98dc4356190a6c6a45a602abe14e84888a2282f6b685f26d8954e3efbbd0778b594ac63ed629e922d91549dd";
+      sha512 = "a3b67578d9ab00920489d088d59f3ff1845319d9b4467ae3854ad9b08df72a07be94f2436f93db7524bed13a467ed0acf1d271dd6faa86ba9ce74535aee3d35d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/he/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/he/firefox-63.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "9e5fd865c107b2b9daf9ebac3ffc1d0c41b35e5d2b10c930e2cbb1da4aabe1040d4c522940b63e42c2cb2dc0923b851dd6a8ad9fd65da73026d9bf2d44dcd238";
+      sha512 = "a6da54477d9a4ba632ab0c077904ead3f83c1e268781ca2bd8fbeecf15da62a3d1393c8cf316716c3c22f7c949a48e2cc7e90bf6d394b5dbf5559cb8c92c8097";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hi-IN/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hi-IN/firefox-63.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "0d625b2ba90172d4e42e17ed7daf1b030ddbaa4327f9d321c67beb0c71e20572705bc54b9ac709fce67384dc6d188fb6832ff7d6e85c79acba8c975cf06455c2";
+      sha512 = "708c9f75ff02efca7cbc7a2483aba15cbe1b22fcc5d4a743633d027afcb22a0ca5778fa05ce40786279a1d145f75c4b9bb64a16bdcad87c9f6f6a439ff748fd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hr/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hr/firefox-63.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "317c6fe9bb37418cfa8fe2d48d5afde58a3e5c192d2feef515865ad4669d65010ff5ca0f82efe22003f9ca763cb132798e1c86216f3ef2875178d367b894d651";
+      sha512 = "6cc028e94748d9133887398299e21f70abffa4df216ab629eb579270be8c5ff9b600fbc2094b9d47ec60c577a2158ef3d3e81d63492954260d4b53bc19868769";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hsb/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hsb/firefox-63.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "298dd184b47db389e1b40872dec2c40814c063ef6eda8582fa6fbef647b6f91e11d49026806aa7b5f735ddd02dd48128adf8c5f9bfe17f4b9bc9e6c01ceb302c";
+      sha512 = "81e8f54353a6279041694ff9e95eeb730d3ccf7438cf0b1c4c45425144b3f9e655656b9ac912405f85b9206ddd37ea31bcd6e975b25a14b179849a33368c0693";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hu/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hu/firefox-63.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "53df50c2e877dab2bf1d7ee40312f77bfac977ba3a041f98c350c1b9d188b539d409f460134f0e79d07c6a3d53fe063e53b1451fd84e7a817b98d6f5b2564717";
+      sha512 = "cbdc13d964387f0a5add945cb5f5f71fe2d4c6da9d37f77883074a5ffb22121c293e7c665580bea27a43d98547e2459c7d42cec60af80f44b0d5650b3b6d9042";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hy-AM/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/hy-AM/firefox-63.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "eec4295b544ccf4ddd46176e3b391b42c04d2ebba73edbde24a6cd0043c31d5f06e7a1e6cb03d7ed02327a07f2aaecce7d8c55f09156f413ae3e8f2c18f08649";
+      sha512 = "16aa31cd906a9dcc41cdee45e00df6fbffd1fc83fe9fe5a7c10e0b6007f3ab542bfe328b456f8ec68283a6633d63457ce61dde4661283e75917a0198b38c1a72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ia/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ia/firefox-63.0.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "b9bafd5b616722d5e0b19abe9e2080ede9c0e3d2e971cc1c00f0e3d2678489e5e4268837341fa7eed34e2076c69880e7ec726814729ede4731fc1336f4b5269f";
+      sha512 = "f622f1a1c95bff1b68beb21398fc22e88e05350a2ca1d6d0c018db4d30962f1b5ee4bcc0b9fee7484b02bf06326596f702a1a9e5b0acad5e0fdb73be1c1dab45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/id/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/id/firefox-63.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "07a271e3c9b479018de9184b32bb5a164d3ac2ce5431bf714f3b53ff7bf5c324e6e9413b514748b6ef84e2e57b66145ae775b5116e88d1b695f5c9dd001ad530";
+      sha512 = "9d44617bac45ccfc191ee02a3c6f994734c9a1bbd5f6cb160808361522430a57798493a33b774eeb331846c99ac09b46788e06abfc716a0a634324b2992085ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/is/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/is/firefox-63.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "f101472751e16e29c2928e3d19acd25afeca20abf7f943be14297e6e03762f67edab1ba59db5e22b8ffeac398208083f91ad97772905fe3436e7daac6d554fcf";
+      sha512 = "6c64320f40b41fc0ba93b94302d83cfdeaa90992681a5ef810399b35fb1f1d40406b2ed80148cecbf6603bd9dc1298dc6b3b334b98a13ffcbdc0b2e19615051f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/it/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/it/firefox-63.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "dfa7a5f9cc4c53f392d061b8bc9491dc541deecb6ef5bc7386a2bda353a8980dfbbccbd16b5a2c167cd523b4f52a9993403bd44ab05b38e03b9b0308a61da261";
+      sha512 = "deaf12ee7fa25a650116dc21b2507df41ed0535821f43cf7e469d870154f4e0d9d66ade3ed3463742e1c5b28d4526f4cccecba4f3995178ad7f6b82d29ea0e88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ja/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ja/firefox-63.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "b84f5317b7917be27d1d93d39b0b3ce0143396642d3f5c2a41a656f16074b31aaa549690bfba0675b3ec8cc2ada383929745ed2823ae6afa399bb7407557ca24";
+      sha512 = "e4c1a5724c77bd99d9d10bff3f9e011f35bc130aa711e629df458e7ee46a3bdf1fcfb4bdeba4852bd0dda773b8327bb3ddeba2115406517c77d0f4d224267af6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ka/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ka/firefox-63.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "5d56a8f8cfa5132c3cd5cc3c1bbc56cf3c076eabbf21f98747c493c3b64076c8506150262ad65cb62880e31cc37ad7a9ab5728094a8d8e1f704fcea145c3a049";
+      sha512 = "1040735b4e1f6616ac9b2676b7007435c7423116e5fdcf8a0a9b472c5cb0c17c089dda5d711fa10129d6bb1c84082602adf20161f5d6d560fbfa12f6225635c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kab/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kab/firefox-63.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "d86d69559d9e7eec6bb111fe05ffb380ba49c2f47a957e6eac8470f81213a544ca44ae685456e22644b08958c54ffe5f815b0812bd045514d1f70a08a5fe9790";
+      sha512 = "511ccb5a8745fb1b93fdd49ec9369498b577a155fe5134b9990e6740505f342e76b0da136cb3ebfd2a15921b677be7cab6099cdc8cdea9d6040b989cb12672db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kk/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kk/firefox-63.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "0cab56f34acb5df1b9a83c48f1a1d2f41c68e79c7896ee4da8ba11bd44e3477214e59697c9e9efec802f633171177ed2653e3184c000d145b7d73089a33930d5";
+      sha512 = "1e5d5aec9db2fc36a56acd1d9e723659c3425ab4f048966f0550eb1723ffa27b0b91acf8daf8cac9bd6f9929a5fd880edbb4ec1aa4359282f4d4c4532bd6636d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/km/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/km/firefox-63.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "4fe39d6a89138111c2e98d1f449adaf474d3011a966c4e17627f9793d599eeef04cc1081c6cac85df235d8854db6b57de1548834abcf3a96baabb30c797e9073";
+      sha512 = "76063e3d83454f4850849af7084d9489baf4d354001277a9f606a28db089e589147033c132320b34c59032b2dfc7611ee52786c960bd280b5426781a0a0b7be3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kn/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/kn/firefox-63.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "563dca7d5874717937747a1771a9ff32d2012205e2da9274f4cff76ae29782d92d7a20eec8c792564d3a4929458cc5c2722fa38d8b08edcc879dc9ea184c67b4";
+      sha512 = "14fdec60154ffe181f00808f8877de3b045c72b91b0a6c017951033eae786ee26e4f96555034b8161318edafb8ff07ac41203a9bce91ddc20215be87571c5e11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ko/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ko/firefox-63.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "69d10aa7d2b91197bb9062ea5bcf1b89e08cd474003e4d9c203f9f4c7df14dac5b991a15c74fad38843d2534ecc5b08878536ca45c2b80e83ec4c8f6168c5acb";
+      sha512 = "7990af9dc0df8f9fae35d928ee5b476dde1e12db6294f5a3033d37e73e44fb8d0bcbf7916f79459dcc6c8f05ef065ff4b0dea95bc2c342ae81f2161fd61b2fd0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lij/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lij/firefox-63.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "01bb7b7bea7e528e2fb4ad910e591642539e68a8a3771be2b2d28c3f1b54e95d74394f3d9411d8ae9bd13f991ac4dc788e98cbc8532a552fd70e83b6b3cae38b";
+      sha512 = "42faccbb1029df56f17b94c7a5d9e6f6d5fcd7c5e6b623a6fe8f89f143c909961dba135e02d0ade1bd57399bed1279a61ae16381402ca391aeb55761428f97dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lt/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lt/firefox-63.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "0bb6582347ccdf31dee98a09577380f7a66e8b3222127fb222000d64cb09c4d0ab19d4084d98be2b47ecccfaed51793c1b4fa263634f61eed059da27da0e42bb";
+      sha512 = "b4079f36c1a4788f8da2a4e1efd0ab4bb166ec45dcda1ff0077746a85ed5d34b8cd498a0f1d12463349d4fcfae820db39946caf7e55f4ae9ff1c9ec587a95fd0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lv/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/lv/firefox-63.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "3357a5fdf0e41b88e13c24c37243bb8bcefe75134df4944f286364d4f926efb9188e66a91ead78c7d9228275b394a8375ff9f24ac83489c987b42e34132d9224";
+      sha512 = "5a8eeb1274c30e57f7ecaf307e23eddaabbd7272128063ece88f480c7a8bdf96efbf8d2db2416e0232773457b10474a531ace2eac264175e590050662c8d606b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mai/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mai/firefox-63.0.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "172783f25dacda040e65ac980d6f3d33125cb6721c2c3568255a27f494e6d80beae3d61783171448caaca89358735a4c3b64dd9be47ca5c904d5727a3e0ab419";
+      sha512 = "b2ff3a58ff0216df0d980c941648e143a3dea87e1c90c4ef1367a3a75d5052b1c1e54b07476602a91adb691bca2fe4e9b70d89895773b3a021944257b0429518";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mk/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mk/firefox-63.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "8f3b31e48b1b423df1cdca1c240db88978f8d03a7409727842339096f5c1c6099e87c2fe1d6a122a6874c080b61ae59bcba1303479d80b944b4cc8d938eb7a00";
+      sha512 = "4ee9b4744ed73d866d6d2e73d0a9aae983d063af3fb4e313e8c6a2fec055b10bb1d414cbf87c0909119f1f804cd64eacb981b5c17ecc87e29ab246d736b6f9df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ml/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ml/firefox-63.0.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "dec1bae8329c9f8498fa9d95547abb2c2ec737df03b63ab44600b5132fe6037454070ab3bdb2ec0be1de48bb97c014d985fdc8530b97803c4202793a14e5e6d7";
+      sha512 = "9bdd87f047491ba138796e48e46dd4fefbccac03adb4d652978d51b933327f007ca89d41929c075dc61353584cfb5a3fbd94986ca791750117b55a4ed65b7994";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mr/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/mr/firefox-63.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "1e876518b8c73eea6aa4f51384e6ba9d7dfa983e7ea878bbc26becc248e2badd4647f3a44d273e33a742e5b6f99ed5ad364d621eff314c830612e0971ff268cb";
+      sha512 = "7680c9af0d556599120b3d8a2883a4bfb9bd0dca47a2d2b3dec669fe2852de39c134cfaec0f53082b269245a28588bc699250d438668264c778c7cbf3037a50f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ms/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ms/firefox-63.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "3c72bd0536ada586d31d02cb0b59184889a064d09cf30f73bcb93417064fc6e7905fe084c554d249d0a29cc6ef6c57dfddde7d97d658c14958861397455f267f";
+      sha512 = "ae78016ae552d10f4220e68259b464097464081cc2b3c114648a6e36e4381df7e9333f7c13c08e0346bdaaaaaadbbc9a111dea55cb6b4daafef29ff0b0db5afd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/my/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/my/firefox-63.0.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "1118b4d8caf8dc2b4a4aa6ee01805bef409e9238e38182ad8561bd8cd1885c22e2462b7baa00355aadbd103279ac0aa008299beca0157356f49773040916c3bf";
+      sha512 = "e682f1e998a946053672d61f880a75472d692ea9f7232df9e2a51c6b3d27f7d5496138144dc17a56cd07378b20bde48450a27157782e9ff0463ce922c08c6e3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nb-NO/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nb-NO/firefox-63.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "b0243d6642d51e9a81d58951e9251cf586080a7c90849adefef1678c856a34c0cac710752efa4f3cf1f9d099461968d0a15327d9610bf1792e451bfb38296c56";
+      sha512 = "b6b68de70089bc3f02741de04138922b3a4b6ea760d5b43c00bc636a3f60fdc510886e76b989facbc4db23e72e0659db9ed38705c8c56851ef9cb9209524d58a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ne-NP/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ne-NP/firefox-63.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "668498eb589927f92fc53806111c47b7b130d08c53c8a3d997edab4efe52ac7aa1388dedaf976fe46cc45603249b99922b803f32b5306888df194bf4d6547aa9";
+      sha512 = "057ba9953a8ff6824567de1d3629b7d995924a7da49f9b03e1b5e872cafe750dfafe05a74b72cc360c932237445712bddb646cad2a961523d29a8b5327ca3bc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nl/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nl/firefox-63.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "c6db81626bfb20724faadc34e113eba0cc3da7e251d1ea9e859ea4b1c82e2d8ecdc01ae3b60c12eab5b071e62c3cfb85a28cddb43573a9da39d3a07cbe78b7ac";
+      sha512 = "abfa808668e527940d7f344522650cccb4272555b67e4d90398faeb7aa31766002287c5e73f259b2ebeafdba890b0ca9940fe0bd12926f8b748ce172ff786abd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nn-NO/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/nn-NO/firefox-63.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "dcac12899163fac3d191104542f1d834a2406388f69faa78b871106408772a0cf01f73caf267cda6731e557cb872c341d6ddcaa1be9c972007e7a3cd9c0781a4";
+      sha512 = "e5048346227c41b20534e71042a911a74348e403283ecbcd3a90f1ecf3154907e0c7c21eb26b67f2ba09a6e8d04200c990f7a4babe4ea5782a847a31a6a880ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/oc/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/oc/firefox-63.0.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "1318631847b588dcf4662a3a82a80fb8bd1eac1fe1e78cd4bb5b1bb8990bc7c2adceef1dc057df1ff54cfb195a05612fc5957ddf22bf8355341d6744e1938df6";
+      sha512 = "ec1f24de15020cd6a16d95d47db8e2e73d1b3aa269e27d30421c15e3d71b57625c10e7c20427fb1fcf2ca7b2e1aeb0f16b254c1107aee28c2e8522fb535d4a5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/or/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/or/firefox-63.0.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "6d9a2af2ab431eaa6205958239e33d336f11ff789ee2cd62b90533153ce41b9e17ce3c8204d679c8949c1edbbf493efbc96d009b463e5ac96b3200ab8ab7d707";
+      sha512 = "c55f10e0a9a3cd3403eb9167139b4c6f0e8a5f66e3f33b12efb40bb6b2bbb7d1dc2aa365b1ab375f41da34e7d21d2848223934ffd2ab61fa93220bccbe9fc720";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pa-IN/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pa-IN/firefox-63.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "e7a0b4ff68c428d0028eb098dc0f1da82e14de691ae77d2d94e32465ef50c8af70dc9abe21f92db4606ce4a42d443b181e11bf2157363faad874b07f9c0e0110";
+      sha512 = "f74dd4d54680d94ea270bb7755f6ea4fe058899cea2472c08ebe5f34b8323be7157b060abc83ec80aef8f2ca63f3c806a7a4d831a4e72025ad25d4ca40783cd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pl/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pl/firefox-63.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "780886f9fa3136ea6d3981e2b63124e3c625acc971c144978840e254e1fb77da5e65fbc7b6b7edc6a363e5f24fbb09bfe16bcd89d3171e6e92efe18a58946e54";
+      sha512 = "05c82b2e08f65e37d4e82fd93d3d2ebe6a5d5441ab11069cbc66b18af0ed93e877466daf1d804c53ac3c712307aea475c99f922b5064cb551d136e5378e23765";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pt-BR/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pt-BR/firefox-63.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "d922b1294bb2aea2019034e7af38b9f01cc7aac316a223ddc54137219f01fa1a6d34b23830d82dc9ce816024532cf0535d2753a55b36e952da1f867e487924d2";
+      sha512 = "c8f2d36ada67a2fa7717527355a0e083ca5891ece1de70505efeac51dad5f6985666e2be0bdf23ad0f4402d6ee96fa2e12af50369297a3e46b9804cb0b830c89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pt-PT/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/pt-PT/firefox-63.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "86760623c1aa85efb05fe66929f1668fc6c7b2f631b77c9c93d1b12a23c6409345caebc25a70a6891f480dff2112966f283e3658e08951a49bac700de754c975";
+      sha512 = "5e4478ab220636c747ce9c5564a1b71554b1c67999722bc55204f747d0ad430eb2a0b71336997e80ca391d7680ebf92c66ea7ef4d25dc568f8c6860cd31ee26b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/rm/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/rm/firefox-63.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "b66f542b8ce0e878fb9ad599233adc136a20e09f1b77a82050273e16903b56b6f3f8f94a33fdc7a2a1ff0eae94d20cccd4ec6ade8c2ddaabad3c32547303d5ee";
+      sha512 = "67438f3cb1a89a0258890448de6d16be5f79291d4c0989691d9c8f38966a7a4ba2f8eaccb26ee4458a81a733ae9513555a22f8b57652b4fce1eb1e3ab2368848";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ro/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ro/firefox-63.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "393fdf5d1ffe51694b50f5027243d19c2f1d5d25daf9ad88f14f21ce3bc3e0d5bece8cce2f3192d263e873a8e55e1fdd6ec22ce014c43c71ae9fe9833a7b0df9";
+      sha512 = "3cdc7f593af3bbd858285237a9ffaa07aa76cbfc67c0f7d22d5cf261a19756ba3aa8971d54a10b820344beb509810b601faf0cc89c86636bc60ea1a6d8421873";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ru/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ru/firefox-63.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "a1af73215c8e3151e45e8a0a7b1c4eee51301065b3a724f904005f41101018eb11313319c1b8206432c4958d5a415575baebc64ff782b4e3b993b71d4a66e829";
+      sha512 = "7b6b03cca2fe3887d7ee86eeb8ee699157a6cd828108737e26724a48af72cf3fe326024f41c6afc13f7e332c262a4e991728ad5d46ac6fb6942c5c3b4ea93a9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/si/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/si/firefox-63.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "ee3a7b6b1e9a5b10661390b7f1d1fa61ef9589d59e4f869ef8ff6c4a1719fb15014e2abcd8472769c4a17b3f74ab7ae2671f3f79ad94a1d3d875f2fbdd03eb8b";
+      sha512 = "10f9fe43304931dbce1d0073ec4e827f369291b3705b322a3f3ba8f7002a974c019be8f5a594d8c88add527667d9295a27e85f2b1072e16ef1720e9e433111b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sk/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sk/firefox-63.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "478eefc7afb725496e3a17615c8458d29e44dc200dfb4534c32cd15d3c45ec15ddf9f5b1fcaad312e00d693a06d9bcd116038177d9844273a64f81b531b6e676";
+      sha512 = "6b90fd21c51d48ca997ad47025aef3a4280e30152a0f18d0ab8948e055b80e5aa7cf1374b2eeeb1432d8892fb07de505adb9ae6c57e776ced4c429859577f040";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sl/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sl/firefox-63.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "f07fae5f52528899ef3dc680ecc551311496125d9c10c2117e35d0ac8af387d99236ac9a3f921a9ad2e40102d70df91fcb43526ccb8910d5ded1379a42bf5914";
+      sha512 = "55faeb2d5310266395a442d0d9ce4a1020197d0ce7655caa8d00efd022db9e1c9926b7418f4cfa380d04e1971ed47e7025d434a36ca0fe6f58f02be7f0e26a69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/son/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/son/firefox-63.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "f20dbcdea88828cdaa4d9bc2e8ffd2792e06929495b0268814808f842c1bb9ccd87f86df16b005af989edd3c470d53ef6254288664ea192d15620ed10ef2682d";
+      sha512 = "63f104da43ff4103b40e271de6c962fae3d77891f50fe5b39698d3c2e382b4234dad41a3a64794015ad88d34a7e2b819c0ecb62b1bb44a4d8e83eadbc1803151";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sq/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sq/firefox-63.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "9a548ee02d1290c112ac3a72be6cf96163cb67448a8a5ae00a88e3e115f907945899cfb5a5edbf3e37a13c16550ebe7b6f67f94c05be6659c168a5e0043adc04";
+      sha512 = "534ce38e5dec85de50e9dd541f6d8445e95fdfac074a51866c993e97d020b9a310abebffa2162fc513572d202f9fec8e3a267207bf9c401b27c8541534ee2aaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sr/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sr/firefox-63.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "ff081635cf761293ca77ce7d3574e0a1b6a57d7dfd5649089e9554c27b85de544a39b2973205e293152a33d69137ae373110a884f6427dd58788c5832caa7773";
+      sha512 = "1174da8c998cdd62370bb8c80c6a47360cdcc84144b03ab33f10367b5622ecf6ff3058e4f525e46ddb523f13e29b6fe557b7442dfec92956b34eaf507bd5f8c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sv-SE/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/sv-SE/firefox-63.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "28686a08fc1c4cc63a084cbfa094e6f1b8ace446a5746f3892ea37d1b916806a15641875ef08c850c316059078a116a2060294f754e722d84d1fdc2817ed7618";
+      sha512 = "7c24f0d4552ca7bc3076b9b0485c757e0547713a58d09cd568e506e37dd6133c5c7a7ad3edcffdd387cc0c5661d3602f4252d778174bf78812788ad1daa9384a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ta/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ta/firefox-63.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "43b3db7262fc43b19f66cc586af56a404b6b0feaa98d31b53766deaa8d4f5314279dd6aaee5e3373f8c1bb9f4c152e2ae6d7aa5b9e4b1123a5dec7b42c6b68ae";
+      sha512 = "4387b1cfd77da777a3257e714b014c686ad8c5ff1edb7ba0e2d01f62621eaec92766ccc3bbeb93be45c0b414b9b31676692e75b366a7ed0fb8e0526f95126807";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/te/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/te/firefox-63.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "05936a5de6d723edf72c1155aa0f18c9a6eb5275dac4f4de58fe93cfd9a814e7ef349fa6c630d043d6b39ca5dab6fe5f3c92c45c36d5b515b4748bff6493063f";
+      sha512 = "8ad96e47cfc1066d27560a5ad26659dba098724374605520198d580867be3bcc05a63120865745055ef00163b8c7cb97ac35f18bfcdc3d171e7eed6a05f50855";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/th/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/th/firefox-63.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "5ececcf6b3404f1010b48956bb2423907261f7d544a695e775900e1a3cbc09e71b008b94118ee39651ff6469cf8c456afc5ab9c9fdf0b9fa4a9c41f76e16788b";
+      sha512 = "74272739144c6ae69dba8229420894b10e0dd9d75ae386f1221b17f8e54baf8c3d921591c5707ab5d8847deedad2daa3061fff03add11a2e450fdf691dd49f9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/tr/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/tr/firefox-63.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "29cc67dc15acf77589fe72d0e28591b5f4403de5cdfc6cfa7cd9f16ccf7315ed19c2d38872b5c76c1f4a78b2688e9401417b6e6ccba1985c27becb54baba4d22";
+      sha512 = "0cddf14cd7a7cd4594ca04d1416b3ab32db42a287e62b68197fe8e08078999028e47074e563302c77e480d02563932d20ceffdd89c53b53c79221f3cc309e802";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/uk/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/uk/firefox-63.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "e7814a55b835051c8d02b74e4343739241ea60d69b8060a496f60b6b323b81d8628541d346281e0080d83d9ef4183640c907c144743d3d444499c887c34709ef";
+      sha512 = "17e3d498e900ddfc4b00e3ea99b7b2f55c0252e88eede45b47b020293131d6adf5642c1bf94c39bba5b9042e2f9e20ba5399e6717e6965e65d90c4717a236832";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ur/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/ur/firefox-63.0.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "e6323528d7a916473a62edd9565ed8d67832e3298fba51c7aca32f9d0c2d401ac74d2df5770962e191f7fc79fbbe6f22ae242475075423a23f09c8f11c26afa9";
+      sha512 = "cef0ade8282d3360e27d51b4c5487882ae8dc78c598b4150cd3053cc442843cd58f5c362ed6c5ea8362517633dfbb2751a894c6cbc45bac796c181f32f095dc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/uz/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/uz/firefox-63.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "759e63deb63e59166d137e109f81ecd57a314aa045eb97a54ae82fe04a418bc3ac73c83bb663d65fc1b66233ed49e43ba7ba5a8db1bce5138fc6b65b7377b230";
+      sha512 = "e8dc2b26f35f5ddbc93e4891d7b9b4dfd932ba6c7d1da19a6bec1f5c259f78c1c3105d9f2c89cd97c91f4032489f95a339ba5a22dc4daf3c948a968bf580d4bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/vi/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/vi/firefox-63.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "cdd1e2fb71043fa628bc9653a1be4c7a4d64779383b25d2b1812ea7af2eea3711cc2777c09be1acaf2fcba9c931cd212c99bde69d067d331a294825b89c2addb";
+      sha512 = "6dc0945c634052824326cfe8558d1eddb192dbb4eca9eac458b8cfb3680cb1cf5537dd8ff4237ed32264d730e95287d9504fd0b1528fa33907dc1a2b4558ea61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xh/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/xh/firefox-63.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "97eb405cc8379cd803af5db55166b9db1e489c5a0e29fc316cdeeb49e2c2beca2ba87f7f01e9117dd22639d0cbfddc26ca90aa4187a522462a1b42126bee89a7";
+      sha512 = "3792ce77db9de5080437b2aad6537f00963593ff98cdd47a145ffef8243a5ea23e8cd42f82e217885601b04df4c17d833aa88b9d15cad7a6840978af3a756b05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/zh-CN/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/zh-CN/firefox-63.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "7559ae148ce548d2b766be291667e7f04d9c28bca0de467cb36f37772736d2f44cb3724e0bf0c95bdd11ac2a84ab07238e14902d6f8f23280796505cf5b9e471";
+      sha512 = "8043f8900ef35f85cb05f2092829899d119e079210dcb8bd9d369c7d73ff901e80afc4eecb25421058b65e5e267f7cf671c62cdec5849c2ff0da104f4ec12ad2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/zh-TW/firefox-62.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0/linux-i686/zh-TW/firefox-63.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "95829dba29e96497f047e2f03a4bcbe36d61c0a36637087e56300f889f9b191c7b6c4ce936604283145f4a8be8ee4b129fefdeba7efd201cd0a647a0016ebde1";
+      sha512 = "614b7835c82f80dd27c841023aca6aa8580bdadac8241f08fc053fe7657f069d6337e3edbe0bebcc4018d47f3d9f2d328176add89aacd9847393ebd21f3e9230";
     }
     ];
 }
-- 
GitLab


From 1d0ab5d73bbaf13c93f262408a7fe7f43ada785d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 01:32:01 -0700
Subject: [PATCH 0087/1065] units: 2.17 -> 2.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/units/versions
---
 pkgs/tools/misc/units/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix
index 23e28c3c286..fa208154eaa 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/pkgs/tools/misc/units/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "units-${version}";
-  version = "2.17";
+  version = "2.18";
 
   src = fetchurl {
     url = "mirror://gnu/units/${name}.tar.gz";
-    sha256 = "1n2xzpnxfn475zkd8rzs5gg58xszjbr4bdbgvk6hryzimvwwj0qz";
+    sha256 = "0y26kj349i048y4z3xrk90bvciw2j6ds3rka7r7yn3183hirr5b4";
   };
 
   buildInputs = [ readline ];
-- 
GitLab


From acb7d8599332903e07069e48970a592b9af3b6db Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 23 Oct 2018 11:07:47 +0300
Subject: [PATCH 0088/1065] lrs: init at 7.0

---
 .../libraries/science/math/lrs/default.nix    | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/lrs/default.nix

diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix
new file mode 100644
index 00000000000..3cf5c3619a9
--- /dev/null
+++ b/pkgs/development/libraries/science/math/lrs/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, gmp}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "lrs";
+  version = "7.0";
+
+  src = fetchurl {
+    url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-070.tar.gz";
+    sha256 = "1zjdmkjracz695k73c2pvipc0skpyn1wzagkhilsvcw9pqljpwg9";
+  };
+
+  buildInputs = [ gmp ];
+
+  preBuild = ''
+    export makeFlags="$makeFlags prefix=$out";
+  '';
+
+  meta = {
+    inherit version;
+    description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems";
+    license = stdenv.lib.licenses.gpl2 ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "http://cgm.cs.mcgill.ca/~avis/C/lrs.html";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14d980062c2..3d227e32c3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21118,6 +21118,8 @@ with pkgs;
   liblapackWithAtlas = liblapack;
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
+  
+  lrs = callPackage ../development/libraries/science/math/lrs { };
 
   m4ri = callPackage ../development/libraries/science/math/m4ri { };
 
-- 
GitLab


From 16c329f3da5fac6f19e4633b8e61c92310783e5a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 23 Oct 2018 12:00:00 +0300
Subject: [PATCH 0089/1065] visidata: init at 1.3.1

---
 pkgs/applications/misc/visidata/default.nix | 29 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  3 +++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/misc/visidata/default.nix

diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
new file mode 100644
index 00000000000..dd95b231bd1
--- /dev/null
+++ b/pkgs/applications/misc/visidata/default.nix
@@ -0,0 +1,29 @@
+{ buildPythonApplication, lib, fetchFromGitHub
+, dateutil, pyyaml, openpyxl, xlrd, h5py, fonttools, lxml, pandas, pyshp
+}:
+buildPythonApplication rec {
+  name = "${pname}-${version}";
+  pname = "visidata";
+  version = "1.3.1";
+
+  src = fetchFromGitHub {
+    owner = "saulpw";
+    repo = "visidata";
+    rev = "v${version}";
+    sha256 = "1d5sx1kfil1vjkynaac5sjsnn9azxxw834gwbh9plzd5fwxg4dz2";
+  };
+
+  propagatedBuildInputs = [dateutil pyyaml openpyxl xlrd h5py fonttools
+    lxml pandas pyshp ];
+
+  doCheck = false;
+
+  meta = {
+    inherit version;
+    description = "Interactive terminal multitool for tabular data";
+    license = lib.licenses.gpl3 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
+    homepage = "http://visidata.org/";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d227e32c3e..9e404360eae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5864,6 +5864,9 @@ with pkgs;
 
   vimer = callPackage ../tools/misc/vimer { };
 
+  visidata = (newScope python3Packages) ../applications/misc/visidata {
+  };
+
   vit = callPackage ../applications/misc/vit { };
 
   vnc2flv = callPackage ../tools/video/vnc2flv {};
-- 
GitLab


From 7a44e6e365cf959bb7ff6f4d52374ed903f63c64 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 23 Oct 2018 10:59:32 +0200
Subject: [PATCH 0090/1065] jackett: update mono version to 5.14

See details here : https://github.com/NixOS/nixpkgs/pull/48821#issuecomment-431837095
---
 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 e1879dc063e..4ece5c53dd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3429,7 +3429,7 @@ with pkgs;
   jaaa = callPackage ../applications/audio/jaaa { };
 
   jackett = callPackage ../servers/jackett {
-    mono = mono5;
+    mono = mono514;
   };
 
   jade = callPackage ../tools/text/sgml/jade { };
-- 
GitLab


From 608e7b20f688cd7561c816001871c4c3b456d13e Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 23 Oct 2018 11:08:33 +0200
Subject: [PATCH 0091/1065] sequeler: 0.6.2 -> 0.6.3 (#48858)

Changelog: https://github.com/Alecaddd/sequeler/releases/tag/v0.6.3
---
 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 89b4e33a927..24f4cbfe8ef 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -4,7 +4,7 @@
 
 
 let
-  version = "0.6.2";
+  version = "0.6.3";
   sqlGda = libgda.override {
     mysqlSupport = true;
     postgresSupport = true;
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
     owner = "Alecaddd";
     repo = "sequeler";
     rev = "v${version}";
-    sha256 = "0j5z3z34jc1acclmlkjpv7fcs4f2gf0bcfnvcpn3zdzw9fzj0sw7";
+    sha256 = "14a0i9y003m4pvdfp4ax7jfxvyzvyfg45zhln44rm08rfngb0f7k";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook python3 desktop-file-utils ];
-- 
GitLab


From 713312810779e5cffcce320848e72d241ce900da Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 02:18:56 -0700
Subject: [PATCH 0092/1065] urh: 2.3.0 -> 2.4.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/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 dba492ca8dd..2d370113873 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urh-${version}";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = "urh";
     rev = "v${version}";
-    sha256 = "1n105lwz8w5fiw93w9amasq0f4gknihl3x9kj0q77lw7ha1lvdfz";
+    sha256 = "0cwbqcv0yffg6fa3g4zknwffa6119i6827w6jm74fhlfa9kwy34c";
   };
 
   buildInputs = [ hackrf rtl-sdr ];
-- 
GitLab


From 6d0b34f3c82e48b69da06c7e558076fd86d8cd4a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 02:32:02 -0700
Subject: [PATCH 0093/1065] wireguard-tools: 0.0.20181007 -> 0.0.20181018

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 33b62d1bb38..12e2deb7422 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.20181007";
+  version = "0.0.20181018";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1nrhwnccs6sqq1qs7yhxqb989inrc9n2saibpqs6ga6gb0pvpac6";
+    sha256 = "0vrr0f89nrpwnyia6kqvrjkxwivrnvjnbavmx2nxlrb3sz23481y";
   };
 
   sourceRoot = "source/src/tools";
-- 
GitLab


From cc4b9ef40f2f891f56968af1163588b649c043e5 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Tue, 23 Oct 2018 03:14:55 -0700
Subject: [PATCH 0094/1065] gocode: 2018-07-27 -> 2018-10-22 (#48832)

github.com/nsf/gocode has also been deprecated in favor of github.com/mdempsky/gocode
---
 pkgs/development/tools/gocode/default.nix | 13 ++++++++-----
 pkgs/development/tools/gocode/deps.nix    | 11 +++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/tools/gocode/deps.nix

diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index 64921ec6e10..bb44074dfc7 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -1,9 +1,9 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gocode-${version}";
-  version = "20180727-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "00e7f5ac290aeb20a3d8d31e737ae560a191a1d5";
+  name = "gocode-unstable-${version}";
+  version = "2018-10-22";
+  rev = "e893215113e5f7594faa3a8eb176c2700c921276";
 
   goPackagePath = "github.com/mdempsky/gocode";
 
@@ -13,12 +13,15 @@ buildGoPackage rec {
   allowGoReference = true;
 
   src = fetchFromGitHub {
+    inherit rev;
+
     owner = "mdempsky";
     repo = "gocode";
-    inherit rev;
-    sha256 = "0vrwjq4r90za47hm88yx5h2mvkv7y4yaj2xbx3skg62wq2drsq31";
+    sha256 = "1zsll7yghv64890k7skl0g2lg9rsaiisgrfnb8kshsxrcxi1kc2l";
   };
 
+  goDeps = ./deps.nix;
+
   preBuild = ''
     # getting an error building the testdata because they contain invalid files
     # on purpose as part of the testing.
diff --git a/pkgs/development/tools/gocode/deps.nix b/pkgs/development/tools/gocode/deps.nix
new file mode 100644
index 00000000000..4eefdd9c6d0
--- /dev/null
+++ b/pkgs/development/tools/gocode/deps.nix
@@ -0,0 +1,11 @@
+[
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "6fe81c087942f588f40c3f67b41ce284f2f70eee";
+      sha256 = "04yl7rk2lf94bxz74ja5snh7ava9gcnf2yx6y002pfkk538r6w5d";
+    };
+  }
+]
-- 
GitLab


From e20e1e5c2cb247ed3c10d9560db7c3a509115674 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 23 Oct 2018 10:23:47 +0000
Subject: [PATCH 0095/1065] weechat: add perl.withPackages (#48815)

Allows for adding Perl libraries in the same way as for Python. Doesn't
really need to be a function, since there's only one perlPackages in
nixpkgs, but I went for consistency with the python plugin.
---
 doc/package-notes.xml                                | 8 ++++----
 pkgs/applications/networking/irc/weechat/default.nix | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index dad28d3ec8b..49f94f3bd5d 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -681,10 +681,10 @@ overrides = self: super: rec {
   </para>
 
   <para>
-   The python plugin allows the addition of extra libraries. For instance, the
-   <literal>inotify.py</literal> script in weechat-scripts requires D-Bus or
-   libnotify, and the <literal>fish.py</literal> script requires pycrypto. To
-   use these scripts, use the <literal>python</literal> plugin's
+   The python and perl plugins allows the addition of extra libraries. For
+   instance, the <literal>inotify.py</literal> script in weechat-scripts
+   requires D-Bus or libnotify, and the <literal>fish.py</literal> script
+   requires pycrypto. To use these scripts, use the plugin's
    <literal>withPackages</literal> attribute:
 <programlisting>weechat.override { configure = {availablePlugins, ...}: {
     plugins = with availablePlugins; [
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index bf5d0642314..513407a0b71 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -6,7 +6,7 @@
 , asciidoctor # manpages
 , guileSupport ? true, guile
 , luaSupport ? true, lua5
-, perlSupport ? true, perl
+, perlSupport ? true, perl, perlPackages
 , pythonSupport ? true, pythonPackages
 , rubySupport ? true, ruby
 , tclSupport ? true, tcl
@@ -108,6 +108,12 @@ in if configure == null then weechat else
           extraEnv = ''
             export PATH="${perlInterpreter}/bin:$PATH"
           '';
+          withPackages = pkgsFun: (perl // {
+            extraEnv = ''
+              ${perl.extraEnv}
+              export PERL5LIB=${lib.makeFullPerlPath (pkgsFun perlPackages)}
+            '';
+          });
         };
         tcl = simplePlugin "tcl";
         ruby = simplePlugin "ruby";
-- 
GitLab


From 886131c2434dfce5e3c8a3584467ae914b482ce9 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 23 Oct 2018 12:26:30 +0200
Subject: [PATCH 0096/1065] wlroots: remove broken tag

See: https://github.com/NixOS/nixpkgs/issues/38344#issuecomment-432032834
---
 pkgs/development/libraries/wlroots/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index f724ae00995..c1f401d0bad 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -85,8 +85,5 @@ in stdenv.mkDerivation rec {
     license     = licenses.mit;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ primeos ];
-    # Marked as broken until the first official/stable release (upstream
-    # request). See #38344 for the public discussion.
-    broken = true;
   };
 }
-- 
GitLab


From debbed29d1da582e75ebf266b203baad063550c3 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 23 Oct 2018 12:29:53 +0200
Subject: [PATCH 0097/1065] datadog-agent: add option to enable trace agent

---
 .../services/monitoring/datadog-agent.nix     |  22 ++-
 .../dd-agent/datadog-trace-agent-deps.nix     | 156 ++++++++++++++++++
 .../dd-agent/datadog-trace-agent.nix          |  25 +++
 pkgs/top-level/all-packages.nix               |   1 +
 4 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/networking/dd-agent/datadog-trace-agent-deps.nix
 create mode 100644 pkgs/tools/networking/dd-agent/datadog-trace-agent.nix

diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix
index 8fd3455a238..5434fe99347 100644
--- a/nixos/modules/services/monitoring/datadog-agent.nix
+++ b/nixos/modules/services/monitoring/datadog-agent.nix
@@ -7,7 +7,7 @@ let
 
   ddConf = {
     dd_url              = "https://app.datadoghq.com";
-    skip_ssl_validation = "no";
+    skip_ssl_validation = false;
     confd_path          = "/etc/datadog-agent/conf.d";
     additional_checksd  = "/etc/datadog-agent/checks.d";
     use_dogstatsd       = true;
@@ -16,6 +16,7 @@ let
   // optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; }
   // optionalAttrs (cfg.tags != null ) { tags = concatStringsSep ", " cfg.tags; }
   // optionalAttrs (cfg.enableLiveProcessCollection) { process_config = { enabled = "true"; }; }
+  // optionalAttrs (cfg.enableTraceAgent) { apm_config = { enabled = true; }; }
   // cfg.extraConfig;
 
   # Generate Datadog configuration files for each configured checks.
@@ -132,6 +133,15 @@ in {
       default = false;
       type = types.bool;
     };
+
+    enableTraceAgent = mkOption {
+      description = ''
+        Whether to enable the trace agent.
+      '';
+      default = false;
+      type = types.bool;
+    };
+
     checks = mkOption {
       description = ''
         Configuration for all Datadog checks. Keys of this attribute
@@ -244,6 +254,16 @@ in {
           ${pkgs.datadog-process-agent}/bin/agent --config /etc/datadog-agent/datadog.yaml
         '';
       });
+
+      datadog-trace-agent = lib.mkIf cfg.enableTraceAgent (makeService {
+        description = "Datadog Trace Agent";
+        path = [ ];
+        script = ''
+          export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile})
+          ${pkgs.datadog-trace-agent}/bin/trace-agent -config /etc/datadog-agent/datadog.yaml
+        '';
+      });
+
     };
 
     environment.etc = etcfiles;
diff --git a/pkgs/tools/networking/dd-agent/datadog-trace-agent-deps.nix b/pkgs/tools/networking/dd-agent/datadog-trace-agent-deps.nix
new file mode 100644
index 00000000000..a51cf183993
--- /dev/null
+++ b/pkgs/tools/networking/dd-agent/datadog-trace-agent-deps.nix
@@ -0,0 +1,156 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/DataDog/datadog-agent";
+    fetch = {
+      type = "git";
+      url = "https://github.com/DataDog/datadog-agent";
+      rev =  "92733ff01547103d5286afc9e272d501cb18f761";
+      sha256 = "1mmb7gyin6c4l6pj0nw3kpmj8wvjm7c8n4h5frv26bhg84m15xhd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/DataDog/datadog-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/DataDog/datadog-go";
+      rev =  "a9c7a9896c1847c9cc2b068a2ae68e9d74540a5d";
+      sha256 = "1m1vpi2s22dqcq0fqhfp3skzkmsbmhzyiw2kh2dw6ii7qimy8zki";
+    };
+  }
+  {
+    goPackagePath  = "github.com/StackExchange/wmi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/StackExchange/wmi";
+      rev =  "ea383cf3ba6ec950874b8486cd72356d007c768f";
+      sha256 = "1x3a3rdxccrzrnkld67p9ilm086v4w195rdhyw0bq39x1v1vzbln";
+    };
+  }
+  {
+    goPackagePath  = "github.com/cihub/seelog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cihub/seelog";
+      rev =  "d2c6e5aa9fbfdd1c624e140287063c7730654115";
+      sha256 = "0ab9kyrh51x1x71z37pwjsla0qv11a1qv697xafyc4r5nq5hds6p";
+    };
+  }
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-ini/ini";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ini/ini";
+      rev =  "74bdc99692c3408cb103221e38675ce8fda0a718";
+      sha256 = "0ad93rznilmd1hw20nlkr7ywi3sbd299mynf4db20k5yl34r3498";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-ole/go-ole";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ole/go-ole";
+      rev =  "de8695c8edbf8236f30d6e1376e20b198a028d42";
+      sha256 = "084caxl71v8lgg475whj2pz9mij3wk3gpbh3pfyf2dm66b6xrq2k";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev =  "d76fbc1373015ced59b43ac267f28d546b955683";
+      sha256 = "051a3imx2m7gpns8cjm1gckif9z6i4ik0svc1i8j7h86800c5rg0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "1e59b77b52bf8e4b449a57e6f79f21226d571845";
+      sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/philhofer/fwd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/philhofer/fwd";
+      rev =  "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
+      sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/shirou/gopsutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shirou/gopsutil";
+      rev =  "70a1b78fe69202d93d6718fc9e3a4d6f81edfd58";
+      sha256 = "04qbzj7r7ahq6s407lh9rb3xagbnaj5wp79siq49qkiz3101kfdb";
+    };
+  }
+  {
+    goPackagePath  = "github.com/shirou/w32";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shirou/w32";
+      rev =  "bb4de0191aa41b5507caa14b0650cdbddcd9280b";
+      sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "12b6f73e6084dad08a7c6e575284b177ecafbc71";
+      sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/tinylib/msgp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tinylib/msgp";
+      rev =  "362bfb3384d53ae4d5dd745983a4d70b6d23628c";
+      sha256 = "0b39cp417ndznkfwdqcbh89f9x3ml4rn7kf4l4als7vqrrwk7vrz";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9";
+      sha256 = "04va4pqygfzr89fx873k44bmivk7nybqalybi6q96lnn45h2scbr";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";
+      sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
+    };
+  }
+]
\ No newline at end of file
diff --git a/pkgs/tools/networking/dd-agent/datadog-trace-agent.nix b/pkgs/tools/networking/dd-agent/datadog-trace-agent.nix
new file mode 100644
index 00000000000..bdd3491ed18
--- /dev/null
+++ b/pkgs/tools/networking/dd-agent/datadog-trace-agent.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, buildGoPackage  }:
+
+buildGoPackage rec {
+  name = "datadog-trace-agent-${version}";
+  version = "6.5.0";
+  owner   = "DataDog";
+  repo    = "datadog-trace-agent";
+
+  src = fetchFromGitHub {
+    inherit owner repo;
+    rev    = "6.5.0";
+    sha256 = "0xhhcdridilhdwpmr9h3cqg5w4fh87l1jhvzg34k30gdh0g81afw";
+  };
+
+  goDeps = ./datadog-trace-agent-deps.nix;
+  goPackagePath = "github.com/${owner}/${repo}";
+
+  meta = with stdenv.lib; {
+    description = "Live trace collector for the DataDog Agent v6";
+    homepage    = https://www.datadoghq.com;
+    license     = licenses.bsd3;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ rob ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79ccf63ed98..70c4050d588 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16084,6 +16084,7 @@ with pkgs;
     pythonPackages = datadog-integrations-core {};
   };
   datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { };
+  datadog-trace-agent = callPackage ../tools/networking/dd-agent/datadog-trace-agent.nix { };
   datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix {
     python = python27;
     extraIntegrations = extras;
-- 
GitLab


From a53a3bf1eeee268515663bb7d100bc9d340c1317 Mon Sep 17 00:00:00 2001
From: Edmund Wu <22758444+eadwu@users.noreply.github.com>
Date: Tue, 23 Oct 2018 06:34:31 -0400
Subject: [PATCH 0098/1065] vscode-extensions.ms-python.python: 2018.8.0 ->
 2018.9.1 (#48849)

---
 pkgs/misc/vscode-extensions/default.nix        | 8 ++++----
 pkgs/misc/vscode-extensions/python/default.nix | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 219fe341d0b..dd1bb0ad124 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -4,10 +4,10 @@ let
   inherit (vscode-utils) buildVscodeMarketplaceExtension;
 in
 #
-# Unless there is a good reason not to, we attemp to use the same name as the 
+# Unless there is a good reason not to, we attempt to use the same name as the
 # extension's unique identifier (the name the extension gets when installed
 # from vscode under `~/.vscode`) and found on the marketplace extension page.
-# So an extension's attribute name should be of the form: 
+# So an extension's attribute name should be of the form:
 # "${mktplcRef.publisher}.${mktplcRef.name}".
 #
 rec {
@@ -24,6 +24,6 @@ rec {
   };
 
   ms-vscode.cpptools = callPackage ./cpptools {};
-  
+
   ms-python.python = callPackage ./python {};
-}
\ No newline at end of file
+}
diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index db6826b2d7e..a2d04edea19 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.8.0";
-    sha256 = "1x1wkqbc0d6h5w2m5qczv6gd5j6yrzhwp0c6wk49bhg2l0ibvyx6";
+    version = "2018.9.1";
+    sha256 = "050r1rb0xyfikfa6iq741s368xz600pqdk74w6cxszxpy8kl2hng";
   };
 
   postPatch = ''
-- 
GitLab


From 3a84f7a6a5a2c368478b3f508a02c0c1bec793bc Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 23 Oct 2018 12:42:01 +0200
Subject: [PATCH 0099/1065] dragonfly-reverb: 0.9.1 -> 0.9.4 (#48691)

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

diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix
index b3d9fd58028..fbe987e09cb 100644
--- a/pkgs/applications/audio/dragonfly-reverb/default.nix
+++ b/pkgs/applications/audio/dragonfly-reverb/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit, libjack2, libGL, pkgconfig, xorg }:
+{ stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
   name = "dragonfly-reverb-${src.rev}";
 
-  src = fetchgit {
-    url = "https://github.com/michaelwillis/dragonfly-reverb";
-    rev = "0.9.1";
-    sha256 = "1dbykx044h768bbzabdagl4jh65gqgfsxsrarjrkp07sqnhlnhpd";
+  src = fetchFromGitHub {
+    owner = "michaelwillis";
+    repo = "dragonfly-reverb";
+    rev = "0.9.4";
+    sha256 = "0lc45jybjwg4wrcz4s9lvzpvqawgj825rkqhz2xxvalfbvjazi53";
+    fetchSubmodules = true;
   };
 
   patchPhase = ''
-- 
GitLab


From ab27bcf01e1686ee449ec63c26595dee289942de Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Tue, 23 Oct 2018 10:37:56 +0200
Subject: [PATCH 0100/1065] buildah: 1.1 -> 1.4

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

diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 95ee4e93f2a..8d2b1d17b2d 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -3,15 +3,15 @@
 , go-md2man }:
 
 let
-  version = "1.1";
+  version = "1.4";
 
   src = fetchFromGitHub {
     rev = "v${version}";
-    owner = "projectatomic";
+    owner = "containers";
     repo = "buildah";
-    sha256 = "0pc7bzcaafrz56glygzhnbilgaz4ca2kmklw8njfgamffbw4d54p";
+    sha256 = "0b9pfi22qcqyp0im8vp02ibrwd49ghgi64d5l98z01cj52n2j2dz";
   };
-  goPackagePath = "github.com/projectatomic/buildah";
+  goPackagePath = "github.com/containers/buildah";
 
 in buildGoPackage rec {
   name = "buildah-${version}";
@@ -45,7 +45,7 @@ in buildGoPackage rec {
 
   meta = {
     description = "A tool which facilitates building OCI images";
-    homepage = https://github.com/projectatomic/buildah;
+    homepage = https://github.com/containers/buildah;
     maintainers = with stdenv.lib.maintainers; [ Profpatsch ];
     license = stdenv.lib.licenses.asl20;
   };
-- 
GitLab


From 68cb7903c7ce9e9f01280eb3e533aee5425452df Mon Sep 17 00:00:00 2001
From: Brandon Elam Barker <beb82@cornell.edu>
Date: Tue, 23 Oct 2018 13:23:03 +0000
Subject: [PATCH 0101/1065] ats2: 0.3.11 -> 0.3.12

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

diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index d6453d1d107..6da21d7f400 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -3,11 +3,11 @@
 , withContrib ? true }:
 
 let
-  versionPkg = "0.3.11" ;
+  versionPkg = "0.3.12" ;
 
   contrib = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
-    sha256 = "300884eca8a54cb9b0daa19bd04a86252160cc8ad6ef494198babd56d5a579bc";
+    sha256 = "6e53e3070f50600373b857a73a76196adffcabc3c0d3173eaaf9a5f50f4596f4";
   };
 
   postInstallContrib = stdenv.lib.optionalString withContrib
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "feba71f37e9688b8ff0a72c4eb21914ce59f19421350d9dc3f15ad6f8c28428a";
+    sha256 = "63eb02b225a11752745e8f08691140ed764288ab4ceda3710670cde24835b0d8";
   };
 
   buildInputs = [ gmp ];
-- 
GitLab


From e74b79709a974c6c4d6941a92322ff55452dcabf Mon Sep 17 00:00:00 2001
From: Herman Fries <h.fries@nyris.io>
Date: Tue, 23 Oct 2018 15:49:20 +0200
Subject: [PATCH 0102/1065] dotnet-sdk: 2.1.402 -> 2.1.403

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

diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index eb7a1e73719..9970fd9b33d 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -12,14 +12,14 @@ let
   rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ];
 in
   stdenv.mkDerivation rec {
-    version = "2.1.402";
-    netCoreVersion = "2.1.4";
+    version = "2.1.403";
+    netCoreVersion = "2.1.5";
     name = "dotnet-sdk-${version}";
 
     src = fetchurl {
       url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz";
       # use sha512 from the download page
-      sha512 = "dd7f15a8202ffa2a435b7289865af4483bb0f642ffcf98a1eb10464cb9c51dd1d771efbb6120f129fe9666f62707ba0b7c476cf1fd3536d3a29329f07456de48";
+      sha512 = "903a8a633aea9211ba36232a2decb3b34a59bb62bc145a0e7a90ca46dd37bb6c2da02bcbe2c50c17e08cdff8e48605c0f990786faf1f06be1ea4a4d373beb8a9";
     };
 
     unpackPhase = ''
-- 
GitLab


From cea4806bc5c425d2f9d9e110ae425b010e870662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Mon, 22 Oct 2018 12:03:33 +0200
Subject: [PATCH 0103/1065] ocamlformat: init at 0.8

---
 .../tools/ocaml/ocamlformat/default.nix       | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/tools/ocaml/ocamlformat/default.nix

diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix
new file mode 100644
index 00000000000..e0b744c8359
--- /dev/null
+++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, ocamlPackages, dune }:
+
+with ocamlPackages;
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.05"
+then throw "ocamlformat is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  version = "0.8";
+  pname = "ocamlformat";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ocaml-ppx";
+    repo = pname;
+    rev = version;
+    sha256 = "1i7rsbs00p43362yv7z7dw0qsnv7vjf630qk676qvfg7kg422w6j";
+  };
+
+  buildInputs = [
+    ocaml
+    dune
+    findlib
+    base
+    cmdliner
+    fpath
+    ocaml-migrate-parsetree
+    stdio
+  ];
+
+  configurePhase = ''
+    patchShebangs tools/gen_version.sh
+    tools/gen_version.sh src/Version.ml version
+  '';
+
+  buildPhase = ''
+    dune build -p ocamlformat
+  '';
+
+  inherit (dune) installPhase;
+
+  meta = {
+    homepage = "https://github.com/ocaml-ppx/ocamlformat";
+    description = "Auto-formatter for OCaml code";
+    maintainers = [ stdenv.lib.maintainers.Zimmi48 ];
+    license = stdenv.lib.licenses.mit;
+    inherit (ocamlPackages.ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70c4050d588..b44edc0a4e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7266,6 +7266,8 @@ with pkgs;
 
   ocamlPackages = recurseIntoAttrs ocaml-ng.ocamlPackages;
 
+  ocamlformat = callPackage ../development/tools/ocaml/ocamlformat { };
+
   orc = callPackage ../development/compilers/orc { };
 
   metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { };
-- 
GitLab


From 3c376155073d3243cf7ea0aa3f288ae1363da4e4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 07:27:38 -0700
Subject: [PATCH 0104/1065] snd: 18.7 -> 18.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/snd/versions
---
 pkgs/applications/audio/snd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 0709917a044..8534d871c66 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "snd-18.7";
+  name = "snd-18.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/${name}.tar.gz";
-    sha256 = "1d7g043r534shwsq5s4xsywgn5qv96v9wnhdx04j21s9w7fy9ypl";
+    sha256 = "16p6cmxl8y58wa19k1z6i66qsqaz7rld4850b0sprbxjjb6cqhf7";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 44a568435957ae4779dfd543843bf24c0efc1c85 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 07:36:31 -0700
Subject: [PATCH 0105/1065] syslogng: 3.17.2 -> 3.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/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 5b8a9cd0aee..1ce7e766a18 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.17.2";
+  version = "3.18.1";
 
   src = fetchurl {
     url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
-    sha256 = "02y593ar1c4503ww7mhn0p5ajfl3q6769c6m311m6srwl5y1yq3k";
+    sha256 = "1y1v16vvyirh0qv4wzczqp8d3llh6dl63lz3irwib1qhh7x56dyn";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
-- 
GitLab


From 00b555ef889b900c32c36ef9ef7fa3fb725ae4b5 Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@web.de>
Date: Tue, 23 Oct 2018 16:41:15 +0200
Subject: [PATCH 0106/1065] nixpkgs docs: Fix tiny typo (#48477)

---
 doc/functions/overrides.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/functions/overrides.xml b/doc/functions/overrides.xml
index 99e2a63631a..021c4b41c36 100644
--- a/doc/functions/overrides.xml
+++ b/doc/functions/overrides.xml
@@ -86,11 +86,11 @@ helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
     in this case, as it overrides only the attributes of the final derivation.
     It is for this reason that <varname>overrideAttrs</varname> should be
     preferred in (almost) all cases to <varname>overrideDerivation</varname>,
-    i.e. to allow using <varname>sdenv.mkDerivation</varname> to process input
+    i.e. to allow using <varname>stdenv.mkDerivation</varname> to process input
     arguments, as well as the fact that it is easier to use (you can use the
     same attribute names you see in your Nix code, instead of the ones
     generated (e.g. <varname>buildInputs</varname> vs
-    <varname>nativeBuildInputs</varname>, and involves less typing.
+    <varname>nativeBuildInputs</varname>), and it involves less typing).
    </para>
   </note>
  </section>
-- 
GitLab


From e1c9af286d21157bd04f908590f4a06f35f2e2c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 07:52:48 -0700
Subject: [PATCH 0107/1065] sysstat: 12.0.1 -> 12.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/sysstat/versions
---
 pkgs/os-specific/linux/sysstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index 5f3eb22f127..d3a9d7834cd 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "sysstat-12.0.1";
+  name = "sysstat-12.1.1";
 
   src = fetchurl {
     url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz";
-    sha256 = "114wh7iqi82c0az8wn3dg3y56279fb2wg81v8kvx87mq5975bg51";
+    sha256 = "0drrlv2fr64g5zf0a2bkla2rql4nmq4n192wvcr9r4zppg58d8k4";
   };
 
   buildInputs = [ gettext ];
-- 
GitLab


From 5b1e005bb67921c1bb37068d8ea99e8c8ec05df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Tue, 23 Oct 2018 16:09:43 +0200
Subject: [PATCH 0108/1065] gem-config: set libmagic for magic

---
 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 8640d43775d..01644080b40 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, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
-, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick, libcxx
+, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick, libcxx, file
 }@args:
 
 let
@@ -218,6 +218,14 @@ in
     ];
   };
 
+  magic = attrs: {
+    buildInputs = [ file ];
+    postInstall = ''
+      installPath=$(cat $out/nix-support/gem-meta/install-path)
+      sed -e 's@ENV\["MAGIC_LIB"\] ||@ENV\["MAGIC_LIB"\] || "${file}/lib/libmagic.so" ||@' -i $installPath/lib/magic/api.rb
+    '';
+  };
+
   msgpack = attrs: {
     buildInputs = [ msgpack ];
   };
-- 
GitLab


From c0ad5bc83920e987a5f1c8d8708cfd876702799f Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 19 Oct 2018 11:31:35 +0100
Subject: [PATCH 0109/1065] gem-config: capybara-webkit: qt48 -> qt59

> WARNING: The next major version of capybara-webkit will require at
> least version 5.0 of Qt. You're using version 4.8.7.

I went to 5.9 instead of 5.11 because 5.11 doesn't currently build on
Darwin, whereas 5.9 can build on both Darwin and Linux, and is still
well within the >=5.0 requirement.
---
 pkgs/development/ruby-modules/gem-config/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 01644080b40..b5aa0933c2e 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -21,7 +21,7 @@
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
-, msgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
+, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
 , cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick, libcxx, file
 }@args:
 
@@ -69,7 +69,7 @@ in
   };
 
   capybara-webkit = attrs: {
-    buildInputs = [ qt48 ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
+    buildInputs = [ qt59.qtbase qt59.qtwebkit ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
     NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
   };
 
-- 
GitLab


From 112bbf3b7de7b9b482277c24ad63b507c57d386b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 08:22:11 -0700
Subject: [PATCH 0110/1065] sleuthkit: 4.6.2 -> 4.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/sleuthkit/versions
---
 pkgs/tools/system/sleuthkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix
index 7e781223b57..23696651a63 100644
--- a/pkgs/tools/system/sleuthkit/default.nix
+++ b/pkgs/tools/system/sleuthkit/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "4.6.2";
+  version = "4.6.3";
   name = "sleuthkit-${version}";
 
   src = fetchFromGitHub {
     owner = "sleuthkit";
     repo = "sleuthkit";
     rev = name;
-    sha256 = "1ykl6ijf15mjfvmkk9b4gj18kspdairn7ms4wsi2v9kb25776skx";
+    sha256 = "1qaggb8day6idbafncslyaz7a475sq6p0xnjwc4c99f0z7i9cahp";
   };
 
   postPatch = ''
-- 
GitLab


From 9f327caa1f146cd9876bbf8a93713e65ba7452a8 Mon Sep 17 00:00:00 2001
From: sveitser <sveitser@gmail.com>
Date: Tue, 23 Oct 2018 23:17:43 +0800
Subject: [PATCH 0111/1065] pythonPackages.sh: 1.11 -> 1.12.14

- Enable unit tests.
- Add MIT license.
---
 pkgs/top-level/python-packages.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c5870b529c..5c525d6b63c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6729,18 +6729,25 @@ in {
 
 
   sh = buildPythonPackage rec {
-    name = "sh-1.11";
+    pname = "sh";
+    version = "1.12.14";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/sh/${name}.tar.gz";
-      sha256 = "590fb9b84abf8b1f560df92d73d87965f1e85c6b8330f8a5f6b336b36f0559a4";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm";
     };
 
-    doCheck = false;
+    buildInputs = with self; [ coverage ];
+
+    # A test needs the HOME directory to be different from $TMPDIR.
+    preCheck = ''
+    HOME=$(mktemp -d)
+    '';
 
     meta = {
       description = "Python subprocess interface";
       homepage = https://pypi.python.org/pypi/sh/;
+      license = licenses.mit;
     };
   };
 
-- 
GitLab


From 78636106663126e31dc2533c6e23adcea8d21871 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Tue, 23 Oct 2018 16:59:01 +0100
Subject: [PATCH 0112/1065] gitlab-runner: 11.3.1 -> 11.4.0 (#48867)

---
 .../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 9981bca3b68..2331bbbe55f 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl }:
 
 let
-  version = "11.3.1";
+  version = "11.4.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 = "13w8fjjc087klracv4ggjifj08vx3b549mhy220r5wn9aga5m549";
+    sha256 = "1vzp9d7dygb44b9x6vfl913fggjkiimzjj9arybn468rc2kh0si6";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "10s2g6mqy7p5dmjmlxggsfqqqf4bfrqjri7m2nd11l1lf4mmr2kk";
+    sha256 = "1krfd6ffzc78g7k04bkk32vzingplhn176jhw4p1ys19f4sqf5sw";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "1k978zsvsvr7ys18zqjg6n45cwi3nj0919fwj442dv99s95zyf6s";
+    sha256 = "0nhqnw6nk5q716ir0vdkqy0jj1vbxz014jx080zk44cdj7l62lrm";
   };
 
   patches = [ ./fix-shell-path.patch ];
-- 
GitLab


From 87de9f7e89874913f7468384a99acacf2da4c411 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 23 Oct 2018 17:56:10 +0200
Subject: [PATCH 0113/1065] opentracing-cpp: init 1.5.0

(cherry picked from commit f49df04c02d083395957fc85e12d231bb536e451)
---
 .../libraries/opentracing-cpp/default.nix            | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                      |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/opentracing-cpp/default.nix

diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix
new file mode 100644
index 00000000000..c897421a5c2
--- /dev/null
+++ b/pkgs/development/libraries/opentracing-cpp/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchFromGitHub, cmake }:
+stdenv.mkDerivation {
+  name = "opentracing-cpp";
+  src = fetchFromGitHub {
+    owner = "opentracing";
+    repo = "opentracing-cpp";
+    rev = "v1.5.0";
+    sha256 = "09hxj59vvz1ncbx4iblgfc3b5i74hvb3vx5245bwwwfkx5cnj1gg";
+  };
+  buildInputs = [ cmake ];
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a43ccf0f92..27175da249c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4526,6 +4526,8 @@ with pkgs;
 
   opae = callPackage ../development/libraries/opae { };
 
+  opentracing-cpp = callPackages ../development/libraries/opentracing-cpp { };
+
   openvswitch = callPackage ../os-specific/linux/openvswitch { };
 
   optipng = callPackage ../tools/graphics/optipng {
-- 
GitLab


From a286d2939931ac21188c58477879527e05bc1067 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 23 Oct 2018 18:01:34 +0200
Subject: [PATCH 0114/1065] opentracing-cpp: add meta

(cherry picked from commit 0b695b6682a5e8d391a5dcf81329ddec527c0eb5)
---
 pkgs/development/libraries/opentracing-cpp/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix
index c897421a5c2..e4bb9bb8ca5 100644
--- a/pkgs/development/libraries/opentracing-cpp/default.nix
+++ b/pkgs/development/libraries/opentracing-cpp/default.nix
@@ -8,5 +8,13 @@ stdenv.mkDerivation {
     sha256 = "09hxj59vvz1ncbx4iblgfc3b5i74hvb3vx5245bwwwfkx5cnj1gg";
   };
   buildInputs = [ cmake ];
+
+  meta = {
+    description = "C++ implementation of the OpenTracing API";
+    homepage = http://opentracing.io;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [ rob ];
+  };
+
 }
 
-- 
GitLab


From 75167083e5a11183d0982dd1d845c783c0e440b7 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 23 Oct 2018 18:07:45 +0200
Subject: [PATCH 0115/1065] nginx-opentracing: init at 0.7.0

(cherry picked from commit 9d6184f1bcd2a57db31c48fd0e1847147d44715a)
---
 pkgs/servers/http/nginx/modules.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 0501bcc9e58..15822a0387b 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -131,6 +131,18 @@
     };
   };
 
+  opentracing = {
+    src =
+      let src' = fetchFromGitHub {
+        owner = "opentracing-contrib";
+        repo = "nginx-opentracing";
+        rev = "v0.7.0";
+        sha256 = "16jzxhhsyfjaxb50jy5py9ppscidfx1shvc29ihldp0zs6d8khma";
+      };
+      in "${src'}/opentracing";
+    inputs = [ pkgs.opentracing-cpp ];
+  };
+
   pagespeed =
     let
       version = pkgs.psol.version;
-- 
GitLab


From 13649b9eee16174f2e90369cfe68b017ea1d1014 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 23 Oct 2018 18:15:05 +0200
Subject: [PATCH 0116/1065] opentracing-cpp: fix version in derivation

(cherry picked from commit df29219f5118dd1ae1d02108aeea4484e20d67e8)
---
 pkgs/development/libraries/opentracing-cpp/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix
index e4bb9bb8ca5..3b0354b9fe8 100644
--- a/pkgs/development/libraries/opentracing-cpp/default.nix
+++ b/pkgs/development/libraries/opentracing-cpp/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchFromGitHub, cmake }:
-stdenv.mkDerivation {
-  name = "opentracing-cpp";
+stdenv.mkDerivation rec {
+  name = "opentracing-cpp-${version}";
+  version = "1.5.0";
   src = fetchFromGitHub {
     owner = "opentracing";
     repo = "opentracing-cpp";
-    rev = "v1.5.0";
+    rev = "v${version}";
     sha256 = "09hxj59vvz1ncbx4iblgfc3b5i74hvb3vx5245bwwwfkx5cnj1gg";
   };
   buildInputs = [ cmake ];
-- 
GitLab


From 0d0b4a89884c5dc0afa77871508a2670ade54c2f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 23 Oct 2018 19:37:33 +0200
Subject: [PATCH 0117/1065] libuv: add licenses

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

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index e608ea300d1..68c35c49ef3 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
     homepage    = https://github.com/libuv/libuv;
     maintainers = with maintainers; [ cstrahan ];
     platforms   = with platforms; linux ++ darwin;
+    license     = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ];
   };
 
 }
-- 
GitLab


From 6f854a2085fbfa41a0ccf28824cc8bee44b3a81c Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 23 Oct 2018 19:40:08 +0200
Subject: [PATCH 0118/1065] libsigc++: add license

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

diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix
index 38e5ffcb4de..fa27a80e22e 100644
--- a/pkgs/development/libraries/libsigcxx/1.2.nix
+++ b/pkgs/development/libraries/libsigcxx/1.2.nix
@@ -11,10 +11,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ m4];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://libsigcplusplus.github.io/libsigcplusplus/;
     description = "A typesafe callback system for standard C++";
     branch = "1.2";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.lgpl3;
   };
 }
-- 
GitLab


From edfffe0adf6a917619625c3744cf64485c47124c Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Tue, 23 Oct 2018 12:40:42 -0500
Subject: [PATCH 0119/1065] brotli: 1.0.6 -> 1.0.7 (#48874)

---
 pkgs/tools/compression/brotli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index 7047eeeefa6..a3987085c8e 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "brotli-${version}";
-  version = "1.0.6";
+  version = "1.0.7";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "brotli";
     rev = "v" + version;
-    sha256 = "1hng7v7n6asli9v8gnshrqjnia5cvrwzgnx7irmk7r98nnjzlqda";
+    sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 89a077a002532309c950f60264ae199bde5ac1ae Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 23 Oct 2018 19:45:02 +0200
Subject: [PATCH 0120/1065] caps: 0.9.24 -> 0.9.26 (#48889)

---
 pkgs/applications/audio/caps/default.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix
index 2d90599346f..1f53809e905 100644
--- a/pkgs/applications/audio/caps/default.nix
+++ b/pkgs/applications/audio/caps/default.nix
@@ -1,23 +1,12 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
   name = "caps-${version}";
-  version = "0.9.24";
+  version = "0.9.26";
   src = fetchurl {
     url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
-    sha256 = "081zx0i2ysw5nmy03j60q9j11zdlg1fxws81kwanncdgayxgwipp";
+    sha256 = "1jcq9y51vdnk93q27r566y9qmddvadhr4ddnvkiypaq5rrdnqjg7";
   };
 
-  patches = [
-    (fetchurl {
-      url = "https://salsa.debian.org/multimedia-team/caps/raw/9a99c225/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch";
-      sha256 = "1b1pb5yfskiw8zi1lkj572l2ajpirh4amq538vggwvlpv1fqfway";
-    })
-    (fetchurl {
-      url = "https://salsa.debian.org/multimedia-team/caps/raw/a411203d/debian/patches/0002-Use-standard-exp10f-instead-of-pow10f.patch";
-      sha256 = "18ciklnscabr77l8b89xmbagkk79w4iqfpzr2yhn2ywv2jp8akx9";
-    })
-  ];
-
   configurePhase = ''
     echo "PREFIX = $out" > defines.make
   '';
-- 
GitLab


From abd029abe70a59a46371f4ee70f2cdee98b0057b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 23 Oct 2018 19:45:41 +0200
Subject: [PATCH 0121/1065] libwmf: add license

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

diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix
index eed0c77af80..bf685862adf 100644
--- a/pkgs/development/libraries/libwmf/default.nix
+++ b/pkgs/development/libraries/libwmf/default.nix
@@ -22,8 +22,10 @@ stdenv.mkDerivation {
     })
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "WMF library from wvWare";
-    platforms = stdenv.lib.platforms.unix;
+    homepage = http://wvware.sourceforge.net/libwmf.html;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From 81029a99eef591935375c9fae77233898c285da0 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 23 Oct 2018 19:45:54 +0200
Subject: [PATCH 0122/1065] libwpd: add meta data

---
 pkgs/development/libraries/libwpd/0.8.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix
index 49012f8bddf..736b1a45fa2 100644
--- a/pkgs/development/libraries/libwpd/0.8.nix
+++ b/pkgs/development/libraries/libwpd/0.8.nix
@@ -2,19 +2,22 @@
 
 stdenv.mkDerivation rec {
   name = "libwpd-0.8.14";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/libwpd/${name}.tar.gz";
     sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
   };
-  
+
   patches = [ ./gcc-0.8.patch ];
 
   buildInputs = [ glib libgsf libxml2 ];
 
   nativeBuildInputs = [ pkgconfig bzip2 ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Library for importing WordPerfect documents";
+    homepage = http://libwpd.sourceforge.net;
+    license = with licenses; [ lgpl21 mpl20 ];
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From 0db57307e6dcafcf1298079dc337eb82daaf279c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 23 Oct 2018 17:50:21 +0000
Subject: [PATCH 0123/1065] perlPackages.XMLFeedPP: init at 0.95 (#48816)

---
 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 e1f90d574a3..c68e15aeb96 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17586,6 +17586,19 @@ let
     propagatedBuildInputs = [ XMLRegExp libxml_perl ];
   };
 
+  XMLFeedPP = buildPerlPackage rec {
+    name = "XML-FeedPP-0.95";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz";
+      sha256 = "1x5806xwmbqxr1dkdhalb6d7n31s3ya776klkai7c2x6y6drbhwh";
+    };
+    propagatedBuildInputs = [ XMLTreePP ];
+    meta = {
+      description = "Parse/write/merge/edit RSS/RDF/Atom syndication feeds";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   XMLFilterBufferText = buildPerlPackage {
     name = "XML-Filter-BufferText-1.01";
     src = fetchurl {
-- 
GitLab


From 970a1ce522cc7e41f0571dab19ca8dea45823700 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 23 Oct 2018 19:50:50 +0200
Subject: [PATCH 0124/1065] libwpg: add licenses

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

diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index 9d262910e14..99808be2b21 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ libwpd zlib librevenge ];
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libwpg.sourceforge.net;
     description = "C++ library to parse WPG";
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    license = with licenses; [ lgpl21 mpl20 ];
+    platforms = platforms.all;
   };
 }
-- 
GitLab


From 3d886991747b9bbb384a16ac988e0d7c78a84113 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 23 Oct 2018 19:52:33 +0200
Subject: [PATCH 0125/1065] log4shib: add license + homepage

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

diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix
index 7b672aebe44..b2fba7df509 100644
--- a/pkgs/development/libraries/log4shib/default.nix
+++ b/pkgs/development/libraries/log4shib/default.nix
@@ -15,5 +15,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A forked version of log4cpp that has been created for the Shibboleth project";
     maintainers = [ maintainers.jammerful ];
+    license = licenses.lgpl21;
+    homepage = http://log4cpp.sf.net;
   };
 }
-- 
GitLab


From 77b7a63af4d7f4af98ad8cf401059cf1c5bda7d8 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 23 Oct 2018 19:54:07 +0200
Subject: [PATCH 0126/1065] loudmouth: add license

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

diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix
index aecd75656da..cad5d0d7eca 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@@ -18,11 +18,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A lightweight C library for the Jabber protocol";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
     downloadPage = "http://mcabber.com/files/loudmouth/";
     downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$";
     updateWalker = true;
+    license = licenses.lgpl21;
   };
 }
-- 
GitLab


From 81342af39db84d87f176790d059f5f64987e32d6 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 23 Oct 2018 19:55:59 +0200
Subject: [PATCH 0127/1065] martyr: add license

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

diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix
index 3b610271539..064f04f220c 100644
--- a/pkgs/development/libraries/martyr/default.nix
+++ b/pkgs/development/libraries/martyr/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state";
     homepage = http://martyr.sourceforge.net/;
+    license = stdenv.lib.licenses.lgpl21;
   };
 }
-- 
GitLab


From a46d0efd031b79d2edfd4749134c56e23a0c8455 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 23 Oct 2018 19:58:06 +0200
Subject: [PATCH 0128/1065] mdds: add license

---
 pkgs/development/libraries/mdds/0.12.1.nix  | 5 +++--
 pkgs/development/libraries/mdds/0.7.1.nix   | 5 +++--
 pkgs/development/libraries/mdds/default.nix | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix
index 11bd437d377..e1dd7586f92 100644
--- a/pkgs/development/libraries/mdds/0.12.1.nix
+++ b/pkgs/development/libraries/mdds/0.12.1.nix
@@ -9,9 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://gitlab.com/mdds/mdds;
     description = "A collection of multi-dimensional data structure and indexing algorithm";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/mdds/0.7.1.nix b/pkgs/development/libraries/mdds/0.7.1.nix
index 8ff1d6d5e9a..2b61668d5c6 100644
--- a/pkgs/development/libraries/mdds/0.7.1.nix
+++ b/pkgs/development/libraries/mdds/0.7.1.nix
@@ -9,9 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://gitlab.com/mdds/mdds/;
     description = "A collection of multi-dimensional data structure and indexing algorithm";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index 43fee9ccead..3b0a0441cc4 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -16,10 +16,11 @@ stdenv.mkDerivation rec {
 
   checkInputs = [ boost ];
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
     homepage = https://gitlab.com/mdds/mdds;
     description = "A collection of multi-dimensional data structure and indexing algorithm";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.mit;
   };
 }
-- 
GitLab


From c97276af5977b5b10a7f0af7df72ff781cf25c29 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 23 Oct 2018 20:00:36 +0200
Subject: [PATCH 0129/1065] mono-addins: add license

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

diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index 345c6e51f0b..ca72557242f 100644
--- a/pkgs/development/libraries/mono-addins/default.nix
+++ b/pkgs/development/libraries/mono-addins/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
       and for creating libraries which extend those applications.
     '';
     platforms = platforms.linux;
+    license = licenses.mit;
   };
 }
-- 
GitLab


From e180966f6b929720f72ccb2a5f91c465451ca3fa Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 23 Oct 2018 20:01:58 +0200
Subject: [PATCH 0130/1065] mono-zeroconf: add license

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

diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix
index d96f90b4bfd..37195d38562 100644
--- a/pkgs/development/libraries/mono-zeroconf/default.nix
+++ b/pkgs/development/libraries/mono-zeroconf/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     description = "A cross platform Zero Configuration Networking library for Mono and .NET";
     homepage = http://www.mono-project.com/archived/monozeroconf/;
     platforms = platforms.linux;
+    license = licenses.mit;
   };
 }
-- 
GitLab


From af8ae49395897fe2d2fe148b4de15c28ffc9e201 Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Tue, 23 Oct 2018 15:49:07 +0300
Subject: [PATCH 0131/1065] nginx: add custom options

---
 .../services/web-servers/nginx/default.nix    | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 508398f03ac..6c733f093ba 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -46,7 +46,7 @@ let
 
   configFile = pkgs.writeText "nginx.conf" ''
     user ${cfg.user} ${cfg.group};
-    error_log stderr;
+    error_log ${cfg.logError};
     daemon off;
 
     ${cfg.config}
@@ -341,6 +341,35 @@ in
         ";
       };
 
+      logError = mkOption {
+        default = "stderr";
+        description = "
+          Configures logging.
+          The first parameter defines a file that will store the log. The
+          special value stderr selects the standard error file. Logging to
+          syslog can be configured by specifying the “syslog:” prefix.
+          The second parameter determines the level of logging, and can be
+          one of the following: debug, info, notice, warn, error, crit,
+          alert, or emerg. Log levels above are listed in the order of
+          increasing severity. Setting a certain log level will cause all
+          messages of the specified and more severe log levels to be logged.
+          If this parameter is omitted then error is used.
+        ";
+      };
+
+      preStart =  mkOption {
+        type = types.lines;
+        default = ''
+          test -d ${cfg.stateDir}/logs || mkdir -m 750 -p ${cfg.stateDir}/logs  
+          test `stat -c %a ${cfg.stateDir}` = "750" || chmod 750 ${cfg.stateDir}
+          test `stat -c %a ${cfg.stateDir}/logs` = "750" || chmod 750 ${cfg.stateDir}/logs
+          chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
+        '';
+        description = "
+          Shell commands executed before the service's nginx is started.
+        ";
+      };
+
       config = mkOption {
         default = "";
         description = "
@@ -608,9 +637,7 @@ in
       stopIfChanged = false;
       preStart =
         ''
-        mkdir -p ${cfg.stateDir}/logs
-        chmod 700 ${cfg.stateDir}
-        chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
+        ${cfg.preStart}
         ${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir} -t
         '';
       serviceConfig = {
-- 
GitLab


From 4b3349b6934f094ceabc97c060a7d404fc7eb0f2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 23 Oct 2018 20:04:29 +0200
Subject: [PATCH 0132/1065] msilbc: add license + description

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

diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix
index cfb02ddbf9d..601e70427a1 100644
--- a/pkgs/development/libraries/msilbc/default.nix
+++ b/pkgs/development/libraries/msilbc/default.nix
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
     "MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include"
   ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Mediastreamer plugin for the iLBC audio codec";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }
-- 
GitLab


From 36cfb4790db5afc832003522fb82fb4af959224f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 23 Oct 2018 20:10:54 +0200
Subject: [PATCH 0133/1065] eigen3_3: 3.3.4 -> 3.3.5

Changes: http://eigen.tuxfamily.org/index.php?title=ChangeLog#Eigen_3.3.5
---
 pkgs/development/libraries/eigen/3.3.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix
index e6d13a5915a..e3367f661ca 100644
--- a/pkgs/development/libraries/eigen/3.3.nix
+++ b/pkgs/development/libraries/eigen/3.3.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, fetchpatch, cmake}:
 
 let
-  version = "3.3.4";
+  version = "3.3.5";
 in
 stdenv.mkDerivation {
   name = "eigen-${version}";
@@ -9,18 +9,9 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
     name = "eigen-${version}.tar.gz";
-    sha256 = "1q85bgd6hnsgn0kq73wa4jwh4qdwklfg73pgqrz4zmxvzbqyi1j2";
+    sha256 = "13p60x6k61zq2y2in7g4fy5p55cr5dbmj3zvw10zcazxraxbcm04";
   };
 
-  patches = [
-    # Remove for > 3.3.4
-    # Upstream commit from 6 Apr 2018 "Fix cmake scripts with no fortran compiler"
-    (fetchpatch {
-      url    = "https://bitbucket.org/eigen/eigen/commits/ba14974d054ae9ae4ba88e5e58012fa6c2729c32/raw";
-      sha256 = "0fskiy9sbzvp693fcyv3pfq8kxxx3d3mgmaqvjbl5bpfjivij8l1";
-    })
-  ];
-  
   nativeBuildInputs = [ cmake ];
 
   postInstall = ''
-- 
GitLab


From 3371821d74182b1d397ce9bbe91a39c7423a8bdb Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 23 Oct 2018 20:12:15 +0200
Subject: [PATCH 0134/1065] mythes: add license

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

diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix
index dd40a396244..28888e551ef 100644
--- a/pkgs/development/libraries/mythes/default.nix
+++ b/pkgs/development/libraries/mythes/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://hunspell.sourceforge.net/;
     description = "Thesaurus library from Hunspell project";
+    license = stdenv.lib.licenses.bsd3;
     inherit (hunspell.meta) platforms;
   };
 }
-- 
GitLab


From d8d8a0ba14a7be1aa36bcbdf66b7f2cd9df9d3ff Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 23 Oct 2018 20:34:59 +0200
Subject: [PATCH 0135/1065] sway-beta: init at 1.0-beta1 (#48829)

* sway-beta: init at 1.0-beta1

* sway, sway-beta: use https url
---
 .../window-managers/sway/beta.nix             | 43 +++++++++++++++++++
 .../window-managers/sway/default.nix          |  2 +-
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/window-managers/sway/beta.nix

diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix
new file mode 100644
index 00000000000..5aebb7ed8dd
--- /dev/null
+++ b/pkgs/applications/window-managers/sway/beta.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub
+, meson, ninja
+, pkgconfig, scdoc
+, wayland, libxkbcommon, pcre, json_c, dbus
+, pango, cairo, libinput, libcap, pam, gdk_pixbuf
+, wlroots, wayland-protocols
+, buildDocs ? true
+}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "sway";
+  version = "1.0-beta.1";
+
+  src = fetchFromGitHub {
+    owner = "swaywm";
+    repo = "sway";
+    rev = version;
+    sha256 = "0h9kgrg9mh2acks63z72bw3lwff32pf2nb4i7i5xhd9i6l4gfnqa";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig meson ninja
+  ] ++ stdenv.lib.optional buildDocs scdoc;
+
+  buildInputs = [
+    wayland libxkbcommon pcre json_c dbus
+    pango cairo libinput libcap pam gdk_pixbuf
+    wlroots wayland-protocols
+  ];
+
+  enableParallelBuilding = true;
+
+  mesonFlags = "-Dsway-version=${version}";
+
+  meta = with stdenv.lib; {
+    description = "i3-compatible window manager for Wayland";
+    homepage    = https://swaywm.org;
+    license     = licenses.mit;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ primeos synthetica ]; # Trying to keep it up-to-date.
+  };
+}
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 50614534f8e..fb30f0073bf 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "i3-compatible window manager for Wayland";
-    homepage    = http://swaywm.org;
+    homepage    = https://swaywm.org;
     license     = licenses.mit;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27175da249c..2355c208575 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17199,7 +17199,9 @@ with pkgs;
   wlroots = callPackage ../development/libraries/wlroots { };
   rootston = wlroots.bin;
   orbment = callPackage ../applications/window-managers/orbment { };
+
   sway = callPackage ../applications/window-managers/sway { };
+  sway-beta = callPackage ../applications/window-managers/sway/beta.nix { };
 
   velox = callPackage ../applications/window-managers/velox {
     stConf = config.st.conf or null;
-- 
GitLab


From 2eb372d59dd67e7eabe9f35472c10716b4cb38f7 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 23 Oct 2018 20:38:33 +0200
Subject: [PATCH 0136/1065] nixos/rootston: Remove the module and the package
 (#48905)

Rootston is just a reference compositor so it doesn't make that much
sense to have a module for it. Upstream doesn't really like it as well:

"Rootston will never be intended for downstream packages, it's an
internal thing we use for testing." - SirCmpwn [0]

Removing the package and the module shouldn't cause much problems
because it was marked as broken until
886131c2434dfce5e3c8a3584467ae914b482ce9. If required the package can
still be accessed via wlroots.bin (could be useful for testing
purposes).

[0]: https://github.com/NixOS/nixpkgs/issues/38344#issuecomment-378449256
---
 nixos/modules/module-list.nix       |   1 -
 nixos/modules/programs/rootston.nix | 103 ----------------------------
 pkgs/top-level/all-packages.nix     |   2 +-
 3 files changed, 1 insertion(+), 105 deletions(-)
 delete mode 100644 nixos/modules/programs/rootston.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index fb6b4262568..ae7a3a783d3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -108,7 +108,6 @@
   ./programs/oblogout.nix
   ./programs/plotinus.nix
   ./programs/qt5ct.nix
-  ./programs/rootston.nix
   ./programs/screen.nix
   ./programs/sedutil.nix
   ./programs/slock.nix
diff --git a/nixos/modules/programs/rootston.nix b/nixos/modules/programs/rootston.nix
deleted file mode 100644
index 842d9e6cfb4..00000000000
--- a/nixos/modules/programs/rootston.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.programs.rootston;
-
-  rootstonWrapped = pkgs.writeScriptBin "rootston" ''
-    #! ${pkgs.runtimeShell}
-    if [[ "$#" -ge 1 ]]; then
-      exec ${pkgs.rootston}/bin/rootston "$@"
-    else
-      ${cfg.extraSessionCommands}
-      exec ${pkgs.rootston}/bin/rootston -C ${cfg.configFile}
-    fi
-  '';
-in {
-  options.programs.rootston = {
-    enable = mkEnableOption ''
-      rootston, the reference compositor for wlroots. The purpose of rootston
-      is to test and demonstrate the features of wlroots (if you want a real
-      Wayland compositor you should e.g. use Sway instead). You can manually
-      start the compositor by running "rootston" from a terminal'';
-
-    extraSessionCommands = mkOption {
-      type = types.lines;
-      default = "";
-      example = ''
-        # Define a keymap (US QWERTY is the default)
-        export XKB_DEFAULT_LAYOUT=de,us
-        export XKB_DEFAULT_VARIANT=nodeadkeys
-        export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:escape
-      '';
-      description = ''
-        Shell commands executed just before rootston is started.
-      '';
-    };
-
-    extraPackages = mkOption {
-      type = with types; listOf package;
-      default = with pkgs; [
-        westonLite xwayland rofi
-      ];
-      defaultText = literalExample ''
-        with pkgs; [
-          westonLite xwayland rofi
-        ]
-      '';
-      example = literalExample "[ ]";
-      description = ''
-        Extra packages to be installed system wide.
-      '';
-    };
-
-    config = mkOption {
-      type = types.str;
-      default = ''
-        [keyboard]
-        meta-key = Logo
-
-        # Sway/i3 like Keybindings
-        # Maps key combinations with commands to execute
-        # Commands include:
-        # - "exit" to stop the compositor
-        # - "exec" to execute a shell command
-        # - "close" to close the current view
-        # - "next_window" to cycle through windows
-        [bindings]
-        Logo+Shift+e = exit
-        Logo+q = close
-        Logo+m = maximize
-        Alt+Tab = next_window
-        Logo+Return = exec weston-terminal
-        Logo+d = exec rofi -show run
-      '';
-      description = ''
-        Default configuration for rootston (used when called without any
-        parameters).
-      '';
-    };
-
-    configFile = mkOption {
-      type = types.path;
-      default = "/etc/rootston.ini";
-      example = literalExample "${pkgs.rootston}/etc/rootston.ini";
-      description = ''
-        Path to the default rootston configuration file (the "config" option
-        will have no effect if you change the path).
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    environment.etc."rootston.ini".text = cfg.config;
-    environment.systemPackages = [ rootstonWrapped ] ++ cfg.extraPackages;
-
-    hardware.opengl.enable = mkDefault true;
-    fonts.enableDefaultFonts = mkDefault true;
-    programs.dconf.enable = mkDefault true;
-  };
-
-  meta.maintainers = with lib.maintainers; [ primeos gnidorah ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2355c208575..cfdeae1d67a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17197,7 +17197,7 @@ with pkgs;
 
   wlc = callPackage ../development/libraries/wlc { };
   wlroots = callPackage ../development/libraries/wlroots { };
-  rootston = wlroots.bin;
+
   orbment = callPackage ../applications/window-managers/orbment { };
 
   sway = callPackage ../applications/window-managers/sway { };
-- 
GitLab


From f346289ea6643e166ea023ddf76210df1dd7ab77 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 23 Oct 2018 20:43:57 +0200
Subject: [PATCH 0137/1065] signal-desktop: 1.16.3 -> 1.17.0

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

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 92f0b11c63f..29a65b5d9bc 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -56,11 +56,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.16.3";
+  version = "1.17.0";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1fhs3408i8f80z5rlchrc3gwm0481rxqb5jk37gb8ip94zf97hsf";
+    sha256 = "0daxp8ychvvr4lqz8wni8lkalk3w409pzwnikvf92f1whxs76xj0";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
-- 
GitLab


From f7a785fbd1e74d7919d3087ac85b03cc337549f4 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Tue, 23 Oct 2018 23:12:44 +0300
Subject: [PATCH 0138/1065] mako: init at 1.1 (#46606)

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

diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix
new file mode 100644
index 00000000000..3950e4945cf
--- /dev/null
+++ b/pkgs/applications/misc/mako/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc, systemd, pango, cairo
+, wayland, wayland-protocols }:
+
+stdenv.mkDerivation rec {
+  name = "mako-${version}";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "emersion";
+    repo = "mako";
+    rev = "v${version}";
+    sha256 = "18krsyp9g6f689024dn1mq8dyj4yg8c3kcy5s88q1gm8py6c4493";
+  };
+
+  nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
+  buildInputs = [ systemd pango cairo wayland wayland-protocols ];
+
+  meta = with stdenv.lib; {
+    description = "A lightweight Wayland notification daemon";
+    homepage = https://wayland.emersion.fr/mako/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ dywedir ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e50ad0a0b45..7967349aee6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17710,6 +17710,8 @@ with pkgs;
 
   makeself = callPackage ../applications/misc/makeself { };
 
+  mako = callPackage ../applications/misc/mako { };
+
   mapmap = libsForQt5.callPackage ../applications/video/mapmap { };
 
   marathon = callPackage ../applications/networking/cluster/marathon { };
-- 
GitLab


From 46dc76b60b2c2736920fd05b8c6069629a302e41 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 17 Oct 2018 22:41:42 -0500
Subject: [PATCH 0139/1065] cloudflared: init at 2018.10.3

'cloudflared' is a multi-purpose client-side tool for CloudFlare Argo
Tunnel, CloudFlare Access, as well as including a simple DNS-over-HTTP
(DoH) proxy tool as well.

However, 'cloudflared' is NOT available under an open source license.
Furthermore, the exact terms of redistribution (namely, if we are able
to redistribute binaries at all) are not entirely clear to me. As a
result, I have filed the following bug report concerning the terms of
redistribution for the source code and binaries:

  https://github.com/cloudflare/cloudflared/issues/53

'cloudflared' does have source code available, however, and it
encourages users to use 'go install' in order to set it up, in fact (or
download their prebuilt, compiled binaries). So using the source seems
to be encouraged. Even then, I'm still not sure if Hydra can serve these
binaries.

In lieu of a more pointed answer regarding source/binary licensing, and
to avoid keeping this expression in my private tree, I've marked it as
'unfree' (to avoid Hydra serving it in any way) as well as compiled from
source (to avoid any 'redistribution allowed while unmodified' terms
that may crop up).

The dependencies for this build were generated using 'dep2nix'.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../networking/cloudflared/default.nix        |  25 +
 .../networking/cloudflared/deps.nix           | 444 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 471 insertions(+)
 create mode 100644 pkgs/applications/networking/cloudflared/default.nix
 create mode 100644 pkgs/applications/networking/cloudflared/deps.nix

diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
new file mode 100644
index 00000000000..fd047147e01
--- /dev/null
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name    = "cloudflared-${version}";
+  version = "2018.10.3";
+
+  goPackagePath = "github.com/cloudflare/cloudflared";
+
+  src = fetchFromGitHub {
+    owner  = "cloudflare";
+    repo   = "cloudflared";
+    rev    = "41916365b689bf2cc1446ea5717e4d26cc8aed43"; # untagged
+    sha256 = "109bhnmvlvj3ag9vw090fy202z8aaqr1rakhn8v550wwy30h9zkf";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)";
+    homepage    = https://www.cloudflare.com/products/argo-tunnel;
+    license     = licenses.unfree;
+    platforms   = platforms.unix;
+    maintainers = [ maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/applications/networking/cloudflared/deps.nix b/pkgs/applications/networking/cloudflared/deps.nix
new file mode 100644
index 00000000000..da7f509378d
--- /dev/null
+++ b/pkgs/applications/networking/cloudflared/deps.nix
@@ -0,0 +1,444 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/BurntSushi/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/toml";
+      rev =  "b26d9c308763d68093482582cea63d69be07a0f0";
+      sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry";
+    };
+  }
+  {
+    goPackagePath  = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev =  "3a771d992973f24aa725d07868b467d1ddfceafb";
+      sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
+    };
+  }
+  {
+    goPackagePath  = "github.com/certifi/gocertifi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/certifi/gocertifi";
+      rev =  "deb3ae2ef2610fde3330947281941c562861188b";
+      sha256 = "1xy09y1fdfcny1z09hd4493w1acj5min9z2sx4gfpshc80icrmr6";
+    };
+  }
+  {
+    goPackagePath  = "github.com/cloudflare/brotli-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cloudflare/brotli-go";
+      rev =  "18c9f6c67e3dfc12e0ddaca748d2887f97a7ac28";
+      sha256 = "10112y4k8qing552n0df9w33cgminrzm6g3x7ng0vgin4sv59785";
+    };
+  }
+  {
+    goPackagePath  = "github.com/coredns/coredns";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coredns/coredns";
+      rev =  "992e7928c7c258628d2b13b769acc86781b9faea";
+      sha256 = "0mvlkca11ikwzii0p7g5a2z3gn1xrp7qmmjwklp4i52lbnsawzv0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/coreos/go-oidc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-oidc";
+      rev =  "a93f71fdfe73d2c0f5413c0565eea0af6523a6df";
+      sha256 = "00pmmky0y9a9l767xn16xlf52h81j4869n6j0xql79rybp6xc1f3";
+    };
+  }
+  {
+    goPackagePath  = "github.com/coreos/go-systemd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-systemd";
+      rev =  "39ca1b05acc7ad1220e09f133283b8859a8b71ab";
+      sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/coreos/pkg";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/pkg";
+      rev =  "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1";
+      sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21";
+    };
+  }
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+    };
+  }
+  {
+    goPackagePath  = "github.com/elgs/gosqljson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/elgs/gosqljson";
+      rev =  "027aa4915315a0b2825c0f025cea347829b974fa";
+      sha256 = "14i45m1y505acvsk4l725bp8p9w3mcg49khz9hxkzg3afg7nc5gq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/equinox-io/equinox";
+    fetch = {
+      type = "git";
+      url = "https://github.com/equinox-io/equinox";
+      rev =  "f24972fa72facf59d05c91c848b65eac38815915";
+      sha256 = "1d3620g1kxyzn8b3py2471qp8ssyzm1qnpbap9gxrmg8912wiww1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/facebookgo/grace";
+    fetch = {
+      type = "git";
+      url = "https://github.com/facebookgo/grace";
+      rev =  "75cf19382434e82df4dd84953f566b8ad23d6e9e";
+      sha256 = "15chyvgv5y59w9x2asm0vh29cmmcji7f5vxvv8gqcr15nkyi61q0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/flynn/go-shlex";
+    fetch = {
+      type = "git";
+      url = "https://github.com/flynn/go-shlex";
+      rev =  "3f9db97f856818214da2e1057f8ad84803971cff";
+      sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia";
+    };
+  }
+  {
+    goPackagePath  = "github.com/getsentry/raven-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getsentry/raven-go";
+      rev =  "ed7bcb39ff10f39ab08e317ce16df282845852fa";
+      sha256 = "0pqggcjbia9sidxqxnyd5z5k44iswxaqss3qvkka8bfm082kczij";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang-collections/collections";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang-collections/collections";
+      rev =  "604e922904d35e97f98a774db7881f049cd8d970";
+      sha256 = "04g0xc1bs4aphc2rcj9knah2shmck500qagnazy4mg052b84ggwm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/uuid";
+      rev =  "064e2069ce9c359c118179501254f67d7d37ba24";
+      sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gorilla/context";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/context";
+      rev =  "08b5f424b9271eedf6f9f0ce86cb9396ed337a42";
+      sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gorilla/mux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/mux";
+      rev =  "e3702bed27f0d39777b0b37b664b6280e8ef8fbf";
+      sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gorilla/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/websocket";
+      rev =  "ea4d1f681babbce9545c9c5f3d5194a789c89f5b";
+      sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/grpc-ecosystem/grpc-opentracing";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc-ecosystem/grpc-opentracing";
+      rev =  "8e809c8a86450a29b90dcc9efbf062d0fe6d9746";
+      sha256 = "1yz3gxhdipmi63n32y5srwx7p254k3fm8y64cimkb1gz7sw99nxw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jonboulle/clockwork";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jonboulle/clockwork";
+      rev =  "2eee05ed794112d45db504eb05aa693efd2b8b09";
+      sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl";
+    };
+  }
+  {
+    goPackagePath  = "github.com/lib/pq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lib/pq";
+      rev =  "90697d60dd844d5ef6ff15135d0203f65d2f53b8";
+      sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev =  "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
+      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev =  "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
+      sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
+    };
+  }
+  {
+    goPackagePath  = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev =  "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mholt/caddy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mholt/caddy";
+      rev =  "d3b731e9255b72d4571a5aac125634cf1b6031dc";
+      sha256 = "1183cfaryw7m3hvngzv87w80pc9vp3369sjyz7a0dlbr39jip1r0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/miekg/dns";
+    fetch = {
+      type = "git";
+      url = "https://github.com/miekg/dns";
+      rev =  "5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1";
+      sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev =  "3864e76763d94a6df2f9960b16a20a33da9f9a66";
+      sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/opentracing/opentracing-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opentracing/opentracing-go";
+      rev =  "1949ddbfd147afd4d964a9f00b24eb291e0e7c38";
+      sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9";
+    };
+  }
+  {
+    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/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev =  "967789050ba94deca04a5e84cce8ad472ce313c1";
+      sha256 = "1djwz6shmyx5kbp9b1pim3kncq2jwn3qhbx4b0b4lq7msww76hpz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev =  "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
+      sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev =  "7600349dcfe1abd18d72d3a1770870d9800a7801";
+      sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev =  "ae68e2d4c00fed4943b5f6698d504a5fe083da8a";
+      sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f";
+    };
+  }
+  {
+    goPackagePath  = "github.com/rifflock/lfshook";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rifflock/lfshook";
+      rev =  "bf539943797a1f34c1f502d07de419b5238ae6c6";
+      sha256 = "0hns4zidw8g3s5l9dyl894fnyjr0a5xgdvx26rnal9jrn4n6z835";
+    };
+  }
+  {
+    goPackagePath  = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev =  "c155da19408a8799da419ed3eeb0cb5db0ad5dbc";
+      sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "f35b8ab0b5a2cef36673838d662e249dd9c94686";
+      sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "a49355c7e3f8fe157a85be2f77e6e269a0f89602";
+      sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "32a936f46389aa10549d60bd7833e54b01685d09";
+      sha256 = "0f24khgx6s7idpnmwgkml4qyrqwkvdjd18aapn5rmybyhmrb57j7";
+    };
+  }
+  {
+    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 =  "ce36f3865eeb42541ce3f87f32f8462c5687befa";
+      sha256 = "0dkmxn48l9g7w1247c473qlacfkfp8wyan54k9cbi79icdp65jja";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev =  "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/genproto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-genproto";
+      rev =  "ff3583edef7de132f219f0efc00e097cabcc0ec0";
+      sha256 = "0bpzxk85fgvznmdf9356nzh8riqhwzcil9r2a955rbfn27lh4lmy";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/grpc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc/grpc-go";
+      rev =  "168a6198bcb0ef175f7dacec0b8691fc141dc9b8";
+      sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/urfave/cli.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cbranch/cli";
+      rev =  "d604b6ffeee878fbf084fd2761466b6649989cee";
+      sha256 = "16csqipw5vrbb91m9w9g72jlxlrhcyxa79fz6fjp6803znmjdpk2";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+    };
+  }
+  {
+    goPackagePath  = "zombiezen.com/go/capnproto2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/zombiezen/go-capnproto2";
+      rev =  "7cfd211c19c7f5783c695f3654efa46f0df259c3";
+      sha256 = "0nzw3g8xpxyzwqqv3ja0iznd0j18l1rwagwhf9sinwdjjgmh51sy";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7967349aee6..5d3fa9f5aa5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1111,6 +1111,8 @@ with pkgs;
 
   cloud-init = callPackage ../tools/virtualization/cloud-init { };
 
+  cloudflared = callPackage ../applications/networking/cloudflared { };
+
   cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { };
 
   clib = callPackage ../tools/package-management/clib { };
-- 
GitLab


From b70b83504121ed2e9ade91e5a85e2befe6d607c5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 13:22:37 -0700
Subject: [PATCH 0140/1065] rdma-core: 20 -> 20.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/rdma-core/versions
---
 pkgs/os-specific/linux/rdma-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index b66cb78a702..ecfd8581ca9 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -3,7 +3,7 @@
 } :
 
 let
-  version = "20";
+  version = "20.1";
 
 in stdenv.mkDerivation {
   name = "rdma-core-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "linux-rdma";
     repo = "rdma-core";
     rev = "v${version}";
-    sha256 = "1zz9r1zq9ql806sbyi7nrslx1d96hgd9zvdlzbv4j31m6kfmsyri";
+    sha256 = "1j6d3n4wzl04m0k4nxbmahfwc094185d5jyijgvg3z5hwwb8lkwv";
   };
 
   nativeBuildInputs = [ cmake pkgconfig pandoc ];
-- 
GitLab


From 516681c8726018fecd0e31ae755cb9a9c01a75e5 Mon Sep 17 00:00:00 2001
From: Christian Ulrich <post@rechenwerk.org>
Date: Tue, 23 Oct 2018 22:33:17 +0200
Subject: [PATCH 0141/1065] libgnurl: 7.54.1 -> 7.61.1. (#48792)

* libgnurl: 7.54.1 -> 7.61.1.

- fetch url updated (the mirror on gnunet.org seems no longer
maintained).
- most configure flags are not needed anymore since version 7.56.1 as
announced in the README
- flags -- without-ca-bundle and --with-ca-fallback are needed for
finding the CA certificates
- dependencies updated (copied from the guix package)
- license corrected

* libgnurl: fix idn support; use mirror url; add http2 support
---
 .../libraries/libgnurl/default.nix            | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 752d2ce5a1e..6938cfd8c51 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -1,31 +1,24 @@
-{ stdenv, fetchurl, autoreconfHook, perl, zlib, gnutls, gss, openssl
-, libidn }:
+{ stdenv, fetchurl, libtool, groff, perl, pkgconfig, python2, zlib, gnutls,
+  libidn2, libunistring, nghttp2 }:
 
 stdenv.mkDerivation rec {
-  version = "7.54.1";
+  version = "7.61.1";
 
   name = "libgnurl-${version}";
 
   src = fetchurl {
-    url = "https://gnunet.org/sites/default/files/gnurl-${version}.tar.bz2";
-    sha256 = "0szbj352h95sgc9kbx9wzkgjksmg3g5k6cvlc7hz3wrbdh5gb0a4";
+    url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
+    sha256 = "0y56k15vp3m2r8q6mnc6ivflwq9lv6npdhbbvxxcf4r8vwjhv91q";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ perl gnutls gss openssl zlib libidn ];
-
-  preConfigure = ''
-    sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
-  '';
+  nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
+    
+  buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ];
 
   configureFlags = [
-    "--enable-ipv6" "--with-gnutls" "--without-libmetalink" "--without-winidn"
-    "--without-librtmp" "--without-nghttp2" "--without-nss" "--without-cyassl"
-    "--without-polarssl" "--without-ssl" "--without-winssl"
-    "--without-darwinssl" "--disable-sspi" "--disable-ntlm-wb" "--disable-ldap"
-    "--disable-rtsp" "--disable-dict" "--disable-telnet" "--disable-tftp"
-    "--disable-pop3" "--disable-imap" "--disable-smtp" "--disable-gopher"
-    "--disable-file" "--disable-ftp" "--disable-smb"
+    "--disable-ntlm-wb"
+    "--without-ca-bundle"
+    "--with-ca-fallback"
   ];
 
   meta = with stdenv.lib; {
@@ -33,6 +26,6 @@ stdenv.mkDerivation rec {
     homepage    = https://gnunet.org/gnurl;
     maintainers = with maintainers; [ falsifian vrthra ];
     platforms = platforms.linux;
-    license = with licenses; [ bsdOriginal mit ];
+    license = licenses.curl;
   };
 }
-- 
GitLab


From 6392bf5edf113a3aa72e66a836343ed75b8e0685 Mon Sep 17 00:00:00 2001
From: royneary <christian@ulrich.earth>
Date: Tue, 23 Oct 2018 23:30:14 +0200
Subject: [PATCH 0142/1065] maintainers/maintainer-list: add royneary

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 13fa3ba9151..22ea07b9f11 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3641,6 +3641,11 @@
     github = "roosemberth";
     name = "Roosembert (Roosemberth) Palacios";
   };
+  royneary = {
+    email = "christian@ulrich.earth";
+    github = "royneary";
+    name = "Christian Ulrich";
+  };
   rprospero = {
     email = "rprospero+nix@gmail.com";
     github = "rprospero";
-- 
GitLab


From 5c249a3245912a27d82e292917d0a3dd0a90cbba Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Mon, 22 Oct 2018 23:48:25 +0200
Subject: [PATCH 0143/1065] rng-tools: 5 -> 6.6

---
 pkgs/tools/security/rng-tools/default.nix | 46 +++++++++++++++++------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix
index d2326c7e8c3..3a6c1cecdf1 100644
--- a/pkgs/tools/security/rng-tools/default.nix
+++ b/pkgs/tools/security/rng-tools/default.nix
@@ -1,24 +1,46 @@
-{ stdenv, fetchurl }:
-
+{ stdenv, fetchFromGitHub, libtool, autoconf, automake, pkgconfig
+, sysfsutils
+  # WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS
+  # https://www.nist.gov/programs-projects/nist-randomness-beacon
+, curl ? null, libxml2 ? null, openssl ? null, withNistBeacon ? false
+  # Systems that support RDRAND but not AES-NI require libgcrypt to use RDRAND as an entropy source
+, libgcrypt ? null, withGcrypt ? true
+}:
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "rng-tools-5";
+  name = "rng-tools-${version}";
+  version = "6.6";
+
+  src = fetchFromGitHub {
+    owner = "nhorman";
+    repo = "rng-tools";
+    rev = "v${version}";
+    sha256 = "0c32sxfvngdjzfmxn5ngc5yxwi8ij3yl216nhzyz9r31qi3m14v7";
+  };
 
-  src = fetchurl {
-    url = "mirror://sourceforge/gkernel/${name}.tar.gz";
+  nativeBuildInputs = [ libtool autoconf automake pkgconfig ];
 
-    sha256 = "13h7lc8wl9khhvkr0i3bl5j9bapf8anhqis1lcnwxg1vc2v058b0";
-  };
+  preConfigure = "./autogen.sh";
+
+  configureFlags =
+       [ "--disable-jitterentropy" ]
+    ++ optional (!withNistBeacon) "--without-nistbeacon"
+    ++ optional (!withGcrypt) "--without-libgcrypt";
+
+  buildInputs = [ sysfsutils ]
+    ++ optional withGcrypt [ libgcrypt.dev ]
+    ++ optional withNistBeacon [ openssl.dev curl.dev libxml2.dev ];
+
+  enableParallelBuilding = true;
 
   # For cross-compilation
   makeFlags = [ "AR:=$(AR)" ];
 
   meta = {
     description = "A random number generator daemon";
-
-    homepage = https://sourceforge.net/projects/gkernel;
-
-    license = stdenv.lib.licenses.gpl2;
-
+    homepage = https://github.com/nhorman/rng-tools;
+    license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ johnazoidberg ];
   };
 }
-- 
GitLab


From 8ada6f6c468b195c5839b8b4b6e22c797a2bad56 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Tue, 23 Oct 2018 23:36:57 +0200
Subject: [PATCH 0144/1065] jitterentropy: init at 2.1.2

---
 .../libraries/jitterentropy/default.nix       | 30 +++++++++++++++++++
 pkgs/tools/security/rng-tools/default.nix     |  6 +++-
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/jitterentropy/default.nix

diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix
new file mode 100644
index 00000000000..175097ef785
--- /dev/null
+++ b/pkgs/development/libraries/jitterentropy/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+  name = "jitterentropy-${version}";
+  version = "2.1.2";
+
+  src = fetchFromGitHub {
+    owner = "smuellerDD";
+    repo = "jitterentropy-library";
+    rev = "v${version}";
+    sha256 = "10yl1hi0hysr53wzy2i8brs0qqnxh46mz3dcjh5mk0ad03wvbfsl";
+  };
+
+  enableParallelBuilding = true;
+
+  preInstall = ''
+    mkdir -p $out/include
+  '';
+
+  installFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  meta = {
+    description = "Provides a noise source using the CPU execution timing jitter";
+    homepage = https://github.com/smuellerDD/jitterentropy-library;
+    license = with stdenv.lib.licenses; [ gpl2 bsd3 ];
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ johnazoidberg ];
+  };
+}
diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix
index 3a6c1cecdf1..86a5a1b7c39 100644
--- a/pkgs/tools/security/rng-tools/default.nix
+++ b/pkgs/tools/security/rng-tools/default.nix
@@ -5,6 +5,9 @@
 , curl ? null, libxml2 ? null, openssl ? null, withNistBeacon ? false
   # Systems that support RDRAND but not AES-NI require libgcrypt to use RDRAND as an entropy source
 , libgcrypt ? null, withGcrypt ? true
+  # Not sure if jitterentropy is safe to use for cryptography
+  # and thus a default entropy source
+, jitterentropy ? null, withJitterEntropy ? false
 }:
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -23,11 +26,12 @@ stdenv.mkDerivation rec {
   preConfigure = "./autogen.sh";
 
   configureFlags =
-       [ "--disable-jitterentropy" ]
+       optional (!withJitterEntropy) "--disable-jitterentropy"
     ++ optional (!withNistBeacon) "--without-nistbeacon"
     ++ optional (!withGcrypt) "--without-libgcrypt";
 
   buildInputs = [ sysfsutils ]
+    ++ optional withJitterEntropy [ jitterentropy ]
     ++ optional withGcrypt [ libgcrypt.dev ]
     ++ optional withNistBeacon [ openssl.dev curl.dev libxml2.dev ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d3fa9f5aa5..2864eec394d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3459,6 +3459,8 @@ with pkgs;
 
   jira-cli = callPackage ../development/tools/jira_cli { };
 
+  jitterentropy = callPackage ../development/libraries/jitterentropy { };
+
   jl = haskellPackages.callPackage ../development/tools/jl { };
 
   jmespath = callPackage ../development/tools/jmespath { };
-- 
GitLab


From fdd59b62c35a8ea6d7f5c8caf7dad734db05e859 Mon Sep 17 00:00:00 2001
From: royneary <christian@ulrich.earth>
Date: Tue, 23 Oct 2018 23:41:36 +0200
Subject: [PATCH 0145/1065] git-bug: init at 0.4.0

Add git-bug, a decentralized bug tracker written in Go
---
 .../git-and-tools/default.nix                 |   2 +
 .../git-and-tools/git-bug/default.nix         |  31 ++
 .../git-and-tools/git-bug/deps.nix            | 417 ++++++++++++++++++
 3 files changed, 450 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-bug/default.nix
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-bug/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 5ae10dd68b6..6661b4aa228 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -57,6 +57,8 @@ let
 
   git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { };
 
+  git-bug = callPackage ./git-bug { };
+
   # support for bugzilla
   git-bz = callPackage ./git-bz { };
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
new file mode 100644
index 00000000000..9022cc5e35a
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "git-bug-${version}";
+  version = "0.4.0";
+  rev = "2ab2412771d58a1b1f3bfeb5a6e9da2e683b0e12";
+  goPackagePath = "github.com/MichaelMure/git-bug";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "MichaelMure";
+    repo = "git-bug";
+    sha256 = "1zyvyg0p5h71wvyxrzkr1bwddxm3x8p44n6wh9ccfdxp8d2k6k25";
+  };
+
+  goDeps = ./deps.nix;
+
+  postInstall = ''
+    cd go/src/${goPackagePath}
+    install -D -m 0644 misc/bash_completion/git-bug "$bin/etc/bash_completion.d/git-bug"
+    install -D -m 0644 misc/zsh_completion/git-bug "$bin/share/zsh/site-functions/git-bug"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Distributed bug tracker embedded in Git";
+    homepage = https://github.com/MichaelMure/git-bug;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ royneary ];
+  };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix b/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix
new file mode 100644
index 00000000000..77d79602a9c
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/deps.nix
@@ -0,0 +1,417 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/99designs/gqlgen";
+    fetch = {
+      type = "git";
+      url = "https://github.com/99designs/gqlgen";
+      rev =  "636435b68700211441303f1a5ed92f3768ba5774";
+      sha256 = "0d4sr6kpyn3zq3kpvk8lizy7hdpcw3fjmv7fbv2m1k9w8fzjawrz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/agnivade/levenshtein";
+    fetch = {
+      type = "git";
+      url = "https://github.com/agnivade/levenshtein";
+      rev =  "3d21ba515fe27b856f230847e856431ae1724adc";
+      sha256 = "0dym3k3ycsj0zj0p4dhdp7gd2hm7c7pyh2wii1mdbmpdyipy99cd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/cheekybits/genny";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cheekybits/genny";
+      rev =  "9127e812e1e9e501ce899a18121d316ecb52e4ba";
+      sha256 = "1z57ga9c2sjnl5ngqgb1ap0zqv36sk0rarm02bbbkipz4m9yabjg";
+    };
+  }
+  {
+    goPackagePath  = "github.com/corpix/uarand";
+    fetch = {
+      type = "git";
+      url = "https://github.com/corpix/uarand";
+      rev =  "2b8494104d86337cdd41d0a49cbed8e4583c0ab4";
+      sha256 = "06ml5m8l9wbr96gvyg6z1syawn797f8kmq74nhgry3vqpngyb6yn";
+    };
+  }
+  {
+    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 =  "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+  {
+    goPackagePath  = "github.com/dustin/go-humanize";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dustin/go-humanize";
+      rev =  "9f541cc9db5d55bce703bd99987c9d5cb8eea45e";
+      sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
+    };
+  }
+  {
+    goPackagePath  = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev =  "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4";
+      sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-test/deep";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-test/deep";
+      rev =  "6592d9cc0a499ad2d5f574fde80a2b5c5cc3b4f5";
+      sha256 = "0f4rbdl6qmlq4bzh0443i634bm675bbrkyzwp8wkc1yhdl9qsij7";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "aa810b61a9c79d51363740d207bb46cf8e620ed5";
+      sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/go-cmp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-cmp";
+      rev =  "3af367b6b30c263d47e8895973edcca9a49cf029";
+      sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gorilla/context";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/context";
+      rev =  "08b5f424b9271eedf6f9f0ce86cb9396ed337a42";
+      sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gorilla/mux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/mux";
+      rev =  "e3702bed27f0d39777b0b37b664b6280e8ef8fbf";
+      sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gorilla/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/websocket";
+      rev =  "ea4d1f681babbce9545c9c5f3d5194a789c89f5b";
+      sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/golang-lru";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/golang-lru";
+      rev =  "20f1fb78b0740ba8c3cb143a61e86ba5c8669768";
+      sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
+    };
+  }
+  {
+    goPackagePath  = "github.com/icrowley/fake";
+    fetch = {
+      type = "git";
+      url = "https://github.com/icrowley/fake";
+      rev =  "4178557ae428460c3780a381c824a1f3aceb6325";
+      sha256 = "1mv4bxfphaqbvacy49v4lf4gf2nmadzpmjq0jbdx93wi5bnkc977";
+    };
+  }
+  {
+    goPackagePath  = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev =  "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jroimartin/gocui";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jroimartin/gocui";
+      rev =  "c055c87ae801372cd74a0839b972db4f7697ae5f";
+      sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev =  "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
+      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev =  "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
+      sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
+    };
+  }
+  {
+    goPackagePath  = "github.com/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 =  "fa473d140ef3c6adf42d6b391fe76707f1f243c8";
+      sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/nsf/termbox-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nsf/termbox-go";
+      rev =  "5c94acc5e6eb520f1bcd183974e01171cc4c23b3";
+      sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/phayes/freeport";
+    fetch = {
+      type = "git";
+      url = "https://github.com/phayes/freeport";
+      rev =  "b8543db493a5ed890c5499e935e2cad7504f3a04";
+      sha256 = "1gwaan8fwmc5lfx4dzymq0jd6z2l1frg83jkmjpm4kw8ay4vr11q";
+    };
+  }
+  {
+    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/russross/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/russross/blackfriday";
+      rev =  "55d61fa8aa702f59229e6cff85793c22e580eaf5";
+      sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/shurcooL/githubv4";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/githubv4";
+      rev =  "b5f70540eee0ebfb6a27b52fc5b131be76415539";
+      sha256 = "0hrjk16l8jwkhrbzcasp4dflv6hl24hcc4q2md5rn6i8f73dl18h";
+    };
+  }
+  {
+    goPackagePath  = "github.com/shurcooL/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/go";
+      rev =  "9e1955d9fb6e1ee2345ba1f5e71669263e719e27";
+      sha256 = "1lad9bvs75jsn61cfza19739c2c057k0bqxg2b4xz3z3l4w1mkqj";
+    };
+  }
+  {
+    goPackagePath  = "github.com/shurcooL/graphql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/graphql";
+      rev =  "365899397c9ad12805631fe4c9b2a64be9d74818";
+      sha256 = "10n4id76zpj5g4hr1ry8d9v5cvm039rygrpgdk4ygk198vhr0gwm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/shurcooL/httpfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/httpfs";
+      rev =  "809beceb23714880abc4a382a00c05f89d13b1cc";
+      sha256 = "1hvj5q5kjw83z7f77y03fqfg7fps7pqj2cj2c38x752m0pq4j2w3";
+    };
+  }
+  {
+    goPackagePath  = "github.com/shurcooL/vfsgen";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/vfsgen";
+      rev =  "62bca832be04bd2bcaabd3b68a6b19a7ec044411";
+      sha256 = "1lh8sw7qxs43jj8k9pfn91kfy2033p3il9bcb63whz8zhqw2a16y";
+    };
+  }
+  {
+    goPackagePath  = "github.com/skratchdot/open-golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/skratchdot/open-golang";
+      rev =  "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c";
+      sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev =  "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
+      sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev =  "583c0c0531f06d5278b7d917446061adc344b5cd";
+      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "f35b8ab0b5a2cef36673838d662e249dd9c94686";
+      sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/vektah/gqlgen";
+    fetch = {
+      type = "git";
+      url = "https://github.com/vektah/gqlgen";
+      rev =  "636435b68700211441303f1a5ed92f3768ba5774";
+      sha256 = "0d4sr6kpyn3zq3kpvk8lizy7hdpcw3fjmv7fbv2m1k9w8fzjawrz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/vektah/gqlparser";
+    fetch = {
+      type = "git";
+      url = "https://github.com/vektah/gqlparser";
+      rev =  "14e83ae06ec152e6d0afb9766a00e0c0918aa8fc";
+      sha256 = "162j259402pa2wb4645z6gplx5g1a2sfk393k2svwgws3bg2bws2";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "0e37d006457bf46f9e6692014ba72ef82c33022c";
+      sha256 = "1fj8rvrhgv5j8pmckzphvm3sqkzhcqp3idkxvgv13qrjdfycsa5r";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "2f5d2388922f370f4355f327fcf4cfe9f5583908";
+      sha256 = "03s92ygxfrd2c1m4697sd6iksgbar6c007w1yf3h6wmd79vr5dxs";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev =  "d2e6202438beef2727060aa7cabdd924d92ebfd9";
+      sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "ac767d655b305d4e9612f5f6e33120b9176c4ad4";
+      sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev =  "a434f64ace81347eff0fb4a32bc80a235e0ad762";
+      sha256 = "0zngnxrxjync4caz6ikmv5v0cn895iqhqmzqg9qddfm5bvl2a2my";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev =  "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06";
+      sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+    };
+  }
+  {
+    goPackagePath  = "gotest.tools";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gotestyourself/gotest.tools";
+      rev =  "b6e20af1ed078cd01a6413b734051a292450b4cb";
+      sha256 = "11k6hmfhaf0qxpddp3i5kfpacdx51q6pv4n1kn3jnf1hjs0yny2k";
+    };
+  }
+]
\ No newline at end of file
-- 
GitLab


From 82d87ccf79127845bf587af65ae68fcdb0ccba0f Mon Sep 17 00:00:00 2001
From: royneary <christian@ulrich.earth>
Date: Wed, 24 Oct 2018 00:25:57 +0200
Subject: [PATCH 0146/1065] git-bug: install man pages

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

diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
index 9022cc5e35a..eabc9258e29 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
@@ -19,6 +19,7 @@ buildGoPackage rec {
     cd go/src/${goPackagePath}
     install -D -m 0644 misc/bash_completion/git-bug "$bin/etc/bash_completion.d/git-bug"
     install -D -m 0644 misc/zsh_completion/git-bug "$bin/share/zsh/site-functions/git-bug"
+    install -D -m 0644 -t "$bin/share/man/man1" doc/man/*
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 6ffdf5a39f492c3bff1f253e00bbb1716f35a8e8 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Wed, 24 Oct 2018 00:49:46 +0200
Subject: [PATCH 0147/1065] rng-tools: Rename attribute rng_tools -> rng-tools

Comply with naming guidelines
---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a0f611dd961..c5cbc3abce9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -234,6 +234,7 @@ mapAliases ({
   qwt6 = libsForQt5.qwt;  # added 2015-12-19
   rdiff_backup = rdiff-backup;  # added 2014-11-23
   rdmd = dtools;  # added 2017-08-19
+  rng_tools = rng-tools; # added 2018-10-24
   robomongo = robo3t; #added 2017-09-28
   rssglx = rss-glx; #added 2015-03-25
   ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2864eec394d..0586e97822d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5085,7 +5085,7 @@ with pkgs;
     inherit (pythonPackages) sphinx;
   };
 
-  rng_tools = callPackage ../tools/security/rng-tools { };
+  rng-tools = callPackage ../tools/security/rng-tools { };
 
   rnv = callPackage ../tools/text/xml/rnv { };
 
-- 
GitLab


From 5de85172926ef93060086b204270bfa263b4895c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 23 Oct 2018 19:55:08 -0400
Subject: [PATCH 0148/1065] btrfs-progs: 4.15.1 -> 4.17.1

---
 pkgs/tools/filesystems/btrfs-progs/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index e84260052a4..42f27e69f38 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -1,26 +1,18 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
-, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd
+, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3, python3Packages
 }:
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
-  version = "4.15.1";
+  version = "4.17.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437";
+    sha256 = "0x6d53fbrcmzvhv461575fzsv3373427p4srz646w2wcagqk82xz";
   };
 
-  patches = [
-    # Fix build with e2fsprogs 1.44.0
-    (fetchpatch {
-      url = "https://patchwork.kernel.org/patch/10281327/raw/";
-      sha256 = "016124hjms220809zjvvr7l1gq23j419d3piaijsaw8n7yd3kksf";
-    })
-  ];
-
   nativeBuildInputs = [
-    pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
+    pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python3 python3Packages.setuptools
   ];
 
   buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ];
-- 
GitLab


From 3c4c4ff0515f7078d9488a3ac216d2b9c4d3e9d2 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 23 Oct 2018 17:08:56 -0700
Subject: [PATCH 0149/1065] coqPackages.Velisarios: New expression

---
 .../coq-modules/Velisarios/default.nix        | 50 +++++++++++++++++++
 pkgs/top-level/coq-packages.nix               |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/coq-modules/Velisarios/default.nix

diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix
new file mode 100644
index 00000000000..cd7ddfefb84
--- /dev/null
+++ b/pkgs/development/coq-modules/Velisarios/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, coq }:
+
+let params =
+  {
+    "8.6" = {
+      version = "20180221";
+      rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
+      sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
+    };
+
+    "8.7" = {
+      version = "20180221";
+      rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
+      sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
+    };
+
+    "8.8" = {
+      version = "20180221";
+      rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
+      sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
+    };
+  };
+  param = params."${coq.coq-version}";
+in
+
+stdenv.mkDerivation rec {
+  name = "coq${coq.coq-version}-Velisarios-${param.version}";
+
+  src = fetchFromGitHub {
+    owner = "vrahli";
+    repo = "Velisarios";
+    inherit (param) rev sha256;
+  };
+
+  buildInputs = [
+    coq coq.ocaml coq.camlp5 coq.findlib
+  ];
+  enableParallelBuilding = true;
+
+  buildPhase = "make -j$NIX_BUILD_CORES";
+  preBuild = "./create-makefile.sh";
+  installPhase = ''
+    mkdir -p $out/lib/coq/${coq.coq-version}/Velisarios
+    cp -pR model/*.vo $out/lib/coq/${coq.coq-version}/Velisarios
+  '';
+
+  passthru = {
+    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ];
+ };
+}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index ca367aeb0d1..75e9506ac04 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -40,6 +40,7 @@ let
       ssreflect = callPackage ../development/coq-modules/ssreflect { };
       stdpp = callPackage ../development/coq-modules/stdpp { };
       tlc = callPackage ../development/coq-modules/tlc {};
+      Velisarios = callPackage ../development/coq-modules/Velisarios {};
     };
 
   filterCoqPackages = coq:
-- 
GitLab


From b41f8936b9326c10178e48ddc8f94c3c17af22a2 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <mateusz.kowalczyk@tweag.io>
Date: Wed, 24 Oct 2018 09:19:26 +0900
Subject: [PATCH 0150/1065] QuadProgpp: Add new package.

Necessary for #48895.
---
 .../science/math/QuadProgpp/default.nix       | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/QuadProgpp/default.nix

diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
new file mode 100644
index 00000000000..4668839ebb9
--- /dev/null
+++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "QuadProgpp-${version}";
+  version = "4b6bd65f09fbff99c172a86d6e96ca74449b323f";
+
+  src = fetchFromGitHub {
+    owner = "liuq";
+    repo = "QuadProgpp";
+    rev = version;
+    sha256 = "02r0dlk2yjpafknvm945vbgs4sl26w2i1gw3pllar9hi364y8hnx";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/liuq/QuadProgpp;
+    license = licenses.mit;
+    description = ''
+      A C++ library for Quadratic Programming which implements the
+      Goldfarb-Idnani active-set dual method.
+    '';
+    maintainers = with maintainers; [ fuuzetsu ];
+    platforms = with platforms; linux;
+  };
+}
-- 
GitLab


From d2c53295f469185893ccc51691128fe39f814e43 Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <ignat.loskutov@gmail.com>
Date: Mon, 22 Oct 2018 11:58:58 +0300
Subject: [PATCH 0151/1065] opensc: 0.18.0 -> 0.19.0

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

diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index 70a1beb8ce7..c23827842f2 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "opensc-${version}";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "OpenSC";
     rev = version;
-    sha256 = "1shwx1rkmnygk2dp0q8pbvnxcg96bn570vch9yq34gs42ryskihf";
+    sha256 = "10575gb9l38cskq7swyjp0907wlziyxg4ppq33ndz319dsx69d87";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
 
   installFlags = [
     "sysconfdir=$(out)/etc"
+    "completiondir=$(out)/etc"
   ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From 0479354e0ca1a951d45d15627b8eb9629ababd1a Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <mateusz.kowalczyk@tweag.io>
Date: Wed, 24 Oct 2018 11:21:22 +0900
Subject: [PATCH 0152/1065] QuadProgpp: Remember to add to all-packages.nix

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d3fa9f5aa5..41383f05556 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21193,6 +21193,8 @@ with pkgs;
     mpi = openmpi;
   };
 
+  QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { };
+
   scs = callPackage ../development/libraries/science/math/scs {
     liblapack = liblapackWithoutAtlas;
   };
-- 
GitLab


From ab6bbdd5cd2a271ac795f1f44a94f77e41edf29f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 26 Jan 2018 23:40:40 +0100
Subject: [PATCH 0153/1065] linux-headers: Fix Darwin cross build

Carefully fake cc-version and cc-fullversion to avoid needing a compiler
for the kernel itself to build the headers.

For some reason, doing `make install_headers` twice, first without
INSTALL_HDR_PATH=$out then with, is neccessary to get this to work.
---
 pkgs/development/libraries/glibc/common.nix   |  4 +-
 .../linux/kernel-headers/default.nix          | 56 +++++++++++++++++--
 .../no-dynamic-cc-version-check.patch         | 16 ++++++
 .../linux/kernel-headers/no-relocs.patch      | 13 +++++
 4 files changed, 82 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch
 create mode 100644 pkgs/os-specific/linux/kernel-headers/no-relocs.patch

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index a7a4c2fbacd..b77c450bdec 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -133,7 +133,9 @@ stdenv.mkDerivation ({
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ bison ];
-  buildInputs = lib.optionals withGd [ gd libpng ];
+  # TODO make linuxHeaders unconditional next mass rebuild
+  buildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) linuxHeaders
+    ++ lib.optionals withGd [ gd libpng ];
 
   # Needed to install share/zoneinfo/zone.tab.  Set to impure /bin/sh to
   # prevent a retained dependency on the bootstrap tools in the stdenv-linux
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 09fa4fbfd3a..3f0b8e9b359 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -1,9 +1,10 @@
 { stdenvNoCC, lib, buildPackages
-, fetchurl, perl
+, fetchurl, fetchpatch, perl
+, elf-header
 }:
 
 let
-  common = { version, sha256, patches ? null }: stdenvNoCC.mkDerivation {
+  common = { version, sha256, patches ? [] }: stdenvNoCC.mkDerivation ({
     name = "linux-headers-${version}";
 
     src = fetchurl {
@@ -16,7 +17,10 @@ let
     # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.
     # We do this so we have a build->build, not build->host, C compiler.
     depsBuildBuild = [ buildPackages.stdenv.cc ];
-    nativeBuildInputs = [ perl ];
+    # TODO make unconditional next mass rebuild
+    nativeBuildInputs = [ perl ] ++ lib.optional
+      (stdenvNoCC.hostPlatform != stdenvNoCC.buildPlatform)
+      elf-header;
 
     extraIncludeDirs = lib.optional stdenvNoCC.hostPlatform.isPowerPC ["ppc"];
 
@@ -24,12 +28,44 @@ let
     # and causing mass rebuild
     inherit patches;
 
-    buildPhase = ''
+    # TODO avoid native hack next rebuild
+    makeFlags = if stdenvNoCC.hostPlatform == stdenvNoCC.buildPlatform then null else [
+      "SHELL=bash"
+      # Avoid use of runtime build->host compilers for checks. These
+      # checks only cared to work around bugs in very old compilers, so
+      # these changes should be safe.
+      "cc-version:=9999"
+      "cc-fullversion:=999999"
+      # `$(..)` expanded by make alone
+      "HOSTCC:=$(BUILD_CC)"
+      "HOSTCXX:=$(BUILD_CXX)"
+    ];
+
+    # TODO avoid native hack next rebuild
+    # Skip clean on darwin, case-sensitivity issues.
+    buildPhase = if stdenvNoCC.hostPlatform == stdenvNoCC.buildPlatform then ''
       make mrproper headers_check SHELL=bash
+    '' else lib.optionalString (!stdenvNoCC.buildPlatform.isDarwin) ''
+      make mrproper $makeFlags
+    ''
+    # For some reason, doing `make install_headers` twice, first without
+    # INSTALL_HDR_PATH=$out then with, is neccessary to get this to work
+    # for darwin cross. @Ericson2314 has no idea why.
+    + ''
+      make headers_install $makeFlags
+    '';
+
+    # TODO avoid native hack next rebuild
+    checkPhase = if stdenvNoCC.hostPlatform == stdenvNoCC.buildPlatform then null else ''
+      make headers_check $makeFlags
     '';
 
-    installPhase = ''
+    # TODO avoid native hack next rebuild
+    installPhase = (if stdenvNoCC.hostPlatform == stdenvNoCC.buildPlatform then ''
       make INSTALL_HDR_PATH=$out headers_install
+    '' else ''
+      make headers_install INSTALL_HDR_PATH=$out $makeFlags
+    '') + ''
 
       # Some builds (e.g. KVM) want a kernel.release.
       mkdir -p $out/include/config
@@ -41,11 +77,19 @@ let
       license = licenses.gpl2;
       platforms = platforms.linux;
     };
-  };
+  } // lib.optionalAttrs (stdenvNoCC.hostPlatform != stdenvNoCC.buildPlatform) {
+    # TODO Make unconditional next mass rebuild
+    hardeningDisable = lib.optional stdenvNoCC.buildPlatform.isDarwin "format";
+  });
 in {
 
   linuxHeaders = common {
     version = "4.15";
     sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js";
+    # TODO make unconditional next mass rebuild
+    patches = lib.optionals (stdenvNoCC.hostPlatform != stdenvNoCC.buildPlatform) [
+       ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
+       ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above
+    ];
   };
 }
diff --git a/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch b/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch
new file mode 100644
index 00000000000..b69dc65e158
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch
@@ -0,0 +1,16 @@
+diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
+index 065324a8046f..d09c67194549 100644
+--- a/scripts/Kbuild.include
++++ b/scripts/Kbuild.include
+@@ -216,11 +216,8 @@ cc-disable-warning = $(call try-run-cached,\
+ cc-name = $(call shell-cached,$(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc)
+ 
+ # cc-version
+-cc-version = $(call shell-cached,$(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
+ 
+ # cc-fullversion
+-cc-fullversion = $(call shell-cached,$(CONFIG_SHELL) \
+-	$(srctree)/scripts/gcc-version.sh -p $(CC))
+ 
+ # cc-ifversion
+ # Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
diff --git a/pkgs/os-specific/linux/kernel-headers/no-relocs.patch b/pkgs/os-specific/linux/kernel-headers/no-relocs.patch
new file mode 100644
index 00000000000..67e8b19e23b
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel-headers/no-relocs.patch
@@ -0,0 +1,13 @@
+diff --git a/arch/x86/Makefile b/arch/x86/Makefile
+index fad55160dcb9..a48c8331cbb2 100644
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -239,7 +239,7 @@ ifdef CONFIG_RETPOLINE
+ endif
+ 
+ archscripts: scripts_basic
+-	$(Q)$(MAKE) $(build)=arch/x86/tools relocs
++	$(Q)$(MAKE) $(build)=arch/x86/tools
+ 
+ ###
+ # Syscall table generation
-- 
GitLab


From 22df9423cd1f87b4390e9f7879636ecd0c508d96 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 11 Sep 2018 14:18:24 -0400
Subject: [PATCH 0154/1065] release-cross: Cross compile from all 3 supported
 platforms

---
 pkgs/top-level/release-cross.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 0d15d817a66..89a8af6794f 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -2,7 +2,7 @@
 */
 
 { # The platforms *from* which we cross compile.
-  supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ]
+  supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]
 , # Strip most of attributes when evaluating to spare memory usage
   scrubJobs ? true
 }:
@@ -10,7 +10,7 @@
 with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
 
 let
-  nativePlatforms = linux;
+  nativePlatforms = all;
 
   common = {
     buildPackages.binutils = nativePlatforms;
-- 
GitLab


From cb254b005b0204a0078b853755bf822c57416446 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 21:21:45 -0700
Subject: [PATCH 0155/1065] python36Packages.python-jsonrpc-server: 0.0.1 ->
 0.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.6-python-jsonrpc-server/versions
---
 .../python-modules/python-jsonrpc-server/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
index 508f18e6da0..0c4d77612b0 100644
--- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix
+++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "python-jsonrpc-server";
-  version = "0.0.1";
+  version = "0.0.2";
 
   src = fetchFromGitHub {
     owner = "palantir";
     repo = "python-jsonrpc-server";
     rev = version;
-    sha256 = "0p5dj1hxx3yz8vjk59dcp3h6ci1hrjkbzf9lr3vviy0xw327409k";
+    sha256 = "1xp6xipslw8d1yv05mjmhql07kz04ibci5psjrv6rapqi6jp4bgk";
   };
 
   checkInputs = [
-- 
GitLab


From f4e7d11a2e3fb28970206bb64cc6f3194aca903d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 24 Oct 2018 06:56:11 +0200
Subject: [PATCH 0156/1065] fzf: 0.17.4 -> 0.17.5

Changes: https://github.com/junegunn/fzf/blob/master/CHANGELOG.md
---
 pkgs/tools/misc/fzf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index b85d2bffc34..a882fe9a9ba 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "fzf-${version}";
-  version = "0.17.4";
+  version = "0.17.5";
   rev = "${version}";
 
   goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "junegunn";
     repo = "fzf";
-    sha256 = "10k21v9x82imly36lgra8a7rlvz5a1jd49db16g9xc11wx7cdg8g";
+    sha256 = "04kalm25sn5k24nrdmbkafp4zvxpm2l3rxchvccl0kz0j3szh62z";
   };
 
   outputs = [ "bin" "out" "man" ];
-- 
GitLab


From ab95faa5076b3d946451ffd2debee681a8fb2d2c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 16 Oct 2018 18:38:43 +0000
Subject: [PATCH 0157/1065] coqPackages.category-theory: fix build

---
 .../coq-modules/category-theory/default.nix   | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix
index 4587e08be48..94ed2945692 100644
--- a/pkgs/development/coq-modules/category-theory/default.nix
+++ b/pkgs/development/coq-modules/category-theory/default.nix
@@ -1,21 +1,25 @@
-{ stdenv, fetchgit, coq, ssreflect }:
+{ stdenv, fetchgit, coq, ssreflect, equations }:
 
-let param =
-  {
-    "8.6" = {
+let
+  params =
+    let
+    v20180709 = {
       version = "20180709";
       rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
       sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
     };
-
-    "8.7" = {
-      version = "20180709";
-      rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
-      sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
+    v20181016 = {
+      version = "20181016";
+      rev = "8049479c5aee00ed0b92e5edc7c8996aebf48208";
+      sha256 = "14f9rlwh8vgmcl6njykvsiwxx0jn623375afixk26mzpy12zdcph";
     };
-
-  }."${coq.coq-version}"
-; in
+  in {
+    "8.6" = v20180709;
+    "8.7" = v20180709;
+    "8.8" = v20181016;
+  };
+  param = params."${coq.coq-version}";
+in
 
 stdenv.mkDerivation rec {
 
@@ -26,8 +30,8 @@ stdenv.mkDerivation rec {
     inherit (param) rev sha256;
   };
 
-  buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
-  propagatedBuildInputs = [ coq ssreflect ];
+  buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ]);
+  propagatedBuildInputs = [ ssreflect equations ];
 
   enableParallelBuilding = false;
 
@@ -43,7 +47,7 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ];
+    compatibleCoqVersions = v: builtins.hasAttr v params;
   };
 
 }
-- 
GitLab


From b8e0a873c1493e1f3e76738d285d3ff1213c86c8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 00:30:52 -0700
Subject: [PATCH 0158/1065] python36Packages.musicbrainzngs: 0.5 -> 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/python3.6-musicbrainzngs/versions
---
 pkgs/development/python-modules/musicbrainzngs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/musicbrainzngs/default.nix b/pkgs/development/python-modules/musicbrainzngs/default.nix
index fd8cd516a92..bef1202182e 100644
--- a/pkgs/development/python-modules/musicbrainzngs/default.nix
+++ b/pkgs/development/python-modules/musicbrainzngs/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "musicbrainzngs";
-  version = "0.5";
+  version = "0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "281388ab750d2996e9feca4580fd4215d616a698e02cd6719cb9b8562945c489";
+    sha256 = "1dddarpjawryll2wss65xq3v9q8ln8dan7984l5dxzqx88d2dvr8";
   };
 
   buildInputs = [ pkgs.glibcLocales ];
-- 
GitLab


From d40fb550cb101511fc39b0e1e402f22728d4f962 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 00:27:54 -0700
Subject: [PATCH 0159/1065] python36Packages.prawcore: 0.15.0 -> 1.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/python3.6-prawcore/versions
---
 pkgs/development/python-modules/prawcore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix
index b59327cd059..950d478b30f 100644
--- a/pkgs/development/python-modules/prawcore/default.nix
+++ b/pkgs/development/python-modules/prawcore/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "prawcore";
-  version = "0.15.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "praw-dev";
     repo = "prawcore";
     rev = "v${version}";
-    sha256 = "0v16n6bzf483i00bn0qykrg3wvw9dbnfdl512pw8n635ld1g7cb8";
+    sha256 = "1j905wi5n2xgik3yk2hrv8dky318ahfjl5k1zs21mrl81jk0907f";
   };
 
   postPatch = ''
-- 
GitLab


From 78007c47b9188602a843d88525e47a0c255d5a55 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 00:21:08 -0700
Subject: [PATCH 0160/1065] python36Packages.readme_renderer: 21.0 -> 22.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-readme_renderer/versions
---
 pkgs/development/python-modules/readme_renderer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix
index d6c333ce36d..2e8693fae41 100644
--- a/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/pkgs/development/python-modules/readme_renderer/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "readme_renderer";
-  version = "21.0";
+  version = "22.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "422404013378f0267ee128956021a47457db8eb487908b70b8a7de5fa935781a";
+    sha256 = "1lj3k3x7wm0w5xdy82jwl0fmchqmlkdh24g41n3lka7ybxqahz13";
   };
 
   checkInputs = [ pytest mock ];
-- 
GitLab


From 38ad109cb9fbcff13d498ff891ad6002800b505c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 00:12:50 -0700
Subject: [PATCH 0161/1065] python36Packages.rx: 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/python3.6-rx/versions
---
 pkgs/development/python-modules/rx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rx/default.nix b/pkgs/development/python-modules/rx/default.nix
index 7f8ba49e027..6183596ef7d 100644
--- a/pkgs/development/python-modules/rx/default.nix
+++ b/pkgs/development/python-modules/rx/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "rx";
-  version = "1.6.0";
+  version = "1.6.1";
 
   # There are no tests on the pypi source
   src = fetchFromGitHub {
     owner = "ReactiveX";
     repo = "rxpy";
     rev = version;
-    sha256 = "174xi2j36igxmaqcgl5p64p31a7z19v62xb5czybjw72gpyyfyri";
+    sha256 = "14bca67a26clzcf2abz2yb8g9lfxffjs2l236dp966sp0lfbpsn5";
   };
 
   checkInputs = [ nose ];
-- 
GitLab


From 03daa8d9de12cb36ffd38393a05932e0d4992672 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 00:36:17 -0700
Subject: [PATCH 0162/1065] python36Packages.node-semver: 0.3.0 -> 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/python3.6-node-semver/versions
---
 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 20ae56fdbc7..13db1566887 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.3.0";
+  version = "0.4.2";
   pname = "node-semver";
 
   checkInputs = [ pytest ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d8a3906e7677f8ab05aeb3fc94c7a2fa163def5507271452ce6831282f23f1cb";
+    sha256 = "0p1in8lw0s5zrya47xn73n10nynrambh62ms4xb6jbadvb06jkz9";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 0cbe7f0f6cdcdde8084f3ae0502c3ff66faa6523 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 00:09:30 -0700
Subject: [PATCH 0163/1065] python36Packages.qtawesome: 0.4.4 -> 0.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/python3.6-qtawesome/versions
---
 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 016266dd854..69dd88f6a6c 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.4.4";
+  version = "0.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12l71wh9fcd79d6c7qfzp029iph6gv4daxpg2ddpzr9lrvcw3yah";
+    sha256 = "15n6ywfkx5vap0bvayh6n572kw5fkqnzpq5ga4a4d7v52nnxbba1";
   };
 
   propagatedBuildInputs = [ qtpy six pyside ];
-- 
GitLab


From ef4ef867009254b94768e3832d20c24f096e2553 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 00:02:46 -0700
Subject: [PATCH 0164/1065] python36Packages.rpy2: 2.9.3 -> 2.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/python3.6-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 f907f72ff24..61447e74026 100644
--- a/pkgs/development/python-modules/rpy2/default.nix
+++ b/pkgs/development/python-modules/rpy2/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     version = if isPy27 then
       "2.8.6" # python2 support dropped in 2.9.x
     else
-      "2.9.3";
+      "2.9.4";
     pname = "rpy2";
     disabled = isPyPy;
     src = fetchPypi {
@@ -28,7 +28,7 @@ buildPythonPackage rec {
       sha256 = if isPy27 then
         "162zki5c1apgv6qbafi7n66y4hgpgp43xag7q75qb6kv99ri6k80" # 2.8.x
       else
-        "1b72958e683339ea0c3bd9f73738e9ece2da8da8008a10e2e0c68fc7864e9361"; # 2.9.x
+        "0bl1d2qhavmlrvalir9hmkjh74w21vzkvc2sg3cbb162s10zfmxy"; # 2.9.x
     };
     buildInputs = [
       readline
-- 
GitLab


From 087d4e8352266fb6d418eb97bb622dd1cb9150b2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 23:44:04 -0700
Subject: [PATCH 0165/1065] python36Packages.pyRFC3339: 0.2 -> 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/python3.6-pyrfc3339/versions
---
 pkgs/development/python-modules/pyrfc3339/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix
index ddc47dfc295..ba72bf4be94 100644
--- a/pkgs/development/python-modules/pyrfc3339/default.nix
+++ b/pkgs/development/python-modules/pyrfc3339/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "pyRFC3339";
-  version = "0.2";
+  version = "1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1pp648xsjaw9h1xq2mgwzda5wis2ypjmzxlksc1a8grnrdmzy155";
+    sha256 = "06jv7ar7lpvvk0dixzwdr3wgm0g1lipxs429s2z7knwwa7hwpf41";
   };
 
   propagatedBuildInputs = [ pytz ];
-- 
GitLab


From 11e25c1afda207894167afad6c079b7ab09441d3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 00:53:44 -0700
Subject: [PATCH 0166/1065] python36Packages.pylama: 7.5.5 -> 7.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/python3.6-pylama/versions
---
 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 c463ab8823c..474728835e2 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.5.5";
+  version = "7.6.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zg7wca9s5srvbj3kawalv4438l47hg7m6gaw8rd4i43lbyyqya6";
+    sha256 = "0277pr066vg1w8ip6kdava7d5daiv7csixpysb37ss140k222iiv";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 7ce5dfb0d35d806a937ae2c93e55f42f418c808d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 00:50:40 -0700
Subject: [PATCH 0167/1065] python36Packages.kazoo: 2.2.1 -> 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/python3.6-kazoo/versions
---
 pkgs/development/python-modules/kazoo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix
index ae9d15dd786..f7712ff6200 100644
--- a/pkgs/development/python-modules/kazoo/default.nix
+++ b/pkgs/development/python-modules/kazoo/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "kazoo";
-  version = "2.2.1";
+  version = "2.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "10pb864if9qi2pq9lfb9m8f7z7ss6rml80gf1d9h64lap5crjnjj";
+    sha256 = "1963l6994vzzy7bjh77y5wnf8lh8zwwibcpcgpfd1rzcppvp9dwd";
   };
 
   propagatedBuildInputs = [ six ];
-- 
GitLab


From 035bdbb1843f0196eec8e2b1a4c56ab203e2f9e4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 23:22:31 -0700
Subject: [PATCH 0168/1065] python36Packages.vcrpy: 1.13.0 -> 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/python3.6-vcrpy/versions
---
 pkgs/development/python-modules/vcrpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
index e0e842a773d..13f7753831b 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "vcrpy";
-  version = "1.13.0";
+  version = "2.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7031f9c78a70b9586d2db4a2ec135c4e04194cabff58695ef0cc95e7cd66bc01";
+    sha256 = "0kws7l3hci1dvjv01nxw3805q9v2mwldw58bgl8s90wqism69gjp";
   };
 
   checkInputs = [
-- 
GitLab


From 84339e448eb23d73236867883e978c848e90e217 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 23:17:14 -0700
Subject: [PATCH 0169/1065] python27Packages.gnutls: 3.0.0 -> 3.1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python2.7-python-gnutls/versions
---
 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 a58177e7544..035545e0de2 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.0.0";
+  version = "3.1.1";
 
   # https://github.com/AGProjects/python-gnutls/issues/2
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1yrdxcj5rzvz8iglircz6icvyggz5fmdcd010n6w3j60yp4p84kc";
+    sha256 = "0ncsz72i6vrhvxpd90y9k74qdfw3pfcj39pvn5dxp6m834ani4l8";
   };
 
   propagatedBuildInputs = [ pkgs.gnutls ];
-- 
GitLab


From 5286c6112858a9599dfac672e828a9d786622c29 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 23:13:36 -0700
Subject: [PATCH 0170/1065] python36Packages.yamllint: 1.11.1 -> 1.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/python3.6-yamllint/versions
---
 pkgs/development/python-modules/yamllint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index d72b1999030..f9db994ba72 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "yamllint";
-  version = "1.11.1";
+  version = "1.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e9b7dec24921ef13180902e5dbcaae9157c773e3e3e2780ef77d3a4dd67d799f";
+    sha256 = "18syqspsal0w8s2lp49q6wmx02wf6wh1n0fscf5vcr53k8q8drn6";
   };
 
   checkInputs = [ nose ];
-- 
GitLab


From 0f3a51363f85c2d60e3b1ffb7be266d0a8572ff2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 23:09:40 -0700
Subject: [PATCH 0171/1065] python36Packages.schedule: 0.3.2 -> 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/python3.6-schedule/versions
---
 pkgs/development/python-modules/schedule/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix
index 79ad778e048..ee86d8869fe 100644
--- a/pkgs/development/python-modules/schedule/default.nix
+++ b/pkgs/development/python-modules/schedule/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "schedule";
-  version = "0.3.2";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1h0waw4jd5ql68y5kxb9irwapkbkwfs1w0asvbl24fq5f8czdijm";
+    sha256 = "0nrkbbmr9k1bqfmv9wg5aslxzkkifcd62fm04n6844nf5mya00qh";
   };
 
   buildInputs = [ mock ];
-- 
GitLab


From 6b90cda929629de93cf0f40a167b8a58dc7e26ea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 23:06:33 -0700
Subject: [PATCH 0172/1065] python36Packages.statsd: 3.2.1 -> 3.3.0

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

diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix
index 6d5d9df0a6f..36042a72ea8 100644
--- a/pkgs/development/python-modules/statsd/default.nix
+++ b/pkgs/development/python-modules/statsd/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "statsd";
-  version = "3.2.1";
+  version = "3.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3fa92bf0192af926f7a0d9be031fe3fd0fbaa1992d42cf2f07e68f76ac18288e";
+    sha256 = "07yxnlalvcglgwa9pjs1clwrmwx7a4575jai7q05jz3g4i6dprp3";
   };
 
   buildInputs = [ nose mock ];
-- 
GitLab


From 66a6b56e0d06696ea8dc058563b71087530dbdd3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 22:58:41 -0700
Subject: [PATCH 0173/1065] python36Packages.scp: 0.11.0 -> 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/python3.6-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 45db62db8e5..191e79a4556 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.11.0";
+  version = "0.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ea095dd1d0e131874bc9930c3965bce3d1d70be5adb2a30d811fcaea4708a9ee";
+    sha256 = "0cjyc19v46lwrhdyc18f87z589rhqg7zjg0s8a05w6mv3262b6ai";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 32ef4b1fa70a2cb5c25d748e919fcfa427781c5e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 22:54:54 -0700
Subject: [PATCH 0174/1065] python36Packages.rply: 0.7.5 -> 0.7.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.6-rply/versions
---
 pkgs/development/python-modules/rply/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix
index b0a761567f2..e7ce3b5b50d 100644
--- a/pkgs/development/python-modules/rply/default.nix
+++ b/pkgs/development/python-modules/rply/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "rply";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchFromGitHub {
     owner = "alex";
     repo = "rply";
     rev = "v${version}";
-    sha256 = "0v05gdy5dval30wvz96lywvz2jyf000dp0pnrd1lwdx3cyywq659";
+    sha256 = "0a9r81kaibgr26psss02rn2nc6bf84a8q9nsywkm1xcswy8xrmcx";
   };
 
   buildInputs = [ appdirs ];
-- 
GitLab


From 20576db4b3bc8aa8f08ca4af6b6f6009ee8da187 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 22:49:34 -0700
Subject: [PATCH 0175/1065] python36Packages.rebulk: 0.9.0 -> 1.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/python3.6-rebulk/versions
---
 pkgs/development/python-modules/rebulk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix
index 565e6ef5bbf..d5305781ef5 100644
--- a/pkgs/development/python-modules/rebulk/default.nix
+++ b/pkgs/development/python-modules/rebulk/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "rebulk";
-  version = "0.9.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1sw516ihfrb7i9bfl1n3049akvb23mpsk3llh7w3xfnbvkfrpip0";
+    sha256 = "162rad86slg4gmzxy33pnyyzm4hhcszcpjpw1vk79f3gxzvy8j8x";
   };
 
   # Some kind of trickery with imports that doesn't work.
-- 
GitLab


From 36f54007f94e1546b2e64a9faa3b0d9114823a2a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 22:43:19 -0700
Subject: [PATCH 0176/1065] python36Packages.shellingham: 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/python3.6-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 57cafe2624c..6fa265517df 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.6";
+  version = "1.2.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0x1hja3jzvh7xmd0sxnfw9hi3k419s95vb7jjzh76yydzvss1r2q";
+    sha256 = "06biyiwq9571mryzbr50am3mxpc3blscwqhiq8c66ac4xm3maszm";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 53f28ca806d22e71c5c8400355fc8b0466b7de2e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 22:36:10 -0700
Subject: [PATCH 0177/1065] python36Packages.typing-extensions: 3.6.5 -> 3.6.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.6-typing_extensions/versions
---
 pkgs/development/python-modules/typing-extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix
index de06ddbe2ce..55be51362f4 100644
--- a/pkgs/development/python-modules/typing-extensions/default.nix
+++ b/pkgs/development/python-modules/typing-extensions/default.nix
@@ -4,11 +4,11 @@ let
 
 in buildPythonPackage rec {
   pname = "typing_extensions";
-  version = "3.6.5";
+  version = "3.6.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09xxykw8mk30r0g33r2gy5qlqw3sqj5vkp6h7nh0flp59hxqw2hw";
+    sha256 = "07vhddjnd3mhdijyc3s0mwi9jgfjp3rr056nxqiavydbvkrvgrsi";
   };
 
   checkInputs = lib.optional (pythonOlder "3.5") typing;
-- 
GitLab


From 26d70425480f9e85c8f42d9a27c6ab15dd0793ed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 22:14:16 -0700
Subject: [PATCH 0178/1065] python36Packages.qtpy: 1.4.2 -> 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/python3.6-qtpy/versions
---
 pkgs/development/python-modules/qtpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix
index e433d922e10..a2e261284d8 100644
--- a/pkgs/development/python-modules/qtpy/default.nix
+++ b/pkgs/development/python-modules/qtpy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "QtPy";
-  version = "1.4.2";
+  version = "1.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1d1a4343540433a203280f162d43226e4c87489155fe4a9a6f1923ba11362bf9";
+    sha256 = "1kdbr8kwryjskhs6mp11jj02h4jdxvlzbzdn1chw30kcb280ysac";
   };
 
   # no concrete propagatedBuildInputs as multiple backends are supposed
-- 
GitLab


From 65714187a2f7c177593ee72264e5f1c727c9a07a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 22:10:53 -0700
Subject: [PATCH 0179/1065] python36Packages.transaction: 2.2.1 -> 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/python3.6-transaction/versions
---
 pkgs/development/python-modules/transaction/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix
index f42a4a02be8..31481e0ba17 100644
--- a/pkgs/development/python-modules/transaction/default.nix
+++ b/pkgs/development/python-modules/transaction/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "transaction";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f2242070e437e5d555ea3df809cb517860513254c828f33847df1c5e4b776c7a";
+    sha256 = "1nak7cwyavrc3pdr6nxp2dnhrkkv9ircaii765zrs3kkkzgwn5zr";
   };
 
   propagatedBuildInputs = [ zope_interface mock ];
-- 
GitLab


From 779dbd65343f33f0f8728314f2a4830a52ec08d5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 22:07:50 -0700
Subject: [PATCH 0180/1065] python36Packages.validictory: 1.0.0a2 -> 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/python3.6-validictory/versions
---
 pkgs/development/python-modules/validictory/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/validictory/default.nix b/pkgs/development/python-modules/validictory/default.nix
index 10808bffaab..c27d13ab8f1 100644
--- a/pkgs/development/python-modules/validictory/default.nix
+++ b/pkgs/development/python-modules/validictory/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "validictory";
-  version = "1.0.0a2";
+  version = "1.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c02388a70f5b854e71e2e09bd6d762a2d8c2a017557562e866d8ffafb0934b07";
+    sha256 = "1fim11vj990rmn59qd67knccjx1p4an7gavbgprpabsrb13bi1rs";
   };
 
   doCheck = false;
-- 
GitLab


From 50ebd47b8a7fb808ac5c9d1c9a4502c9c6c29541 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 21:51:06 -0700
Subject: [PATCH 0181/1065] python36Packages.sortedcollections: 0.4.2 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix
index b80e5655ff9..dcb49a43413 100644
--- a/pkgs/development/python-modules/sortedcollections/default.nix
+++ b/pkgs/development/python-modules/sortedcollections/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "sortedcollections";
-  version = "0.4.2";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12dlzln9gyv8smsy2k6d6dmr0ywrpwyrr1cjy649ia5h1g7xdvwa";
+    sha256 = "12q1gf81l53mv634hk259aql69k9572nfv5gsn8gxlywdly2z63b";
   };
 
   buildInputs = [ sortedcontainers ];
-- 
GitLab


From 734de7a70bc507d73358c4bc1e3597d6573559a1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 21:45:10 -0700
Subject: [PATCH 0182/1065] python36Packages.python-utils: 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/python3.6-python-utils/versions
---
 pkgs/development/python-modules/python-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix
index 654b851b663..b7744ce79c3 100644
--- a/pkgs/development/python-modules/python-utils/default.nix
+++ b/pkgs/development/python-modules/python-utils/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "python-utils";
-  version = "2.2.0";
+  version = "2.3.0";
   name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "WoLpH";
     repo = "python-utils";
     rev = "v${version}";
-    sha256 = "1i3q9frai08nvrcmh4dg4rr0grncm68w2c097z5g1mfwdf9sv7df";
+    sha256 = "14gyphcqwa77wfbnrzj363v3fdkxy08378lgd7l3jqnpvr8pfp5c";
   };
 
   checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ];
-- 
GitLab


From b4cd03bc4f166446954ff1c48610d5095c8b88b5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 21:11:30 -0700
Subject: [PATCH 0183/1065] python36Packages.simpleeval: 0.9.6 -> 0.9.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.6-simpleeval/versions
---
 pkgs/development/python-modules/simpleeval/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix
index 831cfede950..ca304fc10f6 100644
--- a/pkgs/development/python-modules/simpleeval/default.nix
+++ b/pkgs/development/python-modules/simpleeval/default.nix
@@ -2,10 +2,10 @@
 
 buildPythonPackage rec {
   pname = "simpleeval";
-  version = "0.9.6";
+  version = "0.9.8";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "848fdb9ee5f30cf93b9f0d840db6e7562633d20abf7d67c2382a0a2162a79410";
+    sha256 = "00fzwbjg98lsnmfzmbgzg1k8q8iqbahcxjnnlhzhb44phrhcxql5";
   };
   meta = {
     homepage = https://github.com/danthedeckie/simpleeval;
-- 
GitLab


From 44d0de43944a6844aa4a7557696171951fe0b21b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 21:05:57 -0700
Subject: [PATCH 0184/1065] python36Packages.XlsxWriter: 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/python3.6-xlsxwriter/versions
---
 pkgs/development/python-modules/XlsxWriter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix
index 8b7caef8eda..41318347e53 100644
--- a/pkgs/development/python-modules/XlsxWriter/default.nix
+++ b/pkgs/development/python-modules/XlsxWriter/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "XlsxWriter";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15yhjbx1xwdbfkg0l1c1wgjayb55zgm8rywjymj655yaqiammm5r";
+    sha256 = "0dmznx6q3b5xkvlqpw4vqinxh5ynzz8i7hlpz9syiff51y56a8mf";
   };
 
   meta = {
-- 
GitLab


From ae88ee9a40036fbb86465c0e1cda0b5a8b82445a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 21:15:04 -0700
Subject: [PATCH 0185/1065] python36Packages.smart_open: 1.6.0 -> 1.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/python3.6-smart_open/versions
---
 pkgs/development/python-modules/smart_open/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix
index f1a5bf6ed9f..5896437e61d 100644
--- a/pkgs/development/python-modules/smart_open/default.nix
+++ b/pkgs/development/python-modules/smart_open/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "smart_open";
-  version = "1.6.0";
+  version = "1.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c2c2b44125a03d6e96efdf3e53e28be99e1f548e8a4fa8035f8fab448bbdbbda";
+    sha256 = "0lwlvvz7qndq89i8bhjv4zfkhg0lbd5yjhccb7svszf30k8niiap";
   };
 
   # nixpkgs version of moto is >=1.2.0, remove version pin to fix build
-- 
GitLab


From 27337bcf3417ca46defb942e7e0292c435da3bb9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 20:53:24 -0700
Subject: [PATCH 0186/1065] python36Packages.txtorcon: 18.0.2 -> 18.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/python3.6-txtorcon/versions
---
 pkgs/development/python-modules/txtorcon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix
index 2fb7e83c3b1..a17ecc0e592 100644
--- a/pkgs/development/python-modules/txtorcon/default.nix
+++ b/pkgs/development/python-modules/txtorcon/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "txtorcon";
-  version = "18.0.2";
+  version = "18.3.0";
 
   checkInputs = [ pytest mock lsof GeoIP ];
   propagatedBuildInputs = [
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ce50fdd00abb8b490b72809a2c664684f67f3c9467f392642d36f58309395a87";
+    sha256 = "1c7qfpr1zz34whz66lk4xpwdn7d5jqk6ccgas5n54li479mra0an";
   };
 
   # Skip a failing test until fixed upstream:
-- 
GitLab


From 06145c9c81e68ba1146e264231edabe66b2d8d7e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 19:46:24 -0700
Subject: [PATCH 0187/1065] python36Packages.xdot: 0.9 -> 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.6-xdot/versions
---
 pkgs/development/python-modules/xdot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix
index f9a735c97ab..5ca6e03fbf4 100644
--- a/pkgs/development/python-modules/xdot/default.nix
+++ b/pkgs/development/python-modules/xdot/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "xdot";
-  version = "0.9";
+  version = "1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01v9vmgdxz1q2m2vq2b4aqx4ycw7grc0l4is673ygvyg9rk02dx3";
+    sha256 = "18a2ri8vggaxy7im1x9hki34v519y5jy4n07zpqq5br9syb7h1ky";
   };
 
   disabled = !isPy3k;
-- 
GitLab


From c2c1fe1354a18b86800eff0ec92c058fe6477590 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 01:12:16 -0700
Subject: [PATCH 0188/1065] python36Packages.mahotas: 1.4.2 -> 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/python3.6-mahotas/versions
---
 pkgs/development/python-modules/mahotas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix
index a7e92e0b5b8..9ba6698e4a0 100644
--- a/pkgs/development/python-modules/mahotas/default.nix
+++ b/pkgs/development/python-modules/mahotas/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "mahotas";
-  version = "1.4.2";
+  version = "1.4.5";
 
   src = fetchFromGitHub {
     owner = "luispedro";
     repo = "mahotas";
     rev = "v${version}";
-    sha256 = "1d2hciag5sxw00qj7qz7lbna477ifzmpgl0cv3xqzjkhkn5m4d7r";
+    sha256 = "0dm34751w1441lxq00219fqlqix5qrgc18wp1wgp7xivlz3czzcz";
   };
 
   # remove this as soon as https://github.com/luispedro/mahotas/issues/97 is fixed
-- 
GitLab


From 4e983cdd90b0bb3bfa6828a8b146cffb672d4860 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 20:47:42 -0700
Subject: [PATCH 0189/1065] python36Packages.stem: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix
index 1df139ab29c..d867f94a310 100644
--- a/pkgs/development/python-modules/stem/default.nix
+++ b/pkgs/development/python-modules/stem/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "stem";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp";
+    sha256 = "1awiglfiajnx2hva9aqpj3fmdvdb4qg7cwnlfyih827m68y3cq8v";
   };
 
   postPatch = ''
-- 
GitLab


From b899fd6a18ca6cf785f59e0571ee86ba008b74a4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 20:59:42 -0700
Subject: [PATCH 0190/1065] python36Packages.python-sql: 0.9 -> 1.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/python3.6-python-sql/versions
---
 pkgs/development/python-modules/python-sql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix
index 88a2dd2abbf..451138fa38d 100644
--- a/pkgs/development/python-modules/python-sql/default.nix
+++ b/pkgs/development/python-modules/python-sql/default.nix
@@ -2,10 +2,10 @@
 
 buildPythonPackage rec {
   pname = "python-sql";
-  version = "0.9";
+  version = "1.0.0";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07b51cc1c977ef5480fe671cae5075ad4b68a6fc67f4569782e06f012456d35c";
+    sha256 = "05ni936y0ia9xmryl7mlhbj9i80nnvq1bi4zxhb96rv7yvpb3fqb";
   };
   meta = {
     homepage = http://python-sql.tryton.org/;
-- 
GitLab


From a8a11ab31c340b2143a47106fa68f2b77eb3e275 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 20:56:27 -0700
Subject: [PATCH 0191/1065] python36Packages.warlock: 1.2.0 -> 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/python3.6-warlock/versions
---
 pkgs/development/python-modules/warlock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix
index 0f75be8be17..46a5bd533b2 100644
--- a/pkgs/development/python-modules/warlock/default.nix
+++ b/pkgs/development/python-modules/warlock/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "warlock";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0npgi4ks0nww2d6ci791iayab0j6kz6dx3jr7bhpgkql3s4if3bw";
+    sha256 = "01kajxvjp5n1p42n1kvv7rfcj2yyr44zmmzk48pywryfixr3yh6p";
   };
 
   propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ];
-- 
GitLab


From 2829d860a4df2acabf5143673f0a958606b968a8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 21:18:23 -0700
Subject: [PATCH 0192/1065] python36Packages.twilio: 6.8.0 -> 6.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/python3.6-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 5a32a64c296..4abc8af5037 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.8.0";
+  version = "6.19.1";
   # tests not included in PyPi, so fetch from github instead
   src = fetchFromGitHub {
     owner = "twilio";
     repo = "twilio-python";
     rev = version;
-    sha256 = "1vi3m6kvbmv643jbz95q59rcn871y0sss48kw2nqziyr5iswfx8c";
+    sha256 = "09c95xyfcjmsjcklz829ariayvdy08zs1p5v8zay7zwxkm017qsm";
   };
 
   buildInputs = [ nose mock ];
-- 
GitLab


From d0544a355b259f1de82d80fccad81a5db66db29c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 24 Oct 2018 10:27:06 +0200
Subject: [PATCH 0193/1065] yarn: add platforms (#48912)

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

diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index 69545a764c5..47a11e1b7f4 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     description = "Fast, reliable, and secure dependency management for javascript";
     license = licenses.bsd2;
     maintainers = [ maintainers.offline ];
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
-- 
GitLab


From 68a674a376c5ea38a2fb5a5029cef3c96d9e120c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 10:35:46 -0700
Subject: [PATCH 0194/1065] python27Packages.rpm: 4.14.2 -> 4.14.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/rpm/versions
---
 pkgs/tools/package-management/rpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 27793f44801..55171e6d38f 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "rpm-${version}";
-  version = "4.14.2";
+  version = "4.14.2.1";
 
   src = fetchurl {
     url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2";
-    sha256 = "0armd7dqr8bl0isx8l4xlylm7dikasmxhhcbz336fkp2x30w5jw0";
+    sha256 = "1nmck2fq9h85fgs3zhh6w1avlw5y16cbz5khd459ry3jfd5w4f8i";
   };
 
   outputs = [ "out" "dev" "man" ];
-- 
GitLab


From 655b45bb853e71be99a68fd70bb975002f79343c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 08:35:41 -0700
Subject: [PATCH 0195/1065] tortoisehg: 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/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 c7a51508a8c..68ecabe3b9d 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
     name = "tortoisehg-${version}";
-    version = "4.7.1";
+    version = "4.7.2";
 
     src = fetchurl {
       url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
-      sha256 = "0x7hz4v882xy2r3k43fbndkq1kqwl3rl1zjmi8pxgpf05qcn950d";
+      sha256 = "0y2q50380gnjzmyvmzh729ljgvq3wkcv6ham3w62mf4fjcvlpnag";
     };
 
     pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
-- 
GitLab


From c88e09d46f31143933624b4bfa2a4c7c2f6d26de Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 24 Oct 2018 04:50:01 -0400
Subject: [PATCH 0196/1065] arrow-cpp: fix for zstd 1.3.6+ (#48928)

---
 .../development/libraries/arrow-cpp/default.nix |  3 +++
 .../libraries/arrow-cpp/zstd136.patch           | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/arrow-cpp/zstd136.patch

diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 77ce77dee5a..96259dc6694 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
 
     # patch to fix python-test
     ./darwin.patch
+
+    # facebook/zstd#1385
+    ./zstd136.patch
     ];
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/arrow-cpp/zstd136.patch b/pkgs/development/libraries/arrow-cpp/zstd136.patch
new file mode 100644
index 00000000000..1bdeecaef99
--- /dev/null
+++ b/pkgs/development/libraries/arrow-cpp/zstd136.patch
@@ -0,0 +1,17 @@
+--- a/src/arrow/util/compression_zstd.cc
++++ b/src/arrow/util/compression_zstd.cc
+@@ -35,8 +35,13 @@ namespace util {
+ 
+ Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input, int64_t output_len,
+                              uint8_t* output_buffer) {
++  void *safe_output_buffer = static_cast<void*>(output_buffer);
++  int dummy {};
++  if ((output_len == 0) && (output_buffer == NULL)) {
++    safe_output_buffer = static_cast<void*>(&dummy);
++  }
+   int64_t decompressed_size =
+-      ZSTD_decompress(output_buffer, static_cast<size_t>(output_len), input,
++      ZSTD_decompress(safe_output_buffer, static_cast<size_t>(output_len), input,
+                       static_cast<size_t>(input_len));
+   if (decompressed_size != output_len) {
+     return Status::IOError("Corrupt ZSTD compressed data.");
-- 
GitLab


From 782c820ad93af54ede7adb110a6279d1bf1b7473 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Wed, 24 Oct 2018 12:08:06 +0300
Subject: [PATCH 0197/1065] mytetra: support opening urls under wayland
 (#48641)

---
 pkgs/applications/office/mytetra/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index c94d79a0ced..5dae3c9f85c 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmake, qtsvg }:
+{ stdenv, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }:
 
 let
   version = "1.43.27";
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1gzr11jy1bvnp28w2ar3wmh76g55jn9nra5la5qasnal6b5pg28h";
   };
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [ qmake makeWrapper ];
   buildInputs = [ qtsvg ];
 
   hardeningDisable = [ "format" ];
@@ -23,6 +23,11 @@ in stdenv.mkDerivation rec {
       --replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png"
   '';
 
+  postFixup = ''
+    wrapProgram $out/bin/mytetra \
+      --prefix PATH : ${xdg_utils}/bin
+  '';
+
   meta = with stdenv.lib; {
     description = "Smart manager for information collecting";
     homepage = https://webhamster.ru/site/page/index/articles/projectcode/138;
-- 
GitLab


From 5e2590ba6fd352bc65b4cd7fd822eef282470e6c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 02:09:26 -0700
Subject: [PATCH 0198/1065] python36Packages.podcastparser: 0.6.2 -> 0.6.4

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

diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix
index bb8e0ed8ce5..0cfe2dd1b60 100644
--- a/pkgs/development/python-modules/podcastparser/default.nix
+++ b/pkgs/development/python-modules/podcastparser/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "podcastparser";
-  version = "0.6.2";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "gpodder";
     repo = "podcastparser";
     rev = version;
-    sha256 = "1mhg7192d6s1ll9mx1b63yfj6k4cnv4i95jllbnydyjv9ykkv0k1";
+    sha256 = "10bk93fqsws360q1gkjvfzjda3351169zbr6v5lq9raa3mg1ln52";
   };
 
   propagatedBuildInputs = [ ];
-- 
GitLab


From 26441bc650762a5d1a1597f65206d3b3dbf9ea14 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Wed, 24 Oct 2018 11:30:28 +0200
Subject: [PATCH 0199/1065] atom, atom-beta: move versions to top of file

---
 pkgs/applications/editors/atom/default.nix | 26 ++++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 6cfba39ed4b..2ac80007fdd 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,6 +1,19 @@
 { stdenv, pkgs, fetchurl, makeWrapper, wrapGAppsHook, gvfs, gtk3, atomEnv }:
 
 let
+  versions = {
+    atom = {
+      version = "1.31.2";
+      sha256 = "1szx9p2nz1qzjpig0l8h4hj5mqwpjvkcynn8crh21drply4bpfr0";
+    };
+
+    atom-beta = {
+      version = "1.32.0";
+      beta = 0;
+      sha256 = "12k5cn70a0diyaqbmq6s6l2sbi9i3d9p7i38qnm97lnw0y1kh0jm";
+    };
+  };
+
   common = pname: {version, sha256, beta ? null}:
       let fullVersion = version + stdenv.lib.optionalString (beta != null) "-beta${toString beta}";
       name = "${pname}-${fullVersion}";
@@ -71,15 +84,4 @@ let
       platforms = platforms.x86_64;
     };
   };
-in stdenv.lib.mapAttrs common {
-  atom = {
-    version = "1.31.2";
-    sha256 = "1szx9p2nz1qzjpig0l8h4hj5mqwpjvkcynn8crh21drply4bpfr0";
-  };
-
-  atom-beta = {
-    version = "1.32.0";
-    beta = 0;
-    sha256 = "12k5cn70a0diyaqbmq6s6l2sbi9i3d9p7i38qnm97lnw0y1kh0jm";
-  };
-}
+in stdenv.lib.mapAttrs common versions
-- 
GitLab


From f13f4825bf17d785abf91167c8e4754e08714958 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Wed, 24 Oct 2018 11:33:20 +0200
Subject: [PATCH 0200/1065] atom, atom-beta: 1.31.2 -> 1.32.0, 1.32.0-beta0 ->
 1.33.0-beta0

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 2ac80007fdd..a6525804ee0 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -3,14 +3,14 @@
 let
   versions = {
     atom = {
-      version = "1.31.2";
-      sha256 = "1szx9p2nz1qzjpig0l8h4hj5mqwpjvkcynn8crh21drply4bpfr0";
+      version = "1.32.0";
+      sha256 = "0dha8zi4gshxj993ns7ybi7q86pfqwzsasrk3a7b5xrdqbrcm5md";
     };
 
     atom-beta = {
-      version = "1.32.0";
+      version = "1.33.0";
       beta = 0;
-      sha256 = "12k5cn70a0diyaqbmq6s6l2sbi9i3d9p7i38qnm97lnw0y1kh0jm";
+      sha256 = "1x4s12zvfd2gjy7mimndbhs6x9k37jq4dyy6r1mzhwfysix74val";
     };
   };
 
-- 
GitLab


From 93a2ad09f53ef351088ab9e539e9343a98a4f83b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 02:39:03 -0700
Subject: [PATCH 0201/1065] neovim-remote: 2.0.5 -> 2.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.6-neovim-remote/versions
---
 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 b0c834934f9..8e99005bbf6 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.0.5";
+  version = "2.1.0";
   disabled = !pythonPackages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "mhinz";
     repo = "neovim-remote";
     rev = "v${version}";
-    sha256 = "08qsi61ba5d69ca77layypzvi7nalx4niy97xn4w88jibnbmbrxw";
+    sha256 = "0gri4d8gg5hvywffvj8r123d06x006qhink7d54yk6lvplw64gyc";
   };
 
   propagatedBuildInputs = with pythonPackages; [ neovim psutil ];
-- 
GitLab


From 81047fa45827180eefa821ee70c5ab28da67c233 Mon Sep 17 00:00:00 2001
From: Thane Gill <me@thanegill.com>
Date: Wed, 24 Oct 2018 02:42:04 -0700
Subject: [PATCH 0202/1065] Airtame 3.1.1 -> 3.3.0 (#48505)

---
 pkgs/applications/misc/airtame/default.nix | 64 ++++++++--------------
 1 file changed, 22 insertions(+), 42 deletions(-)

diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix
index 18f47b7652f..3e5bf8df4a7 100644
--- a/pkgs/applications/misc/airtame/default.nix
+++ b/pkgs/applications/misc/airtame/default.nix
@@ -6,51 +6,20 @@
 }:
 
 let libPath = lib.makeLibraryPath [
-  alsaLib
-  atk
-  cairo
-  cups
-  curl
-  dbus
-  expat
-  ffmpeg
-  fontconfig
-  freetype
-  gdk_pixbuf
-  glib
-  glibc
-  gnome2.GConf
-  gtk2
-  libopus
-  nspr
-  nss
-  pango
-  stdenv.cc.cc
-  udev
-  x264
-  libX11
-  libXScrnSaver
-  libXcomposite
-  libXcursor
-  libXdamage
-  libXext
-  libXfixes
-  libXi
-  libXrandr
-  libXrender
-  libXtst
-  libpulseaudio
-  libxcb
+  alsaLib atk cairo cups curl dbus expat ffmpeg fontconfig freetype gdk_pixbuf
+  glib glibc gnome2.GConf gtk2 libopus nspr nss pango stdenv.cc.cc udev x264
+  libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes
+  libXi libXrandr libXrender libXtst libpulseaudio libxcb
 ];
 in stdenv.mkDerivation rec {
   pname = "airtame";
-  version = "3.1.1";
+  version = "3.3.0";
   name = "${pname}-${version}";
   longName = "${pname}-application";
 
   src = fetchurl {
     url = "https://downloads.airtame.com/application/ga/lin_x64/releases/${longName}-${version}.tar.gz";
-    sha256 = "1am1qz280r5g9i0vwwx5lr24fpdl5lazhpr2bhb34nlr5d8rsmzr";
+    sha256 = "16ca1vcxpka26jcrfbxpq74kcizgrm138j94bby6kzqp2swhrl76";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -77,15 +46,26 @@ in stdenv.mkDerivation rec {
     ln -s "$opt/icon.png" "$out/share/icons/airtame.png"
 
     # Flags and rpath are copied from launch-airtame.sh.
-    interp="$(< $NIX_CC/nix-support/dynamic-linker)"
-    vendorlib="$opt/resources/app.asar.unpacked/streamer/vendor/airtame-core/lib"
-    rpath="${libPath}:$opt:$vendorlib:$opt/resources/app.asar.unpacked/encryption/out/lib"
-    rm $vendorlib/libcurl.so*
+    vendorlib="\
+    $opt/resources/app.asar.unpacked/modules/streamer/dist/deps/airtame-modules:\
+    $opt/resources/app.asar.unpacked/encryption/out/lib:\
+    $opt/resources/deps/airtame-core/lib:\
+    $opt/resources/deps/airtame-encryption/lib"
+
+    echo $vendorlib
+
+    rpath="${libPath}:$opt:$vendorlib"
+
     find "$opt" \( -type f -executable -o -name "*.so" -o -name "*.so.*" \) \
       -exec patchelf --set-rpath "$rpath" {} \;
+
     # The main binary also needs libudev which was removed by --shrink-rpath.
+    interp="$(< $NIX_CC/nix-support/dynamic-linker)"
     patchelf --set-interpreter "$interp" $opt/${longName}
-    wrapProgram $opt/${longName} --add-flags "--disable-gpu --enable-transparent-visuals"
+
+    wrapProgram $opt/${longName} \
+      --prefix LD_LIBRARY_PATH=$rpath \
+      --add-flags "--disable-gpu --enable-transparent-visuals"
   '';
 
   dontPatchELF = true;
-- 
GitLab


From c8b5deae19a6de2febaa130651343ea4c4f1a1e0 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 23 Oct 2018 22:55:40 +0200
Subject: [PATCH 0203/1065] r8168: init at 8.046.00

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

diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix
new file mode 100644
index 00000000000..f2c87b97c4f
--- /dev/null
+++ b/pkgs/os-specific/linux/r8168/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, lib, fetchFromGitHub, kernel }:
+
+
+let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/r8168";
+
+in stdenv.mkDerivation rec {
+  name = "r8168-${kernel.version}-${version}";
+  # on update please verify that the source matches the realtek version
+  version = "8.046.00";
+
+  # This is a mirror. The original website[1] doesn't allow non-interactive
+  # downloads, instead emailing you a download link.
+  # [1] http://www.realtek.com.tw/downloads/downloadsView.aspx?PFid=5&Level=5&Conn=4&DownTypeID=3
+  # I've verified manually (`diff -r`) that the source code for version 8.046.00
+  # is the same as the one available on the realtek website.
+  src = fetchFromGitHub {
+    owner = "mtorromeo";
+    repo = "r8168";
+    rev = version;
+    sha256 = "0y8w3biw5mshn5bvl24b9rybfh67f1s9gfzkcv9p4m7s7nchj2dg";
+  };
+
+  hardeningDisable = [ "pic" ];
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  # avoid using the Makefile directly -- it doesn't understand
+  # any kernel but the current.
+  # based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168
+  preBuild = ''
+    makeFlagsArray+=("-C${kernel.dev}/lib/modules/${kernel.modDirVersion}/build")
+    makeFlagsArray+=("SUBDIRS=$PWD/src")
+    makeFlagsArray+=("EXTRA_CFLAGS=-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN")
+    makeFlagsArray+=("modules")
+  '';
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    mkdir -p ${modDestDir}
+    find . -name '*.ko' -exec cp --parents '{}' ${modDestDir} \;
+    find ${modDestDir} -name '*.ko' -exec xz -f '{}' \;
+  '';
+
+  meta = with lib; {
+    description = "Realtek r8168 driver";
+    longDescription = ''
+      A kernel module for Realtek 8168 network cards.
+      If you want to use this driver, you might need to blacklist the r8169 driver
+      by adding "r8169" to boot.blacklistedKernelModules.
+    '';
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ timokau ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfbc6687f9d..960aeb36bcb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14329,6 +14329,8 @@ with pkgs;
 
     ply = callPackage ../os-specific/linux/ply { };
 
+    r8168 = callPackage ../os-specific/linux/r8168 { };
+
     rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { };
 
     rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { };
-- 
GitLab


From 039f9fbb5b6963d0f92022b7eeef0dbb0a853e98 Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Tue, 23 Oct 2018 11:52:36 +0200
Subject: [PATCH 0204/1065] featherpad: init at 0.9.1

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

diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix
new file mode 100644
index 00000000000..dbdc13ece2a
--- /dev/null
+++ b/pkgs/applications/editors/featherpad/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, qt5, fetchFromGitHub }:
+
+with qt5;
+
+stdenv.mkDerivation rec {
+  version = "0.9.1";
+  name = "featherpad-${version}";
+  src = fetchFromGitHub {
+    owner = "tsujan";
+    repo = "FeatherPad";
+    rev = "V${version}";
+    sha256 = "053j14f6fw31cdnfr8hqpxw6jh2v65z43qchdsymbrk5zji8gxla";
+  };
+  nativeBuildInputs = [ qmake pkgconfig qttools ];
+  buildInputs = [ qtbase qtsvg qtx11extras ];
+  meta = with stdenv.lib; {
+    description = "Lightweight Qt5 Plain-Text Editor for Linux";
+    homepage = https://github.com/tsujan/FeatherPad;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.flosse ];
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e404360eae..e1404f123d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2544,6 +2544,8 @@ with pkgs;
 
   fdm = callPackage ../tools/networking/fdm {};
 
+  featherpad = callPackage ../applications/editors/featherpad {};
+
   feedreader = callPackage ../applications/networking/feedreaders/feedreader {};
 
   ferm = callPackage ../tools/networking/ferm { };
-- 
GitLab


From 0fcd2ca7b2e313f88687037a835555b31a0892b6 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 24 Oct 2018 12:04:05 +0200
Subject: [PATCH 0205/1065] darwin.cf-private: include headers from
 osx_private_sdk

This includes things like CFURLGetFSRef which are not part of the
swift-corelibs CoreFoundation.
---
 pkgs/os-specific/darwin/cf-private/default.nix | 16 +++++++++-------
 pkgs/top-level/darwin-packages.nix             |  6 ++++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/darwin/cf-private/default.nix b/pkgs/os-specific/darwin/cf-private/default.nix
index 3fac20d23c7..dc1b0112a21 100644
--- a/pkgs/os-specific/darwin/cf-private/default.nix
+++ b/pkgs/os-specific/darwin/cf-private/default.nix
@@ -1,4 +1,4 @@
-{ CF, apple_sdk }:
+{ CF, apple_sdk, osx_private_sdk }:
 
 # cf-private is a bit weird, but boils down to CF with a weird setup-hook that
 # makes a build link against the system CoreFoundation rather than our pure one.
@@ -13,10 +13,10 @@
 # because of their magic "toll-free bridging" support, the symbols for those types
 # live in CoreFoundation with an ObjC runtime. And because that isn't public, we have
 # this hack in place to let people link properly anyway. Phew!
-# 
+#
 # This can be revisited if Apple ever decide to release the ObjC backend in a publicly
 # buildable form.
-# 
+#
 # This doesn't really need to rebuild CF, but it's cheap, and adding a setup hook to
 # an existing package was annoying. We need a buildEnv that knows how to add those
 CF.overrideAttrs (orig: {
@@ -38,22 +38,24 @@ CF.overrideAttrs (orig: {
   # this is watchman, who can almost certainly switch to the pure CF once the header
   # and functionality is merged in.
   installPhase = orig.installPhase + ''
+    # Copy or overwrite private headers, some of these might already
+    # exist in CF but the private versions have more information.
     basepath="Library/Frameworks/CoreFoundation.framework/Headers"
-    path="$basepath/CFFileDescriptor.h"
+    cp -Lfv --no-preserve mode ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* "$out/$basepath"
 
     # Append the include at top level or nobody will notice the header we're about to add
     sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFFileDescriptor.h>' \
       "$out/$basepath/CoreFoundation.h"
 
-    cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path
+    cp ${apple_sdk.frameworks.CoreFoundation}/$basepath/CFFileDescriptor.h $out/$basepath/CFFileDescriptor.h
   '' +
   # This one is less likely to go away, but I'll mention it anyway. The issue is at
   # https://bugs.swift.org/browse/SR-8744, and the main user I know of is qtbase
   ''
-    path="$basepath/CFURLEnumerator.h"    
+    path="$basepath/CFURLEnumerator.h"
     sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFURLEnumerator.h>' \
       "$out/$basepath/CoreFoundation.h"
 
     cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path
   '';
-})
\ No newline at end of file
+})
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 3bf7c31b700..78ca0d20908 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -31,7 +31,9 @@ in
     libcxxabi = pkgs.libcxxabi;
   };
 
-  cf-private = callPackage ../os-specific/darwin/cf-private { inherit (darwin) CF apple_sdk; };
+  cf-private = callPackage ../os-specific/darwin/cf-private {
+    inherit (darwin) CF apple_sdk osx_private_sdk;
+  };
 
   DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
 
@@ -74,7 +76,7 @@ in
   CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { };
 
   CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { inherit (darwin) objc4 ICU; };
-  
+
   # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in
   # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { inherit (darwin) apple_sdk_sierra xnu; };
 
-- 
GitLab


From 12a658ad340d53e02cb47c4ca32eeb488dc78997 Mon Sep 17 00:00:00 2001
From: Raphael Das Gupta <raphael.das.gupta@hsr.ch>
Date: Wed, 24 Oct 2018 12:07:36 +0200
Subject: [PATCH 0206/1065] tealdeer: 1.0.0 -> 1.1.0 (#48918)

and adapt description to changed upstream README.
---
 pkgs/tools/misc/tealdeer/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix
index fe0aa6cc308..73a9f68d3dc 100644
--- a/pkgs/tools/misc/tealdeer/default.nix
+++ b/pkgs/tools/misc/tealdeer/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "tealdeer-${version}";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "dbrgn";
     repo = "tealdeer";
     rev = "v${version}";
-    sha256 = "0mkcja9agkbj2i93hx01r77w66ca805v4wvivcnrqmzid001717v";
+    sha256 = "055pjxgiy31j69spq66w80ig469yi075dk8ad38z6rlvjmf74k71";
   };
 
-  cargoSha256 = "1qrvic7b6g3f3gjzx7x97ipp7ppa79c0aawn0lsav0c9xxzl44jq";
+  cargoSha256 = "1jxwz2b6p82byvfjx77ba265j6sjr7bjqi2yik8x2i7lrz8v8z1g";
 
   buildInputs = [ openssl cacert curl ];
 
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    description = "An implementation of tldr in Rust";
+    description = "A very fast implementation of tldr in Rust";
     homepage = "https://github.com/dbrgn/tealdeer";
     maintainers = with maintainers; [ davidak ];
     license = with licenses; [ asl20 mit ];
-- 
GitLab


From 0df3d8d6c40f3c323fece42b283f45227f5ea88e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 24 Oct 2018 12:07:50 +0200
Subject: [PATCH 0207/1065] wxmac: include cf-private

Fixes build failure because CoreFoundation doesn't include
CFURLGetFSRef anymore.

    clang++ -mmacosx-version-min=10.7 -c -o basedll_filefn.o  -D__WXOSX_COCOA__      -DWXBUILDING      -I./src/regex  -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -dynamic -fPIC -DPIC -Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy -Woverloaded-virtual -Wno-deprecated-declarations -D_FILE_OFFSET_BITS=64 -I/private/tmp/nix-build-wxmac-3.0.2.drv-0/wxWidgets-3.0.2/lib/wx/include/osx_cocoa-unicode-3.0 -I./include -O2 -fno-strict-aliasing -fno-common  ./src/common/filefn.cpp
    ./src/common/filefn.cpp:849:18: error: use of undeclared identifier 'CFURLCreateFromFSRef'
        fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);
                     ^
    ./src/common/filefn.cpp:875:14: error: use of undeclared identifier 'CFURLGetFSRef'
            if ( CFURLGetFSRef(url, fsRef) == false )
---
 pkgs/development/libraries/wxwidgets/3.0/mac.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix                  |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index 9c307b2d15a..a13ade3bb74 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -1,11 +1,9 @@
 { stdenv, fetchurl, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib
 # darwin only attributes
-, derez, rez, setfile
+, cf-private, derez, rez, setfile
 , AGL, Cocoa, Kernel
 }:
 
-with stdenv.lib;
-
 stdenv.mkDerivation rec {
   version = "3.0.2";
   name = "wxmac-${version}";
@@ -55,6 +53,10 @@ stdenv.mkDerivation rec {
     expat libiconv libjpeg libpng libtiff zlib
     derez rez setfile
     Cocoa Kernel
+
+    # Needed for CFURLGetFSRef, etc. which have deen deprecated
+    # since 10.9 and are not part of swift-corelibs CoreFoundation.
+    cf-private
   ];
 
   propagatedBuildInputs = [ AGL ];
@@ -98,7 +100,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     platforms = platforms.darwin;
     license = licenses.wxWindows;
     maintainers = [ maintainers.lnl7 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41383f05556..bb2e40952b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12692,6 +12692,7 @@ with pkgs;
   wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix {
     inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel;
     inherit (darwin.stubs) setfile rez derez;
+    inherit (darwin) cf-private;
   };
 
   wxSVG = callPackage ../development/libraries/wxSVG {
@@ -21133,7 +21134,7 @@ with pkgs;
   liblapackWithAtlas = liblapack;
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
-  
+
   lrs = callPackage ../development/libraries/science/math/lrs { };
 
   m4ri = callPackage ../development/libraries/science/math/m4ri { };
-- 
GitLab


From 53b55573a5983b815cb42e0349a10375da5d86da Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 03:20:43 -0700
Subject: [PATCH 0208/1065] python36Packages.outcome: 0.1.0 -> 1.0.0 (#48978)

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-outcome/versions
---
 pkgs/development/python-modules/outcome/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix
index 9525be4cb34..dc06ab63d2d 100644
--- a/pkgs/development/python-modules/outcome/default.nix
+++ b/pkgs/development/python-modules/outcome/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "outcome";
-  version = "0.1.0";
+  version = "1.0.0";
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d54e5d469088af53022f64a753b288d6bab0fe42e513eb7146137d560e2e516e";
+    sha256 = "0wdcakx1r1317bx6139k9gv6k272fryid83d1kk0r43andfw0n4x";
   };
 
   checkInputs = [ pytest ];
-- 
GitLab


From 616cfefc27b4b806f2449d40a4e6e0420a31370a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 03:25:02 -0700
Subject: [PATCH 0209/1065] python36Packages.pudb: 2016.2 -> 2018.1 (#48975)

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-pudb/versions
---
 pkgs/development/python-modules/pudb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix
index 0c76974e5d9..028af67b9af 100644
--- a/pkgs/development/python-modules/pudb/default.nix
+++ b/pkgs/development/python-modules/pudb/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "pudb";
-  version = "2016.2";
+  version = "2018.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0njhi49d9fxbwh5p8yjx8m3jlfyzfm00b5aff6bz473pn7vxfn79";
+    sha256 = "0vl7rbqyxa2vfa02dg7f5idf1j7awpfcj0dg46ks59xp8539g2wd";
   };
 
   propagatedBuildInputs = [ pygments urwid ];
-- 
GitLab


From 32032825bf84d1306a27ae1e1a8f630d74b62cb6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 02:54:18 -0700
Subject: [PATCH 0210/1065] python36Packages.lmdb: 0.92 -> 0.94

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-lmdb/versions
---
 pkgs/development/python-modules/lmdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix
index d46b51e27d3..a7767be6dc4 100644
--- a/pkgs/development/python-modules/lmdb/default.nix
+++ b/pkgs/development/python-modules/lmdb/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "lmdb";
-  version = "0.92";
+  version = "0.94";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01nw6r08jkipx6v92kw49z34wmwikrpvc5j9xawdiyg1n2526wrx";
+    sha256 = "1zh38gvkqw1jm5105if6rr7ccbgyxr7k2rm5ygb9ab3bq82pyaww";
   };
 
   # Some sort of mysterious failure with lmdb.tool
-- 
GitLab


From 6d321dc204140517a324bce06c0003ab0aa055f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 03:38:51 -0700
Subject: [PATCH 0211/1065] twa: 1.5.1 -> 1.6.0 (#48900)

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

diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix
index 8e9a88ad6f9..7d2e17af388 100644
--- a/pkgs/tools/networking/twa/default.nix
+++ b/pkgs/tools/networking/twa/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   name = "twa-${version}";
-  version = "1.5.1";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "twa";
     rev = version;
-    sha256 = "14pwiq1kza92w2aq358zh5hrxpxpfhg31am03b56g6vlvqzsvib7";
+    sha256 = "19jn4wp4f0vp2bxvrbyhjrwqgbphr5y1l17qawy8vdv3yswbyw46";
   };
 
   dontBuild = true;
-- 
GitLab


From b2f6aa00696f174f8d7ab453a89b8b7370dd128b Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Wed, 24 Oct 2018 13:46:08 +0200
Subject: [PATCH 0212/1065] nixos/rngd: use new name pkgs.rng-tools

Instead of pkgs.rng_tools which is now an alias
---
 nixos/modules/security/rngd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix
index 3a1ffc55e5f..81e04a44b11 100644
--- a/nixos/modules/security/rngd.nix
+++ b/nixos/modules/security/rngd.nix
@@ -30,7 +30,7 @@ with lib;
 
       description = "Hardware RNG Entropy Gatherer Daemon";
 
-      serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f -v" +
+      serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v" +
         (if config.services.tcsd.enable then " --no-tpm=1" else "");
     };
   };
-- 
GitLab


From 2e2bfc0355081931afb3d23e743c55a04ebe3e59 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 24 Oct 2018 07:14:04 -0500
Subject: [PATCH 0213/1065] libinput: 1.12.1 -> 1.12.2

https://lists.freedesktop.org/archives/wayland-devel/2018-October/039553.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 e2d7d09b259..87c6bb03d4b 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.1";
+  version = "1.12.2";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "14l6bvgq76ls63qc9c448r435q9xiig0rv8ilx6rnjvlgg64h32p";
+    sha256 = "1w8wkh03j5zdgbamyj7wv2f6k76kd0w4z04abxxf5b0mnplrb6vb";
   };
 
   outputs = [ "bin" "out" "dev" ];
-- 
GitLab


From 5ae13d48d26d65522a2af3027619abecc1d15015 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 05:19:14 -0700
Subject: [PATCH 0214/1065] python36Packages.django_classytags: 0.6.1 -> 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/python3.6-django-classy-tags/versions
---
 .../python-modules/django_classytags/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix
index 022709bacbe..3de7412462b 100644
--- a/pkgs/development/python-modules/django_classytags/default.nix
+++ b/pkgs/development/python-modules/django_classytags/default.nix
@@ -6,17 +6,17 @@
 
 buildPythonPackage rec {
   pname = "django-classy-tags";
-  version = "0.6.1";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0wxvpmjdzk0aajk33y4himn3wqjx7k0aqlka9j8ay3yfav78bdq0";
+    sha256 = "1f2dc9rq8v9sc4kv4x9hmbzp5c4amdxjkz5nzas5abg2s1hr2bvr";
   };
 
   propagatedBuildInputs = [ django ];
 
-  # tests appear to be broken on 0.6.1 at least
-  doCheck = ( version != "0.6.1" );
+  # tests appear to be broken on 0.8.0 at least
+  doCheck = ( version != "0.8.0" );
 
   meta = with stdenv.lib; {
     description = "Class based template tags for Django";
-- 
GitLab


From 19b7cf3abd9f7325b7221e561b6af84d86e83315 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 24 Oct 2018 10:44:56 +0100
Subject: [PATCH 0215/1065] firefox-devedition-bin: 63.0b14 -> 64.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 fcfa88a755f..5cbc37fbe5b 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "63.0b14";
+  version = "64.0b3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ach/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ach/firefox-64.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "baf8a78f63e7fe6b09ac1d5fc4cab9d51b7f43f5dd747c569aa9dc17380745b306a714ce3c166ebaf48f180a62492e15bfc3f1e4d597bbbb766101a9a984a68f";
+      sha512 = "39642bce504c68c2ebbc7c5ae42664f1b7b0da218e58a7340d28abf639d8c034b33603146070006c914a19beb9e2659fcc3e2023018db36fc51cd7405620756e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/af/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/af/firefox-64.0b3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "556958203022beeb2a091f347bb02dc6815cb8480dc05c92021d8b8290f7eec632baca2e697d476d63f52db5ffb62546f52b696ada1163e39abf4afee1d73792";
+      sha512 = "8a8f1335e91a510f3e884fc19e2babfbc279135392d4d527dcd634cc3f08a7c914b13ca8439dd3f9a7fedb021b13b4a79355b89c12c38280c09c78e11aaba64c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/an/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/an/firefox-64.0b3.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "2ba5e5a9d5a4aa80f3fd30e85d2b94aa024d14d13572433fcf148d3211b9400a08c899cae57359b4ba09b0038d5e867e4266fdecb5da5a45ff14d09a38f864fc";
+      sha512 = "f8589a2bbe767c61387239218feafc622c786521d6435c7a25e587e81dec365bfbf8381a46345a5c96ca3ffb3e27eb5085ce3305a95f76c7d1a05a4fbec50600";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ar/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ar/firefox-64.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "866c25745a7ef818e9293bdf3e5c0d64da71afe6f63157a3fa0ef0712cda2d1ffa6407ca2d9d4e240977f01fd71215fd9446f23a850c012f5ce86eccdbc5e3e6";
+      sha512 = "3ce0f917a1dd3c8aa624b1868acc213e45cc0208e5020beb4264d288b017d573f634bf0a98fe9ea9023aec42a3a468fe13876c1a8b5ad17295a17063b38e3623";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/as/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/as/firefox-64.0b3.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "15bc92f11b42ebe01a1e3c908f9567807c8cfc2abb67a29a6bfa90d59f4835b01ff6b36272b9db1f6e5880fa7d38fbec5edbde7a7444ecae74eb8c429e89c8d2";
+      sha512 = "5fe875648ba0ded96cc065751e23d687c22da8cf708283ebe96836afaebaa74c38e275dcbfdbb3a9b0959071a682d21714fe313e3d458864d0d6e22414014e8a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ast/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ast/firefox-64.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "4e8b4f5543dfa4f73ecb4b18a3ffc10ac1a50cb39e67ce5077d78eb95ce7664f261663051bb29354fbef8e8f0ab0213f1abbbb4aa7a9b6d313baaa787bbdcb7d";
+      sha512 = "0b39ba80b1d60a34e762b89ab0639dacd0785af151c11b38666706f4a3e2a9e902b5c7917e31275a93818453dbd32557ffcb71160a9acde09bfe01ff507aa212";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/az/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/az/firefox-64.0b3.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "211032b7d21542900298ddcf7157a7d40991a6337ee51e7e646327eec8464b28e054a8ad8a42003c998a5010427c6f7618405ea3b95dfd0e484f73614250936c";
+      sha512 = "f02866a3a0881eb2f63677346ab45b6e8b9d7f1d3d15d2e2ee088017bab77ec6632cb73a1983fe17b5ce9e5376d43f836087abd8e277f53baea609872c907245";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/be/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/be/firefox-64.0b3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "985f1f45357ec1579a7aa84bceb2450f5fd8779e509c9ce8a01138f5c4b840ef18195ed1b7309e3d6d436e9002516c2f76a7a5d1081345b5a1893fcee43bd123";
+      sha512 = "c33b9825759f0375bc65d3139b00adcdde6c89fbdc1e2f38b552374042c455a1512d377ff60bcd294848f85ea03631fa0b5cb2278ad5c07dd83be8760d53f09a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bg/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bg/firefox-64.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "2294ca16c22477953f9bb75c4be3914822c07c19cf7ae776d4108df6c3bc3333bfa72a129645487a5b245cb5c97a3ddfd225079be5380d2a9433e98d165022f9";
+      sha512 = "90977c309a39b065425c93005717a97cfabf78734a20c8146e763ea7af49de4a51d49a7b20b061681130d19a911f4d4f9ddbde24f3cbc546b14014a4550619d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bn-BD/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bn-BD/firefox-64.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "99f1fd21abd3f92d73daaaeab5c9987728c7b852505e6b92a67cf59efad7115aa4586e34d37c77e4f5a3011c5a82bbf927e9a918c723221a2b48d64d650d9d3c";
+      sha512 = "25d6703e8c02bf65e3f6aabf6a5a6f31cb375cd22c299ada483e9a0dd075eb57798d40ae4b1bbfe72f6f4fc78989b9849d1c98d540fe5f7de235343ba1e3231f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bn-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bn-IN/firefox-64.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "c1ee3e532fbd6eb047d2de9499ac1010d9ca2d4b4b0c19845b3d248771022d885e4c3fc159d6ae37820186bb4a2031e1049ee8af219fcdcf0873d0b585840258";
+      sha512 = "b89cb442136dd3a28cb30cff95f31e24ca43af11ebcb23e16a7e3fec1d2e9f6ddddab9c7a14304a52b52a68a520d0bd6c7ccc34b4835953d2428de84c2cfb3c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/br/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/br/firefox-64.0b3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "7e7b0c3fc861aa4628acd0ea6cc1a4d0b5015ffe2b02b8ef716861f1ec97122f1ea4bb60e7bf3c287ad77cbb91836513b6e073f88f8183800a77afaa2693a833";
+      sha512 = "f848cd20d0c550896a5a791ab0746ed7a0f52f065563d42e0fe4489982978cda1ed0be5a1425166e61445dc605db3aa8f052099434d91f81d489c5c3bca6d5b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bs/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bs/firefox-64.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "6db4e06f0c4ed652f983415009079b7a92b73d715e4b5b629cb4962c533a9080c1cd5129f2d4f1d59dd9118d0d715ed39f76f976a50b0b2235ca220b5483f7fe";
+      sha512 = "338e2e595929b2a08e055a268357cb7a3d869c94bb7a2050375a24baea19bad6c0f381564f2c43cbd16091630b8c701987484633682ffd6875adcac480fa5ba0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ca/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ca/firefox-64.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "cfbc585b9404a9a1aa5a94eb2e8bc4cac923c557c9c2b8f22d084c0b118aa8b93cba4f28850b6e3e435e6456e63f0c7a2c029e9269db5a55a66d597a91b05235";
+      sha512 = "778e3ab1556e929cd8b3e842024d2f59558066dbb8970516017068139ce8c703f151d2ff735b091492e26e21effa18bc02dd8479819504b679f2ac9a8ee2f657";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cak/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/cak/firefox-64.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "1e96d1e9b91147dad5244514e87c1aabb1f7e17bde43eca2c9044b8085e12228c943adb540eff283dcd5be78b319beddd0161f0397ec4486109401023ab3c29f";
+      sha512 = "a3d19ffbb0e4319623de006b97c9d7988cfb3d00ccbb996c3cb12e527fde0c6d39480f00e67c27939935ac44bb8422ca8dca4d91b87a349fdb7e6165062fe3d5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cs/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/cs/firefox-64.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "0ee029b5ade528f59cf039cf63c4fb03a25ec79c4c8ddaaf9995a10572f7a26f446461d3948023c54d6fc5124200b11e331233100eccbe74c5b2c819358f0474";
+      sha512 = "259e511ad5c253c9015b44e0c0d014f2b618b4c821eb5e5c1d8dac4fcaaef00255c80c401705815a1283cface8209a41550aee0a2d5c17b020a8630be2819d19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cy/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/cy/firefox-64.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "6270844c17a7c0f5e25454083acdaeb668bd76fad90b925762aefcfa3bf281116e47ab5946389e3a0791cc3ff43e1faee022e701421156e1991aac863dfd6ca1";
+      sha512 = "70fe96e7d36afa26e49bc2e2cce52e30bc41f4e56cda5942364a9cc4a37a4caf8fbda4915cb1857432624826633bd35ebcb732e2db1f07629b8854b59e06fa62";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/da/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/da/firefox-64.0b3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "2d2b84db47b7ef1023f321a001223b30596df58ca322e6e893797fb1806df24647c5c529063b503869e0c34ad9982902a252f5a6e4151bcdeb97ec5015a2b255";
+      sha512 = "017e6d0f9ae0ef68cc6ffe5fc9f572c5d7fa9c950ba5f337e992800e703d381e854a0b7379fc89ffd837a1fc2e731dff7feeb078b58cf39481a7d8730db8c4a5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/de/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/de/firefox-64.0b3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "602577b05601b303eebd51d6fc922e60cf1706dde4bd7d9d1a9549a8dbd960e726d58b86ecf0607c3984382fa8ce20d5cf5152a84b01484baf9dde235efe948c";
+      sha512 = "9f5116f3e1d6cd87d245b0afb95b8c7d8de55603294f8cd3dc7e841ae74a6cc54cf39200fd0f1765a8e74e7d95b5de975365c26eeb728e90c2797183e26a5bca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/dsb/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/dsb/firefox-64.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "e3ada860ad1b25dabe55d7497cabfb495324a57429d7fae70548a40e0bf613b9a8c699f109e2c93faefad774a05fac8ba59e7356f360547f38cb7fe96327f72a";
+      sha512 = "0399dfaa14e453c22ca1ad133ba61358c5a88b79e36262d91e1fc2d7981dfd2f0a37266fcc8c737f4cbe84429e6ba0682551c453370f8f40167c4fc1e27921ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/el/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/el/firefox-64.0b3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "efd92ecf884798196dc04121ad93a1a152187806f4b33829914a4e2034b8a131d5e58d2b2f455ca65f8983cfb39d6993e0c6ecb335c0246a20411da0d132ff0e";
+      sha512 = "b5960880be96730ed01b1ad5da7625dd42d44bc9d2256d3daba5c4d8bdc52eb97fa123ab187a88c3e3d17e5affdc302e869793a30cad55080755d330ce8961c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-CA/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-CA/firefox-64.0b3.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "1933a5c39c8eca1ddad4918fd2f49b820a281d18831b5fed0193dd6a78b6ee3b019c5307d1853fdf14d805c5642b92982e1ef4079a191254c69f8c9c78ec3883";
+      sha512 = "ea19403c07d0371a36dc0611a79589807f44eb1f2e238c86de21412dbdc0c29bf99f3df88ae9c5be356c263d5b021e888a786b24d0c11e13bed8ec27e6bf4a72";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-GB/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-GB/firefox-64.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "ccb03d4eb7e81f04dfb700016c0b84be72c2d0fa15d63460f36ef66a619bd2de7e98840f9600e2be0be4bed8f247ec4363b4544ee66a43540ae0ba4f6a00a52e";
+      sha512 = "e6ec9b351c0e130ced1fb4caf131fa8b547ac46255b1a63b135b370b8d5b6c855bae8b2ef349a6ee67d77ce69043ca374d40277e6b2befd89e94f7ac404c072a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-US/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-US/firefox-64.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "e533cedecae4c0916b18d14a2045d0bd0acc5b2b812a81adf268280505027b034c29f584c71343e10d88d1b021cc6cd22481d1c36b50ac9a8504014db5741138";
+      sha512 = "0304a7916ea7daa22756e484ebee602c6ae7bcd68b853b46f36189dfa1e0ef81ce4293a04dd0694d9c6b2fd3b3ee5ea1199776943d8db54fe0ad2ff6cc1355e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-ZA/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-ZA/firefox-64.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "a2996e9ed146f2ef5da7c837d5341be9c87f65ff8ac42d97a455aea5e00109c702295df393234f19dec6af16d77652d53d94a1822604367530a088e8b3ae6a3f";
+      sha512 = "931901f6dbc21cc2dc35a99aea6789a4567c98184e0d79bdaf03087155723e9a0046398ce611a290c554e2f7a832f4423549ed451ae6ebb4e7b21abd1880a076";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/eo/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/eo/firefox-64.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "2fddb89b3da67fd871028c1740887582be7414607f7dbacf7fa05984a593b59eaad7a2e96da6dd28941fc17511db2152a4bfd673a7e5c9e11e2c04d56be21a7e";
+      sha512 = "dd6c54b9bbd2817537efbdf0ee1396fd92fc0682c6a864b759664b438afc8b9021b6ef3f602ff7132d5ea1ce2e03135dc708f768496387e219c102076f13b5d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-AR/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-AR/firefox-64.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "37cab9ccb5254ca55ba798da4c26617acc75d47a4a8610e8dbcdca3c3494ddc32969a1743a440a2e6935535093b86520df94997bb01bae6185a12ddb041a09c9";
+      sha512 = "ff8843659cf29e667d2e2f79e58bf8bb24a766de624c2e99e9ac809357c537527110af39790596689ad8eef0455229e40e5ecd5ed51f41a68c28aae47a9db076";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-CL/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-CL/firefox-64.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "ca661918dea82892d0e44277ac2513f9104485c897ff1239495f63bf976efa04ebb10e32817522f8a237aad7c85e6678661568ee456a8cf5a99a36b7bd6d6478";
+      sha512 = "5971ea9c0e8cb49e57fc26b744ccf3e0726dc60575dcf53c63599ab20de6ff84825ebee5a8c37eafc1d442559d92e7e4aad770222991dc34c17fbb4a6c58ec44";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-ES/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-ES/firefox-64.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "d2316270848dca3922e5b18264fae1fc8f791a9234cb234ad3c9a80f56c8e13bedd63e73712542509a68f9b7f9482a46fda56ea61478b44b9571151822bc83cd";
+      sha512 = "ce13162b414694992bbe2d49ed66d9b6c2a7c80121a057ba12a473e14a7d5efdcf867e864a0809c219e9c0bbe3995320873162b028510cfb10f0459d9c223315";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-MX/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-MX/firefox-64.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "bf032b016c2f9fa2dc79b22fb7ae807ce9c744ae563dcae66f20849f8696d1dbd30404c629acad472e89a4f42a504b6c46750684e45988146747d505c7b81d28";
+      sha512 = "25a771fa0f7d36214a5e641bd5f13a8ab5459bdc516fc37541b42e27fb66ba00889001ada3a89c9199ae53293126dd5df86533bc7a9f5760e20ed60db954cd09";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/et/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/et/firefox-64.0b3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "1d89153f009e29709d20f2a38a2ac34395bc64ded8021897eab06a31fd573962b2166d8367432e30489ec0e5062e3b526f7077ed08b7177aa4744a50da33286d";
+      sha512 = "dcfbfb270fd8265a9e6deeea0f2645d224385e860034568fe38d49547159920bf2d954e4f2c64c9530f8a8468ef7b1a7b626b1702c4fcafbe186d887d826503a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/eu/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/eu/firefox-64.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "e42f0014a0235b9baf6cc0c15731a70cb2ae6d35b477cc12d989cb383b3714aa827292bfe4943163648194f79ccd542ef03378ad119020c59e8251a8161df60b";
+      sha512 = "d58ece9f65f1279930b3860582fe4f430c8dd7cfed2a2b85b7447af6d86935948e6e0d1c3f067c67e9561853149b2807c011317a9d78cc07c619aa6deb21a43a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fa/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fa/firefox-64.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "e6d2cd4a97b45519adab8e0b498e06100556614f9ff783030bd5a06acde8dad508b8f4c312fe7bb97ae837d10f4d0ed00ab0add86c7551b97a6c4101829d036e";
+      sha512 = "d0d06deb139f57539631cc44544a773abfa305bacbc81bb4e89a90fade0e9dabd4977934356e00a0cef4117b27d8d66aef8d6b34049759fb911cda580da98fd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ff/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ff/firefox-64.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "b44ad961e626c0964aea65673b54ec2555ad322d0ca25b7b1cd934afec17a2809a1c46ebb15d2a22b4ac597c06f2420e940e7f4c980cbd6aca9badf9c39fee3b";
+      sha512 = "602c9e6044cc0aa16cf80ff015fdf03ce48312321fd8a52445db871dfc1c475b05a2cccc36355f5c1681d540fca94e3e1c566b6153b2ed4038a6b69a3356d222";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fi/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fi/firefox-64.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "9b8769687c95f867ccf53184d0012507c7ec6835779563c8ae89556380a44f61532f1d44b2da13e39998cceb4591cc0d57cc7b627ec80467c2ca6b291022255a";
+      sha512 = "bcca1c3cc30f78712fea324b6bf4f3c6020b47dcf95abe5013eb0e2f588a7ca5c80261707922443a35e4d355f5f0cdeeea9a094f1c3c00a695a42692f6519cd1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fr/firefox-64.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "e9d8fb68d4adcd2cdfe0d3849cc59f3aac13ff488f34459e1f391ce896b5bc302cf48a3bd979770db3fa19650b764bd2980be5f62ea2853a7fe247a62734e996";
+      sha512 = "14ba146eef2148b5f4617a9ba73499bd783cf030683d87dc9ea75feb31cdec3b52636d8df3ef36001b5304237b39fda42d76d0f70e56283211d49abfa7b2fc8c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fy-NL/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fy-NL/firefox-64.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "52514c4098e6cb2a109e2530b7c59a0d9338c3c7085c5ee99bf9ed1c0400bbc1c846aa7e3303967c7d2eb7bfec691c4875418bba0aef2bd5133e0f7721edb71f";
+      sha512 = "70711c19244e034ebd8ab944e71c9604b26704c87e114db8a0daed9048a8ad54c1931c33b7dfac152f737f543cc58fa65262ad7f3d7af20321e3600437826467";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ga-IE/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ga-IE/firefox-64.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "d37863818720ebac9d97f09464aae36b02c38ca82bc6a0eeee5bd38dd4e57ab98a5ca340a6dad4504ea230def09984854ef10ed91a4cbbbe0cb18eff1a4af929";
+      sha512 = "3633ae56e5a9d84e81fa5ad6110c5804a56681ab9ec526750aca51f11296b82a6f3f6531c3a2b83d6e86d414df47e6087937fe4ef08eaca36f77afe7d5d3591b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gd/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gd/firefox-64.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "24baa5cb6a00b40cb6bb53e1981abd0b048ed30c2898f5f7b24c2c3ca41465f5f7fb258b86441bb2a2327a461a2764969f216715a5be4e1744b798501e56c239";
+      sha512 = "7d6bf6919815935dbe77ed44832d8fb5b22bc96beb5f3d061ada46d6b4840fa1bd248f1bae7c7c3296e5e10dbf78216a427c1f0c9d76e6f1d9396288ef2b8823";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gl/firefox-64.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "7a653d3262c3b433dac0442b03be5c358a357a7905bcb352a7d808c00d68110d4587d1f2155acfc69522374c91b44261b3f2f874ae2f17b06e492f7cd9fb4085";
+      sha512 = "eba1485f5942820a30c5d0c176ff6fba83a2af8020c4d83c00242d1266abca53046d2dea6920e38390a2044f25cc8868319c0f94453631140ab91ac68aaf0be7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gn/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gn/firefox-64.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "54c135c24001d57a79e8da52548b9589d4d1a5864776976fba20fe9be63f6b2429705e07f816aba438e6d6fabb16cfe309a5b267062a5e3a19ae3b946752ad56";
+      sha512 = "e0fd4b5235ae9120f32bee6e2a1a04abae9576e7222f201006ba56f66e48f5c7ea98a1b01a777316252a21f807744a7a9393dace8195b96375233c72f31c381a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gu-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gu-IN/firefox-64.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "e86d31256874667c80db2c568c0189dcdb0a5bf4e86390638a49ab8a411b5c4e3d8facd9c6aba181962a61288992d9c5f7506fab168005db93452e7d79533b5b";
+      sha512 = "be52a2122ff012ecd2990ef7ef03de4e84ca675ceca9c81d4f8f1fbfc82e911c65d36f83a20d372e765ac3b741924df85043e4585309c8e37ea84dea5e89f192";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/he/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/he/firefox-64.0b3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "1544ce91046c2c5dcce685889cfc6aa17032d3cbb8f6ac59eb8859916567922062c38d566d69e0fdaaac81be19eabebcc35d816c455cbc02e2e439ac7613ae63";
+      sha512 = "8c66a38eeab2c15a532bd0170ec70f7a22cdbe49cccf0d0d1baedd30f6e708b1c67eab3c4db2a42826b9e05a7252bb57d5c5a67bc8adfd6c0235c5a4a410c981";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hi-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hi-IN/firefox-64.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "8780464509cbdbcdd7c7a7e21964881dcbc5e2e6b9289ab4cb262b63e264459ba85e78af89ece752432b352ac0c0132bd8f551500180cd6e0886fcad8d71cdc4";
+      sha512 = "03d51782a0c80240b84c2240aebe3940c6fec5972e1a39d875717c9d4ef9496cb43dcba5a5009319c4b174dd85d3ba2753d71d60bb64c030f07604e63499f4e2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hr/firefox-64.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "5221765d6d4781dce88d9c4904e2b0c29b0328ff029672b1a4caa773a556fca3e871b53da5fb580b9878cd0556f5db629065171c79035709bf0a750d3e14f0fe";
+      sha512 = "af26fe8a3bc9523e50425aecdb735f6b6dbb4f1285d0eeb97f91e0da6148012c608e33c683d800ab2062bb7fec21045263ccd1263f07dba0ef96323db30668c4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hsb/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hsb/firefox-64.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "c4f61ea2530d279df1f96ff29631c43f3cbf23dc023b93579e8434539921ed9705e64f8d4f0a4fde1980384505b237c926b50a15f17eec5bdf2599c9584b1fc1";
+      sha512 = "7437f1108ca22f77ef0b61346e5a18042981d268ebae2465dd7f3699e7ecd99dbc782302e48f8a7a16d4db17ba2c4f6167a6f137f711a713bced7c7ccb3fb19a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hu/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hu/firefox-64.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "e06a424d115b32bc5225639d6fcb5251904d49730613da9e308d40f681392b992b4aca1d251d2a68921b2bfd270de1506f5647a59d42e9c1f6305347f0fd6328";
+      sha512 = "1a430eba889ec39be81a19b747a43be86fc6751281a24cadd421fd2677e0b7b28f5338847213fd9e548c8451a44a5d181b6efa19bd1cd200cba3405f8a1969df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hy-AM/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hy-AM/firefox-64.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "b856071f3cd1a90ae12b06797c2b3eaa8e019a49890599670e5e3d564029052f27b62a7ac6dc80056cd6f1be6b05bfff44a1341a5685514959c69462d5c68e92";
+      sha512 = "00ae1aa437e4f145ce89e9081d2c01498201cfe39e48466521c29a678708bd48a3f9931dc7c039d9c313129b851afbfa7b24658087bbfe7e0c0e9bfb37ebc90c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ia/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ia/firefox-64.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "5355629b1db1cacd0fff5b681da7fedb234a19187027925534ec18d59e9e68e84ba2e1f86c0969da5459ead80b2bef14257b6c4fd193e492b7d22c3db7c498bd";
+      sha512 = "97b1555eeae73c0b84141f6be1f6555bd91543f6f8fb89b09c3d25bbff5067476ff67a08a6c9e433e6d0059a8ccbdef8ede224ad7eda6e7805e3f15a13279235";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/id/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/id/firefox-64.0b3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "59741fe39778528934766b321061dfc7b50853a6c2aed9f1316662aa7bced6a2adc6ecb4598bd7d8e4180e5b446d840b917794c017f897f4800b6722ae6e8192";
+      sha512 = "14f56d956644d22f58b882bb6cfb941031716ea651009c72ab08e0501ca05ea5ed60658763a19ece7d6ef28a77afb2898fb998a17ef4620690cd527340c5d994";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/is/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/is/firefox-64.0b3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "1c90d23e59f2a499d98715e8f747ef80361130031345aee44a85bd385a802c13cc55a04374cdd18ba85a2796fc68a749e77a23f1c4d402cb0f28c0a70e9d762c";
+      sha512 = "000f64b07f9be1b56fa47ef0b2222ef9669355a1c415da73e6b11dfc9efc89a4ae07ca7de6c2367d9f2c19c91dfb3cdfa484e1dfd25fbbce759d4d3bdf09b0ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/it/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/it/firefox-64.0b3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "fae18f485444ca9db42b44759452ccbb814db34a9f5e95b061ffece9492a9dd06fa0d83b898e76e33882c5fb3dd353b343714ab74a7fcc83314e76cfc248fc70";
+      sha512 = "6d1a2184869f746ff413b71bfc0f356ecb00a7f9bf996054a5ce3142482ded733ea3bae76a0e19d07ed2dea8edf3d16f346ceb1f09c4b3477491c8ac428979b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ja/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ja/firefox-64.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "5d034246e87efe01eeab0d3b209f968e861cf2c2d6a45d64be733d944c0e2c9788db274c21d470abb603d2522b3fa5705c5f3990ebfc3cc4c9fa5f641a98c07b";
+      sha512 = "1bcaf9dbbffb01cab2f4c84bfde1b98238344d6a44ecb209b61caf9f30ef6a6629c3c702951a4f2405efc72272612edcce98b0979e09131f930995adf94ec60b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ka/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ka/firefox-64.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "1cc70ae6775038225a83595e74113b3f14650ce0cfb7890945387afe638ca2a8a11ffd9084c395ceeda58b36d15f89a6458236964c6e4893764312fbb85f2893";
+      sha512 = "0137e1f0148f641748e98ed10554b3c6db319ed2b7e8e382fd80c6fb425a588951d7c78047afa9daacdf0d401790a441cd95bd055a4862e3f3991846499b313d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kab/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/kab/firefox-64.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "4df6f0b331410e8669eb450ccf57a959dff94b3b8941baf9e14d033fc43481b62c89351217a65c2e425225b5bc412e29cecc743c75f751e7d4f54817af1bb78a";
+      sha512 = "75343d0c3ba1dcb04b87571a376a0d223d38b32b939111d6d3fc3e2ac416980b8e6d0023c07daa6ac1484336a1268ffd6cb47c1d7dddb294257106146ae53ec1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/kk/firefox-64.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "dc524414f0da850b15327a47b02f7f1852095aa6878a1015da3807103ac9cdb54a7dc1126a44a0dc02e12edf593eedc3db7e11905079fbda1fb6cc3be94b2a27";
+      sha512 = "caba86f7350e41b996c5c8e2c3cd5e7b227ac8714aea82eb74ca114c588eed5184f023caf1b4b6586c21c2eba66d3c53070aa6bfefa072113cd2a4a74110fdfb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/km/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/km/firefox-64.0b3.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "bb003bb4a67b6ef935ba8c90aedeeac77c813c26bff798927c9056f53fa287fa69bb07fcf998aa1603c78b7f22238ef2dc91442f73c22a2488f7bbc887d315bf";
+      sha512 = "572222b72b9853e2d71662f4ecd62af748d872c18f01dba6c0168dee69d383d4c54cbcc2786a66ea09b6c79014923fd9be34d9505c06bcaa4660ea071a9f9a33";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kn/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/kn/firefox-64.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "eba80394d9cabf5cd5de8cbbc1a91176df19e9b25604a0291f17fbf0c84b4a6dd6a4139b19a26d6f1e112cd57acfb3b567e7d16c8ddf9854bc6e8d44b9672e62";
+      sha512 = "57208fa78265ca4ce0b19a53b455cfaa8d048423f3f1d5626601aba89ff272c3a008a37682e1f706b7e499361cf4f8fe3fab42f43fbc0fd362d4a461b3578e9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ko/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ko/firefox-64.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "77a6c5a9c18534ff6ba70d52760f9989105aa72266ab7ff830d4a8dd21b028d42d209068c7c023b54098c9b22a1118370093bff0c9fdb3cf779cd4058e6756a6";
+      sha512 = "78f372aeb663752c5981ce15a955480317ee40ae29a83e55c53328d51a76ea1800e74fa64a35ac10d94297418a50de1da16f9b2352159ed0d08579a1de46c5ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lij/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/lij/firefox-64.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "3e0598765c0e05f233c73a5198bb94fc506dda4f0653a445d2d03968d709b6da875c03bf088efd2dc40e56682f77a33b848b6d29ac5e31e7ff7e5ac5d2824255";
+      sha512 = "6f3355264ab1599122f5e9ecf3112d069184ee2b4208d7e6fba6dd97a358bbf4beda43ccacca63fed9837632d5d8f979403e5404aa3513ea21487eaefb4fc519";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lt/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/lt/firefox-64.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "ff07d3dd2d594c8abbac8662aaeef6beff0d5465205f84c79e1271d3ed9ee935548444268cf072d26d8574bf48bf69c5b74a3b451c93dfc581e23f7aac5ade1f";
+      sha512 = "145963b3e8d88b6cac78d25aa6d34b3991e7432bfdb11e53df86e1cfc6ac5d88a43b535ce64a4225174c41c9aa48065f766c49cb70828a22bfb6791aab83f68d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lv/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/lv/firefox-64.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "235b13b9d3e8c9d8e43265c5af82f7ea0aab3a0113787ab9b5a52aa9707a0a6c443ce6469ea88c34397bbdecceaefc570474ed05c3e9b1efb5576790638bbe71";
+      sha512 = "8fd53f1f2fef7bca7a75a8e18a4268d9e2bff0f550b23c8a817b51f9791b2e31061a612dcd8f72a61e5f8dd51b973b6e8d4b86481ef07f973335cd1e7d8af42e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mai/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/mai/firefox-64.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "0b9d67be23502e1279f895566e69fbee36452f6848f8dc814fbae23ded7b09a06850bf3b99d42038cb532b4c309f8ce21f7f4bb4f3eb74cdb688278aa23bdc6e";
+      sha512 = "ab9910b231e6d395bd9142f6a2d7ac5d565317abe5cc977e602055d5eea83f5520918ff17372e6fedcaebce4509d30dbd0c9a1d89bcc5ec3728c2406ac62bc8f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/mk/firefox-64.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "da8458afd3b0f244d298ce70ea50f22ae7a5b2070078ecafa1f5b7dc5838430e6ffaafe9c333eaf81e21b11da9e65ba4feca23ea5abcebaefaa7e05f0865a7f4";
+      sha512 = "a84ff39f063a0aa11490f6d059a2112a1e0e2ae931dd8b3a576ffe2253c4f0a2600c221d9cefa2bdac8c3af87b4aa6bc571caeffeda10d78b7dcea7bab694a1e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ml/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ml/firefox-64.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "4ac011104c0d52f418a712321bff63310575209b4e445e5bd53a047b7d3da2c62389862131ece662b7460b1aca57c51bcdad2a5dff2b692a5e1c40b154da2ffd";
+      sha512 = "46db7c4284ad4441877c8a72560c560bd4e46d0669ab4144a5296f1f25c796943253dfb1e55882e9443f1f4bd2f083f83e00dca597e20a35f241e8bd54cf5727";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/mr/firefox-64.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "8d37b246a9b9b527e188e557c496df0f2efcdb92ade95ac3e34788ed5b1d4d9a2a748cd8ccba01360cc9e3273e143f63341fa4b87e50c1b30b07c3da884ecabe";
+      sha512 = "5182c8648adc51b04354ef1dc4848b4245800dc57a80d54dd605c56c9a792cc9b3d57085c0c125e27453fbdb0f55523c555c91b84b7f8462df365b7d47d7c1f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ms/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ms/firefox-64.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "5d67846ccd9b1e5550ac51f49528340a31ee5218169af5dd93a37e034feca13deae208610d1e2ecf14b515ad618e40db2857bacc043dac0662f9d9c4e1e86816";
+      sha512 = "599f460adbb94ab3adac29bdfa7849dc0e44c975fb2b8d4cca4ba25980bbd36085eecfde7a23dd26c223b0d9917a6800de230ccab738fc4e23f7863dbec21fc8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/my/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/my/firefox-64.0b3.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "e55d0d24b8cc6ce22f6d16467631e857ebc7d7bee6bb3ecfefa536927cb7f32af08b5f0b9924286c7a2df8ab48c12d8af2751da9fdb3e012d1c031bea01ad39d";
+      sha512 = "86f01c39b760489c33d81b18507af2e365d2269ee33b8149d66447b57d35d41316f65e187d81faa24e5d1f9f045c69beb6e7ccf660f89793bb7d68263c451416";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nb-NO/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/nb-NO/firefox-64.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "8820195b803b46b4b01ff27c1f2dfb5182b96b329cc7a0c0a22e25f9507d2f2138528beeb4a2e371f432ae2ab67189c0f066da920d81adfa6790e7735d6fb79f";
+      sha512 = "717096bac06b4dc090dfd751352f1dc081f0df04e52e09cc8cc4645c9bf7f95f4e6170e2871bfd86516c24b5feb125a0fb6c6f798f0eaa806299bc225abc0d97";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ne-NP/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ne-NP/firefox-64.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "76f9fa940003a7d1596db4e8c231c2e773207a36dc6c2d3ccaa6667211b6015f8d8d5d7fb799ad86f9731184ac338d0f07e1ffa2220c03710dfee84d12937d7b";
+      sha512 = "487cc658fd62dc09ee3b58372dbfc94d8ceab4c2455018ead3eb7cceb2912740d2a63b3d9f2ffbd92de14c538511641028b50e41b03e27b4a741cbdba6b63a80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/nl/firefox-64.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "35c90c990926cec24de48d3748d49285d9238a8a3ec7068c219145619f3370c0f0add66b364fe17f29b0db221b588050c6445399410f568f89bbe8d3d7efa978";
+      sha512 = "094fe47b6f3da6b807f951664c4172766281f8b359fbb461a1ae724197931a259a02dc24f6bb47643ad4a14bd6a415e74f3ad4ca12ee66aa6ab0ba727479195b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nn-NO/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/nn-NO/firefox-64.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "d5d851790e746108d98160d96bfa035af08a9ad27134d377e69f1b08f059afe751a6f516e76a512999420662e0c58cc1b1c06572fe596b86975efede5ee28349";
+      sha512 = "298fabc34d153c384502b2a218f147c64734f0b5d2db810ad711ae09cea45aedc8d2dc70065845925bc7c79bf6567beee1977786be035f3e3c8955affb412a1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/oc/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/oc/firefox-64.0b3.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "27f61535766bb7f1008f900147c387d611ed7269b6826af271ddef98fab22b7db73f58c452130bd1d31303ff64f75e663dff4d2bd533589f97d183bc731cd9c2";
+      sha512 = "05775a6cf16a7afade486ea6475e5d0de668ed474ff35d22a97dcf7b732fcbc718ce2d83673cf6257e2304e649c1d4535483e88b1c448f1eb8a667a75432e74a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/or/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/or/firefox-64.0b3.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "210d2981e4c48f4b9381558ab77e9f55e9cdfa450adcd23b4348e8b7f554fc844d4de8b48283d14b7588c86843d1a2c41acb49df12d167099e42805fae268980";
+      sha512 = "e748661be43563316b621243d5643e1e0d4ef4784dcc0bb6781e2d656d50476f8985826fbf169808793cf0354f206a3192f8d4976a21d3ea9175617682e4a8d5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pa-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pa-IN/firefox-64.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "09f5277ab266b671633f11eaa4389f3ca0e3ac2ae9e8b0c5c4cdc8d3d457a6973c213617f1f450bd4b7e598bedf5cb0820f06ae55846b1d47dbe34cbe4209804";
+      sha512 = "c1f497bbba045b5f416c3c471954592e5932300a941b9df27cdbd4c488d2690fa3a4f6f97f566b3dcda9ed21c1f7ac4bef7ea487adbf36f88a6245ac885cb5e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pl/firefox-64.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "8f1071a5ef4596355f17e65c1cc06641f224b53486c9be9aa7ad8ba8e240239cef9dbd913c44f1f0136ef27bff152e0def1e3366255bfe555ad87331735a7789";
+      sha512 = "2333b1e05501918abe9a47efd061ae946eddb7f6c0ed687cbb6a9e2816af31f956482dfa916c4cee23c61d2a98be21d43c866daa4bc84ce5a1b9b01f4138c742";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pt-BR/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pt-BR/firefox-64.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "609402cb9f3ae4d94ad33f0189e85681de1d356bb97d73e2b8c682b4e664462ec486a3a757234a7353c08a92ca7b5b3ced349c1c10e40e78950c493c09d3d788";
+      sha512 = "f5b63931cb71e6d9a0c483e2b73cae04b38bcd78492082cb56bbe42b95732d450d7956f39edff29d33eeca24678d8db7e85c18cd3b8530123917cae58b685a73";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pt-PT/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pt-PT/firefox-64.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "4d375ce5879b9272396868ab4a70e82e8e1117dcb07d8d1e8780d90d35c77ff6b9c94179ce48233ca9b6e1c559d7c0b339f49066366b15ef2adc563cf358cdd0";
+      sha512 = "691b48471848e11fc30388904cf20150eff3ce0cf60de319523153afc13a28179309861957abe0222bd96fa15bdf27f2051f353b9e89c47e4706f2ed8e08181e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/rm/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/rm/firefox-64.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "1583dcaca18fbe88ac598449ad2d352a6857ba80bd7e97d07beb282b270b7277ee58992e622ab6a6fd66d9393dca4653c7e3562c8d7c6a006c7637162eca0e73";
+      sha512 = "854ae30ccae7a822ca2e33671d3bc900f9f86734fdd625097b6c4c5e4dd83369ce420244395451a5d740032d7024437cf4fc3a492921044a030cdcbc389db620";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ro/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ro/firefox-64.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "79fb6405d9db8f6fe97dd7612574863636edaae54ed879bff5b2b137bec006664684de98e94c37c0d64f37c8b930b075dd47a47491b8377b8b1cfc351aa4b6ed";
+      sha512 = "b2ba3286621fcbc43809dfaa029f5dc7f5a1b7fb7603e570698ee2a9666797e4fbdef147c3a437064502ec7612b951cdb7420a325f1e2eb102ddacc37596c771";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ru/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ru/firefox-64.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "eb23667f89441c24dc38835e5fb105e24eeb3e7a5d896943e796a92f9bdaacd654b984cef060328d8df6cd659ff6ced32d86bee5c3372c47f3106ce95e5f8898";
+      sha512 = "c248bc397970040678d3ae715e6519a2707553417aa1afad5ca2261b1cdd6bafbf01ad21a5209b7ddd0676cf432bbfed2e4ae52302c2df7bb9562f98803934f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/si/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/si/firefox-64.0b3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "e867a968620d23742c78f6798870a3e96c38849247fe66e068fd92f04ea78de434b6f4faea9e5bb01fe7dc0dca18285e39310ed354e24fac12a5c86a6378cb63";
+      sha512 = "09ddc10e60db630c40e449c7cf7c85eaf843eed2305361a50de001fced23bc622d6a754dee8a7f5086d570eeabee318da0141c92ba04f242afa172346f54494f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sk/firefox-64.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "bbfffdef77d2aaab7c2becf876b28fff518ed6eb3a87d96d9faf2c62dc0861a1a33a9260e34a3f4ad2bfe475361234a3401fa091531d1c90b3179fcb0a946aa6";
+      sha512 = "fbdd72fe546d00bb5bbb5879d85107b29286100edcb57f00ceac36a22729e7c33b648af7a064d79287a87bede24077fefee589865ce0e36e34e281391ee2deda";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sl/firefox-64.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "11101ac18a3f473028407d413057a9801afc76a898126b65b73bab057578e6d8f2eb2e9b29cb6be35a5375ac59a11a3bd6918c54a8fc23fb6caf35ff7e667910";
+      sha512 = "725e1d1d1d551be26298224bb1d28ad868a0ff6f186417af95e6687eacd2a43c750c69b7156559019691b43bc71d71b9624cc541f87ed967af2645040c135169";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/son/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/son/firefox-64.0b3.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "be40096b63bcb006c587489fa99abd758fe3a24b5f965f9e53b9e2602bfa37a3f07fe6660f7064fdba6861a8e2bac5f3da5b0616968ba4b88d1868d0955cb0bc";
+      sha512 = "5366370c753b5879186bf1bcb288a8bf54e1d6c7615176f90e4bcdb75210472b05b20c5253972dc89d517523f02859c57387ef5dda5c3cdd6ca1feaf087bcfbe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sq/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sq/firefox-64.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "cd6b1f2e826d575865cf51fe78f3872c50571c9bfeb726f4a253dfabe3af3a91ca1fd238d5b5ee73e1a01339c88444fc3dc3a1ba38492d6b99924c597dc96fca";
+      sha512 = "33e85039f5a57c4e3c18777cf42096e8025aede9e40286533d3bea42635829d91065ba9d96e3270aaf0347425fafe726f220c3ca2a68ffb8d07f6e97fc38b489";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sr/firefox-64.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "f0cf8e489db3cd8b7fc535a0b3a95c67f6f63fc7c76d5b1882e3fa8d17ec18fc751aa91945dcda984ee09547ce161b8b7965186ce0013819eb45fcc2d72c9391";
+      sha512 = "0f2effc9cab91295e5e715853a3d632b42c0236d07438187581a93acf4c5206625f11072828f552988708d6a093bdb165ef95030a2ca42f70613237c4a121d21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sv-SE/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sv-SE/firefox-64.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "12223fd3031b445d4b413cc48b74131793f3c2d8158e7aa7b2271d6b94645b33956e066b30fd4021dd36fa0e32c08deafd3f5c9c1fcc554b87e364715480a5d7";
+      sha512 = "273be614a7da8eeea5b88b12d8e5dae30782af8d70b0fb6eaef0c6f0f32863bf7b36e2b4f6597c67580077e4e0a57361c7016598f421dcf295e2bea3789bac15";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ta/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ta/firefox-64.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "97095e3ca525aa45f7339b5fdd171acc7e0758c401924cb2721e368513c260e8094162bf2e22daf5f34fd680416dd7fdec3f5e3b65b6fd655be1ffd4a1850de2";
+      sha512 = "9573f6bb941dc4d82ecc257ca31b5c5112c1a5c8fa489ff4b588ae66eda36963c614f4ed526f863f65f6aa0c4d0d1884a4300ae69359c3a35144b4b6abcd9d2f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/te/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/te/firefox-64.0b3.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "739142d798738f12758d335b8556f518dc8b2784b9517586215f82d5653059a3cd98539c5784ec3461529156282f6246d93220a7d06208872d9c90eaf08582f6";
+      sha512 = "2280629fa2611033c1c3c614af54ae2ebf76fdb0576670a4e8d8fd5ba3a288ad56cedf6486883c7bf26194910944c73c0e15d14514b91c179510b555cd8b369a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/th/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/th/firefox-64.0b3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "a138503adb1f0ee2197714fb1e0db4b5bfb004b64205835078cfbd51548a99e0b9d920552130d0646c4f16699b084e4fa88eead584846be9650964fd51ef4882";
+      sha512 = "4b0b6a910e66bdeba240a5b6580ea7f00e8da8a4aaa932448a8c6050bc2f5e0d2eeb6c87a8c7c093a2060faee2d3f94be7de4934bc4774a7beb3b9cf147444f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/tr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/tr/firefox-64.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "ae9f2a6f83816f02a0b0c2240cb8c6eb003b50b3b9cb3c6b959b3c11f6b87effc38f40daf3d4b2b33140fdda3dc99a5f90af582e9d78689ce1cc965f5a88e119";
+      sha512 = "a9c5aea78fe892e7351e2fa98afd3ed14a5ebec3011ff015389842f5a42bb791f0a9f52a07cf09c62a3861c918dbaf87b5c571adf4c06e73814e4d070b4f1be4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/uk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/uk/firefox-64.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "b0e650c6149a761f202403d0e4e4c75e976657924bce2c10d592c5669b7a055ff9d6a82f1795b5fae2f57c6d49be4cd6923a36da73e300a5b6d287f442be93b2";
+      sha512 = "1ee682f1b801e181f6c12380b6a7ca0008893adaaa31b74cde539a316169e96fa67d2c74205d65fdfe1ecc246c3a60265c898ac931b6a153fe991f8669bdf02b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ur/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ur/firefox-64.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "c7d7c61d810042bee0f5befca5c139550bd73efb67785b87b21a002521fde0d415c4aca753fa47471fb7489bcda0f9248426ccaa8a2bf0967f71f5b1d4329df5";
+      sha512 = "0e80e4691add90b17185e8499ec764ce490e6a80e21c0fc1f551073e8809de1ea25ec15ee23fd5b7e4821f35b83c7b9abb6ae7a8592ab575c5cd3b851966bc6d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/uz/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/uz/firefox-64.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "6e79e3635b68ff87d616f8626475684b4c18626c9e8a2bccf99987e96124a31751c6c9638725c8882146acd9368a290c51fd5726a9b9903f1b0e9f1ada42e6e9";
+      sha512 = "1bbd37542b7afd25d767512f55b5444b0d3b464da5219d7983f3c816e9dd31bfe3546e51087fa939a92e96dbe89c5edd5e2a01222ab86bfb48cad4b87f71fa14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/vi/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/vi/firefox-64.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "d4137788bc763ea1a2663fb0bb4aec3b7af412cf1e38ccb9fd484f9f486b877a19d86d17fe9af19df12104433705053eb374dd65cb76c6b180526871f0d50290";
+      sha512 = "8445821da59233ed45571d1378348208c23d0738f4a3361e880f174601a64190d32ba859299e340a906d81da08131ce74cf7aa7e083b66fe117009e97bb1a0f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/xh/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/xh/firefox-64.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "614d803676b83df0ded1db004b7f17aa66cef14e6fba2f20504d1629b55ead1daead52fba7eacd66e6519dc41ecd5802f7c1ec49b6ad5b402129528914d0de69";
+      sha512 = "46bcd715cd6656a64acfcccb73a04c60f358c64fd227ca6a973e52d285733ab7af81633a931f15b847b4791f42aa6fa4629ca269d71d31c1f51d6f52a6c06e7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/zh-CN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/zh-CN/firefox-64.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "741671e9bc6d102873b899e649d733befa3e4ad26b2429f04e87073eaf445a9c571087602a8c347cad0412a9efee7483b9440f794248a2dbc30962c9e4a599f7";
+      sha512 = "498c416d53a7d75657b13ffd98b6f15d7654a59bfe7326bc6ed69137fc4b124bbb8ba746da6b71a5486c802afbee54f291457ce67cb073496a688c815d03d6c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/zh-TW/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/zh-TW/firefox-64.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "615ce8b1f44f02aab20407dd090a7f7aabee0b022b616d33e2d7992563ef8703493967a2762df1457c6e520a886a4f03c0477ee79025ec36a4b345a0aa913362";
+      sha512 = "dcf126fe240e0eeeb52d402dacb6750a80e2d4b2342da71e7869875d92e0bc1ae60e6204ee7c68b78ad116d5029ba1c0f841dfb9908ba18361df85ce9d2bd8b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ach/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ach/firefox-64.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "070e6e47174129cfbc530975bf5a59ac055e942a2732379578a30502b109b80c93162d144ead7306a8604c1945723bca0666c26d1250cd17c4404d5164551d06";
+      sha512 = "a3db29314db1fdd166bf452bdc2f9633a1aacddfe825220b1c3952190201c407a116d90cfaf356b27039db2c313261ffd8bb450b15f7d5b03a3cfed1002254c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/af/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/af/firefox-64.0b3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "e808f80625803ef21873fbc52f82569b086e20671011049761ea1e9562c57df677a3bb4baf147442d1c699f7c79e61b89bf3011a47457940dc5497ee03410b91";
+      sha512 = "fec2646759f8ab2dc3485c907da2e94cbeb452ecc49863172ba4cbcaaf1efd7d29753a70aded63ba7431bb6d1042bd17ffcece5b47aa1e8caa9ebf9ca836c47e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/an/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/an/firefox-64.0b3.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "45fb2dabfe3bac2bcd78e659a03140d9e75fe9ff9a458037cb35f7bd2eb81b6c33484b1b6766c72e03705020f25cf98ede7a5946e99ffe59963b054d27ce05e4";
+      sha512 = "38570642baff4a9e3430e39204c2a06c090127a41465b217bbf33a6b8e131ae649cdb746bc2a7f7af89c8dc3fd6f52c39dff8b88428d35a105e47f82bbbb592d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ar/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ar/firefox-64.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "7bb953deaef6f5d3c09f8a62a7e2abb285e9f23a8b6a47286cab12b2de9ac5fa911dde47c652110b635cfcc3c28312e348113ae8a791a7e7552cc30d9767f3c6";
+      sha512 = "472925b60b35d42953b8cfe381de13f6080dd4f378870c27899c53419aa8341be7f713816539477eba34281a2b08b233529305f187f851372ea02e6369ff4d77";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/as/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/as/firefox-64.0b3.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "38cba3560bcdf6356c10ee2813743fda65563385510588a5d58703b4ed033d43f6ddf1019f18b29ab803f25cee5cf2263291eb49969d998b26fdd105bcd14312";
+      sha512 = "271091d9e6f28849a9d58f5760cc35f1789cd651fef30ff1d9cfcae66c84653e4ec8ef30889a6379ed5427e9abc84433684ced99bb314e380302253afda047fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ast/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ast/firefox-64.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "1d632c4fa3e15145dd58f311bd3f4cb731fab4646f6a54bce4d5d58f53bb58964ddff8aed77cf5c3dcf59a00a9441b0f508bd9a031b79448009fdb37b501e249";
+      sha512 = "c4ff0474f6233bf7c93cf031edb629103adeba462c2f28eda3075b41c1ab690ca13adc0875a97bc65ff1c7e3c1102d601a62cc3804fc89262afcf898684977f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/az/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/az/firefox-64.0b3.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "3b4a42141d00480775d96db00376a66b4c65d9702a91fc5390805298f9b94eab260c6433aa8ae9c1c2e79f4706128b2771ed058c1196a40e90dbf1c24be880ab";
+      sha512 = "4a8454e339dbaa80024debf6e7c852195dc4be476da263613dc1bc086301f780ab12cdcfff5720d655b0f8d6731efe28f1afd0c0be4cf9ac2698914835cc9988";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/be/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/be/firefox-64.0b3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "aa4b8a4dbd3721e8162d391108e209c02f50d5d681e31fd2d4877794c9d24c8d2669dcad7720832c6dd6bfefcfce110ea25face288acdd368c5437d77b0e7466";
+      sha512 = "2c1fd73725b6a776ca6dcdf1b6a3b7c0493c70ca01e2c90790d963fb7edf6f6a5b826e032cb9378de7b1b86ad08610b683214d8b02d8217df6a3a44676f68afe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bg/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bg/firefox-64.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b9df5e8149384a09039db582a4548994ffc47344326feb96cd6f6ef228e3a6e222495284ba0cf35f9c130b871ad827dc31022242179c88dbca86c61ff5185aa2";
+      sha512 = "88d6cd39c2531b32c57ed2fef3ca0bb2e949be1abdc7b8e1b67411f8a7437bd7d8bcc0f2f6f366122ca08069390d3cf58e1b188cae6ea9be498385e0c03c37e0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bn-BD/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bn-BD/firefox-64.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "a58ab41fb6282e64447021ec4b41ef1653ab7ad11d3b2947ed61d6d711061c476cc19d20320aa70fac30ed106869a0f88e8a22ce0e1184d68795a25bb8b4b4dc";
+      sha512 = "426c76c24a0cb7ad7fe8854e4ade3d4b965f44b02e61c1bd83943ea53b68a863c278d751549f84b5aaa8aa2403398d68ecc665e855adc1e898c83a2e47bde3b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bn-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bn-IN/firefox-64.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "5a690010ceeebeeb9130fadcf04eec5eefb087990ba254e11a5c6f67561bea287783656d1cc9ec7fd1945afdefdb56dbe93eb43a7fad6ae130a56aab64652e24";
+      sha512 = "9d368244d95642c5ae5059fbce23eef91b91913910f2df69cd0f9133aef194f94307b3db1bc8b54a8c9c74128e0478053380e7c80835ffc0c63b930032f61ccb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/br/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/br/firefox-64.0b3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "d2be7334cc018260c299879c9c9c64da71f62d44f8f0e0262af6140fa0471faa9354d9289c4146e9152e1e8fb7b9791b8169136f4902fabebdec05c15695e15c";
+      sha512 = "ff4a92180da0afcb9b4819d4548fe999ce855db2a7ad23b9bbf63028f48a91e734782b5f72637546c318739006b72e97da4957186989a5565499ab406b66dc9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bs/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bs/firefox-64.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "9197ed27907f509e1dff0cd4f4fa1d7309ffc1196b937f77ea0623ceb772ba653568b295ef6532ea3599ef7df5a7ce47eee55663df0f811b006ee303bff8ba1c";
+      sha512 = "752d225d3a02bc576d586126cbb855a104eb31ded32b878ca48dd75a33497fde68e02625d65155df103dc3e09f52e86e94532f0654c5cc278f543a2f52c2665d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ca/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ca/firefox-64.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "efa6c11c2137f336576abf75b40b91326fc1593aed79cfe78fe84994b275c4f49c9fde8e6f45379333225bb41e50d8815e64297008816b1fd93367ab849955ce";
+      sha512 = "cec7cc4b77318726fb2ceb348bbb888c2b06d43d991ab05f0b55b60a50ddd1878b6518c70cadb0846b722fad9faf753be3efe7130c5ada1b22bc339169418ce3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cak/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/cak/firefox-64.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "465611898bc9bcaa69a6aabcbd214f8f83fac62759d4bf2a64b9f07e258dd6d5f5c4ceb17682ba9c885f97b53536ba65acbd772f692dd6e40bbfe41ef1b0bf4e";
+      sha512 = "46c5ef10eababc1478ac40cbb94911061bd75e7b74e3dbcae6a42ca8afaa6f0ce4a60e1fd9cab4739b4862938c8330880e966160cb87c59006df2087a3208e8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cs/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/cs/firefox-64.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "e6c2a3f4412946576cc91a1ecc45e4cf18d2e4547c935f45ff776c736faed9513d777ca443033ed7e99f4a4aee11792651617c658d4d8e020d67ec302c457613";
+      sha512 = "77fe4977710da8503a9df99e9e2969baea734ccc5634c9d3bf250e336018d99779317569840dfae21445131a534e1817cd7de199266bb144498fc0d361f6e63a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cy/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/cy/firefox-64.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "38136e7cbdf7d6b297ea2e183747bbdc79f61d8bee2372bd6f40c1c407e24eaf2f21dbf92f3b96dfd116437e0212ad20eff53ca512c2fe129c395e2d117e26b2";
+      sha512 = "b8e56afce6df77270c3f33ffacf219b6ddfc78a42396caf98fdb88662cc84d477c6cb367d7118b9ec628f498943ab0d3e3711d076c3f01c4c226b8379f85f4f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/da/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/da/firefox-64.0b3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "0ef2e6e928a04d8560286b01ff735647aaba246d1f2d6880644b7750d1cae89e63858ad98332c6cee99edc051a50f3c560edd4d20d836dbf7f4aa01ff281db4f";
+      sha512 = "f733b6a7a470b63d450bf842d20ffda14f2e77a8a4da6ed327b0406d1d1627898ee592491a9d3f2b30e6f5ee14616251e31e14bca995459545a69f2629b5059e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/de/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/de/firefox-64.0b3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "0e66e8ba386846eb140cc9f6606b9b0dde49d1827f98345801967b02d87c0f1b6071ed8fe217b41b0412e098b52fdc80751089058f42bcf550a2b5ccd614a6f2";
+      sha512 = "85d7c8320e815a8462a0bab7931edd439a726618839501e5201cfc526d6fffa401ee696a0cb3dcb6b07b303d1cca96a87805ab593b6d02a9eadc0b8e9dbf4afb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/dsb/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/dsb/firefox-64.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "d37a0a5ee7f9f03ff3385ea1ffe886949d63ae52b2e8e0bf1c49192edf725686be73f63fa9f528a5d4911401927777488dd1b490be36d21b541b5b71850a05b3";
+      sha512 = "9aad72f2f479cb00ed2f862797efe7ee1d0b478aa0fa0c26c22b37c0da1553e62cf16786a7fd285a67fde183a8b01142bf8e80f16ed69ee11162568575aa8a5e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/el/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/el/firefox-64.0b3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "8af83b0c3c498dc157986598d5b5559944089bc27e62b832cf16937be1a3aa7888731fd16bc8a4400c49be012cf217404aff865e8cc8996959b594aa55becff9";
+      sha512 = "60c271b8d83b4ced29b608b6ae16fa1acaf16c63c6fcc0c779e5fcacf1943e86a12acc9d5ec1cb2b3675d85b633c9a809e244d1172bb9666a80af997b4cd5075";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-CA/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-CA/firefox-64.0b3.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "7ae083c02e5a98bda3d74c6f3c8269bd668b6985c411b5deda5b1618c34721650c881ed32987ab369d7b730c9ab4db38f0d7047c23ed8f513a0ab9cfa8a1ae41";
+      sha512 = "ad63eb42001b165bdb453ac5a0e090ad1e42bb6350c8f600d0a50528fa56ed32c5aa96112f79480e68e9c6cf36965986ec322175ef9f36b6265eba75eab37c73";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-GB/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-GB/firefox-64.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "281132f7cf22eae25ee953794d6a26f9cf574e8a794d8a9e1e85359fd5e3ea9ce9d74b961babbb0e91bf0bf4dd29bd49cbcc177c5ed80bdbbf8418ef8e837969";
+      sha512 = "9ad916313359aa3a31407ee0a31d49c3f80a5fb3aaf5167d55e0f01fda49cb85769a8cb70632d82040823ccecf03bccc3d5b1765d96bc3755eb2da785fec0577";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-US/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-US/firefox-64.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "0ab406c65017d67a05759145305816a05f802c7d71e445abe1b0e91385a1edfdebd2991aec7ed808ab2eb006112c5967dddbcca6e46cd7055caf4b7328d2fb0d";
+      sha512 = "4a6e9eae976726c2f3f7652ef82b7787a7d2e173c2894e49317f5d2de8cb546a1ed1f3e9d75c0a610e85883f9009dd2e77045383758565205a3d3d27c05e1e5f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-ZA/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-ZA/firefox-64.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "e85ec9f241bd282d9803b3d2bd56f96ee54605c64a0cc458861baf8006080f1e9765069368aa7315e800a3d67ece1a07f0d97d7d8ffa2386de7c6c4f284cf214";
+      sha512 = "abc7464bdb8da37f436ae8dc3d32beabfff657b52a257ef934f61b885f876d06f67a35515aab702dce9bf5cac2d10c192c4ea367c77eaed53acee84e1ab0d52e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/eo/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/eo/firefox-64.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "208161f8ef28da94564f2ee317dccd8a142770e1656b748737b4d3a474713b683a49c9071515c0ee8de1dd20609a2c72cfbf9ebbadb88aa4a024b74db79479c7";
+      sha512 = "5f0d1732271245a380ee0dcd7e0cbb6dcdd7a428796d7421683708ed10962d3706e7e95047753c1d081239aec0d3319dade644e2ed70474f88621ac8e35a5e51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-AR/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-AR/firefox-64.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "4a847c0e6230a3f48363e327adb8b940a7bbc266cec09dc007ad1357be1a219ea0870dbabe227a3771048396bfbfe41114b9109a3de6a69f52dbbf959bf7d428";
+      sha512 = "5cdf81fc39ae3ea414f9ca4b85f273c79001395cc309ff5dbc0e55d29033c476395b1fa952206757c40b8d3189c69ae97a0a4d909a3eda39669bdae5983f5f31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-CL/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-CL/firefox-64.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "c5a95e4bbec779e250d8cf4ded6623a99fa8088ab67b2d645287249c097e5e645d51524fdf79de408df5c2136efae8718f01c028d15a94991ad87c2ed6469ceb";
+      sha512 = "22d5bc6c5ffb9753d27dd5384b38f06abb85e2903b768dc322e449c9281a850b90de4a281a86dd197cddc57ab0f4f2eadf5cdb5a603d1a2848d8e83cace0554f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-ES/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-ES/firefox-64.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "2dc7893b667b8c381c242190a55fee072a911f3f4f11c80983de84b5a9533bad67b05bb4e42a2a5ca12de751703ddccb2be22226ec66919b9125f1df05d0bf05";
+      sha512 = "2983df2889567e630c0d8b5657e93bfd2898a97a6bc8507f1279c845e5b98bf2993c807009ec6dc8b1870d55810ca0cd1ffce7bcbd3e7eaae17a9bf8948320ba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-MX/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-MX/firefox-64.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "9c4667dfb88881dac477df7a87d351ff26b6cb4640f0a92332f5c62dd88efeebce6840fa8ac4d931d8ec17ebb75ace57e1129cab5fd06a65d2e84218bf6a5118";
+      sha512 = "43297a1ce9fb0a4cce569706563ba7921be9729a732597991bd67a995c89ae40c65b2a8c9849f1a8f7671ad85c424c763462761c8fb7d11ca25c3b8385e96d7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/et/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/et/firefox-64.0b3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "9b68ddfa1049e6a533a070a07672c160e5199e26552242cdfbb8954f649ded4372396071b302ab359ee6010fd912b590d39e1f1f8971d73c805e6db8ae194952";
+      sha512 = "02bbea64ddb822000542412c20f351e4c7debb690ba06d9fd22215ad866eeb0e170b0a109b51c7e4e23741cf87177b75c3ff62cc356b4d2fc58847423ff6d3e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/eu/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/eu/firefox-64.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "fab38c25d1c35bba77fcef1caf4cabade57d9735d3c09decd824bc9c9982846c0790d279ef3915a7255df86db2129a41db22a2bdcfe98a55c5589e4554d63d5a";
+      sha512 = "424bb950eb0393079654ef652ed5366029567fbad87ef0afa127a26ffd863ba01709ecc037d3e09c59fceac27957c8d88211a17434cfacec6fb4f178db8eb912";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fa/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fa/firefox-64.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "160940c8771a376e2cb2e22bce0a3a5bd9619328c1b2d8596a222414e5962805d8c8e343bb0b969114eaf0218e4e1830470b813bc68972f814097de2fbba56a6";
+      sha512 = "06b05c63f63e3316b3dcee41f5f3296cc88052137cf9bccefd0f1dd51202613c61d9d4e43d5131174a91c38bbeb28450c92aa9e183cbed74ec283ec9c48a72b7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ff/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ff/firefox-64.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "519438cbb8fed811428060f0e94196a276fcf6fd02bdb4359098b4a9c33635f4d0022ccc6557976672ac39d4097425af91c07789a443e978fd84c1237e8b034a";
+      sha512 = "226f1e5ad28ae5e43e6475f9fc3deb7d7a602097df2d587919490d6e584b6aeaddc632186180f9d63ab75ecde0afb203cba89ee8749724466a85e7a259813fcf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fi/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fi/firefox-64.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "defcb3c8039228e9c6d64338d9e2c4eb39e87078d0f66b98c229f9f2205516be97fec53b50f18406ab6a14edd06afa6197ba62cc31612b48196b39f5babf99a1";
+      sha512 = "484d9c73ef78217ec3f72146507286002eb798a1a3a7089a927969b48c2dbef1804930758c87b116324f5f348efa3d1b1dc3416e55bac7e30da7315c778cfad2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fr/firefox-64.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "d02c656de8c92f3d8bcbb07ed17308c5753ba08905eca36a4d081fe18fde86443f7a4de939b39feb57def17aca7782756c4a264816ad6fd092252331bab958bf";
+      sha512 = "e4d3ee3716acbda8e132cf7f41160c376560bb2c31219014d1e6ded0c330cba43b7c5fa1ff41591a3c2c9e0ddbb0d9d9894b5dadb42e49af4b992440929e3e9d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fy-NL/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fy-NL/firefox-64.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "89f1e0b0f908ca0a6238e76895d4f8e70008d987e20b64accc91efb0a9024de0d739d7bb34d608e4b125324e19e93dd044490992bb26a1a25cad1c83d4ebc19c";
+      sha512 = "37ce8e65248aeaa25768eb49aeaf0c0d697c6cc32601090525a7aa9879b631e70587c2059148689de358817926e0937ff056796db4381303ee87c2cd72f9dab7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ga-IE/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ga-IE/firefox-64.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "7d3724d3e824ba80e5342049a1e1cdb2754f25b8c85f2135ae782000dd11caded9afd760533371b46cf2dc30dac0d396fb5c4223100c130c2e390d12ce77fc48";
+      sha512 = "f7037a0fff6948e10a3f45c90f115845e7b5d2e6e7db973db361a70ed000e62482eb89f91cad12a939e5df81588f06116b64bdeb72ee247725b042243c53062f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gd/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gd/firefox-64.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "1ad110a807b0e823d3d99350c72a92c0bb81724faf32587d0809f040a29317bb3286139be6652a74efeca4e1e461d98c36d5cba93d18abf98fef9634e7724ec6";
+      sha512 = "e3ebec821362effab4eabf1c14a912a3b40e30ca1392cae5c3cf5df844cb5a0b675f046924117c9b414ed7315acd0c23a7259b19fd480d38801c61d45885db7e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gl/firefox-64.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "cfca9987511af0185cdc5594681807af1a6519443c225942c68b3b53f0424ff0cb6173b0686164b681aca08f8d93f81499f6d15dc18ad729c762d8344dd76c12";
+      sha512 = "2681686a797d128b9715835f05fbb9a266150594da19d4c5a4d5135e3301974db8e8db3da2ff27091339e3e6144b81e1726337f6d1fb7abdf2fbf9f567143103";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gn/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gn/firefox-64.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "28f18f8c402b41e4145988f93939b329efbe447ebc332ee88b32c3071a786a7bd68aa8be8e6f85073026fe1ff56c09d7c366efc9c155b6bb9edd2d84d36467f9";
+      sha512 = "21d2c731ffba1abc9929c312852b856b5875261899867d27633024e0d185525b958d6261bfdb12e986bbc3d3ea5d73cf3200386a760858fadacd410898a255c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gu-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gu-IN/firefox-64.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "a8e45a24c09a0285daf2029a4a483c4d2067acb622aad1be2213a4f5f7ecbe6c1f3ec2095edb15060bd37d3c009cab222fa21e0555a93dc2bd1dd6cfdff54e40";
+      sha512 = "cae83ee0284af96069c96841097ec33eece0a9f2cb5f084ae9356f50af03dbb38df156eeb876164281c69553d46f2c0a6f11036faf58e78d49c297748c1b25fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/he/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/he/firefox-64.0b3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "9414106287db53abf4a57a0e3396a6dc03ebb8f4b5655d23cae019ffda804d8121544d843931082a21969846ac8d13f0f726c275c15ccc84fd7cf7e8c5e3fef9";
+      sha512 = "2b22318e0b591b4d959a8365dbff5471e8fe4667a8a1f0eeb6810f1f61734edd88f656f36c36bdc56e71667313cafd017a26ccd9b11cdd4d1bd6c7599c1e5013";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hi-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hi-IN/firefox-64.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "5b971598c8b2c89150ddd563d9e2001816a4283288f34814abcd8a96520f09c35f9f07068145010f8091496fda33b5200a4ce95be0804d2debd9b34c2ac71a2e";
+      sha512 = "5a297a9898c04d3566e9841f67eb62fc3eb01bce2d4d643d10d9c1dfb09c55281a67810581f2391e29a9cdc41e7c9488d965c7f6202e5aadc3c6001d12f5a2d5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hr/firefox-64.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "7d8ce6ee5d6bc6847481c13ddd1f1002dd7cb6464d5669eea629808bd3d1cd1c28dd653119bdbc131c59588d4c92c1172f7d926a07ded78f8aebc28beb8f0053";
+      sha512 = "90a98b1f6cca47dee81c4970586a0d791720ccbcc11e1146143324b4afe019aca700824feaa228b773bb5786ce3b173f6675f47ab63127480e8b832601026300";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hsb/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hsb/firefox-64.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "73d581fcda9b9e8a6a97402f0b9a42245e015b20feea2428000c05fe10a255a7345bbbc8ef6f83097500dd7910e21928175911bccb12a5b841a651ffe0bb77af";
+      sha512 = "fb1ff2cad69462b6eb5e6b017af7b9f97c99a7267b7c0d5708d876b3443e3eaf588b7154c19cf0e7afc1ad68b16434812904c5ca0989aad56cbaf47b76ba4bee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hu/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hu/firefox-64.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "3f84f4d13b2f474252de73ea7940a70bc2da1d27e3b560c3f448493e1c5b10277a508848ceff8f2bee0fe11ef2196974033a88242b93cb0cd4c34c16996b653a";
+      sha512 = "6c4cd05567597aaacce7903b149778cc55163a64625dd70ea83432b841299c8c46afacf643be84a2322ddc4d5331c0fc2a578e94a1b89cbc53bc5d65c5d1521d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hy-AM/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hy-AM/firefox-64.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "4a667161aebf1b3888b0e78187d5de9030aba10f1fc90c74960104c38eb1d4474e2109b59e1eb2f4a41309833d0fc6c3c6e0dbda5d2c3428875cac6dec7178e8";
+      sha512 = "ab3d4dc4b723e425739ade0263a43367b15ab84cce796afdfb392a60aef1789a27a5153632a9c9efc5e2a4c732f300d86b5e35b07790fa83792f6b70c5bdb232";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ia/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ia/firefox-64.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "a3efa1a6335c7ba1ba7615f90fce09ca508bc1de4e1483cc26f28c0781c215f71dc119a4fa1df0b17cea62c47ada4e75482e45f359bbcafb5d48b11f8acae7e1";
+      sha512 = "5e5306c35a3d6834f3beb5e9d102d014cfafe1c2ce9b7da4939af347166c3fb78db1ebafb5699ef206df62fbf99d7b220f5ac205cc50c626c304584145a5e022";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/id/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/id/firefox-64.0b3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "f5186a99d31215c07ec6533956b52f263ee6c50cac8421eba039b9a5ffdc431efc075bc9f7cd0cad950e56b9a574f6ae47ddd79f1135e82b602d8bc2ad43e4d9";
+      sha512 = "1377eeb88eca23bdf50925b1e6ba606205994c9bdd55776a8d41bbe99a9f57f4a213a4766005af1daa44c0a20a1f053fdd54195e586536dfdf658daa4e55be48";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/is/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/is/firefox-64.0b3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "4c0103edb3041f5b3dd4af8c7a24ef87d372d64cea923f1e911a5ac565c89d734f30d8e17df2a457868e67d470c8609e2e60729974f37fc17c0ffc08ca676c88";
+      sha512 = "b92211a08e555606e2b38d400e89a941920eedcb0da593bc3daf4ec37e93a8d796145bc088b4a1f6a3f93c0568c281790db025eb2e21a85e4a72b2bfb9e6f5fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/it/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/it/firefox-64.0b3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "f00b933c155199ee59639f2e8f790d5995c48b3ff9280f3cfd2a968960e64fedd8bc8a6f90f023898ba966f4a91bd6ef6692e5d66d117f8fb828d08ed4536d4c";
+      sha512 = "4faa4d802e59c7cbe684ae07ed499275200dc77f16ef0e262d0fff72ed3b8435e05a9aa710a3640ce94f5f8331c7044d449ec303d301de393ad1defe171e677c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ja/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ja/firefox-64.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "188e79610192fa583ad20b1db294079187ed8e7ee9bb1e488bb62c3ea3da6a7607876cbfa14158f2f8f39963f18e52d5926b95dd9e0228aa7969e24367b75d9b";
+      sha512 = "9532bc0b84dacd779df9ee323e1c2a9f62f178b2972a1cc3936ee6ca4bbb867d217e2d11aaf9a79fbe4f18f9d53dcbfd91f2cb27aa7b45321d44ca6de72fd9fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ka/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ka/firefox-64.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "e14b97d251e1ba190375e8e6a29483515f123b9527963c7c90df6d54a022bde02b4f1d6df1c8ed77c427d01ce81e13132e6c178b5f5035bd4e7ac9c5f5bea6c3";
+      sha512 = "062eb5cd16d0ca7890bad1e250836314758ff8dc5c56d426d24f72f23258af357f4eaee9f58b7991712b60dcf8969863abb9b2f49b7fda3317c48d612a26d0e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kab/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/kab/firefox-64.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "7ebe6f342e189dc2ef50e9e0a5672acf30169ea28b080df0106e25fb43ee6916a8bc7cf395f4c16c060672d27e53e551d938eef448adf4d36110a045c0b87094";
+      sha512 = "ed1802bd61889dc1627db1bc410713f498fdc3155e8c32b7f210226bef04ad6d6b34555a5578384d427acd092c48ab15f282f870df69f60a9dbe9ea65382c83d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/kk/firefox-64.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "277c44da1ae25755970483abf6eea4303898feb9f0dda099d5245f6b24ed638a565a616515521fc565153504fe86c4d832a780c1799569d4764c7f9ace9cfcb0";
+      sha512 = "83c3cb82272b5e078de1ab71e936ab91e4a386f4ff94c690d62bf546f1d0794daeed53d7b7fdb2334ea378608655cedcd105d90bbcab9a5c9092ab1927a7b534";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/km/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/km/firefox-64.0b3.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "41b351181cc9ca4a77b1ce3d33c27a2e89fdbb8a6132c231cc17959c61b8295503e09e8f828a458f47df49c52166680c07d34a07460daec82b0897b5b6abcbc6";
+      sha512 = "7968176245c32c729884550b7c8b2677b7856a086c06683c8808f29f1517872310daf54ad5618630fd3284e9e1eeb88dba14d629487906b696f87feaaf056e40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kn/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/kn/firefox-64.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "40242adb26067a9502876399c2e1b53c170c7f8b0accbe03e85ecc69f9ba9d377f643d54386184e0f7a612417e45586949c5c47c93cf0e192b5f81adcf391ba3";
+      sha512 = "93926d6ff2e6b466f21386643f045f65a819fde5b1276ab889d9fc6d7bfbc7b0d979f9da15744c59e1ecc565c4960c7f1e96657db2e4fdd9e04b9a3b46378925";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ko/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ko/firefox-64.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "3880d95e5e5fdc1da8e36c58ce16350f9a3eaee4e6d400370b375c4ed77e1eaec950acd483de560dc66634cf0931bcc83b3454c89575029197402be18976cf2e";
+      sha512 = "09c829a2de1727c6b26ccb8810bf2cae48fc2db84011337bbd3afcf6d64e9ddfad7d982816d2acea227ffe6ba94c387f8a8cedf45c390199c078eb8ff42a0886";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lij/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/lij/firefox-64.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "6bfa9b6569d188f8544cfcb7d20e17f1a2827e5bf10db63fe2b10e64c1993df2f7026a957fbd9df5815ffda67698a095253ae623d20d2dd0db4e9cee9329dad2";
+      sha512 = "3b2b39b158059f223c476635bbf4fc2f8ec352c45a76a750391c425d996bda699d6e7a72aa7abef5ca13d6e62bd2577533b916902775567bb2838b88d975bed5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lt/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/lt/firefox-64.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "c8cedf4026472dfe887bdafdd15ef6cf1593bcbb1121ffb8dac5ab5d6ef230c463a8afc36df408ef81f5a3dedcef8367bd8a07deb0c6fb47f34f89f34553affc";
+      sha512 = "048ab9de33176583c324428366e2f950de38eb29ae8d72309ab5559768818f6094cb47e6f4092fd05973a5dc21c1ca554e86dfaa254930802dcbb05e895067bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lv/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/lv/firefox-64.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "c903182cdf3cfd403304e47dc28603749fdf760e4a1b18b23a7723fee73d3c6835390bc868ecd445abaf3267bb69c188499f52c27942a63147b99068a1ec80da";
+      sha512 = "6887e5286c28fa4e26b3b0323533dd3fd6850da62aa2180520200fcc24c7a3ba1ed1fe818f61144b522a268ebf38755650e8bb6f4bdb406418897a2ac978609b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mai/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/mai/firefox-64.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "56b586ba243bf31499504e38f4025b3ca760a409c8b9d6c9edce120ce92eb697fe2b00fb69552dde0937174e8ae90c19d3cb1671bc91a38a0c9a930137c1c954";
+      sha512 = "51a4ed003b8bae2971a8f6f58d1c0a2f738e225a7f5bb53f3e0d6f2dc3028cfe4e6b7deb40dd65d67f4cd57b85e0943e495000a47aeab991f7ff08bb211c79d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/mk/firefox-64.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "9f3e97f154553e6969dce0403e05305da31e3363ce84dddd48bf5156ec2c86e7ee2ff2ceab3400e4c7cf0820318b981cd01383a77402f2856dae44b42138c52e";
+      sha512 = "4e430913b1a6bc6206bd2e4fef04c235e2b3ba4bd672692e3d2c37d7dc56fa902bcdfc58a16e6a66c40999fd94c80169c129cdc4618f6dc1f73b2f094a36801a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ml/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ml/firefox-64.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "ed3c06e17d2ff131b45ba66c66834b69f733356a7c95a1bc6f1c4f8f987dbff1dc1aabc2439bcd01e6d6a27f45919584a09fbd2fe61563008870e90f9dc3d970";
+      sha512 = "992693c9e20d6f08815b636c711c8f27bf616133365f2204d78e93c37b2c0f88454af1b562b2aa7879b7ce94621980e90451636cd0db8493e054b69519406895";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/mr/firefox-64.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "2c14e0ce6ffd02722e9d41492b1dbc9a5af909a49199a685733a351b1f3638702a9234c6ce35c5bf25dcb2c3155d7496c10fd6d38b45cdb5ea7fe066176378ac";
+      sha512 = "92f040a94ecfbdef4f48813b21050a767ec7dbf71613630b9afaabd6d4bd6821b7baf8b445d2456c29e5f708a0c6d3858b8cd8e3143bdd3abfa5a43dba4e6484";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ms/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ms/firefox-64.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "23f6e5eae45c273efdf7f4758a56e5883e3063cfb2ee223ca775149a8dffdb9fb614e5ccc22be07e7d6ff3ec83534adcf6511131c6a4b2464ac02c520fe0dcc1";
+      sha512 = "2c6bbf0a52b1ae0c9a63480768ece2bc43ca147c38d8288f0845068b29dcd995bc4b8744215258bfae4e2b90cdcd27d64860d9125330ed43fbe9cd3f823af73d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/my/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/my/firefox-64.0b3.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "f0589827713b4466ad07dcdb7d289f5b7ffec184b8f259ebf6718deddd242a8269301b13974360c5e10a4dc96eb17bcb3255e1c4f10fabe8e8cbb66e8557d8ae";
+      sha512 = "a8dc48cac66e89b7e2f8044f1091cc0e57fa791acd7f9af2dfdf4225e4c9c3b738c88f7a6e5f5683ddfe016b6158d87ead62f0fcf33e5bee48cb69eabe444921";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nb-NO/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/nb-NO/firefox-64.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "de31966866491c5a91be0bfa8fec3f0c5bbf6add028caeafdf1f7479e7e37f20d58e7988facefaf40ff9e524dda554db8f425821a2cc056a0eab1b19e8cc2773";
+      sha512 = "d05467ca3e2f4839419fe463a090ec3fd5fa80dda6d2e6b51ace3ea3df793332a1071b1cdc1b1187d73fda996ee59c97f6c2448cd29142fb8b27d4338fa24e4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ne-NP/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ne-NP/firefox-64.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "1d9c1fbb917315a22a28fc6fbfc9813a6e2cfc66bc774f20128c2b4949c5c96425e74f26f0872ab91858e339af70e5f3c0dea73aa01f2491d757bbab9d5ba434";
+      sha512 = "6d2da614f0afe7e40edebdd823f25233050108301cf0dde1df62a336bdd97449fd2d4635e1ec9b9bcc33a9103633995ab92b4a1c691939b5486bf7d49bfc5cd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/nl/firefox-64.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "f3639b1bd361d86f2b134de404319ef6fab9f44d7150e8070a5fa2ea2e8cfea708a7426781ec4e177f4ba4355815f0e7c55479fea2e9e4a7ace4c53cd90005ad";
+      sha512 = "b1acb0a977be5af4a539839b01a871aae8cdcd709a3fcef8f8793eb9e56a52fcf39e7459e915ae109387041f8a6c65c55c234bc088823fc790b1c56e68acdbfa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nn-NO/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/nn-NO/firefox-64.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "4e4a678741561a2268292643563688cdaf15e188190bbf760952ea7c566f410092347800537cb7b80753a474e031e9066365d162d21225e8257440412e99f9ce";
+      sha512 = "5d72d260044921cd9108264991fb1158397d2bad147baa15472f4aa7722349694dccde1c60fe7ae593141100bf26d5f09031f36a893e49e902cb3b40c076c76b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/oc/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/oc/firefox-64.0b3.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "f4525312cbbe3048f1d671517f552739a5ceacb52b672e212848a13ffdbf736ab475adadf1cca02a26068ad0a9edc0dab5e6dba19c1831647be16781a56390b2";
+      sha512 = "1c66a63a4ba36dd1ec7883c1cc41db9665b5b141a607ded2dade770461365aac2f8430d7039dfec4de3d1baa5d12fe3fc4b36e7ecf08c706544d443fd7ffca73";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/or/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/or/firefox-64.0b3.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "fbcd1297fe658b0743a5a791a05204e4bb7f4951a3250f494e48daf8da31432ba56de05232e68f6d3a0f6cdc4a7cf205a0088d56cb3fe08add03a27b05770a92";
+      sha512 = "e2f24ed7e4ae2e2601700f02b7abeca63546c82fbb4c67ece0815474ef13421e6c06b4a14c3886813c28f722a2e7f3b421358bba089d67356448b0a00655a6ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pa-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pa-IN/firefox-64.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "2dd10ff59acf1f362405842913eb14490d40947bef3ca2a793813ab99fe3d908dcb5cef5dfa2854399b37f11aa4cb3025383a73dad0c95e008122f87d73e5787";
+      sha512 = "536d1a61b2849950a44d3a3b4cba9d468876c038cfc109449b9f7f3c24ca7ed1c50ff28e48658f3b90a6b7833c9a1b337ebe1cb63bdf7f8dc7b9c11f03a5885b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pl/firefox-64.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "50d5283440925c946088f97e779b84070c7ac4f8710c43aad42ad85879446ef8b9d4e070299cb64b35435421db8b1b4b1848b43e8aa1e3b88be453d4c84c0a9f";
+      sha512 = "9c3c2bd596ab937e9757f2c6204f3866e0a6432802dec1019c9878c83f1a85a863df6f3759e992f0641af5135fe917ad9ee5988eed83407a94aaa2b7b24d140b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pt-BR/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pt-BR/firefox-64.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "51a561e1aff7c3f9d80a8da2343c168d7d12130d94b77c4a4f8ef5daba928082e3668bd87c7502877443d6f5d51e7e03ae8c2a993e91806048ccc40b59e4ef31";
+      sha512 = "0a854b735af9ef1a72d90d5508209098d70bec03d93e1590e04ef3e1d0e1ea9577d617c0acba8aaa490090daaa2b9281b6bfd1c8e3af964146c8e7cc182bfcb0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pt-PT/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pt-PT/firefox-64.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "837d627728c6ae2f1f717c379505a5f2d9b709368448c8344d156da6c9e87282f9821655ecbf4d4639d81c310777e29043126c01d4196a31358456d31489714b";
+      sha512 = "e7510b5ba67d92be489098e9b79a39ebece92f54ac8d2420629b44d80d9cd3045bb46989ac84b57c6297ace41503ff7cf6738b6aae0e00e6ff16f9478566848b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/rm/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/rm/firefox-64.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "f783fd68377303a315e8ca4ca971c7a302d4e1c62b7e3a289ded882ed972156131bf2a48ed7b904ebacef64e44f9dd6d14608b9edb90726a4081e241881d301e";
+      sha512 = "cc05bcdcb8e0f796b3007132657980f8e61ea392a79b4a06bb0cdce3ac35cfec7b96f0e49bcf0517dd2e74309e58a67db69718a7f003093026bca1126ce1c399";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ro/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ro/firefox-64.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "df0be20c8dbf5cb352c20ebeef479bc1a9bc4f60bb8b54b4d81bf0e1dbcc83dcbfdfad5cedb42713ebba888860639a8e3669cc2c159254fee3885d07f8cb1625";
+      sha512 = "158fd225dece07d6820609846ca1bd12e046dce97f8c20bf7386aa57f4c3f22db7611ec845bf48922f1fcb995d8218970a09b7c6a750f3a056c22a5a9266e3df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ru/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ru/firefox-64.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "bedb4e28f62ecd75fc93af2c8ccfadec755ec500a5aedd0a8136f69c23e39c5cb64ea509e9b3551453754a3feae7dd123564aadf8dc13e9179c199177b82be5a";
+      sha512 = "271455f7bbeb694e932d09e32b9c2c3b898a83178bd38f9880acb087dfff33b7e9cf8558977167be0dd9022e18df0919472e3d5c665a9f107424074c8e4df85f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/si/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/si/firefox-64.0b3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "02bac6fcb481ae02feff97ae7f83fbadb170e9ae133ee4f557882e004c21707f82e5e4db24ea6d67170f4ed88f7f0a271292eefb98853b0f96b0c894f88abd27";
+      sha512 = "7c8b690c348a06c9be6179befd0d7a2700e8aa78a9d1c33c4c10c82553b738339f8cdf1be52c5e4fcf5eb980a6ca4074bde18f1ac3a20e0614cdb9d474b371c8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sk/firefox-64.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "d4669ddfb2675b3cd47a617e122079546ee4a35cb10ffc69ccaea76e3108155f3e209b2654744de356f68d789394a82b12b4a0c1ef54c358441e0887c584911f";
+      sha512 = "096084ca8f060031fda50d698e264127309911da0adea44c55c2e64a29fce2fa0553ced2198c65e47c851a99f9a95d07373dbabc13fa05bb5df3552910fe2c5a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sl/firefox-64.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "7e58faa6d6a72d0a750d9a5375931a69b82ddb0ed1ed28c154d93accb3f8db2f0b4416de18352e36b4d5182b634ba1ffabd44fe6a89905f06755288c5c3361c9";
+      sha512 = "0d7cd746877b8e275a6c17c7723c43831716ed48c28d0e2498a5ff483324e31926b5e69f4b14aaadac3e3eb126fd369e8ed334f1e1f38ab7e399edf5cbdad4ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/son/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/son/firefox-64.0b3.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "f4472e1cdc43a1a9d36d06306bd12259f3d63f6282c0ab51787d33af58546554442de80064775f4f55e37a3b492c33a6ca41acadadc85d4036b874d001a9f49d";
+      sha512 = "31f13990de570121e4124ae53e450344a8c52e98547eed09434ef716446953bd27466bf550dda4be88b59ba22d0300087a741112fc2cc649bd9d8b97d21a1a52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sq/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sq/firefox-64.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "3e3d4b7eba47980b83e9abaae4d59afbb879273e55c942e8320c22a67fec924744cdec93e679c4d789596fd3227695865d446a8604580f18b3125c88f50f26e5";
+      sha512 = "07aa225a0f257fa277a932ea3c069ee13b29d2baa79c376ca73a44e04c3e409fe9ae2d65116bc7c3ffacd77685ee111dc68cfeab16432103044025d2a77707d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sr/firefox-64.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "4670270b2fb252c9fd75cb22e79c68ece97e6bafcbb042eed842b12fff2d7224042b273c1106390a0f2ec4a246923877cda50c93313be2aa736a54f0ba127c21";
+      sha512 = "99f8dc070613334eac983c5da8ec9f3b36cbee42dacb68d3c9b3d9c2f4f0df0652fb1ee1350c08c2376e0000539a3ab64b8ab742cccc4da72868e8cc323b49ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sv-SE/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sv-SE/firefox-64.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "30e7f709d3c9efd5f559082b00222dc6cb1b3e8376e977239bb5d76d9793092729d49255599e537c86fe615eb0713ca8c3f9a36a78c6d41ab1bc676ba46cc9b9";
+      sha512 = "6b11e0b66177ec6bcd30f3c30f9a2d3be0f9b2edfccd1ba1374b12e04f450bba4dbe03760650e596b9bd56c9a21cbd2c4b73140d84cdcdef528fceca5db7464a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ta/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ta/firefox-64.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "313a8d22b9870ee916a571a9d591517ecc162c8d37fea2d3efce4e839bb0dfd5ba3f960796b3e2279f1c115d68296d31bb05434fdd2335164c0c211dc2a1638d";
+      sha512 = "1e5f31e988489825a56ad6ef94d1c1b4df5206cd4548bb7b4d624f9472d591c88ab10dc9233f34b81a1fb421638de33905dc825e73f7df1a2378c87091a157f0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/te/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/te/firefox-64.0b3.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "4cf19ea59dd841de4494f4d458075ce42d9d97471215b7ba2f7a84eec79d1258c5cd341ee013ddc422e060f1aef902dc93216aac15aad04c9b28466feaed89af";
+      sha512 = "de45851b5a4b0c748405354542273d9489cd852e40dc8c23dddfbed2b5ffe8c988ee9090f098001ff4da9e446384bb65165c7a8f9445adaa8287c57786a34ac8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/th/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/th/firefox-64.0b3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "cf873be3f9d72655093719937242a69f0b0644396e3332fabec20eb696a1310f88481b2f412ab45835c5ebf40821b298ba2371b20db101621710d7f522e19cfd";
+      sha512 = "b0f06d7e3bfbd2d06c2b95cc9afeb1b24f46368daa3f8bf93c9eb5b3d939a5cb20a1ec65310f15a554fbc3640c7495ccd6333e202d01d72b4af667c91da45526";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/tr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/tr/firefox-64.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "598d4308933d01459cecb91e3edd2bd428a70d7f40905f03e04009ab0f890537310b8ad93393340937e7eccce2d78ef15915530ef2f27dff46885f95b23d702a";
+      sha512 = "e05572dca0d8c7539f433a72c4958a270d7e81bf74c9eb01b7838d0f52b00d0e3a2f399d69ccebc5fcf7041f9993b2ca18c8e078ba1b84b693dfd013460e4e5e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/uk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/uk/firefox-64.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "b5099c35b12c6ce96ee04b49c0b8e38b6304274ecaec1897008cf74af1809fb0a3deb5acd4a5cdfb27d949ba06a669d3eae450b59721afe9441aedb8c6728822";
+      sha512 = "67b3484136deee0c48c99177e7efd8f9287f278b750da94483df9f0eea80e5abba6bfff021f6a5713df86e74032d29ffe9c712a0d5df874a9dcd554a18938aa4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ur/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ur/firefox-64.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "f1f5435ddc19aa2ea3199982a2eb83cff78f016473837e375ab0ab9b3985ea7f727c9b5a94137a76c08c3c1fe4af0d8f127b479d4bb9778bdc807cb46147dd87";
+      sha512 = "9bcf8b221de817429b00d9aa229b49d99a67bab1b39a265adad6f54b543e07d98d715038ad2f17abb4b4c408fc741094f2a05dae3ad77006d683af5b67793854";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/uz/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/uz/firefox-64.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "019a84aa64fc11eb0266d33f67e19623f75960f5272a4b46ce9985349a15a4e16be7c84f3bd7293617cd4c778d62ec8d745b99ee707fee30f3a3627717793587";
+      sha512 = "46a22299c91c7924ec3020221556ba213accf7459c01b9ed42241f92e18e410943bc26a3cbee0e01e268285d30affa240e690b18c9347557dde3924e2c9c0fd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/vi/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/vi/firefox-64.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "32ffe1615af1522970a00608a4689360ca21d51b3003d2ab41cf317a27043c72db483ad427af982925034c40cd84684c973d4faaba81ea503cd28503afb6055e";
+      sha512 = "9fd932091d7e24f64cf6f275b28a02c90d2ba5d1fecf81f2d029b3b3891eb7e22da03932d8b96929c229d46bc28e8905147f4cbc7be0676b2caa85bb57ad5ad6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/xh/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/xh/firefox-64.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "bc88e7f0cf213377d77a3d8ba2b7a391a57c69ea1ed8c5253da5191cd0742b97b0de1566c971d5a9870156cd98af9e3c8ad9a1b175e1079e7a023f002a72af20";
+      sha512 = "bb06b8a88a6b4086f3efb5a310c8e87e61d549ad5a0b3f192015676c15b720333011d4ed7829a5165c2703d4a49d3454512f18dfcd27496aaee2580283f78d00";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/zh-CN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/zh-CN/firefox-64.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "1c2c9177fdb47271b7388e9cb445de61e2e21739a558788f0012c3ab8f9da5a64fc5d833ce4f8d8a7326807daa3147420b88d8d78aeecc827a8596adfcd60b0a";
+      sha512 = "65a328cd8f87ac7ff2561ea7ce105e1faa33bdd727edc05488a4a5c75f456506373de5fa5d393c5050d7a2a1d600fcf754b80ecf56144f64248e491fed45a194";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/zh-TW/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/zh-TW/firefox-64.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "5d7066183b5f8dd41f00fe89f5423109d6d1a8df6d51934c49e2c50c627fe3492294ba992a92d1f07b0ca96811a0d27842418b416618d059981a8dff21452391";
+      sha512 = "4cc0ec59a111a22a81047bbf68c364629bd2376763bac9c361faf33db781c3dfa5a22b896a0cd3b36baaeb935bdf4340d64357496fe12c01c0256e3bdb95751f";
     }
     ];
 }
-- 
GitLab


From 515f89bc3ae4f9a7b6a104d7fe66cce10670ec39 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 24 Oct 2018 10:45:02 +0100
Subject: [PATCH 0216/1065] firefox-beta-bin: 63.0b14 -> 64.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 6633c6d22d9..8c3d7dc7a4a 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "63.0b14";
+  version = "64.0b3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ach/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ach/firefox-64.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "23bf5d5195c7678ec4bdcb1c4caa46e2681031213cce0239509e4999c81ad196c8c3cc77720f83154ff4f60ac161c01d0f8fb0c22655777325f67ee7cf31b4a1";
+      sha512 = "6780c222879e7199a430102865afeb7959a98ff05d5dd0b153fb545d0870bbc3fbd51fb51d6a88e18d57ab71e157dc15d2631754437dc8b4d4826d4c57b5ac6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/af/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/af/firefox-64.0b3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "7e8983fd49deae14281a400ad15146ab27abd9e2f7b3cb060734f2538519541bfe0c20411df35baa836f62a176955edc005755b4359eb66a661e73c75e72a04f";
+      sha512 = "e209850c490e90d64e715b0725bee788d3e10a727253dfdd344ff100893f3e407b10c684a4783be369f35d96c632d0f4809c353370d093daf855dbf7b0486fc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/an/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/an/firefox-64.0b3.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "3542bceed63d08bb955cb089fc29c3d49b0f60ee5dcaed70bee27f1b340b3e34706e64079a5496c4c11cd99ff8ade790a7105b22f9a13a2aad8a0dfca80690b8";
+      sha512 = "b79953646a31876e4db9636ff5a87eef3e84722b33bab3c146a68b64c4e04f02d2b0b58b4c51f5480573d77cfa859415e1b8257d5082c7c01ca8380715a44bec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ar/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ar/firefox-64.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "010a259bc60e823417411ac9cfc35597fc7a5ba997ae30d2f5359194720e7dafacac152def59cb755ea658d581d2a19e434c5863cc837c43d478454837910811";
+      sha512 = "fa511dec672dd61a10d57963da29b83847a5b791b37f386675ef6e7bf86ac7c57aa74114c8b67421650f743d4b0bd44cc9be9ab5bd0cb5fa90403c60eeac00db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/as/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/as/firefox-64.0b3.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "a78ded1af77b7ef20c319022d94275a8843995bbb279b3570f7d389692287af5f7e50f1a5bc3da46ab60300f5f9fe43396d577170c7bdf950bb38e2433a97b1d";
+      sha512 = "f42e5366a7dedf5a113911f1dcfcf8736ff1a0b037059b47f4b0e6021e4a3dd3dfbf1f3afd9873382bdaa1cd8cc535b07a97d5e34eaa3838a98a8bb57f8e8279";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ast/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ast/firefox-64.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "97891240277fb80a206c5bea6e9e2edf98adae043bd68b421ff92339c8857084a5261b91bb672485fdda4ccea31a5b37230a94d760fe35390dc9736e8dff4163";
+      sha512 = "0bf6c6fc480a1d7bf71f2eefeddcfe1fd8ae2c6b40b369e42e18487075f3744b98dadf61a94a10989b9b606256292bf4d016acc2089014ac71ae160028351df0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/az/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/az/firefox-64.0b3.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "fb31a2b02c901f1b52b8a46b80c6118a2689fb4567f64c9ce963dbca2c106983a1e1fe56bd428e3aec381f85136f4914e1c57692bd4a021a5204059232bb74e3";
+      sha512 = "a287d058701dad9c8f9dcd7b2e9a473471126fab1e1cc0c64eab5dd34025a4d10d74c63d1894f04ce55513c26c1effc3b8078b3d59fd85cb3be9a2b78fe76ae7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/be/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/be/firefox-64.0b3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "2efdeae4f09e12b99528f6370e3486630224e0d5baf19df62e79a890f03c2d512c81dc60963d537c128f3749d7d9fa73f2bd44e65563261f4c3850e75a7f3eee";
+      sha512 = "84c511d0fb20709cbb32a51c2e488102899a73f6c7bf17a8367ceda6dcb838a3052c3e6c92f6cb86b5f881c83398e23ff21aeb4abc6e658ad855809dde1fd5e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bg/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bg/firefox-64.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "066ea34c198e13ed78c4b48c6b4d751c3fda1d42d9470a7295982d9510e23d17ec0a937a49b5403bdfcfe8bcddde16438dba0879759ec362f26a4583b435b448";
+      sha512 = "2905bfc56034a2f6329e8247cdaebe212cec97be86806d95f22eb0fa07e4a3ac94652b52a1e0dae4e725d9941a008f7f923dffd5679bf747ddbd645724100286";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bn-BD/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bn-BD/firefox-64.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "3d25f71604d83984c0c86eb9fa27fa3bfc35631087cac1bae4ba2a773b6c870ed2bf81167633757108b631a18506255a0bc8e9dd4160b8cb35960efd987c9bb1";
+      sha512 = "917f7821a7ba71a8dde46e53468b4e3a9d4a5315c9b4ae9af2ae0bdce56b5a0333c12ba44604dd7159c4ecb61a7d5087fe60d83a3c8e7734cd1a90c4aa29b259";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bn-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bn-IN/firefox-64.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "be90418ef58e6005086919dc89ba6168654a6bfde2dc87001a8092174e2b38d8695a70d7d1afdd75307db332785b5248e4b2d38facb6f9a7884d6483c8ab6c2e";
+      sha512 = "12b515b616cb55dae73bbda075a141dbc96a38a1b2d2ad50b56a48fa58bc3c802251098c61a08105f00affcfc79b71615f18c11d57da92d78d66eb737f8a3c46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/br/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/br/firefox-64.0b3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "b8dfee8bafd5b1ae7edb061c04b66ba63cd2421da54780499b947b4cf13721cc8cf7ed1ea06409a6a30dc831bedbbc648ac3a123d994ad676061edd10e7e1478";
+      sha512 = "c6fadf68795b0ceaa5e162ab145da5eb26006e481a9e85923bcb37ef3ea6e6d83a0333d76954f4865c4900b015806a3a3c350839eaca5d6ce56ebb3f5170d97b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bs/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bs/firefox-64.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "402898f9b309d56ffba067d7cf607b56b01d7df80fc8eb60fd04f6d659e4e473b3c2553238bc63a4372059d7841eded51f4f80de602104a6a52ec34cd2a6eedc";
+      sha512 = "05f3ec07875e53afae59ca9ddbf9873529f2350f1a19a2adf29f205c165afcf13a54a54f2420944665a702aa9d8f738c22519ff9172720d09de6e720dd2db0e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ca/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ca/firefox-64.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "233640ecd9dc6847ee9a538563fb3668a851aad7ac0216c09a31c62151c31cd6afa3ce84c36558aea39ead48a85d4270f0a4bc64701d699ead668f687c0e8e28";
+      sha512 = "696d279a802ee758eda15bda7b0b10b11a6f65f5ab5b8068df294a986552211c27437ee825ba7533650b5174a4525510b96cdc39fe244008de0c8c757a95744e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cak/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/cak/firefox-64.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "e326c1e011f9a58b40a026853c2d1d34ef45090a2f86d69aab46d358c2e3a42367424bba49d4c93fe92cf27c8bcc4d802084b28432b550b3c1e3098f37b72fd2";
+      sha512 = "828f577737e9c767b349c0413e9fb9db6a271a97121fa1960da885592c29bed060e15cf53ab29f9c181b220a4682814879b2848ff6ccae7d5ecad5626884475b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cs/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/cs/firefox-64.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "efc79e7384761d996a9ac636dccfcab32f4d14cdff218eb3c0161957b8a659ced0ebddd2ed0bc9dcc915ebb863ee8054b1f8bc6f16666f42421e4982682f97d5";
+      sha512 = "61503f4dc11c4d8026939cb5808a2a9ff6d74e2aa8cc474425f6704608dfcf5f8794885bfab2bb9e4aa589ca8c7ba327040f0668ec3436a0be39cee60db9cc71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cy/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/cy/firefox-64.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "89d06350b5fe8c83bc23b69620c7b6707d2e35981031783ad41cec728e41b842f990d7acfe2ba9e0298f0955f11f54d7c6551752e9f51e5b563a553001fc27fe";
+      sha512 = "45cb13ac3ecd45144d898d501a3bd29dd3bbe2de22edc9bc15453321a787b594b1b3a10bd5c4c1586998dbb0b6dbb60916673c062eaefd2224c035ff23f8c9c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/da/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/da/firefox-64.0b3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "103c34d736307f91e4e4343ad0b5f3ebbcc1efbca660782768ca20bc7a2cdada2fa40382f46ee57d70499529819f000eebc3e5d62c53ee5bd5f15437a18be6ea";
+      sha512 = "0e5ab638cea0ee3203215777c92c519f04290a29a9b893c527ba5b8562776f252cca57ae6618267427a70e08c832ce017f2c2f25cfbac2575779fa1a946e4c5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/de/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/de/firefox-64.0b3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "6a5e6e92fcc85846b3c92d34694e30672399d9a2821a9107f5a00942bd90e0e351ac6de435709149647cf94943c5f07fad834f7925682f0c0668f4c29b4644e4";
+      sha512 = "eacbbd4eb3c962c54eb892b156d60cd4911367788c3ef8d142037ba1c9603f3f2dce63482c614a1547414fb5a2b19fbc0027c64ecd78f4661c52096a033d1b23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/dsb/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/dsb/firefox-64.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "bbe625995bf300b561fe55210f396d4131bbcadc33c707051b226115cde5982f52520cd815a857542535e5787df210d612493deef50df5e361108db27ee86478";
+      sha512 = "36aa46f73092120b7581b894bcfec8f5ebb53a0169a5136e6758db452f5be174056a61c0c367e9701575c63477249dcb65c0666ce9b97b86d36b2287220cdf05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/el/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/el/firefox-64.0b3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "6b5ea1e59bca7b531728c70ecb644969a33955fa1975b7c9d03b550389f8fcb24de45d041df59e44d5a4cd66c8caa98725d2349d5b6c45da8f9cba917528d1a8";
+      sha512 = "b9ed6e9f45f97df8347b708ec0ddc41fdf684da431b7d97956aa8464010ea9d4cb83ed81f2f97b71d32224bd0b8f2d6dd02bee0b74fe6c7251b8c6749f852299";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-CA/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-CA/firefox-64.0b3.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "ffbf1ea4c01004c435d12ae5b0309f3a60df116df371255d53e252cc3d3e220b154b9f32fc81c6868dd20108ac9d35cb79e4b2402cb62948408288d9cff774a4";
+      sha512 = "4a608528c847cb4a9e37cece45fca3f88b4367a835c49bacc646b06ab89f13498f7f5d8eed2d1bab12da7e9dd416e231aa664c44ef85c0519028283a7c8d1908";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-GB/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-GB/firefox-64.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "7649d91b6d454992d457a3152f066c8c76375bca41ed6101fb5f2dc700f5c5a9adb0c560b5abc5a8e21135e5d2abe577d286e64e77a11fc4d14f0a95a367e371";
+      sha512 = "bbd2b19f8b9a1df28af1afccb1e115e89be0d8bc3686c23dad6c0792c647de93f896e13e87110c91006aa6dc5fd84ffd4583d3fbdd4a4abb1bb13220ab6f14b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-US/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-US/firefox-64.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "068297ed38ee0ebe823069a823a46a3b871528b36815324a7ef514967e2e640f9277373cf1841df5ee64a24d3909bf317ab6d6e70670c4067a2d1a8caaa4f0ea";
+      sha512 = "77f3ed6ba0b07b38fb46b79913040cc37225d56909afbdda49e227fefffad70a783db16dd4f23d89f68d4c7ddb7531298e36f97d18cbbeb5288497d054409ebc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-ZA/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-ZA/firefox-64.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "5f50d62bc6fba7dc71169e5f7c2dd66c0a654c150d29b51a33333147e536eba671b0778ed66e08ef49d8399f3b77a34f31b90cc5ff47e8d6a779bad29d402974";
+      sha512 = "df6ded2a54a5df53df36fe1e81289d26ddc958ecf6a8a40a14b00d5a4c1383e7bdc77658a410eb4d906a69b926d2f30be4e60b30eee384194c5641b37d29ba89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/eo/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/eo/firefox-64.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "341bdf9ec2185e353c27e8037dfeb427c189214964766b4191e1b2b85cfd713a8ec7cd000d2f52d347a605fd41608a574a56f1334ceb8c1cf11fb51ab2e4c7c0";
+      sha512 = "cf2c73fd2dc14e38ea9add2f5438fb03bf5380bd8fd49ed0ac9dbd50855bf01579e9473d4ae1b116b7069d7d58e67c61bec2b4eed53f583ba9557b318f3ca126";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-AR/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-AR/firefox-64.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "6c92fc52e6b63e9fc14161d20e90d58551f7b062682fc12fb40491fead1c042f21bb0e4cd241f6bbc63df865bc28b60177508275b46f340d9438707431c74a74";
+      sha512 = "f9e6cf029b1d883aab0c3550dad4f94b63afc35eafa68e0f426fba1a7e555ee4419845e7c1f1d6811586201d13c81c51a9f1dc79ff33aba41660229497abe9d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-CL/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-CL/firefox-64.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "85ab9fbf84396f15c7d3fa350b9da367aa3e13550a4f936f6578333216c828913635c18f19eda04c31ff8ecd511330aaa9b3499aa86c5113981e91de5ce3ffa3";
+      sha512 = "49674a7c3aff83eb3b667ccfd9d0e58522d9732534cec334db7595a58c44dd916127e36fce51d356e12c2ecec4dd635bafa1b3b015f6f21569d0041556ce7289";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-ES/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-ES/firefox-64.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "78fb7a9d8bba35aeb3ca6c4a28ee92cebefdbcf84a1d169bcdde659d9dcbf4f7770e0a0a5f448b38a9cfa4f8dbe780fd324ccb904d0a16bd44ce82ce1c51942b";
+      sha512 = "1cc2f6e9c0cd7b4a4f5df8ee18b4b7e70875d3ee39e8c865f445fbbf085e63111239f56dee645f03fa0c26dc096c0cd2d955aa2c2b7fcb0f7be4c3a20863b5c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-MX/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-MX/firefox-64.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "e354e8cb44f9ca53df613d40b3c80f3e1c29900d3a1b7c72ffe886d4160e76c7b692ba9e047616e1526aadae8e72050752b4bf310d73f19beebf6533a2f3a160";
+      sha512 = "621dc1088af68c755bec9bedbc9ca8bc31fb8bc3278faf082389e3eb367461d02619ac78900eaf9809c1025b6fb9316d2b65f3d789789c6862fc6d5a7c91680e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/et/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/et/firefox-64.0b3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "68ba92cc0e8d26177884f921239dcbfb43642cf145a8445b22e3f2d0d8b34a2755c68bfd00ba3a05763b9606d27b4a13b8bcd91553e4f6aebf3920bb64eb5a59";
+      sha512 = "dc7f53c0344dcd02736555447750e31fd95c89142e3a2f0ee9c462adc417a2578d22bca743ed4ef73f2f1432c3a7a4c42a6e3d22fe815b05a6bf1f2005de8ff1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/eu/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/eu/firefox-64.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "d140d0fdae10e801203e490b4ad6816393e88a55f1caa1b4e76e11cfa4eb48360f43331ff7c544061a24d9c9f0df91a3ddb39c0926eabd8a2a85a16aa95ca8bf";
+      sha512 = "da7da58bd15cb3ea17c972977c609fcdcd959fd33d28fce3bb1d78e1510ba613203b48cb549532aceee6b3c2a7e2724be355e9347801e32e789ce27c544bf2b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fa/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fa/firefox-64.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "f9895dafc082cb31f74f6f467b59be3e161ebab65a191cd2bd8432e67615280c9d37db3b57d949290c3abf1d50911370d12fb40ac77f1f178608124f1d298071";
+      sha512 = "28e7343dca8bdfe8b6e91095eb3de6efa6a8c573a2482e2ecc60e2ddecafe1a96bc0aac555bb7b7eaca681bdc28a24a04ffe6033b99910ff4169811338d87bd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ff/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ff/firefox-64.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "051ea2a565519497f481f2270290eddbd4f698e6bb9a9777ba49bc751b3069b04961ed67314512727404bcb23d8411be967261b3be54b2f8be2a2f4379688ef9";
+      sha512 = "cf7ff3db94d78802ac6dfee4ab9fc07283d7da3a87ff46d14aec26c4a50ab66ad6fda68a867c17c23094396aaa302a3736ac416de5418c139a69422f03abe3a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fi/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fi/firefox-64.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "813c556ebe83639558f2af959cece13e3940ddd51826fdc0afaf7ce4142f78d07e6454dffe76d57e78dbf7e0479a64024b3720529eb032260509e51f72ac4372";
+      sha512 = "68806d9504c1abf1174dce455910d9e7b06cba0b9531bbe703faa38334531a1194447cb57254e71008696a3a056d575a3280752d3317cf99ab620e8bbb9de976";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fr/firefox-64.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "b63c2db2f5c115aaf2dc4f784d0ee194ab5647e493e64f315557023241d93c7228e4a94f8a7ab9521956a1ad8d811c5b8b7adcb34bf241a0eb2ff28e87472700";
+      sha512 = "6d08c8b11f7baee9895b81fc44fcce77f9ad71f45b96e268dd112735a267ee0ba2cc3a3624e66c95fc675aa01e4fb1b0b6cdfc6e67956206d14168c67adf9a9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fy-NL/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fy-NL/firefox-64.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "eef5fa19a954138a97c7f14371bf53b66eecab4e932b559cb241d885414db578d90ddbb835450589cde6ac97937c9946c7abfe37f2808c7141b46730f899980a";
+      sha512 = "25d5e8f252c3c8d4068f6bf73a083ca19679debb1019c797c075f0a7d56ed50056a66c6da23a2ffa164b13043c1e8ea4fe8c569968f2d4b1dd471d6b8710d158";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ga-IE/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ga-IE/firefox-64.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "5e5ba8b843dcf7d9beb2f27482bc7269d4b3488aadfae0f55fb2cb88d78ef11734255b557699539fa91a772c44c27366faf5d004221b523636d101d6c11a6be6";
+      sha512 = "f3d93d6606404befcdd8cda5c979c9ec22a0de3ed089574f902ef906622e19a88fd27200c8a2e8574336fefed1df6c656c557a29d81f9c4a25b88f3765a18f77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gd/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gd/firefox-64.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "f69b169d9e1fc361ef762c2c6e23e6974e525b984d05d61364aaa1e08d7f71ecec333bed1e5f6e923ed19e6f733add637b6915ba28d6751273f75bea02f6a285";
+      sha512 = "a781c22454cc205e33c4b3632cbcac4494676b92676889dec2cfb4b3f9a39f7d805694ed4fabde77b20d1851f6931c4fcae145941fa0a433d1d373ae264ee501";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gl/firefox-64.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "dabbd994076fffa9e4b265724dd43123e58dbed9f2bf6875e3cee296361be6e90d293e03d7a7dc36a0c7b5e06358970d0d2da9ce59445e6dd8cba853cc7d6625";
+      sha512 = "ec991b1c98d6250635440c659ffffa04365cae760576b60d7bd8600915fdce8ecb58598edf676f4736e55c0025e236121f9e8f0e9d02b2051cc636555bcb9d49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gn/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gn/firefox-64.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "daad08e31d848a8944e36de81e01bc2d25614033ff89dfc7e9a4124e2c7c9193752c4be08240778c05a317c27e2c7b924f45c91b20de46e54ce28d030b4aeb96";
+      sha512 = "a86ce563657c7870df74aa8ab176f6bc0526355f1fd3237126cd5444edc934524b008052f5df78a24f35a4220ac074a425effb586b29a00fb25989c145677191";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gu-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gu-IN/firefox-64.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "e7f674c1588c1674f28e7f76f8a413f20b8f50a290297f045f24db0a0911e65f7069ca53a985aeabe86fb69ee8ff26e8897eaca6a36de47adb42ebcc36a8a4f1";
+      sha512 = "6b30fa7cb8d6cc5e91ff936aa323874551fc5736f991d49d790e2934d9c75d2edd91a427abf269878f6d9aa1153215195ba30442bb9f19030f22ddb669cb1a88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/he/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/he/firefox-64.0b3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "236f84d6ad9588d3ef8accbde3361cf89bc27e72d16bd5702925f929a7da46108671e2ec15a4daac553868433e3758d280dac5bd6e4c60676f55a22575114a01";
+      sha512 = "eea36cec7a878a26fef05de7d8a8e45836478d889da001f3393b8a6c1f9e6a961a980c4f6794eaf190a89d28b56a8fb7ccfa76f810e8526cb8ff2b70d07a2aa6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hi-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hi-IN/firefox-64.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "a8865c86b1a86fe1c60ddd42ec848b1be92f686571777fbf7b874902cc07458bf5e0e5739e6afbe399b499baa38e92414653d469e9d64b26dab15fcab89ae2fb";
+      sha512 = "732f1317aa98ce67a809952071d0a03b7c195aa327072a33a5976b64b2d6ba1695b1ae5a6ec9d7def16402f8f198c12a8cc313c99455a1c23c019dc492c776d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hr/firefox-64.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "0a55d784b892c4d7704da36e8d4d173d96b594fb452e61c7b090b4d1634d4f32be21490501bad131b98bcb3648d36a08f1e6a944e6ea20f606136b4bd8b063b1";
+      sha512 = "ed11cec198299d11af3d58209cb43eea08c4d16ccce56a6e938f57a998ddedbf37267251b05e983bd929cb72649d60f724c60c1c1eef45d993ddd41c57e49886";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hsb/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hsb/firefox-64.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "74a645a86ad9af1a9dcb9fd8c98970deb1f5cb435e3a648f420e66d85235a7348f392f34c0f1a6467965c877b1a12e0bf67dab6e979bb1df82057d059fdeff21";
+      sha512 = "1ee3ad7982470d337865782a00528f2edde41c62f693ca667cc6ff0a1bc72601b4a4e289398c2235ac14d1ed3a82bf2ed2ee0d532a0415c2bb76a1419a0159d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hu/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hu/firefox-64.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "b4f6ec7eb9fbf8da6e1f9bd99c54c84557c29596fab6f9f75211d72632ce644cf2a103c02a4ee67196e161a2ec9127c569ed0fd47bf7d037c01c301c91bc14e9";
+      sha512 = "9b159bb5b48838baeef8fd623e19eb2e801c952dd825f838e2e9c70aa9045c69bc7814763127380d77535e9dfb2256a3f0aac5f8d34b287bc90ecb9aa258a91f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hy-AM/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hy-AM/firefox-64.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "8c8e175aa2f2ae57f525d4b1391eb919b847598019b1e1f2dbe27da40512293075bd87574df5490fbbbd13bcaf5bda5017d980d815475a82b3c0df4dbcc28301";
+      sha512 = "c2e76476e2e5e555f706f9fafbcc034675754eb2c46da5243ad142bac1f71b3e0a116c74aa8582f7c3ee346ce936fda5d6e0f274acb485736bbec1b7e00b9e2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ia/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ia/firefox-64.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "9ab9458e038d48871f6c978e50ba419dd94be472f06aa42fd781b8a75a28be20d365c7828aaa674bd818b32198dfd5a075f2481caa5a7e201e7e94a10e7d2763";
+      sha512 = "06c5903dde7b5a2c0290002fab190654d262f3d6c582cd60834b767dfd5987ab7c3f74c07b4b0527615cd689692b0c1e33ac4e726e6f5512c318ac229cc8dce1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/id/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/id/firefox-64.0b3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "0f0ba70673b6aa030d4fe415097822c3259ff7e76a0a4163fada661886a7a422ade8defb6d47ff8c49833892ea0ed224af2c2d0a95ba6bb3a25a89a990b39ce7";
+      sha512 = "31579b18b37b183f5f26e60e391b9255bd4a2d7c573351a54e07aac89f91d81aed13f9998332ecbc746bd2abf40ca98e10c28845b0b9ede004ec24d488f48505";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/is/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/is/firefox-64.0b3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "ef5065a080d382ed3046e0f2c3f5dc09ae88fbb295d457ac659eb506f5ee171a0f6554ea83e486e98f41e3e4fab0a2e47247e9d72d67636ace34844262446330";
+      sha512 = "f22dc2c3fd59768eeb538b85f0a7843a1dfc974cff5f31d0589a0ffacedd227da6c249507de38c41ab9c51a3b03c37ec110344e5423c7e5b7e4709916558def3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/it/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/it/firefox-64.0b3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "ff46ec69b6778e9f17e0829d007e11d8e9f33dc83469beaaf0c7d99b4157d612f4c749ba0b4080c1f6384b0b0e56d2ee10df6a6e9e220935009a3c09a65ec570";
+      sha512 = "35aef32e732264f1489db1cd031f672b91aff12c02ac7ea4ecd5c8583a27c8e30b6a18a572177dbef466b7c2b6fefbaaa064b8b3206d5d6df25d54391544a7e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ja/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ja/firefox-64.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "f1df613339e61bacd632f986511f0b933857e7a24207aebcdb068d2290f52f1224907347263fb2aa121d14894a0f49bcb3b87e8737338c95a701dac5a4c858a2";
+      sha512 = "d00a6a1dfe229e137e84a7becb1743e2189319052867fadbc62ab5808c8873dc3a72fbcef47f236929a6e1a2c131332dae206dff006ceb7f502073a209a09ae9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ka/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ka/firefox-64.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "94c378806ac9b3c80801f344323efa0a3680f9f7319193d176032b36f36a879c9528fcb010168ac8e7b2f2c72a78e7f30eb9f0d88c2db4d9d4e57b99219e48d8";
+      sha512 = "8c4f89cbb4a5cb026c633da5f2a562b5f43bb9e0e3144d22cc56d7828fcd186031566bf7f0bb48f233c34dd92296f9059731cc92373c0d42fa296ea2294b672f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kab/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/kab/firefox-64.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "cc69f5fda4840fb6e23bca315eac82614e0987aedbd54c01cd685cb09a9737eabf75b2074457cfa44880283701b0f178c903922be948ee94638b88c1102ad11d";
+      sha512 = "1de0080e0cdbd54f066d213d6a09bf1e727b410b71bcd789bd192815f88d0749e1abae41e82b6bba65759004d5f30a8c34da96d1b54a6878fedd7abb098cd703";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/kk/firefox-64.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "20d3d3a2fa0ac8a8226e242076a431072324fd9cbab2a0e15901d6f2bee3532878e8453a2460e6ce1b0d211ce409c9659098a2b02c303ca171a1857fb8469395";
+      sha512 = "2936b54d148ab79f45ba11606632c607ee0d0a9dedc4b48d4ae0db97cb88f6c6167e0547fdb4f67dfc89894c4d4ec4cf53d3b71176dac7e48793e762d4f7aef7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/km/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/km/firefox-64.0b3.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "1ab989e25b9bd016b65b45c3361f7bb3cbabfd3246ae9395101b1316a77123a09d07c780355279f79219dfd42e3b053f88ef3a33596eea07e6eec0ea3306a886";
+      sha512 = "71d3e28b8698debb941ccfa4e046124c2d80fa8e0b8293b3a710bc35612fd1cd49c5b63ea656421901bad7875c7bfc980a9a9b9f0b0e4f1d6c9277d4bb60768f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kn/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/kn/firefox-64.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "a8cbc0b97e8c5ddba7ea34cdd2d23b4251fff3196b8709c22a0f4627709d63827db36119d707b5e1b985a5efe3ca157365e29e090fab971b5b399f5c65cb1059";
+      sha512 = "43e5d3080e96fd95823400c8ae274a168c3b4e5103bedbe2359264f22ec2308ddbced05fa91ae2fdfd68c22ea0c1fa0cb7e5d4cc39d38f47d3834e4e024bb414";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ko/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ko/firefox-64.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "f1a81822c8e4b2881bbe149e709450084be843d71f4397584e1c4c1c665752a1e5f1928e4e7c1562b6c9a7a4a2f394376753c61d8ed71c65e2d9acbbe3817f4d";
+      sha512 = "3b824a6b06b1ca896ddbe640b7664beaa5ec1a2eeaa17d34e0f516a1b5aaaaf6f633c34f563eebd9065ebcb0d740dc58dc262217472b8b0c91b113ab55dd6983";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lij/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/lij/firefox-64.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "e8e4743ec730f999a5944a0ce33244a38d4721a9993fa37bbd2544e7d1599c4005e79bbeeee4f3cbed5385c5fcc40db14db7b07d0e68816b85b0a5d7e64feedb";
+      sha512 = "c311738217edd99ffb79ddf7a75c6295972116d7e7feba29a221c256705cb9e280c7d590fb1bad0ff0b9dc8fe098b1bb8c4ce653e70d170d90cc350bc83c3378";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lt/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/lt/firefox-64.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "c32ca1a2394dcb6d022319f204101803292cad9bd8210bef6c55210c4b52fd7bda257172e751554a652b6c904d53675f0927c0e10a05d0ed13eb2e1bf41d66eb";
+      sha512 = "ff7823346bd78ef5ca874c43d62c19ab1fb99398507ab9784f7bf6485acaf90e794bb878ea2801de2a5b07806bb8b4b3e96fc4acb2e73f9d99607f43ada1d987";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lv/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/lv/firefox-64.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "79c2414ffd2b386bdc232adde3f79de6b3163833b91b42e6a2cb5698536378ced2fb2c87d74af7b5bb00767076a66e8cd7b994dd014a0aade07d4a635a038692";
+      sha512 = "652ccc4cffdfa2f9e3dc13162647c96aed6af18d40380e8f9fd484ef80244716d5052718d49f4e0b806d8f953d30f7732b06cdf4055ec2c37d1a99e9c68cf3f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mai/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/mai/firefox-64.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "0c5ae8842de2fdbec65204d409cb64e96264865b06931c0d83e3d7ea17892b68ae19344807510a660db0f7508c4a12cc846156cf07c19ff99579fdfbdbbc3789";
+      sha512 = "673b77ffc28ec487aa87ac8c6d1940d0804ad47d8cb9a74e32b0068304456dad2c0ed814d126fdfd8433090c843e901de5e0ed0dcdd8161644a3802c4f9576f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/mk/firefox-64.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "5d4dea8c824a27f9a1c4611f4d147d3ad6dcf58ff855239609dcd3b0f5b63dbec68127b6d9004b956db9992768ae9f18c4162ffea37c430342de010de3f9720e";
+      sha512 = "52fcafde72f01cc41bbc1de6985b044dfc66a421aef6c2fe09f89c10d8d1472b69208c2a7b9c4b9dc8fe091dd337bca89577d5bd32198d1867d794985c952340";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ml/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ml/firefox-64.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "69dadd70e72b441ca0d769de082e5d8bdb30728c0ec94fd173e9cdd18207a06cb819a3e0fc5a473878debc223d7c61a6cea4b9fb05c1e430d9c3335e7643ef18";
+      sha512 = "b8592d02931efc5c1a2e1a8c0df73353051a69e94b5205c620893b9ceace0730f63466d9cacae9e8b451e79ae2f7e73334fc5ae35133e2df99d7ff3f227fadbc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/mr/firefox-64.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "4192cc3e34c83e4af33851de30ec113af55fdd3c68e7808a14e506861ccfca63909eb550c263a6b5297d37518ad82741e9ff36d155d27e0eb2189e7215c22492";
+      sha512 = "d4a831c25b20d6ea93938003d68366e34e52b01b87d5e740f89a20ec70b142be52d624345e1779244c9c254d66557b7299edcb3ea24867b12e6fd8d47eb90138";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ms/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ms/firefox-64.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "11bab8f2f33f277e5720dbf298a22c6f175645c3f4f8452e62eff8614fdb0959a25f5069db208521f2878cd3222744c81c6aa33dda0da883bd4b938b9a3fda78";
+      sha512 = "a71249aa2fdc1d22a1e223f58d004fd18e0436e7578d2d01a82480b53212059653babeee0fe1620c2a455d854ca3e68a98e8e9a211862f599d1b3f50323ca230";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/my/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/my/firefox-64.0b3.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "3ef85a1a63026f878cf75ad2d48f1008495cc24d52a884eaacabdb13039c5f212c9b0c2fd28c8dc5bd48102bdadd98aec7c975e53f8abc028747c6c90dafeeee";
+      sha512 = "175f5dcbf66405e9f80c9f62de3e2b972ac9ecacafc82fbbc1409e0bc26e87838ab8a193f6c50a497742ce2c334be24f200a6085e8a256838920087ef2ba873a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nb-NO/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/nb-NO/firefox-64.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "b91108f3e30085becf9bac0e743d5e84129f8713f31a3fddefdb05433b269b16b05db3d4751928010f135ca975d4979e6ae0c8a2ab465be09908987ad79fff63";
+      sha512 = "e2e16db2580e030239018fa34a3c50695fe8f6c94e8017193d6a9e2127567ecbcfa1d87040550619e894edf3ed698e9789fd506a0f386352fddcd31314b0a9f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ne-NP/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ne-NP/firefox-64.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "dfe613dc9a749805202c762de75de6d16571e37a9f74594bd3011c8c62388cae10b4556031094e8e3dfe7cc6773cdaa03532e99da80499b24ffb4d98a3bc6ee0";
+      sha512 = "e659cdbd3a9cc2f9bf8ee18a5a952e30cf1216097d4f016d86d3dc1a0adae29189d52ecc3acad78333ae213216f5b6a4f76dc407ab53364271e3e7b570050da2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/nl/firefox-64.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "cbc5dd229cc5f33350625fbf6667354a21c8ac63b2afb0c256b7c507a2ecd9a089e577e28280f34a91416d1dad3aa5b2b787b104e26703e8db947e9c05e7e6c0";
+      sha512 = "bc58308f98f8bd3290103db79bb37f3a15ed9c1133c6da59648ea6fb587235d2b79ee7374968064dfabb1dc88827e27fa7a8cae39e43c5429bf43c096f0e081f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nn-NO/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/nn-NO/firefox-64.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "827b51031897e41a796f212c9377d8119b9d1d0da9b7974170ada0d7ee27111bd55223797dcbbe272ef576780c6b80e8b8057d4bb461f1679f487a24baf3ba54";
+      sha512 = "c3fe7d0ea818c1dae682fa9c35899ddcc7b878e2b12625cabb76a001ac0808875315752fa8bae0a83d455c902a88a86e44acafea26cd4d85cb531a5cc8aad8f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/oc/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/oc/firefox-64.0b3.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "6ad998087dac027dc02b0157fe11b4b7ce9d2f2f3c923853cd1181557417e91e43e499b83730a5201060b31e30c996fdbd8a3b7c29b263f68c377c34662e8783";
+      sha512 = "35bb0b6f5a5a3f6d217dc215cfb737eb2366b12399884d1f1998e4418ea951ffd7d39d5fc6970dbee883b8440c4b965e013e361fefef3b298bbba303c1ee3481";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/or/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/or/firefox-64.0b3.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "8da84ebe54eba9df2b4754bbae8911570f0dff51d41e07b331ff4c0cb6929ec7835c166f0d0dbad1987ee0692d88dd41d3fc86b749b5b5144b52b2530b822379";
+      sha512 = "f0e4befffe8ca8ea9a420d891d9dbbab4ebc8eb538158d621576e46e6b05a47c2aca815af06c2b44036fdb2f5db3d0cb0d8afad964a8beb809ff1d9c1b6d5c05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pa-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pa-IN/firefox-64.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "6ddf92d42e02778060e3ad6c9faf08187ddd0926fc85f8904f10b5d20bc57a243b61db0ae42c57d264c345d1b5bee51c7e6e62e207c8bd8edc170d84d673e87b";
+      sha512 = "bac1a1d713f34aecf4565c937ebb90a8f226aaf6cd12c1682560634ea6bbc53462832ffb08fa5fe65215014b9efd52eaf5608dd47f30dd13e5bf56beb00a51c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pl/firefox-64.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "aa7ea0983b12ecff3ba235615ff2df5323fa979b02486506af9de83cb4eee679c90751ad43ba60d71ef8d30c39882e69793f266e79d45070157b097d7d12db1a";
+      sha512 = "5b08de1128c10a5408d699d68512f72e54124ccb6b43b3e6ffa49bab90e47c823fe6044b85b58c7880c942b23bdab1ee24d8219ca54d9fdeee6772b546a825c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pt-BR/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pt-BR/firefox-64.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "e28af3020417ef5d42b1f48b18310fb78c6ea33332ad2714c69d8979b4269327b76e1c7e9c55534800d8a3c4937bddf95273097ddcd4270e67bb23366b641584";
+      sha512 = "f4cfd768a38c12e3ed45a36835ec2ea9674b726553cae8755e45e8a0ad20d46b55463de8fdff493068895983b7a816b5213977638d61bb5e57f4acddbf1c2ee7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pt-PT/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pt-PT/firefox-64.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "efae38a659b0d15fe1b1af9fb4d860df2796705df3c11aa51369c6844fcf24aaa342ff5a897b5d2f3be36a929f3fa748646e99db6bff70876e43387f45769b14";
+      sha512 = "3dad284cba4bd414c88d96e1ad5e8a62ff985f1a5dd4408462fef3c9f08fe5855c85298dfe1105d99fd812b6193200444f15dc217d62b300e052018cdae213fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/rm/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/rm/firefox-64.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "1b382086b6e2acab4298ebd6f80cc2585878c30f48a264e9501dfe4bb503818ed84d87e4e520f646a727ebe6180ca3a639267297ee4b463d5661cc61294f91e2";
+      sha512 = "c2c783cb59688602c7788cd17dd5b04901806bf341280f7368aff672005f1bf1e2cbdb81f22fdc02f4eb41cbe9d4b76c47bbdc5585fc97caee4b5119ca5c0dfc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ro/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ro/firefox-64.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "6eff37c77266ac61e9fd28bfdc7a674bd9ca26e30c1cc4697e0e48946e788b632291891fabe11d602727db931af1fdb56467f20c362aab555afd6ca9cb9eb690";
+      sha512 = "68d8225e5873d7328c0d368c0d03a8b3a219ba40c80d74f724e50ac3a1f513842576d14a2af44f10cfc209d782aca94ed17114f97e9c7c495b61a2d239a6ab93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ru/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ru/firefox-64.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "bac168bc68b214100078b88d66c2c88de66e23f0e456bbddeaa371a5a64a44c831281f4443edcbba49af34c6a1a5677e43d8a5c56d69ebe63614d8b3badd9799";
+      sha512 = "91119b5aa441e79969eea5438295e2c9565f96512c834787976d29a2bd8c619d243a500ac065ea64073bfda845382e20e8fb117972ffb9167c927db232343849";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/si/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/si/firefox-64.0b3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "2a0c42e62eaf8e23ea423fbd9f8995fd4c42c8c65141a537c51c8157861a8d9ad38912ca864824d52f961e752695739610bc626862153b091b9bbb1e83086265";
+      sha512 = "5c4404793e0df7286eb529f6a1e110708dfd2eaa0cdc08bd0166dbc8b7cd467e708a6fe4c2ebca03facf5d18f4d6ecf0d0113e7f9745a77b46cb8cebed4aa5aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sk/firefox-64.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "5839b61e1bb4a74340d3068c13111ada01f38d60fedd9e64e78770ac92340f025f1cc92e562686a12b65fe1f17ba170ed925ea2e53cd4b70e0d2f5a1253623da";
+      sha512 = "c4b3f9ace0755c3b19edabfce85a2bc281797cba9d00d5bea3151f40d196615b2d6e978b77071fbccbca1841632d149f946a486e02b8552811fa339375ee1ea2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sl/firefox-64.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "2787536b263be9b7e0fa9f9bd91286b544d83468bc7cbab64ebb6c3c4e3d8ac7018e7ffa877c8a6b35718cffe190dd9ca96c3e3855029eec636dccf25636d3b9";
+      sha512 = "2a1b4dc094025c95ac5f817f7915b5bde481e7d0d98a68af7a232725ffd0cdfe6f999b601d94d09ce85de3f0c60f9f9282fd9ecbd873996dfe77801ae3b5decd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/son/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/son/firefox-64.0b3.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "835bc4e3710394916c23ad066969364cb3ede5bd671ec2d96cbeaa448158f0048d4a33d54a98add87a0471253932f1dfa2cae05094d04bcd859846e6027903d5";
+      sha512 = "24b5fd14fdcfcd1ef1388d9630985c09b42e633eff9a2201e5b07f8d5d95a0845d09323d52d9596d23a3e3f54696a1c33a038445522a3c96d333df7c57a0eb9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sq/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sq/firefox-64.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "ec44a791fd197df0f878e69592aa00eb8425515e072628ae857ac15101d08620023dba0f30eeda14baa8c6bfacf343c22e3e8c344576b413e32cca218d6e1001";
+      sha512 = "260978083ead7ce3e07ab02b324ff1437850a327ad0a270b3f905c975516e676e949f616fe3ea4ce324de2d33e14b6cf442bf7d22611ca4e29cf1226f5c2bbeb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sr/firefox-64.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "6913e130cbc2e982a39e88656e15793e2583ef4686132588e5b1b101af1e4aab53124732b64b46eac2d2df43376b2a65fac961c6120d05158a44e3217c315805";
+      sha512 = "bbaa90b245f24cba9a829adec7e057458cf830fe29879ef5be31b44be602eb4899eccae2b8b7fd32ed58bbef371440747ac9777803c806ddcaa1723c314882ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sv-SE/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sv-SE/firefox-64.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "8469bbbe04052d1fc120a2748997376f397359bafdad36690bd7c498c401c4934b278e1d1e57d39c1869fbd4f3a195247aa6a339f49e8b17f9399c21253901b1";
+      sha512 = "8a143bc41243c7a79c6001d1f9fed8890226ee111433a6fbd1d96170b8e31ee09b589eb36e6eb4a2895b94b020fbbedce01fdde68a1cdcd849911fe5b176423e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ta/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ta/firefox-64.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "048dec7d7c0e2959176ac19f215cf585b12168d7a83f117a35fdc82afe8d001b7df7f84da628976d1e43dae2e6f28fed06701bd1c9a44b0fffe9c2d893f64d52";
+      sha512 = "aaaab23021c7ceedcd6aa5b2f8ff43c0ba1ac8bc998c632554de0022536d42ed6c99759706ecdcb0660657a79c1f640e9474da4fadb74735c7af09da8eb9b8dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/te/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/te/firefox-64.0b3.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "63bcefa4ef757bde099b7661e21d241b2ee88a9b8632567b8f2e8150f70ccbe21b89c4fb6d59a7488ebb372130bc93406408b33ff8bbb54c555538cd77744c9c";
+      sha512 = "4ae162266445d1a7d573368ef4f4bbd8ad87487ad1c0a94ed22430b5eee6a9e190b93ee9789fad6b91470fa575e248a9f4da2152a80145c4c1810a36a588f473";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/th/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/th/firefox-64.0b3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "ce360ddefbaa522c5f4bfecb7e5deb61c342b0adc59a69d1fffd953dde013ab999430b9f0dbfb7ceae94e9684896d83c9222bd3460a5eb7afba9eba26447dc0a";
+      sha512 = "3c4cbaf05a942e8afe7b1c95cb0a049f6aed502cbe6e1fa537aeb4835ec9d06032f9e473a15af83dead5a6a143686796f6d98c1458d33f227eac8feda696e011";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/tr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/tr/firefox-64.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "eb0c148b071a7d654ffabf62ecb1236f9294421bff913648c95fb729547f6388be2f8f0c8f771e5dbec2c446dc4b6c1db962a5abb46019c2cc0f8eb8a775b402";
+      sha512 = "10d0437d731eb6afcc857a957c194e74b892bfca0502527b19fbf7eeec4ee34d45024eba3911ef1ff66575d6c48bba00e42e057558a1e085385e574d37e9ab3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/uk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/uk/firefox-64.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "a0023efdb0ff31515f51b4150ee35ae834d6f0ae976d0209ee23c93dfcd70db58c5c94ebb8f8e319690701d2364ab5fd5db03ed7a151fd33875787c0478e5eb9";
+      sha512 = "49f10d817d5bbcbcafde66b341bffd230d4dc63e1a0addbf12785e1a0526880fba6d371247eb51e224cb58039276c05a698a8b348ceea2cd5be4c63e9ae29931";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ur/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ur/firefox-64.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "b850af8723d3d32fde0b938fb4f7a8734cbddbbae34881deef09bd537d27275d553c107bde3aa97c3123324f8bd0f63e7dadacb9f85b38859bd30a5085bb1511";
+      sha512 = "4c2b3ecfc85526a754cfc8ea3be9efd13b4cac14e4ed66c3b35c353862c2f2b4df17c9c2a00d1f670d0aec382e4132dcfdbe71d65734f2b34ec964f8d5623ee6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/uz/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/uz/firefox-64.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "57bf9bf93df74d3b8549aa706604d9c49c3157ebe9f23fc4fc0a221f9c00d2e60570055135fe4534ad5f364529e6918110997d5ff2872bd7e8a78021a0df32da";
+      sha512 = "7546c56c5e1a20c2e0b9d615cb8a8b084036a6522510a97882c2e6464b7265c4852f813961a821a6fa5eff244db7cdbda8ff49fbdc91c7a8928e20f969b7f351";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/vi/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/vi/firefox-64.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "067ce92c82925b7b5e9bb74aa98d59b4d7828e47780790634941f6e08334822bbd0751d783d7ae4a0ab1058f33676ef94fe15db7626e4b0aff6c514e972689a8";
+      sha512 = "a0a4fa36cc1804f786463e681bb1474f94921611d277d8f24cc2cf20e98b24244d897f7db59e81e645ea35c7dcdbc57efe12c78ef14242c99b9fb5cde0b05989";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/xh/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/xh/firefox-64.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "cc6b9af7acf4d5d075cd53f1bbcf433a379fcaa3326f483a88ba7c44022aab53d4c53a2620b94189b2034c5009d2cc93c1fce2e0143c0d3ca0469bc00edbe8a1";
+      sha512 = "eff49b74691e348768d489e5913adb8916bec7533d28623181983972f77844384819eacaa4d8e6083001c693b180a95957854a0a547d5b41517c4fd392bec9e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/zh-CN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/zh-CN/firefox-64.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "20d87043704c605855962db40da5b66514a0920b396f815e4ea091769c6564e9226f6ea016415f1f99ec914450a9b364741c32bdc84a12976902451e41b16463";
+      sha512 = "64acdd41eb15cf6d25f09c21f1059ce42effed27e09907439397e8da27c9ef123901c9185651f2ac89e6b4c026e6a7ac08c4a8c363766b49a5a44132275b975b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/zh-TW/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/zh-TW/firefox-64.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "d868cf388f5748e282eb6f276d318babf7e44ce8540fe6a13aedc04a7cee8adc85597e5b95f72780fbcf17ef54cd3b3127742e18ded91f0d6b08a4b9491c3d19";
+      sha512 = "e0181679697f610f5af5f096e6872b9ca4c4f814e1dac6f045913a83be681376d5019988c721ca0bb57b86d288cf7bf1e19847b4179a1781f957891ce452ae49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ach/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ach/firefox-64.0b3.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "1d874e55ca2994701c7a52807ec518e46cfbf16626b174e0f3e6cbe8827a885e3517ff709db5fc66c98c3859384d87cf839f7e72655a0d8d769f4db9cc39e666";
+      sha512 = "f64e8886f5adc2e40d0325bc45f86b81b475cc29fcde180e07bd0343ce88e199adcce00bfdc661f185afbc3f3b40d4518abc0f6787a446fd189abc27991728ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/af/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/af/firefox-64.0b3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "91d5d2a53d8d85e59e9ad4ca9dc0eaa931091f6f267506aad095c77b71be59826cba00de1814d2e78eb95c869ff0c8bda02676aef290b4a8332df0d066fe94a6";
+      sha512 = "1f260f205c63558d31a4de81e51428b93c389d374d8591f2152c301bac623d27fa1fa56a10754e54b372b6d389c24c04805dafd99f1508210662b71024349d8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/an/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/an/firefox-64.0b3.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "3abfce359bfe5cd385417d2fc30a4af9bd705602b3d902d51030a12ca6ee9086ee7b741a07def056a0e37c767a5e38f293f0d52a48c8f6f60458e74ee73cd300";
+      sha512 = "58d824350995bfdd4152d5f1080f4d0fb99b0976c717dde29cce6b3830f1ad1a1ff7631946febd7ab56ece00dbb4b6e6f73751503d64e7c600b63fe6ecc85d1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ar/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ar/firefox-64.0b3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "d79566a5c6889421e66f189c86dab9e32c377270b2fd70e1e128810dd391c651cd66283045c8b0888520f7f42f4d98f03274fc06dda0a1dde23c3e3f50ad91e8";
+      sha512 = "9e27cc3e2a55c1f03e019f26f8dac0400a86b81993260fedcf612d0e731d721c3d4b0a152d81e0499efa14007fd6b6823f3c28fc97aaa07c3a7db11dbeed2c45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/as/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/as/firefox-64.0b3.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "6bb45e54027839ceb0f8ece8a5a3d49ced35bd4f391385a69f5c26f191e87e9f06f9f59c2471ec156aa38a23cae38dc3996967946d12e88bd98743e15d888edd";
+      sha512 = "ffbe4274423cfbd1fc4bcd44548d83c92556fc358475c1057fd16ac2e693a344f910aa4190eb8edceb05768fb634e3ed3838be40745100a66bfc8ed0322b9046";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ast/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ast/firefox-64.0b3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "3707d12351e2c7f1d4c793593ae2773625c4342d53a5bb32fd1a1f52d85c504eb662beb995894a5b2eca67753d1db1988a247317cb60252b95dc1262618582e9";
+      sha512 = "af21bba6a92856bc028cdfc4c2ea8e6225e73f5c3311bc4c20db8f0a84f93e84dfa6b4c24d5155d0e43dd664241047654353761e7c46cb659315b63c60ae43e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/az/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/az/firefox-64.0b3.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "d18c2cde2cf0964d8a52a68a3f4e2c9ee8c6239ea7c642ec2ef12bf2024dbc15c125a9ce2c49223c826114714c22a27bb831b3f5dcef0680646212cdae6849f9";
+      sha512 = "01a2c32b5fe56d81157020fb1c48808f29bab23a8782f69e5f06e530f92b2a33d3ec1e4130df9ba8ab0fe61ef9f13f6d6cf30540af40b5ce104fa488168afb1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/be/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/be/firefox-64.0b3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "2085451b2deee6741ea6e724ffcfd373118dc309018e66efec6364eda48b05d06836819d86a23d623ed584de547e9c55bdc11ce5a2c4e1d44d64c442d3bef929";
+      sha512 = "c921b35e3f6c6419dc1b8a1168caef3e466e7f5937c10ba8c3eb2568423b6bf358c61b97b9500fc9422e566404bfa9d4897b8dfd040a081b2e2921aef468036a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bg/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bg/firefox-64.0b3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "2736a45bb91407cf262973337afbf8d2612890b82dba65f1d9c83007550809464a60d3b74bc33cde23a23afba0e2cad905ee96123dbe791d14cb4ada7f87e1de";
+      sha512 = "89bac25afc4458983ccbdf3fd13052fc014be74815e943d1c5c3b30bcdd30cf81acaf63025a6dd8ec0daa9bcb5009826df516fbf65a4245e94b4bb746f1dc10c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bn-BD/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bn-BD/firefox-64.0b3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "7ba928225062999981206972559f6c52f9367d714d38ea0d7fa086e2f1d9d990b336ebfd0b7d1b08fc06cbb386f89dc5c95d8e136a393c7568a0b9198c0fa6df";
+      sha512 = "79a8dc595dfa333f98e3fb33b1a1534f535876808469ce4534b27a68a804e61e120afb40e171c6a5874f3aa46abbb38278008eb453daee0fd1d1d8f17d076b44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bn-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bn-IN/firefox-64.0b3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "92c33e5139b130fd9e3e83614443ccc2a189b19cb61949a381e259dcaf0dabd66b3b127446abd1117079cbf4c584c1de0398dacb1612285db56f5a4f0072cc90";
+      sha512 = "4e20c698168c888863445abb7f3cbc1b57b69a1a80b5fcafcc5cb8efa2a7a3dcdfad6dce2969ddc1ba62beec2ad3aeb784132ab8ef79e41505af733615a8a19c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/br/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/br/firefox-64.0b3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "bc34bde0506218c0e4251b22b1849d05b9d49ccbdaa8df650f56ebf87f04172b8adbf2204709f182b286212bdce08ef9448e8818dd2622bccc3cd9496c48e111";
+      sha512 = "8e973f0694a10f1330d2652339d1acf1e6853939596eca8ba87f337f9ae3bcc1bf34f24771b73cef634eb3ad62e68471d818c55140fcfa90be61ec445df735db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bs/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bs/firefox-64.0b3.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "8fdf9e385f94357aa7a08147585d02e7d293d7c6155afff3da92ee37475afee222439f4d93198bd24c02d7f8109bd6842426c65725f19aedec9b38c8aa088627";
+      sha512 = "ac017ee280d1167771878aabed612a42a58390339f954351d9972594203a966eedd10a17699b0f04a6651a0ff3996f5407a341f3643d99dca8cdfbf9f47781c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ca/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ca/firefox-64.0b3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "f95d32c4dd652b35102cea1f9791713a4dbf40cf985c33268ed35f3e5abec87a46d304cebb961f8a80d97e4e26ee907266502f9e6d1f72741a018a29e48544f8";
+      sha512 = "03ee3a07f0efb6c6adbc1224c9b1872f68b2099e51852028302f5a6904c264033cb0642d530fa6368e15b8b108af49346ea82a46b4376c7adffb2890a353cddb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cak/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/cak/firefox-64.0b3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "b4909593c8c99530b791dd40381e891f4ee61c0473a0fcf44e0c5e5ed76e4424930747ac7f479b21d977e245b0b53b2e692a43931a5d72ad16b65f37f8726967";
+      sha512 = "ad7a6cd81affa6d5009468ca1e301b05396b335346833225948e2f64a32993f7360f190a13aca4bcea8889658c56ce7fe1f84d9b9af7eebb7c2b79769a159742";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cs/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/cs/firefox-64.0b3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "43f40720b91f6de7323fcf866b032ebbfa34640ae9786198f87f0e662c1e33d7910812e3c4bf45fcf929d9e2d669f7ec4d8f10cfe47d1fc82c5654b4bf2b40b4";
+      sha512 = "14780191d373277f51e6ce9c06327df17c4bd324e5c12b4760a43de38bb3d36f733d92b5f83f01bc4633f11ce7a51b0bc8babb1214fe36d61c7611ea7b50d516";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cy/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/cy/firefox-64.0b3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "a9905e192147a4bde8b97f26a63f08d982fbb05fce96482084ffad7ef8aa54355cb79859ec8e095ce49497e2c24ada38fadbd77e0e31ac70a5fb6632bc7d31de";
+      sha512 = "8bf6c014c6710e3a096238bb76eb862b579dff7a798c2a4aa8a3232a93efe92741330580769bd16e17366746fc1dfafd24152260f996851a45f9cd684c848d93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/da/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/da/firefox-64.0b3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "d1275cac1c2c1e98df38d745b6d1673b341198d87db6bd767ea8e2fb4f525df874b3dcf9c000e4ebe196bbd2a0707af6ac3fbf28f4b21dedab78cdb89d6342da";
+      sha512 = "e1719cbcf4c532ab484c5aaf3a766d27e4a409aa38d9ceaf2dd52bd183beaca2954e392e8faa66a747e02e21813a4b8e3f9a5c6d7bd81ce321df7811fd529842";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/de/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/de/firefox-64.0b3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "d40af9cc9212d83a260d42e1c4e9dc1102253cea3090f8aa232ffcf97b5fe417252b1360f126c97c44d9f333187b896883cc3a8de77ced1020805d7bcf1980db";
+      sha512 = "1f9ef9906988924c254a44c796a935ce5ea8cc40dc033bcaf28b50dcec8e90451ae09f039586d1ecc72b5e839f1cf42517a01d0c9e8e9b7c81f365597a8d6dce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/dsb/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/dsb/firefox-64.0b3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "2e2dd4c1f5c2f53f3df2510f88a1e73f320025871b3b1e4e08f3553c51a1f41b8974f17754d705c2939d84442af4b4e6e0f2f09b35674bad0fe14dd57415d191";
+      sha512 = "946334d8ddd8f7c82226db0d7cf838e2b6208cdcceba251beebcb9b625b6f3f684c6b9479c23e743a7a1eafefbb54eb4e63685256f0ef5d482e76fff55691e32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/el/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/el/firefox-64.0b3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "6fa7e9d22e7c379325de750725b25e31ccf814bf391dc4f7ec30c226d64345c52d07542d05d4d096f1feb6d75da37fcb3028a5cefce7a4a7bcb72cdfe940cc1b";
+      sha512 = "f8664b184607f5a655a96b60bc2a97f641c15dd299448d94cc8b630ccec7009d7c51b5e0d4245b1c0eec4477f2217ad54c1453ed516dfdf9fb1b519169c313a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-CA/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-CA/firefox-64.0b3.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "0887354d8e3a990cb3a2a1267b6e6e60084aec7bea75f4839a41834023f327077f36164dae5317da47fd333223488b903c77258d73fc1077bf411e1eca860b67";
+      sha512 = "67339f09f046a4f72bd5a2e79dd5b53876521f5761eb7e9963a1af0acdda507ecc372fdf8e7ccfea96c3ef5324fc06faeb5510060d3840467db03d1f229c07ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-GB/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-GB/firefox-64.0b3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "53ce519552bfaeba90c00e108a7af36bbffa8f6ca1f580abadbf441ee29a40bd93d31ac65ba3c875e04299646237ed4a51736653552d607436ae177d5682c84a";
+      sha512 = "1138722e998c0d09b5e6bc404833e652302e7f4774ae024238679f22fcfc4a7acaf6e3bb88c5b04f331c457ef18b70451e485eda79377acab668ad2369ec0e76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-US/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-US/firefox-64.0b3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "1c23a2e28c7c14da5f2c0fd30525ec38c1169e8433991123c8bc97145354c8d1ecbbf6df0430b89e981222011e27b0c5b723af093ce640c8881e0b9e5b231939";
+      sha512 = "eda0706887013a73e7e310268cfc327be64efab22764357dde8ca8c7ccb26c388a20cc18fcd4f5de284f76541894f2b67454e188d30958fa7f2cc541af14917d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-ZA/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-ZA/firefox-64.0b3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "9439499f577858237dbc39c6cdc20a87276cda77d45e14ba5ea7f090cabe6813d7fdd8b77a32dee6a98fb880f421562a861e98aefa619fc44b0c4aab8b522b4e";
+      sha512 = "8da5ef93bbf2f7d51b11276b8d3fbde8cbe4b02e9db5f95d5158c0aee0a20438dfcc3e36485c61410011eab6ad119729c6ec4e4aa3565176255d39e71434741d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/eo/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/eo/firefox-64.0b3.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "a04051d0bf181a02a04e2c36b8f05b38d7f3eb6188c5977ed965776120a692d8fbb1d3d2ceb38da8768d201f27c1b36995f68b002a9261fce8786d34aa2265e5";
+      sha512 = "b375d409c35829aada3e66b6e610f4bc2fa0e3907416dbb18f924dab4eeaf40db65d9d5c470cc63c84b9e73f901e15fea0160f0e63b6b2cb469152519e50e863";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-AR/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-AR/firefox-64.0b3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "2230ee909e8cdcc10d40939eb6eaeb5c8289c697e2d0a5e4a25a9b1345fc6b49c9528e974212ca3a5aea3e54c8c8948ae56a2232bf0d207e82658ca2dfdd82c2";
+      sha512 = "68bd243d3bd388f4556bb66595a2323d5ca1b4c8045121734d40bac6250dc3e83c40cffbcf28f3af439c0b43d082a8e90ff3b680dff4bee1f3ddf6e3bd59ffb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-CL/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-CL/firefox-64.0b3.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "26e7a24204190fb43a972038c1036e93e2fcfb68be804a8189b0006ef8a15094e152659206b1fa9b7f0cb5f9409aa4dd769fd675fbebbc90f323d28b0f3d58d4";
+      sha512 = "7b8c047120da9174585d8ecacebf155d02a3e6bf560b3ff87ed32e718f253a566bcc73439560ed3d922e410fcbb094e5c34d766d8a665ac1da8251a2e836c83c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-ES/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-ES/firefox-64.0b3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "9a86d804c199c530dd7d41d4ae0d72604f85061a594c5cbbe1de2daf4860c4e36831efe00ccdfb6b5440c88575a6d4bc2d786396f13999453729861ee723cc9b";
+      sha512 = "c2d1f066d5b65049961d8c9ee9e12b8f0ddad1e76f83b2a13f670c56763db4b7e06a5dc7712e457e5c08d135113a3ef97b90efa8ca377a66eb9ddd2c3515a670";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-MX/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-MX/firefox-64.0b3.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "181c0a83a5bd7d7fc2e80948704f2a466057518c5a748a54e43bbbc0fb8aab37bd7a1c83892af60ee359243633fb8317c42552121b4e0ee476c5bc7fe115c0d8";
+      sha512 = "fc54a4647c81fab54f6c28d59d51b9303eeec2cc7c78bb20a76f1b9fbdfcca10a51a42735a93600b390dfd5592121edb8a10bf359fcf90190c93470f5393bd6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/et/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/et/firefox-64.0b3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "6734e4572f50cc7cef74dcf63994ac5ac2d17cb0c2a2110a99cf0d5c38cb3075f72fa21561ed9ec98dd860c39262bf282c3a82083e436d1b160a3d15dfce3a51";
+      sha512 = "45dc3b8b87cc6b2fbeca18a685e3e07d676af25d2d9e2987b92040b0f055bb29388fec3689e670b6764e7df0c6945f331af9555898179119f4b3c0516f0fd773";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/eu/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/eu/firefox-64.0b3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "85382c13dc0a828155142805b83543371487162821c1677e5411d8570dc8e1393479116a0e7bb62abcd6e0abe477f0671ba2c2c600bbf855ed32ed86f1aa744b";
+      sha512 = "e7b955cd2b6cfb30aad321af5d0bfad7740abfc0f7935800f3fcb780d107c15976526a25cf3e1a6d567b18dd360af09362f89e87cbcc94982c3b46a93e57291c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fa/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fa/firefox-64.0b3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "a2c071e374c3dea2da8dfb4e1d7a001ee30bc33c3702d5e352427596dc03b36b734767fd3bd72fc4e3323f99ff88b475a1d7deaa8d14c47921986b4e3b6e9454";
+      sha512 = "d302e756531cb2cb9116d3266c4a7ddca9875c7d8e92f10d94046059805f8babc18e50d68156f4a4a9b637af4a06ef80d351a70e46781fea7eac3cecec537d34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ff/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ff/firefox-64.0b3.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "3f92ae32d51baa4dcdc13322aef8653da33fa0bfb970c3a58e5cb4297d90f8162f2020902b3f3bc566b7e5a07a317c8eb51a7f9c737a27bf043e56cee258d523";
+      sha512 = "354f803dce5f9565c582f11357c2436b4ad2fc795ede74aea5d38c9f7a3d446876b4a71467fcabf1808fef488ad391cc3b063506cc696539c4af61aa70b00dff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fi/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fi/firefox-64.0b3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "eaec68e83af4a68e8dd1e7ac63097811c4c1a84fc577ec8c4ed9cdce72785fd2d99e4e534257f34a4ad53254e81a6c56711cca9f85cabf1fa8eddcd26ed0946d";
+      sha512 = "4f18d88beab0208a85da71d4812fdd01bb3006d9230c1dbceca2756ea0b27242ea97a76f12b3c99daa51af03b1fd3866351b0cab621a4bec369c16ee8bb87ecb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fr/firefox-64.0b3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "b0264932f94862f6b4629f1c853e6207120234dc030a298f7d5dd975f9fdcc357cd9b8bf38f46221e090b1f63aa7092c3c5005b3f569a937e8d6ac69a941d4bd";
+      sha512 = "04268d69d544b5bb4d5ec48b8debfd09a83f3a0faab08da16b6b1c643c1451c89e8c67c3f02a05100d21319cbc27feb09531dc87ec3a1e5cc7ed2a7ec8e77aa1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fy-NL/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fy-NL/firefox-64.0b3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "a557244b523d64db01ff42209e48fc5ca21f603916339e61fbadbd74a59477b9adff021a0f47759d5104eded00a12f4b008644279c19cab7a45cfa9a9a3494d4";
+      sha512 = "76dd116eabbe4aa6c7d0b4e0dfbc45f4b057f86a06d95e56cfb9000ea38fe1d88b55d2b2fd885a88027083d930195fd8917fd20da2f54d7461dae707ddcae6bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ga-IE/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ga-IE/firefox-64.0b3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "11619898aa4163d6ee42e178e58b3d25ef8c9263312a1c62cb9e2c0b9516150ef9990a971594f8b1f1421231c4a03c3337d2aadc292150d384c085a1c012cb96";
+      sha512 = "6a9e40802e1574175fe1b062205bacdd0e3ebddd04987ff690d8991178911d74ac7d638f19857bb2180545689d8ca641f073458df7dc83311499c176b1102f7e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gd/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gd/firefox-64.0b3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "642ac490b5171afa96f3363919e6b5bf4e16ec65671b36fcc543f7e160bb0d595bf271606b25ebf1bcfdda5fc3b3ec5a088a766d52fc6b72b72a1bc5d107ebb9";
+      sha512 = "58fd25bf8319cd2ca6b46ccb3f6aa8e5e9416a6cb229755f111a8e7304a806aa2aac3789bb666ab4ea2d63658eab79a50c3c11431e87f2e105ea3de584de9fcb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gl/firefox-64.0b3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "bad1ba5729895d622c0a452af5a0b34b24fd332a386cf27d71505ce1e9a0cd164671b0ed6b4c4c7befb1aeaef75f3142f73ade1dd384580dc71a3eb382f221a2";
+      sha512 = "781d7c01208190351350fa601424132eac394c6e6ba0f0a55e799b59a91d4e743dec4bae8a973e384977b76d3e064b62a2162b6b0a025b05b7635cbd424b18a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gn/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gn/firefox-64.0b3.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "d8b89350f75d4cd6f33e2eaae4c3098462ae319f4a7df6674239992bebfbc961b9e60a2cebec99488e1391fe68b218663822e8c1b773f63c6fccf36fd57fea46";
+      sha512 = "a3287a85a1549015c8f1c5c125bb3296da2da07505a961425ea0b5c755f6c6709c26a384109f700992f4d50746b441d4470c39dee9c78be1255f031d63dd73f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gu-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gu-IN/firefox-64.0b3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "835550054ecad1bd4aef10f18b805d9bf1726cf7ccbdeca04696c73a684777cc51defb1e9ff7fc67a1f37ee99a0b5adb553078cc7a83e95ad6d87ce338c9bef3";
+      sha512 = "033e88246db1c1f1768e032d58c8b24f30ffa541a86e1922e9cfe0cac8706da67da3951d596844f1ae6eb9d0ba8de4e6d787c1d1e918c38a0c57989c48327d48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/he/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/he/firefox-64.0b3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "cb6836604f5159d13f883678287c340ef01118980014ba9e72ad4c17d86e10349a5b44be1ad0c0ec14e789a1b24e47580236e0d298d816a2fec0c5c02ca0f19c";
+      sha512 = "436cdbe1d1da1f54e3e48b5f439b73014aca425984e4ceac7834ec22754d07b3d3f1449df640cfaad75c09d658df5b209e77fe830411c0be560abe74e00b6148";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hi-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hi-IN/firefox-64.0b3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "119ae4627c1945b00acfbf03b43e97b1b94ba4d80ce71e277a6e23ef5953bf775e575236cb16ce4d4e298007f02fbb1676fc0526ae44564c87c8212769811587";
+      sha512 = "f6a50c0b04f7ecaec138947a2cc6f942230482ed7f3ffe353cb4a5298f4161042aa0a99b1445ae7dffcaea1807d0705f93949748ffa8342778d8a8bba8319b48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hr/firefox-64.0b3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "aae23b11eea3a49054c0ce4e9e9ea9c1200d9414599a6e9e993912a3b64b5c94c2819f1f9f4b65d6ac8bdd2cfc0ff125047cdceae286324db33174c3d6e7bedd";
+      sha512 = "bcc4d9fb87d255aab901d322ef3f05242d3899c7146a34cb36e9f7e49091ed48cf81f7a1388ffe2a3ff55465121932b9bd3fbecc9eb1a032c9dbf535b95ed236";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hsb/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hsb/firefox-64.0b3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "aa88612f31e96a0babbd08ca4c43db75a869cfac1020176bcdf00125a7dddd0736935a453e277b6408a59d3b21636a3c60cd9e40bbe9098c2da31aae54d790bd";
+      sha512 = "7e3ac04497b122a18e78f144423bb7244c91cfe3cb0c1bfef98885f779d6032e1f71ac9a36eaff66889e043c8b28e51c2a47117ca573e426abe15815b3e068e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hu/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hu/firefox-64.0b3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "25668686e42ca15bdd7dbe95380c95b907262ae72c3758fb0993e077326c183e1af79af4bc9d33b7e7d8dfb142d92618b1ead67a834d01e9cbb3fb346f139b8f";
+      sha512 = "383e4442f5f78e8e5e0d4d4dcdc302d92dc8e95957393ae77eb88a93278cd68c0df61fefa1255f75bbaa53ac47fbb336dcce6aea455750b50c210b8919c24686";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hy-AM/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hy-AM/firefox-64.0b3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "9beb520fc3da468a73d0df7fb8ea937f05107191167fff8ffff2242d4db6677d4ad1d4d248170ab55a6b31365b5bf965b17e0a52d4c3c748cb0fe62f7eec85e5";
+      sha512 = "50e3b0c10c6b9c02e58649c29844f78c202de2de0bbbaa8ec3d7df9a802f365fa01d9ff99c3baf5ad58f64f0388ca9cbe8c49d4443f2971697e6eda10bdd054e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ia/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ia/firefox-64.0b3.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "14f5bc56ea03912ce445cdbfea2840fac886bf048587db3230bb03e2f6999050e532b27011c1d83995e74885fc0cf870990773df564fa3232337a13b4951d1a8";
+      sha512 = "6b213d33cc2f66f6e40dc12aeedaf5fc2b102a810324abb0053dbef3af230b5241ac76edc0048b01b29f108bfc7c40e77f6317b0b3dcbadf6eb3cacfdb7d9709";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/id/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/id/firefox-64.0b3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "57816fefb3fb9024473723c1e53dd769356d08f7cee6fd18f3a618707d7c474b71ece7e0da9b61f9dfc8d870db046d29a6905330248cf4021e538cfd93684761";
+      sha512 = "f4111d085f8fd354e8c85b6e92987bfdcd71f778282b7bfa8c6d74f59786a3f2bd7a9bcb9c358c5fc905702d94800ace03d2126c964b8cd2fd2f421713935c93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/is/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/is/firefox-64.0b3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "8ba70aab5a6407a5c4d4ee301b0f5d91c02cc446b1543abfc9ada2063a53d6c9335b6523c6a35abe45cea142cbce92c86f0100a036ffe69932b587cb16caefbb";
+      sha512 = "0af27d25809a5e28100d0b65b66964edda6fbb7799b7d7c5954b513d0ef58d4800965459a8740908c6b184a6c70493f8adbc8f258e9c5a1b5ae6c38c0d56d71a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/it/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/it/firefox-64.0b3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "ce9cae447999f616bdedc37c45ab1bba851ba8f983a4b8b9b1670d080521172fbec753377c7577818144fe297c9a7f81b9ac3cff5f42a216b089d40b035a9cbf";
+      sha512 = "1ecf18b33ed2ea28828882a0a6a876c0489555e1f6430625a56a81f76a81be96c1b3ace5f3c4a55cf1555e9d3e0c3a0e76f680f0f08605302c9a4125401eeea5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ja/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ja/firefox-64.0b3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "0792d7a73fa37b69be10f65e99184c6bfb7de72c493a06d2a808583dc091f414c686b9274335b532d6e371024c069d20200d0454dbb4c4568e46cf6c0fba2bf4";
+      sha512 = "1eac9b077a7f121631d4378cf00fe9c131ace2fe7eee7b864c32bda99ccd07b415401a14470cc00d466f5c280ebe430ed1d3bc46fe2130ff4d5819124855d137";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ka/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ka/firefox-64.0b3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "59fc959730efd2e78399984a3d0ed18d653e92bc2edf8a37b055ff715e66672d8f938b128fcb9f5a5c932ea8d265a509f1c16cbed7f054449a4f4f2fd51c42ab";
+      sha512 = "c5386dc11f5e5fa756e0b13d5e2dbcbb2dc8d99494586494932c3b6ed8ab920cf56ddc1062b18106e58a83013108851b64704756b8c3a5d9f4a04ba1fa279a4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kab/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/kab/firefox-64.0b3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "575d9b2e082d5729f09587434965b383049375771029c188f0476e34bd21e10fdfa20d766cb934c567602f6f38d883c848c8110f6a42f9f62ad258c478ec0f5d";
+      sha512 = "0c77ff888ce71d4da366f552d5e6a586e73a31eee53054b9c25663c8602c353cdbfc09f0b4a0c0b9a91b042eae5a31a8bbae0227efd5d6b1bffa200c515ff6f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/kk/firefox-64.0b3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "712438e519188f19bb9786c72a795c030214dfe02995419934e58276a4b5b22413daf0ed0c21da4849c347c222f7d22b3bd9a95e9cf9aee6b5e94e7b950ce801";
+      sha512 = "52ce683a996853aca8d0a503b1407b88daaeee86fdff15da2f67bf0b7040768916f92eec1afcbe306ad1966e1a0f126207a5db9a0fbef2b3883c5d809cf105f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/km/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/km/firefox-64.0b3.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "8bf978cd1d226dfb74e9da959da105d6cf995c1028c1cd2bbcdf09c93ee300de6eb58eadfea690fb629ac93bd49f85cbf81b9bd49390af6c6e54048e0191b8be";
+      sha512 = "d1055d1018ee47db02d85eaa72c1106d2d87bfa05f424b1ce01b9d59b30705835eb41a256548039728063427ddfaf7afbc82bc0b6881d1c4b594ecf03b79568f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kn/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/kn/firefox-64.0b3.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "47c20810081469552659ae2d845c292db2dc447c1974dd768544f2444020127df85d3320d7cb25225b8dbedb4e3015009de9eb7b5aaa1e7a4298302f527db32b";
+      sha512 = "893a073304d6efbd5c1827a95f64e8b2f55987ea22c598c68f75dc4d30ba71d056270cd83cb35545994c084d6766f9fd6b02bf5c377e7aaa4f8eb14a08e3bfb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ko/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ko/firefox-64.0b3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "4c4feff0c959291112f30b952232d50fa78e4d05e715fcd6c34e26d26ee7629545ae46791d04a8672aab3bdb19024295c94a6fbf2b8b818346107378016cb72b";
+      sha512 = "0d17f3d3c482f434f848e91dd0e0fca1073245187ce736d6518c709ff9193f37a9c8febc3d03ae770775d3f39838d25d6ac8070cb3421c86b42a280b0c650276";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lij/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/lij/firefox-64.0b3.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "980910788cd4d38db52374cc399e90315b0829e741c211ce0d225289c8e763bd45df45b09ef4ee0228484a7a33c3ccc9d05015ede42eb427b2336ce09747649f";
+      sha512 = "b19010fcb1f5c0bc078e662299a06a75c7a99076cd7d4100bb3c313a452e4b96ed3c795dfb46bf33182c59030c28d9f3eb75c031f0349431d559e7720da9904e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lt/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/lt/firefox-64.0b3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "cd2f42c3ac9daf3fa4ea83467926ba9b08f718847eb22847be933d561c485791f1befbe04600a87bf0c5bc9016864c46c85add776f5e6c0a1586437fb57a9532";
+      sha512 = "35e3599b5264895d470c546a3a91dc416bf1707dbb6f7d4b1b1c13ce98864ab432136b768eb273edf606085e026f3de1bb7b2348c1c908a197febaee8a9d2682";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lv/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/lv/firefox-64.0b3.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "6f1f8fc6aeb632a9b64b86c38ca38ed1baff443ca2594506e7b899c422a9bb38d02ede49bfbde255ef2ff6d0bec55d4f42d05693459b4391521a2bb5971ed6de";
+      sha512 = "b67447ee34562d2f0b6d1c6b5f5eaa10b22797acf29ac0c5d55799511db34a2d1ef24130c7a0ab7dd846cf0eabc2cf5838b21afbdf5ca0689ad012e52e97a4cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mai/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/mai/firefox-64.0b3.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "f44f549ac0119c680fcc345bcca64f5cfc6211184ba4cd02970268bcb26a9ba574fd402b4f6c0f979d0585ab53b63997adee54b3ad681637323abfeb13c5b0cf";
+      sha512 = "10c8c19b45550d2c6b7129afc72988cd803308433fdeb6f97d36cafe31cdbd69989caae92f14353de6dedb56ac0b78529c8859cfe12651677213ca9fa5780ad7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/mk/firefox-64.0b3.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "b1b2b02937e7eb609dacc7fa5328028b91ada27ed0402354db6e9824afc6d0a51fbc54a65ef9e779ee202b6f900950393ec057c1486036a6976894f35d0a79ca";
+      sha512 = "7da68387e0b8451dd97c8565b9728249bd05ca162bc8da52f3ba8cc7d5bff944b7da7ea2fe5a15d13a38180708a510d3f8011ece96bdcbeafbd14713953de437";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ml/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ml/firefox-64.0b3.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "04446201bddec281e7f47512490aeec2f408c73f6f075a0ca354c012266bb96f5b5bd1d226e75cae470229b4b2b3ab6aa2b2fe48040a10d576f6a4647dd0ba45";
+      sha512 = "0fcd853afefceb8cc81f32187f8bcc81e499ffca12b33eaf5f6dacc1c4f3e1af7ade7880431da60606eb382f7ba85a6721e1f29691d77c3880fd216d8f2cf545";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/mr/firefox-64.0b3.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "09099db984cc27c86a0c86a0d45edaf6e4028cb5d946fac90022e65e18736e1d048137e3728338ddcd465075ae77a863e39648c08a173da366071168aa35bff8";
+      sha512 = "27ae7b43d97ae119ab383e85d95b325897542dfc207b868fad098cd98a0a61cf55020801f6a64bc72086ad685a204dc058f77bbcdc821cdb823552beecd30474";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ms/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ms/firefox-64.0b3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "0bdfd73251227b87ce233bb482d2b690cf462ff0ace68533a1c69689894c109500e8fbf76e51a20ce086d59a0cdd717b0605bfdf906fb964abf9d2c2d4ec1d96";
+      sha512 = "690e5c12da34c29a39289f2c863d0f1e36da16f730c832f09d7b52fabcbb940077f906981d2ee1ce854fccba708e23badc13ccebcecf36fa72ab17c56cbc011a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/my/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/my/firefox-64.0b3.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "a6c55d4c646fe6579901b29eef484c5584c4f35115d3820280ef45d5d45a2e95e6f9dd5167663df2cea9276eaa4d3bbd05cb9550cfa3e9b3d3f1741cb1e3796b";
+      sha512 = "60bd5d1489326bc6cee765a34acce16206b111abc400677d8cc25a5000422fead636ec71f4848752713e861726ab80a53f9310b8148f834b6c2a839fcd48eb8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nb-NO/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/nb-NO/firefox-64.0b3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "934276a4b149df5d511652c8a0e159a5f9bfb1d903e09d6ea171e89463d00fab344944b90751d28f4352ec09147f6ba02fa018311e4d0bf47994f3be2ea4fe87";
+      sha512 = "4168ce2d6dc32fb8f013a4fde2924dcf26ea7aa3c06ba40a90356715f55d2201e78a7b04295c328972070af26d2f2fac856de5b8f613f483d0ac4cbb86e9849b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ne-NP/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ne-NP/firefox-64.0b3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "8e1cdc427310c5f8e26d321f4b741908e3413461fe7ad54b7a18ca9e3d93800fed87a907e0e4c5f689c4becdba3066ce22f03269cd668e98ed30efe577d9f3f3";
+      sha512 = "00ac6ab02669dbe2792fd8b75756b1a1436b8282fd7c0b5ff8ad4d64108b516003bfe893033e4c862c5f2071f9a580abd18b17fe9f100ab8b75d3829880d860c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/nl/firefox-64.0b3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "de83fd739c30a7cd23eafb0ca2e0abfd55c1ba84d0fad159f99489d948205b4cf5cbc71f929b4e1ce1caa03f70b67465564986fdac1c0ab0e0a21df99849c5f9";
+      sha512 = "ed7299ad0b5717aa4cc1c3e615ef66bfcfa20a2c5e840b1055ca40b39643a37aef624f68c3cfcde2d3fb8ceacbfb18be771970e669dddd755a877a16bd09bbc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nn-NO/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/nn-NO/firefox-64.0b3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "588be3d59eeb3413f18b642c392af4431141597598ad8e9d9625231c0831f62b06d591a997a68711d042715f939d57ef4bb7df481f3b512dbaac0e29ad46d55b";
+      sha512 = "34438a89adb22ad924771fff06bd4440f7ea35d7c34bca1366104739d8fff1f1c00e5de2b4ba29004b3ef946a747a2a60787e8af2b35c20c5cef36c908a45136";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/oc/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/oc/firefox-64.0b3.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "c261aaedfcb393c76ea74b0c0ad69a8df90530f9f39d49e69d6639cad3d9255090180880fc70e650b5301d7d1480517aaf630502fb6a750fe9fef23d4e25fefd";
+      sha512 = "c7aaf7265f7322d5648eeaea7a58bb6dc89f09b2b0fce5d03f3996c01792642941e6b3116f1deba5d300874a44af06a3b1eb062857ffc85f5a6d87a983cbee74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/or/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/or/firefox-64.0b3.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "bf743378ace07a33ce50752ae804a4fededaef212d38d102f3374f53a7ff794a777397f50e202e952dafd04aef88b0175f34af69b1265b347aac8c48f923dc54";
+      sha512 = "d1024ae51c997c8da657a94556e130955e0a133f41ae6d81b34626646781134c9024d03f6be5ef6d53233c0fbfd00fe9fb3aba25b7aee0edf7f583a8f01a66fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pa-IN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pa-IN/firefox-64.0b3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "61dfa74084c99644a38ccbb81ee0ea634fc067a27c6ddcfccf57d9b29ddbb0315e48dd17305417ad580f3864cb3be65e57776e34b7771d21f55510104e5d58ca";
+      sha512 = "44b00d71bc8330cdb028cd00c8bf33957353e4f728fb7d36d27bc7685f963a047d39c2fe42d2817fc8094e00696cfdf65140324a53a7b867a11bcf4ceeebdba5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pl/firefox-64.0b3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "43fc4a57484f67ee3e93373c0bf67a6b2c1989fd3f366d98970d68f94c1ec6514a45cab77e06c54f61a31a6ae0d629ab37157373cc56bae1752158db4e4bc648";
+      sha512 = "39406db62c4c94bb2f4b9a5ce594c93846aaf3110af3ed754a2b90d4f357444235686560e6bf413edb5c7c65d008d66a00c4f8d03f8477014899bc25f1c28176";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pt-BR/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pt-BR/firefox-64.0b3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "303dcbe422e52be5276d98e062e4a9b46eae0ba36797f9ed1566899ef5c2dace22244b5449ceb042aaa75f72138d19e3f8c0b920541f36fd5df7aeb52d0bace5";
+      sha512 = "ff4b51f5213ae9f861602536db0118bea6ae7f2a7bd9ffb997e22993b09420ef3c1598f489eac28f126d3c270bbf1b7af62f30dec9b30ac93d889e887ea15fad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pt-PT/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pt-PT/firefox-64.0b3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "75e73332122afd1e86060c57d0c0987fcebce290d0591b5661571514523d746dbfb43a55ba1ea95f66c91f3c045f7b944e14f8d65a372104a9390e334ff900cc";
+      sha512 = "2a90179db419253b37c1d46c65f86dfe06ff2c226daf7f1a889e9b8de705d705de18fa63966305841ecd28b81c1a5b7d39a7a7451c325e3b79f0e376fe5a0664";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/rm/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/rm/firefox-64.0b3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "2b6f03107cb7e1724a48854e88536809b7e235e04e7cbd7454ca8f2c952b83ed2a004e25f637f22690f4c9c73eb12fcb35980fc1e7cf4f53aaa061ff8a6066b7";
+      sha512 = "5822fe796a8f790919ef2d7435426b75e755989ae5f99dc765ce018898fb7f3ce3ab8c26b76db8d6eca5358936748dd46c1d74073246389c9b3101f03d5f9c61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ro/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ro/firefox-64.0b3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "aa6e8cc7181ebfc77c5ead071871dc0fcaec2a64bdc2aed4ef22ad43ad81b18aebc4acd600aca7ac83f5acfe1fab07154a9f15bd4e189bc787935d3d0777c291";
+      sha512 = "f58ddfec45aeca8af38f539e3a5dce572b3fd7347d7221b964cdc15882ee8a6d2df17d4673639c126b9b7d4db823e5f8e2c12ddd3bdb5f1ad07de37e407e738a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ru/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ru/firefox-64.0b3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "c48abdd9531a39d3f63f8db2d3bd6aaf85c0f4d22d0297aa16734eb67d81d653aa6862ec7d48557e29c768f0431fed57ed2a83577719d8411dd0410d4465d35d";
+      sha512 = "87a098da5a149af265424a6f43d8f992269c92caf2beec002077c0a0a51487ef7cfc1e766b0f4b50c3955d9a47530df51dbf7fca6983c103092e58c035a2f97d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/si/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/si/firefox-64.0b3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "7d2c1faf418662c762a227c04b3b23bf0e7614001c94535a8bbc75d2b95e540de8f1ed059aafc224118550fca350d459cb74d398b0cbded1aaa5a46ac6198bb0";
+      sha512 = "b9f742a394ccdee8c5bd1c4e9ad9e78719a27a4296f7ce8e634e9a8d2123a6d8f36b4aba3b4a1d812740bdf19cc93d08b89623e3566543f8da392b124a53ee89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sk/firefox-64.0b3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "d63443f220ba1c099385410e458033a0132110f26b511fa1b9d5f157dede1aadbd958019cc25e47f70cd0b30f7c6f0482427a5591a8b0c714efc46851f787091";
+      sha512 = "1f6a53e855aaae8eba829915de95aac53fa43d5ad3058c41e099a87c233dceee3ec8f730ae0b7fd0d8c06ef6539cd7bb82890e202c6a5a13a46da3d95f3f361a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sl/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sl/firefox-64.0b3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "c52dd6462fd950c0a120cdfb721234300b84812b10fde3436f35c583728e5a6d05153eb30f9bd55722b48fc047fe096f8a2e63870a33b25c67e73477355b7c40";
+      sha512 = "08113daa78aab30e470a3b388a9756e794277aa10d5ff8b91842122b76506d2b5a72e87b32462ac84c7286723dfc997b9768eeea3395ee38db7afc9c99a66795";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/son/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/son/firefox-64.0b3.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "4a4a4a26e17f8d49eff0192d25afb02b11573dd4970a1b7ed6033695f4ff92ea7d0b417cbdea8e8677b8572c23d84878d52752b603ae3abec23a87436b13b9ec";
+      sha512 = "834f193d8fb2a4552bb95e8d2e6aa0e6713f2f5450f19f28a247c544cf86e7d3490b405e1355a956d33611e2d387020a16d040f127e401f57b5cefcafec054c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sq/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sq/firefox-64.0b3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "c663e5c4cabdb0328fff7847e510081c8800ea4f05228874cfc97dec3d88bdb539eb0998bd355cc5e229c8763819c3611d207c2f1dbaecb2be8d4f418f9b2f9a";
+      sha512 = "313fe1fa9118476fcc417da6191706657c4aa1c2bd8a9058c0b8a908dd99093bd340516aecc400a485abc098ef8b6af4768875bf2901ac7d7c56cd140bc023db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sr/firefox-64.0b3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "bc19998a6e0f25d9cf96b22dd4ad8d131cb230d578a46b255478d658af83fe5ed5d2199adbe8118f18059734e644fe3658313df08978c25a785c0c61087e3344";
+      sha512 = "297b6f0c048c3c7c5754ce0be1f2e166818480b3d3c3c50f568f18e1416b7df5039b726060a11973adfd21c7fb1402dbc82599c2daa177207982e5529ce4031e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sv-SE/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sv-SE/firefox-64.0b3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "317fb7ad0a8974b691a713a37a7a4d9acb9e22a9f0d542afe64cfe9ab5ddf5f584b8607af5deefbb46d5c8fe1161124fa73f02aa8df1fb8b77080b36d5aa6393";
+      sha512 = "08855eb50d2db6753b42085fa948cc146df27404ce98b33d529066d37c7f6e74e14deaf05a654360d0e47bf78927d3a40df57b8839f0503c18ee93d71d45e971";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ta/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ta/firefox-64.0b3.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "8a65324441eba950e4312eb9850d0033f3c9add390804141791a2ff39c43fcc042f2fc97073ed20dcd2223e67360c7bbcceb105f8999bd79c1b857c71f3288b9";
+      sha512 = "bb8a13b790d97c321a1d8ba17e89ecba580c0a170226ee1c3a9181ede94ab9b974fd4b10f63627c4a0cea854aefa99d6288678a2d0685e39d806bc3ac4d11e69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/te/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/te/firefox-64.0b3.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "665a95603538b594c4fe6d7b3607a83184e69720400022605215e229b4f103766b02083499f4c0c3c0d30255f478db81c4d0bc6ed93c0991cb7ead7a102c8dd6";
+      sha512 = "ae66f62349163cd5a506117e6e823b75ccc55d80cb3227284d5d42a76e7b190b6057a693b98751f5ec7897afca220795e4a74711363173b92c389ca7f4132dd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/th/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/th/firefox-64.0b3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "ad7aa47085404415b7bf99142480c5a4d2b2688a98b2d9ba904e383da0e25138f9e8992787a4cfdbe3830ba2f7ef777676e0700d4611a6e17bf0be76c8991bed";
+      sha512 = "4d652e220438babe1695ff144008eab854dfb529c7fdf6ac2381411dbbe3a926801d0919ceaac50ce30b5141835edebab846ffb2bd44ecb0c735a386bc49adab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/tr/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/tr/firefox-64.0b3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "4c777f58eec33a68e1c10088250be80d018f54ca47d22d16db37f6e26a294e4bc7ba6551b1674468df2e8db4bc0f4c531b19efb8faa254782a2a34d606e59297";
+      sha512 = "65fc1a5e20e0fcf0c2440df4627e0a79600380fc8aa3638922a7ad10e6d3e0a50bd60d99ec69b4d3040fdb37869cb2141594bef5e052949ae01330166bc8b901";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/uk/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/uk/firefox-64.0b3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "bc7801da3a0d7374dcc11a44c967d8752027bf8f8c921dd6ce1c52bbd6a198ac0fcc61f7fe23985ab7088bd2b7fa4218e3ddbe0e2429a35f7492a788fe9c299e";
+      sha512 = "38702b51bbde6c4d73c78991eff55a3228db540fd3e6f524a1bdfaa7c8092012ebb9cc7621d933dd4fa0bf054edbceca2e7b642bec8e223c8f8dc611f26257b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ur/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ur/firefox-64.0b3.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "6e6e0d4ccab43555b769942e26f9a60509270e7f90350997237cd00d717219f41b5993dfb1b7a55ef1a0c3bf5e4dea1e25336ce604482f19d1fcdcf0a07eeca8";
+      sha512 = "ba13c463bc1b966d7b3d12f1c18eec4fbc6dc9d17a618f5b973afa116950f324c9c224f4807c36e79e5bf27428b47c886ae9c0e86ec57c8f6e48846c51ee9ecf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/uz/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/uz/firefox-64.0b3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "f25f9f16af30b9301319de38659f2d046c5a03d7d9c027a9aab5477d5a65fe46218721deff5d635023ba87bd4c493bdbc3002707c120e0879abe72c87a9f08fb";
+      sha512 = "8458f27bef11639229dace0403d3750fbeccd8c7232b42aefd0aac5a9bbe8fb9541523072c6274795637210f889e9b1f86dacb94c3622e62d890a27c4b24e8d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/vi/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/vi/firefox-64.0b3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "8a8bb70b56db334606dba006ca4863f7c09d9ba546ceec2e5fafa5eeb6944e66e795ef4837933be871a4f5b5d63f8c2f918136667b955eeadab11163aaaab6a2";
+      sha512 = "54dd9d15abbdf9ff1d0f48cc1a3dcf4d977e044471066d8bd1dabe953dd150b16b132a5c09378defc1dc179aebb43cd1eed8fee8130ffd1f92fb686c8d78389c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/xh/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/xh/firefox-64.0b3.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "3cbf6c26c1831f8e7926bae33c380f84f278c1717516e08bb2cac98805d5c4bfcc67d8cd37ce2116224b010d1f6198063e4741c4ad82b9526e4c042ac40b1941";
+      sha512 = "7c52cc72839ed80704e89a0cf6b35c090c18bfe0bd5f55e5a562bf13163f2f6920cc3d4aa6bfd218c7d264d5b44bdb400570e98747592cedf0e191ad0fd00660";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/zh-CN/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/zh-CN/firefox-64.0b3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "5288f4186b731c82ce1bb3edca0321ccfbca69882f0e2fc728c7d3effed36cc4a4c01f79d51fc52be8cc1509c4d516de9d6cbfa9add416c36a6c90543fab1e67";
+      sha512 = "9caf08219db7531732250cd1584d8c914965af4697363c722398e815e1f1fb9c666bb9983d8581b10f84cf03ea7bb215d2560bad653edf1d285a4cb9da29692c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/zh-TW/firefox-63.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/zh-TW/firefox-64.0b3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "9cd0537802f9e1465a9cb55a5929757631b14c2b61b8ba701b8408a274ba35de95a7df1d1b2af22ee2a3db9ef9d106b93ee6698eb411ff67bb0f7b9a56cfd454";
+      sha512 = "a4224c57508466f4d23248e607d53f5b06b5f498a828d7e6bf81b4aa60a74e91237c53343bcf9c6b12c33df23633d85efd4a65fb5fd8b8fd1d624a335f06e17d";
     }
     ];
 }
-- 
GitLab


From b5207ec0add46851fb79531c8469ab6b2901ead6 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 24 Oct 2018 15:10:23 +0200
Subject: [PATCH 0217/1065] ntl: 11.3.0 -> 11.3.1

"Fixed a bug that effected image, kernel, and gauss routines for
Mat<zz_p>. These routines did not behave correctly when the input matrix
was zero. Also improved the mat_lzz_pTest program."
---
 pkgs/development/libraries/ntl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index 63a51a90ccd..cd3034e8612 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null;
 
 stdenv.mkDerivation rec {
   name = "ntl-${version}";
-  version = "11.3.0";
+  version = "11.3.1";
 
   src = fetchurl {
     url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
-    sha256 = "1pcib3vz1sdqlk0n561wbf7fwq44jm5cpx710w4vqljxgrjd7q1s";
+    sha256 = "08a1v92js13ij6lpf75xkjc8iy2w89igd7hy58abll6wnjj107zs";
   };
 
   buildInputs = [
-- 
GitLab


From d92dcb7ee15124932d4743649f0e39c474b33dbf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 05:54:55 -0700
Subject: [PATCH 0218/1065] python36Packages.geojson: 2.4.0 -> 2.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.6-geojson/versions
---
 pkgs/development/python-modules/geojson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix
index faf55773539..91b8d455cde 100644
--- a/pkgs/development/python-modules/geojson/default.nix
+++ b/pkgs/development/python-modules/geojson/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "geojson";
-  version = "2.4.0";
+  version = "2.4.1";
 
   format = "wheel";
 
   src = fetchPypi {
     inherit pname version format;
-    sha256 = "0r9pc8hgnc5hf5rq98vinbrncn08v4kgzdfmfs14rfypvacsmfpj";
+    sha256 = "12k4g993qqgrhq2mgy5k8rhm5a2s2hbn769rs5fwbc5lwv4bbgxj";
   };
 
   LC_ALL = "en_US.UTF-8";
-- 
GitLab


From ea1b540208c35e49ee92a8a213f94377b313edfc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 05:44:31 -0700
Subject: [PATCH 0219/1065] python27Packages.fudge: 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/python2.7-fudge/versions
---
 pkgs/development/python-modules/fudge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fudge/default.nix b/pkgs/development/python-modules/fudge/default.nix
index 0f6d10c3c52..f2e92d96f57 100644
--- a/pkgs/development/python-modules/fudge/default.nix
+++ b/pkgs/development/python-modules/fudge/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "fudge";
-  version = "1.1.0";
+  version = "1.1.1";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eba59a926fa1df1ab6dddd69a7a8af21865b16cad800cb4d1af75070b0f52afb";
+    sha256 = "1p7g6hv9qxscbzjv2n5pczpkkp55mp3s56adfc912w9qpf3rv4nr";
   };
 
   buildInputs = [ nose nosejs ];
-- 
GitLab


From fafead37483dc3a9e69017520621d1a6f5edb436 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 05:13:19 -0700
Subject: [PATCH 0220/1065] python36Packages.filebytes: 0.9.12 -> 0.9.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/python3.6-filebytes/versions
---
 pkgs/development/python-modules/filebytes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix
index 3dbcbe59442..424cceab4cb 100644
--- a/pkgs/development/python-modules/filebytes/default.nix
+++ b/pkgs/development/python-modules/filebytes/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "filebytes";
-  version = "0.9.12";
+  version = "0.9.17";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6cd1c4ca823f6541c963a317e55382609789802dedad08209f4d038369e3f0ac";
+    sha256 = "0nkwrw3qnii346xd87gb9xdy5pjpmg7ncjxsmb08mhmy1i0libcl";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 0ab77afc4eaa52c38ef514b87f3147263a7d9959 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 04:54:15 -0700
Subject: [PATCH 0221/1065] python36Packages.MechanicalSoup: 0.10.0 -> 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/python3.6-mechanicalsoup/versions
---
 pkgs/development/python-modules/MechanicalSoup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix
index 63eb93a207c..6c4a2d310da 100644
--- a/pkgs/development/python-modules/MechanicalSoup/default.nix
+++ b/pkgs/development/python-modules/MechanicalSoup/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "MechanicalSoup";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "22423efd025c3eedb06f41d3ff1127174a59f40dc560e82dce143956976195bf";
+    sha256 = "0k59wwk75q7nz6i6gynvzhagy02ql0bv7py3qqcwgjw7607yq4i7";
   };
 
   checkInputs = [ pytest pytestrunner requests-mock pytestcov ];
-- 
GitLab


From bd7663c9ab8aec943b90e79547d7db861afe8b55 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 04:48:49 -0700
Subject: [PATCH 0222/1065] python36Packages.pydub: 0.22.1 -> 0.23.0

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

diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix
index 0770c78b674..cbadd518897 100644
--- a/pkgs/development/python-modules/pydub/default.nix
+++ b/pkgs/development/python-modules/pydub/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pydub";
-  version = "0.22.1";
+  version = "0.23.0";
   # pypi version doesn't include required data files for tests
   src = fetchFromGitHub {
     owner = "jiaaro";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0xqyvzgdfy01p98wnvsrf6iwdfq91ad377r6j12r8svm13ygx5bv";
+    sha256 = "1ijp9hlxi2d0f1ah9yj9j8cz18i9ny9jwrf2irvz58bgyv29m8bn";
   };
 
 
-- 
GitLab


From db1a5097972cc893fb7cce0060eeb6441b9d0789 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 04:09:56 -0700
Subject: [PATCH 0223/1065] python36Packages.Nuitka: 0.5.25 -> 0.6.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/python3.6-nuitka/versions
---
 pkgs/development/python-modules/nuitka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix
index 55eb4e7c97e..67e2782b53a 100644
--- a/pkgs/development/python-modules/nuitka/default.nix
+++ b/pkgs/development/python-modules/nuitka/default.nix
@@ -13,13 +13,13 @@ let
   # Therefore we create a separate env for it.
   scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]);
 in buildPythonPackage rec {
-  version = "0.5.25";
+  version = "0.6.0.4";
   pname = "Nuitka";
 
   # Latest version is not yet on PyPi
   src = fetchurl {
     url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz";
-    sha256 = "11psz0pyj56adv4b3f47hl8jakvp2mc2c85s092a5rsv1la1a0aa";
+    sha256 = "01vm8mqhpdrwlxw6rxbg3wz51njq69yn862141mja00mllg3j7pg";
   };
 
   buildInputs = stdenv.lib.optionals doCheck [ vmprof pyqt4 ];
-- 
GitLab


From 1f7c29bc43118d5961931d2084794f0c5fb0e27a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 04:16:31 -0700
Subject: [PATCH 0224/1065] python36Packages.keepkey: 4.0.0 -> 4.0.2

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

diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix
index 540542da10e..e7b78edbb3a 100644
--- a/pkgs/development/python-modules/keepkey/default.nix
+++ b/pkgs/development/python-modules/keepkey/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "keepkey";
-  version = "4.0.0";
+  version = "4.0.2";
 
   src = fetchFromGitHub {
     owner = "keepkey";
     repo = "python-keepkey";
     rev = "v${version}";
-    sha256 = "144awjkc169z2n1ffirs697y6m97izh3pbh3sjhy3nji7jszh592";
+    sha256 = "0aa7j9b4f9gz198j8svxdrffwva1ai8vc55v6xbb2a3lfzmpsf9n";
   };
 
   propagatedBuildInputs = [ protobuf hidapi trezor ];
-- 
GitLab


From a2a95fd406eb440da238f1362dfd6acd31378e5b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 04:27:21 -0700
Subject: [PATCH 0225/1065] python36Packages.poyo: 0.4.0 -> 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/python3.6-poyo/versions
---
 pkgs/development/python-modules/poyo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix
index 5a05f2dcafa..26dcd244c51 100644
--- a/pkgs/development/python-modules/poyo/default.nix
+++ b/pkgs/development/python-modules/poyo/default.nix
@@ -4,12 +4,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.4.0";
+  version = "0.4.2";
   pname = "poyo";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1f48ffl0j1f2lmgabajps7v8w90ppxbp5168gh8kh27bjd8xk5ca";
+    sha256 = "07fdxlqgnnzb8r6lasvdfjcbd8sb9af0wla08rbfs40j349m8jn3";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 7476843b47bda86fad8fcfbd21d1fc6f011193db Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 02:35:36 -0700
Subject: [PATCH 0226/1065] python27Packages.mechanize: 0.3.5 -> 0.3.7

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

diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix
index d797190cb89..63a255c941c 100644
--- a/pkgs/development/python-modules/mechanize/default.nix
+++ b/pkgs/development/python-modules/mechanize/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "mechanize";
-  version = "0.3.5";
+  version = "0.3.7";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0rki9nl4y42q694parafcsdcdqvkdjckrbg6n0691302lfsrkyfl";
+    sha256 = "1licf3wiy21pncg8hkx58r7xj4ylrqa8jcfh9n4rh23rmykf2rpf";
   };
 
   propagatedBuildInputs = [ html5lib ];
-- 
GitLab


From b83e23c70d4dacb9fba6418d7e681e5d08d916ab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 03:31:01 -0700
Subject: [PATCH 0227/1065] python36Packages.persistent: 4.4.2 -> 4.4.3

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

diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix
index 721385f3ed6..bc4c4b20aa4 100644
--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/pkgs/development/python-modules/persistent/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "persistent";
-  version = "4.4.2";
+  version = "4.4.3";
 
   nativeBuildInputs = [ sphinx manuel ];
   propagatedBuildInputs = [ zope_interface ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "451c756b4f4faa5f06f87d57f5928758bb3a16a586ceaa8773c35367188eddf9";
+    sha256 = "05hi8yfvxl5ns7y7xhbgbqp78ydaxabjp5b64r4nmrfdfsqylrb7";
   };
 
   meta = {
-- 
GitLab


From 74bed8afa21e8506f79809709b1787f10be69324 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 01:32:58 -0700
Subject: [PATCH 0228/1065] python36Packages.nipy: 0.4.0 -> 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/python3.6-nipy/versions
---
 pkgs/development/python-modules/nipy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix
index 8ff7bbe2416..ae7043c826a 100644
--- a/pkgs/development/python-modules/nipy/default.nix
+++ b/pkgs/development/python-modules/nipy/default.nix
@@ -12,13 +12,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.4.0";
+  version = "0.4.2";
   pname = "nipy";
   disabled = pythonOlder "2.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1hnbn2i4fjxflaaz082s2c57hfp59jfra1zayz1iras5p2dy21nr";
+    sha256 = "1pn731nsczrx198i2gadffqmfbhviglrclv6xxwhnbv6w5hfs2yk";
   };
 
   buildInputs = stdenv.lib.optional doCheck [ nose ];
-- 
GitLab


From f8916419893884d985e53d7a81f75a2766bd2d57 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 03:42:53 -0700
Subject: [PATCH 0229/1065] python36Packages.meld3: 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/python3.6-meld3/versions
---
 pkgs/development/python-modules/meld3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix
index 12b518484bc..018a634a43a 100644
--- a/pkgs/development/python-modules/meld3/default.nix
+++ b/pkgs/development/python-modules/meld3/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "meld3";
-  version = "1.0.0";
+  version = "1.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "57b41eebbb5a82d4a928608962616442e239ec6d611fe6f46343e765e36f0b2b";
+    sha256 = "0n4mkwlpsqnmn0dm0wm5hn9nkda0nafl0jdy5sdl5977znh59dzp";
   };
 
   doCheck = false;
-- 
GitLab


From 91107eb3c7f9b30b713a433d1a6e77dc344b1315 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 03:46:08 -0700
Subject: [PATCH 0230/1065] python36Packages.jsonpointer: 1.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.6-jsonpointer/versions
---
 pkgs/development/python-modules/jsonpointer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix
index c07a4bf3a35..6971393b80c 100644
--- a/pkgs/development/python-modules/jsonpointer/default.nix
+++ b/pkgs/development/python-modules/jsonpointer/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "jsonpointer";
-  version = "1.9";
+  version = "2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "39403b47a71aa782de6d80db3b78f8a5f68ad8dfc9e674ca3bb5b32c15ec7308";
+    sha256 = "0qjkjy1qlyc1nl3k95wd03ssxac0a717x8889ypgs1cfcj3bm4n1";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 09d548484b794756cc586824c5c14e1ae016ab89 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 03:49:50 -0700
Subject: [PATCH 0231/1065] python36Packages.limnoria: 2016.05.06 -> 2018.09.09

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-limnoria/versions
---
 pkgs/development/python-modules/limnoria/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix
index 96490c8f0a0..58f2d2a9694 100644
--- a/pkgs/development/python-modules/limnoria/default.nix
+++ b/pkgs/development/python-modules/limnoria/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "limnoria";
-  version = "2016.05.06";
+  version = "2018.09.09";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09kbii5559d09jjb6cryj8rva1050r54dvb67hlcvxhy8g3gr1y3";
+    sha256 = "077v4gsl0fimsqxir1mpzn2kvw01fg6fa0nnf33nlfa0xzdn241y";
   };
 
   patchPhase = ''
-- 
GitLab


From 6676cf6e88ec2daec4c5f943e72ea20c67ed21cc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 04:30:35 -0700
Subject: [PATCH 0232/1065] python36Packages.powerline: 2.6 -> 2.7

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

diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix
index 841e003bc89..b35c9de19dc 100644
--- a/pkgs/development/python-modules/powerline/default.nix
+++ b/pkgs/development/python-modules/powerline/default.nix
@@ -9,14 +9,14 @@
 # the executables of git, mercurial and bazaar.
 
 buildPythonPackage rec {
-  version  = "2.6";
+  version  = "2.7";
   pname = "powerline";
   name = pname + "-" + version;
 
   src = fetchurl {
     url    = "https://github.com/powerline/powerline/archive/${version}.tar.gz";
     name   = "${name}.tar.gz";
-    sha256 = "c108f11fe10dc910febb94b87d3abded85d4363fb950366a9e30282b9ba7c272";
+    sha256 = "1h1j2rfphvfdq6mmfyn5bql45hzrwxkhpc2jcwf0vrl3slzkl5s5";
   };
 
   propagatedBuildInputs = [ psutil pygit2];
-- 
GitLab


From 835043a6f6a712159e571b22362a1e764f2f179e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 05:05:27 -0700
Subject: [PATCH 0233/1065] python36Packages.plotly: 3.1.1 -> 3.3.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.6-plotly/versions
---
 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 30293e9798b..e2fb97d20d4 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.1.1";
+  version = "3.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2e565c8907ea6f9c517423cf5452e4f4b85635bd0dd400aae943339c826d4176";
+    sha256 = "1bsjk4crf9p08lmgmiibmk8w8kmlrfadyly5l12zz1d330acijl1";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From fe7c001cbc284dcfba50764ae04c4efb37ebe4dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 05:58:37 -0700
Subject: [PATCH 0234/1065] python36Packages.ezdxf: 0.8.1 -> 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.6-ezdxf/versions
---
 pkgs/development/python-modules/ezdxf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix
index 814cac3c9e6..317c16d5275 100644
--- a/pkgs/development/python-modules/ezdxf/default.nix
+++ b/pkgs/development/python-modules/ezdxf/default.nix
@@ -1,14 +1,14 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, pyparsing, pytest }:
 
 buildPythonPackage rec {
-  version = "0.8.1";
+  version = "0.8.8";
   pname = "ezdxf";
 
   src = fetchFromGitHub {
     owner = "mozman";
     repo = "ezdxf";
     rev = "v${version}";
-    sha256 = "1c20j96n3rsgzaakfjl0wnydaj2qr69gbnnjs6mfa1hz2fjqri22";
+    sha256 = "0ap6f6vy71s3y0a048r5ca98i7p8nc9l0mx3mngvvpvjij7j3fcf";
   };
 
   buildInputs = [ pytest ];
-- 
GitLab


From b9b82e371f8939f60f0573264e509c1d64160903 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 09:26:28 -0700
Subject: [PATCH 0235/1065] sslscan: 1.11.11 -> 1.11.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/sslscan/versions
---
 pkgs/tools/security/sslscan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix
index 6c89b0defa6..0484e8e069a 100644
--- a/pkgs/tools/security/sslscan/default.nix
+++ b/pkgs/tools/security/sslscan/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "sslscan-${version}";
-  version = "1.11.11";
+  version = "1.11.12";
 
   src = fetchFromGitHub {
     owner = "rbsec";
     repo = "sslscan";
     rev = "${version}-rbsec";
-    sha256 = "0k1agdz52pdgihwfwbygp0mlwkf757vcwhvwc0mrz606l2wbmwmr";
+    sha256 = "0wa0z6my6aqjp8si6x522ivk0yy55izbs3ch298gxjw5r15f4jb1";
   };
 
   buildInputs = [ openssl ];
-- 
GitLab


From c759273e2e7951b47edecab1c942b67fb7ee85c3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 08:52:13 -0700
Subject: [PATCH 0236/1065] star: 2.6.1a -> 2.6.1c

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 c552d9f9de3..e22043d9eb9 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.1a";
+  version = "2.6.1c";
 
   src = fetchFromGitHub {
     repo = "STAR";
     owner = "alexdobin";
     rev = version;
-    sha256 = "11zs32d96gpjldrylz3nr5r2qrshf0nmzh5nmcy4wrk7y5lz81xc";
+    sha256 = "0macdbxa0v5xplag83fpdhfpyhnqncmi9wf9r92wa7w8zkln12vd";
   };
 
   sourceRoot = "source/source";
-- 
GitLab


From d2a137abb5d404810bd8fcd7235e040109b463bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 15:16:54 -0700
Subject: [PATCH 0237/1065] pg_repack: 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/pg_repack/versions
---
 pkgs/servers/sql/postgresql/pg_repack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix
index 1b7cd08b082..a50605bd040 100644
--- a/pkgs/servers/sql/postgresql/pg_repack/default.nix
+++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
     name = "pg_repack-${version}";
-    version = "1.4.3";
+    version = "1.4.4";
 
     buildInputs = [ postgresql openssl zlib readline ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       owner  = "reorg";
       repo   = "pg_repack";
       rev    = "refs/tags/ver_${version}";
-      sha256 = "1mmd22nfaxjwnbl3i95f3ivmjvfqwdflgaczlg3129dbpwg265xr";
+      sha256 = "0ynsmsxfkcp82ccpz2nrgg8wiil8yxqigvw6425lx8v80h5lszbw";
     };
 
     installPhase = ''
-- 
GitLab


From abfb6b46d9ced0b0f168c0b7e0a03dd0ba116074 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 10:55:45 -0700
Subject: [PATCH 0238/1065] shairport-sync: 3.2.1 -> 3.2.2

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

diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index eef97588111..aaeb810eca0 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -2,11 +2,11 @@
 , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.1";
+  version = "3.2.2";
   name = "shairport-sync-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1g9pd00c1x66cbp4gls93pvnrwbzl37q7p8jaag3h5d6f1431i51";
+    sha256 = "1cw6wybnh4sp3llzmam0zpd6fcmr9y6ykrirzygckp2iaglcqbcv";
     rev = version;
     repo = "shairport-sync";
     owner = "mikebrady";
-- 
GitLab


From 8f57e7f711cc8e674c5cca894651cf096490df9c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 09:33:15 -0700
Subject: [PATCH 0239/1065] sundials: 3.2.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/sundials/versions
---
 pkgs/development/libraries/sundials/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index c903b041fd4..f3cfc1e56e8 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
 
   pname = "sundials";
-  version = "3.2.0";
+  version = "3.2.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
   url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
-  sha256 = "1yck1qjw5pw5i58x762vc0adg4g53lsan9xv92hbby5dxjpr1dnj";
+  sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7";
   };
 
   preConfigure = ''
-- 
GitLab


From ebe1595700271fd77b1cc5bfbea3290dad658de7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 14:48:56 -0700
Subject: [PATCH 0240/1065] plantuml: 1.2018.11 -> 1.2018.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/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 b3ceb41191d..0f035c347cf 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.11";
+  version = "1.2018.12";
   name = "plantuml-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "006bpxz6zsjypxscxbnz3b7icg47bfwcq1v7rvijflchw12hq9nm";
+    sha256 = "1ydi4zwzwf9q6hldzd9pcvsbrwy8r52vqxm74j2wq8yivh2p85s4";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 69349cce7fda6f28fa6f4a46d9099938f484f90d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 11:01:52 -0700
Subject: [PATCH 0241/1065] rocksndiamonds: 4.1.0.0 -> 4.1.1.0

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

diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix
index 09478001fb7..c0b07814aa5 100644
--- a/pkgs/games/rocksndiamonds/default.nix
+++ b/pkgs/games/rocksndiamonds/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${project}-${version}";
   project = "rocksndiamonds";
-  version = "4.1.0.0";
+  version = "4.1.1.0";
 
   src = fetchurl {
     url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz";
-    sha256 = "0bmszf2hqyh76p3lzmhljcjwlx7jzpirwx9zyzgfvwqcapf5i6af";
+    sha256 = "1k0m6l5g886d9mwwh6q0gw75qsb85mpf8i0rglh047app56nsk72";
   };
 
   desktopItem = makeDesktopItem {
-- 
GitLab


From 0b51a12e4839c1389797c478d315a73bf9dce073 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 04:36:13 -0700
Subject: [PATCH 0242/1065] python36Packages.pycountry: 1.17 -> 18.5.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/python3.6-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 90d573aaaa7..c1a7f19b126 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 = "1.17";
+  version = "18.5.26";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qvhq0c9xsh6d4apcvjphfzl6xnwhnk4jvhr8x2fdfnmb034lc26";
+    sha256 = "15q9j047s3yc9cfcxq1ch8b71f81na44cr6dydd5gxk0ki9a4akz";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From dce4042b26d88658fb81254111925b3797396e23 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 06:32:39 -0700
Subject: [PATCH 0243/1065] python36Packages.ipyparallel: 6.2.2 -> 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/python3.6-ipyparallel/versions
---
 pkgs/development/python-modules/ipyparallel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix
index a469ad46883..7ce31228705 100644
--- a/pkgs/development/python-modules/ipyparallel/default.nix
+++ b/pkgs/development/python-modules/ipyparallel/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "ipyparallel";
-  version = "6.2.2";
+  version = "6.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02b225966d5c20f12b1fba0b6b10aa5d352a6b492e075f137ff0ff6e95b9358e";
+    sha256 = "1k9701r120gv0an0wxvcjrbmhns8lq3zj6px5y2izly56j2dafqy";
   };
 
   buildInputs = [ nose ];
-- 
GitLab


From 47a082dbabea04ef2c1aff740b74aee804836afb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 07:00:51 -0700
Subject: [PATCH 0244/1065] python36Packages.fusepy: 2.0.4 -> 3.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/python3.6-fusepy/versions
---
 pkgs/development/python-modules/fusepy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix
index 74ab0fc01a6..80ca5099f34 100644
--- a/pkgs/development/python-modules/fusepy/default.nix
+++ b/pkgs/development/python-modules/fusepy/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "fusepy";
-  version = "2.0.4";
+  version = "3.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0v5grm4zyf58hsplwsxfbihddw95lz9w8cy3rpzbyha287swgx8h";
+    sha256 = "1gg69qfi9pjcic3g98l8ya64rw2vc1bp8gsf76my6gglq8z7izvj";
   };
 
   propagatedBuildInputs = [ pkgs.fuse ];
-- 
GitLab


From 5e4fd34cfe9d8c866b6a8d8aa52d337cb032e987 Mon Sep 17 00:00:00 2001
From: sveitser <sveitser@gmail.com>
Date: Wed, 24 Oct 2018 22:10:04 +0800
Subject: [PATCH 0245/1065] pythonPackages.sh: move to python-modules

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

diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix
new file mode 100644
index 00000000000..37388bf4690
--- /dev/null
+++ b/pkgs/development/python-modules/sh/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, coverage }:
+
+buildPythonPackage rec {
+  pname = "sh";
+  version = "1.12.14";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm";
+  };
+
+  checkInputs = [ coverage ];
+
+  # A test needs the HOME directory to be different from $TMPDIR.
+  preCheck = ''
+    HOME=$(mktemp -d)
+  '';
+
+  meta = {
+    description = "Python subprocess interface";
+    homepage = https://pypi.python.org/pypi/sh/;
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5c525d6b63c..cab23eb8060 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6727,30 +6727,7 @@ in {
     };
   };
 
-
-  sh = buildPythonPackage rec {
-    pname = "sh";
-    version = "1.12.14";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm";
-    };
-
-    buildInputs = with self; [ coverage ];
-
-    # A test needs the HOME directory to be different from $TMPDIR.
-    preCheck = ''
-    HOME=$(mktemp -d)
-    '';
-
-    meta = {
-      description = "Python subprocess interface";
-      homepage = https://pypi.python.org/pypi/sh/;
-      license = licenses.mit;
-    };
-  };
-
+  sh = callPackage ../development/python-modules/sh { };
 
   sipsimple = buildPythonPackage rec {
     name = "sipsimple-${version}";
-- 
GitLab


From 0aa3b6c0bf644797373f63af921dd519a31ae2aa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 06:51:03 -0700
Subject: [PATCH 0246/1065] python36Packages.d2to1: 0.2.12 -> 0.2.12.post1

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-d2to1/versions
---
 pkgs/development/python-modules/d2to1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/d2to1/default.nix b/pkgs/development/python-modules/d2to1/default.nix
index 195b20c27e4..70b0da89d5b 100644
--- a/pkgs/development/python-modules/d2to1/default.nix
+++ b/pkgs/development/python-modules/d2to1/default.nix
@@ -5,7 +5,7 @@
 }:
 buildPythonPackage rec {
   pname = "d2to1";
-  version = "0.2.12";
+  version = "0.2.12.post1";
 
   checkInputs = [ nose ];
 
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     owner = "embray";
     repo = pname;
     rev = version;
-    sha256 = "1q04ab8vjvx7fmq9ckkl8r9hlwwbqiyjbzaa4v1mv5zicfssxwsi";
+    sha256 = "1hzq51qbzsc27yy8swp08kf42mamag7qcabbrigzj4m6ivb5chi2";
   };
 
   meta = with lib;{
-- 
GitLab


From 435ee8e1f992ad72fd092dd1e02906f0ae841b5a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 07:06:16 -0700
Subject: [PATCH 0247/1065] python36Packages.colored: 1.1.5 -> 1.3.93

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-colored/versions
---
 pkgs/development/python-modules/colored/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix
index a32c9ebb429..42443c873d7 100644
--- a/pkgs/development/python-modules/colored/default.nix
+++ b/pkgs/development/python-modules/colored/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "colored";
-  version = "1.1.5";
+  version = "1.3.93";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1r1vsypk8v7az82d66bidbxlndx1h7xd4m43hpg1a6hsjr30wrm3";
+    sha256 = "0xbhq9nd9xz3b6w0c4q33jfgnv8jid023v2fyhi7hsrz1scym5l2";
   };
 
   # No proper test suite
-- 
GitLab


From fb718dad4137dd12be598babdfa76212b2f91512 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 06:25:22 -0700
Subject: [PATCH 0248/1065] python36Packages.django_nose: 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/python3.6-django-nose/versions
---
 pkgs/development/python-modules/django_nose/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django_nose/default.nix b/pkgs/development/python-modules/django_nose/default.nix
index 9d16ee343d6..02aeb9b204e 100644
--- a/pkgs/development/python-modules/django_nose/default.nix
+++ b/pkgs/development/python-modules/django_nose/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "django-nose";
-  version = "1.4.4";
+  version = "1.4.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fm47fkza2lk0xgc6qpi9vs78zg7q8cgl6mdan69sbycgy909ff0";
+    sha256 = "0sp78839s8yba6vlj9ab4r364skf1s5gzhaar1b1vw15rcc3yrl7";
   };
 
   # vast dependency list
-- 
GitLab


From c3c05e97d1b265380f0de3ff66d9c1b1132cc2aa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 06:43:33 -0700
Subject: [PATCH 0249/1065] python36Packages.django_polymorphic: 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/python3.6-django-polymorphic/versions
---
 .../development/python-modules/django-polymorphic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix
index 2cd112d8150..3a33960faf8 100644
--- a/pkgs/development/python-modules/django-polymorphic/default.nix
+++ b/pkgs/development/python-modules/django-polymorphic/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "django-polymorphic";
-  version = "2.0.2";
+  version = "2.0.3";
 
   # PyPI tarball is missing some test files
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "18p84kdwpfp423vb2n38h840mj3bq0j57jx3cry7c8dznpi0vfi2";
+    sha256 = "08qk3rbk0xlphwalkigbhqpmfaqjk1sxmlfh8zy8s8dw7fw1myk4";
   };
 
   checkInputs = [ dj-database-url ];
-- 
GitLab


From 6615b769961a1ff4413f0d9c64d325216184dec7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 06:16:45 -0700
Subject: [PATCH 0250/1065] python27Packages.enum: 0.4.4 -> 0.4.7

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

diff --git a/pkgs/development/python-modules/enum/default.nix b/pkgs/development/python-modules/enum/default.nix
index 70462e5f403..8aec63689d9 100644
--- a/pkgs/development/python-modules/enum/default.nix
+++ b/pkgs/development/python-modules/enum/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "enum";
-  version = "0.4.4";
+  version = "0.4.7";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9bdfacf543baf2350df7613eb37f598a802f346985ca0dc1548be6494140fdff";
+    sha256 = "001iq0yqs9f5bslvl793bhkcs71k5km9kv8yrj5h0lfsgrcg6z4c";
   };
 
   doCheck = !isPyPy;
-- 
GitLab


From 95371f3de1c7e67e01b436966baef27afe6b7c4c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 03:12:21 -0700
Subject: [PATCH 0251/1065] python36Packages.kerberos: 1.2.4 -> 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/python3.6-kerberos/versions
---
 pkgs/development/python-modules/kerberos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kerberos/default.nix b/pkgs/development/python-modules/kerberos/default.nix
index fdaec0d817d..455368e58d4 100644
--- a/pkgs/development/python-modules/kerberos/default.nix
+++ b/pkgs/development/python-modules/kerberos/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "kerberos";
-  version = "1.2.4";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "11q9jhzdl88jh8jgn7cycq034m36g2ncxds7mr3vqkngpcirkx6n";
+    sha256 = "19663qxmma0i8bfbjc2iwy5hgq0g4pfb75r023v5dps68zfvffgh";
   };
 
   buildInputs = [ pkgs.kerberos ];
-- 
GitLab


From c70ad805d216f18f91d2b0786b4ce248917153bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 08:13:05 -0700
Subject: [PATCH 0252/1065] smplayer: 18.9.0 -> 18.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/smplayer/versions
---
 pkgs/applications/video/smplayer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 58ed3ec59b2..52876bb1bbc 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmake, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-18.9.0";
+  name = "smplayer-18.10.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "0gff22yh2h76cyqsbjpa7rax51sfzygjl3isd8dk47zar9cyvw8d";
+    sha256 = "1sql1rd4h74smkapjf5c686zbdqqaf44h7k7z5bxfvfcsad7rzrd";
   };
 
   buildInputs = [ qtscript ];
-- 
GitLab


From 8c3e5b0401f6ec2d8e0ea676e105d57ff44618cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 24 Oct 2018 11:57:47 -0300
Subject: [PATCH 0253/1065] arc-theme: 20180715 -> 20181022

---
 pkgs/misc/themes/arc/default.nix | 43 ++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix
index 0fc86e096f3..ca49fb7d8a4 100644
--- a/pkgs/misc/themes/arc/default.nix
+++ b/pkgs/misc/themes/arc/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3
-, gnome-themes-extra, gtk-engine-murrine, optipng, inkscape}:
+{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3, gnome3
+, gtk-engine-murrine, optipng, inkscape }:
 
 let
   pname = "arc-theme";
@@ -7,40 +7,45 @@ in
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "20180715";
+  version = "20181022";
 
   src = fetchFromGitHub {
     owner  = "NicoHood";
     repo   = pname;
     rev    = version;
-    sha256 = "1kkfnkiih0i3pds5mgd1v9lrdrp4nh4hk42mw7sa4fpbjff4jh6j";
+    sha256 = "08951dk1irfadwpr3p323a4fprmxg53rk2r2niwq3v62ryhi3663";
   };
 
-  preBuild = ''
-    # Shut up inkscape's warnings
-    export HOME="$NIX_BUILD_ROOT"
-  '';
+  nativeBuildInputs = [
+    autoreconfHook
+    pkgconfig
+    sassc
+    optipng
+    inkscape
+    gtk3
+    gnome3.gnome-shell
+  ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig sassc optipng inkscape ];
-  buildInputs = [ gtk3 ];
+  propagatedUserEnvPkgs = [
+    gnome3.gnome-themes-extra
+    gtk-engine-murrine
+  ];
 
-  propagatedUserEnvPkgs = [ gnome-themes-extra gtk-engine-murrine ];
+  enableParallelBuilding = true;
 
   postPatch = ''
-    find . -name render-assets.sh |
-    while read filename
-    do
-      substituteInPlace "$filename" \
-        --replace "/usr/bin/inkscape" "${inkscape.out}/bin/inkscape" \
-        --replace "/usr/bin/optipng" "${optipng.out}/bin/optipng"
-    done
     patchShebangs .
   '';
 
+  preBuild = ''
+    # Shut up inkscape's warnings about creating profile directory
+    export HOME="$NIX_BUILD_ROOT"
+  '';
+
   configureFlags = [ "--disable-unity" ];
 
   postInstall = ''
-    install -Dm644 -t $out/share/doc/${pname}        AUTHORS *.md
+    install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From c90051c53db56a3717cd4bab0ad4e1010ebfd3da Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Wed, 24 Oct 2018 17:02:54 +0200
Subject: [PATCH 0254/1065] clarifying `name` arg determines vim command name

The `name` arg of `vim_configurable.customize` does not only determine
the package name, but also the name of the command/ executable to be
called.
In my opinion this is not documented properly and finding that out took
me several hours.
---
 doc/languages-frameworks/vim.section.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 1b235dbb52f..2cec1543a24 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -23,6 +23,7 @@ Adding custom .vimrc lines can be done using the following code:
 
 ```
 vim_configurable.customize {
+  # `name` specifies the name of the executable and package
   name = "vim-with-plugins";
 
   vimrcConfig.customRC = ''
@@ -31,6 +32,8 @@ vim_configurable.customize {
 }
 ```
 
+This configuration is used when vim is invoked with the command specified as name, in this case `vim-with-plugins`.
+
 For Neovim the `configure` argument can be overridden to achieve the same:
 
 ```
@@ -83,6 +86,7 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n
 {
   packageOverrides = pkgs: with pkgs; {
     myVim = vim_configurable.customize {
+      # `name` specifies the name of the executable and package
       name = "vim-with-plugins";
       # add here code from the example section
     };
-- 
GitLab


From 77addd67bba2a441501dd0ba1dcbfd79dc5b8b5c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 08:11:25 -0700
Subject: [PATCH 0255/1065] python36Packages.i3ipc: 1.4.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/python3.6-i3ipc/versions
---
 pkgs/development/python-modules/i3ipc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix
index 492c4da6fcc..cf206472cd3 100644
--- a/pkgs/development/python-modules/i3ipc/default.nix
+++ b/pkgs/development/python-modules/i3ipc/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "i3ipc";
-  version = "1.4.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner  = "acrisci";
     repo   = "i3ipc-python";
     rev    = "v${version}";
-    sha256 = "15drq16ncmjrgsri6gjzp0qm8abycm92nicm78q3k7vy7rqpvfnh";
+    sha256 = "06d7g4d7cnh0vp5diavy3x9wz1w5nwdrb7ipc4g1c3a2wc78862d";
   };
 
   propagatedBuildInputs = [ enum-compat ];
-- 
GitLab


From 15f275d1b998e175dd0e6ab5d1f5eff9be734dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Wed, 24 Oct 2018 17:12:32 +0200
Subject: [PATCH 0256/1065] slic3r-prusa3d: 1.41.0 -> 1.41.1

---
 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 7df4007cf40..cc9133257a0 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.0";
+  version = "1.41.1";
 
   enableParallelBuilding = true;
 
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "prusa3d";
     repo = "Slic3r";
-    sha256 = "1al60hrqbhl05dnsr99hzbmxmn26fyx19sc5zxv816x3q6px9n2d";
+    sha256 = "0068wwsjwmnxql7653vy3labcyslzf17kr8xdr4lg2jplm022hvy";
     rev = "version_${version}";
   };
 
-- 
GitLab


From f7d26489ccd64feb6a3c0586dd6706048406d8c5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 08:21:05 -0700
Subject: [PATCH 0257/1065] python36Packages.elpy: 1.9.0 -> 1.25.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-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 79ec94a2c82..a947faec453 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.9.0";
+  version = "1.25.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "419f7b05b19182bc1aedde1ae80812c1534e59a0493476aa01ea819e76ba26f0";
+    sha256 = "10n20lw7n728ahnfrx03vgx9zim7jb8s1zqhw8yivksm9c1a6i12";
   };
 
   propagatedBuildInputs = [ flake8 autopep8 jedi importmagic ]
-- 
GitLab


From 810385d62bea12e6962b4de6c84bf1c7875f2541 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 08:34:22 -0700
Subject: [PATCH 0258/1065] python36Packages.ftfy: 4.4.3 -> 5.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/python3.6-ftfy/versions
---
 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 d2e806e43b9..ce847b81de6 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 = "4.4.3";
+  version = "5.3.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 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w";
+    sha256 = "0zybd0ypxhb83bgdbwzi120n02328v4j0ndm6bgkb6wg2gah59qb";
   };
 
   propagatedBuildInputs = [ html5lib wcwidth ];
-- 
GitLab


From fbfd51a8c6e8f267cfdeceb18d8dd5112a5ba0f1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 08:42:51 -0700
Subject: [PATCH 0259/1065] python36Packages.django-picklefield: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix
index 7037f23b071..694b11c6ca8 100644
--- a/pkgs/development/python-modules/django-picklefield/default.nix
+++ b/pkgs/development/python-modules/django-picklefield/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "django-picklefield";
-  version = "1.0.0";
+  version = "1.1.0";
 
   meta = {
     description = "A pickled object field for Django";
@@ -12,6 +12,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "61e3ba7f6df82d8df9e6be3a8c55ef589eb3bf926c3d25d2b7949b07eae78354";
+    sha256 = "174zlsajpjflrf3jgn0wp5svnxfyrjadk4s9jb45vzjqcmffwzyf";
   };
 }
-- 
GitLab


From 8324a938e7186a9526f794677f1a5c2544755961 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 23 Oct 2018 12:14:03 -0500
Subject: [PATCH 0260/1065] tor-browser-bundle-bin: 8.0.2 -> 8.0.3

https://gitweb.torproject.org/builders/tor-browser-build.git/tree/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=tbb-8.0.3-build1
---
 .../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 23f0db67e66..dfcc367170d 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -103,7 +103,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "8.0.2";
+  version = "8.0.3";
 
   lang = "en-US";
 
@@ -113,7 +113,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1vajphnl53bhp0bnq8shljvnnq4k2wpvfrfclmxklp97lqvfl9vz";
+      sha256 = "19clhhsyhc8brjzjyrq0xl5gavwhbyq036nbl0x6dybawr3684gz";
     };
 
     "i686-linux" = fetchurl {
@@ -121,7 +121,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "157yd8n53w79xx58xf5v983a50xq1s0c09cr7qfd5cxgs7zrwh34";
+      sha256 = "1hlrbn8r9z93mswnaksn66azgf3zjf08wrlk58risli32j9gywd0";
     };
   };
 in
-- 
GitLab


From dd2534b287df4ce3aa23170b9f30733a29e70c92 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 08:46:06 -0700
Subject: [PATCH 0261/1065] python36Packages.django_extensions: 2.0.7 -> 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/python3.6-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 3548e930ab3..30ef1a10418 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.0.7";
+  version = "2.1.3";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "1xf84wq7ab1zfb3nmf4qgw6mjf5xafjwr3175dyrqrrn6cpvcr4a";
+    sha256 = "0ns1m9sdkcbbz84wvzgxa4f8hf4a8z656jzwx4bw8np9kh96zfjy";
   };
 
   postPatch = ''
-- 
GitLab


From 6cb7d25090d84f86bc7a0a18ef59703cd2794b14 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 09:03:33 -0700
Subject: [PATCH 0262/1065] python36Packages.fido2: 0.3.0 -> 0.4.0

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

diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix
index 3642d4e55b9..809871b50de 100644
--- a/pkgs/development/python-modules/fido2/default.nix
+++ b/pkgs/development/python-modules/fido2/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "fido2";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ddbhg4nsabi9w66l8vkr0i5r80jqihlic5yrdl3v1aqahvxph1j";
+    sha256 = "12245b16czsgq4a251jqlk5qs3sldlcryfcganswzk2lbgplmn7q";
   };
 
   # The pypi package does not include tests
-- 
GitLab


From dae80d35fdff860f2c88c2efafd5f251bf1fa228 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 09:06:38 -0700
Subject: [PATCH 0263/1065] python36Packages.influxdb: 4.0.0 -> 5.2.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.6-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 100ca5b0ff9..0d6828bff72 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 = "4.0.0";
+  version = "5.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0injsml6zmb3hkgc03117fdlg573kbfgjbijpd5npf0vsy0xnpvz";
+    sha256 = "0fqnshmsgifvp79pd4g9a1kyfxvpa9vczv0dv8x2jr2c5m1mi99v";
   };
 
   # ImportError: No module named tests
-- 
GitLab


From 13c8469938d9fa86a3a637b9314e8ce7dbce7e25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 09:16:15 -0700
Subject: [PATCH 0264/1065] python36Packages.icalendar: 3.9.0 -> 4.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/python3.6-icalendar/versions
---
 pkgs/development/python-modules/icalendar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix
index b83785211f8..e2e833f7c47 100644
--- a/pkgs/development/python-modules/icalendar/default.nix
+++ b/pkgs/development/python-modules/icalendar/default.nix
@@ -7,12 +7,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.9.0";
+  version = "4.0.3";
   pname = "icalendar";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "93d0b94eab23d08f62962542309916a9681f16de3d5eca1c75497f30f1b07792";
+    sha256 = "0mk3dk1dxkcm46jy48v27j2w2349iv4sbimqj1yb5js43mx49hh7";
   };
 
   buildInputs = [ setuptools ];
-- 
GitLab


From b457c1282be4f8907ac045e7f30603c79ed8d16c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 09:54:42 -0700
Subject: [PATCH 0265/1065] python36Packages.evdev: 1.0.0 -> 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/python3.6-evdev/versions
---
 pkgs/development/python-modules/evdev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix
index 2deb16924d2..c4543032c2b 100644
--- a/pkgs/development/python-modules/evdev/default.nix
+++ b/pkgs/development/python-modules/evdev/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "evdev";
-  version = "1.0.0";
+  version = "1.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "be0288ef1125bf1c539bb8f3079ef4aa5fb813af28f0c5294a4e744ee554398a";
+    sha256 = "0l837gm9cjdp3lybnam38ip0q3n1xy0j6vzgx11hdrr0ps8p5mid";
   };
 
   buildInputs = [ linuxHeaders ];
-- 
GitLab


From cfca8b528ca4f57088291ae9b5e30c1bb79fe673 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 10:37:08 -0700
Subject: [PATCH 0266/1065] python36Packages.chameleon: 2.25 -> 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.6-chameleon/versions
---
 pkgs/development/python-modules/chameleon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix
index 1a2811b50b6..104bdb86bf0 100644
--- a/pkgs/development/python-modules/chameleon/default.nix
+++ b/pkgs/development/python-modules/chameleon/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "Chameleon";
-  version = "2.25";
+  version = "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0va95cml7wfjpvgj3dc9xdn8psyjh3zbk6v51b0hcqv2fzh409vb";
+    sha256 = "1a83jf211mqjhgbd3abqyrn4mp4vb077ql8fydmv80xg3whrf3yb";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From bb03fbc2c8b97ef5a4f4205eee51029155164b8a Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 22 Oct 2018 23:36:37 +0200
Subject: [PATCH 0267/1065] chromium: 69.0.3497.100 -> 70.0.3538.67

---
 .../networking/browsers/chromium/common.nix   | 44 ++++++++-----------
 .../chromium/patches/fix-freetype.patch       | 15 -------
 .../patches/nix_plugin_paths_68.patch         |  9 ----
 .../browsers/chromium/upstream-info.nix       | 18 ++++----
 4 files changed, 27 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index c18f77f8f99..4cbd44c100d 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -92,11 +92,6 @@ let
   buildPath = "out/${buildType}";
   libExecPath = "$out/libexec/${packageName}";
 
-  freetype_source = fetchurl {
-    url = http://anduin.linuxfromscratch.org/BLFS/other/chromium-freetype.tar.xz;
-    sha256 = "1vhslc4xg0d6wzlsi99zpah2xzjziglccrxn55k7qna634wyxg77";
-  };
-
   versionRange = min-version: upto-version:
     let inherit (upstream-info) version;
         result = versionAtLeast version min-version && versionOlder version upto-version;
@@ -132,22 +127,26 @@ let
       ++ optional pulseSupport libpulseaudio
       ++ optional (versionAtLeast version "71") at-spi2-core;
 
-    patches = [
-      # As major versions are added, you can trawl the gentoo and arch repos at
-      # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
-      # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
-      # for updated patches and hints about build flags
-    # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
-      ./patches/fix-freetype.patch
+    patches = optional enableWideVine ./patches/widevine.patch ++ [
       ./patches/nix_plugin_paths_68.patch
       ./patches/remove-webp-include-69.patch
-    ] ++ optional enableWideVine ./patches/widevine.patch
-      ++ optional ((versionRange "69" "70") && stdenv.isAarch64)
-           (fetchpatch {
-              url    = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch;
-              sha256 = "0f37rsjx7jcvdngkj8y6600091nwgn4jci0ny7bxlapq0zx2a4x7";
-            })
-      ++ optional stdenv.isAarch64
+      # Unfortunately, chromium regularly breaks on major updates and
+      # then needs various patches backported. Good sources for such patches and other hints:
+      # - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
+      # - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
+      # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits
+      #
+      # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
+    ]  ++ optionals (versionOlder version "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" )
+    ] ++ optional stdenv.isAarch64
            (if (versionOlder version "71") then
               fetchpatch {
                 url       = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
@@ -193,11 +192,6 @@ let
       mkdir -p third_party/node/linux/node-linux-x64/bin
       ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node
 
-      # use patched freetype
-      # FIXME https://bugs.chromium.org/p/pdfium/issues/detail?id=733
-      # FIXME http://savannah.nongnu.org/bugs/?51156
-      tar -xJf ${freetype_source}
-
       # remove unused third-party
       # in third_party/crashpad third_party/zlib contains just a header-adapter
       for lib in ${toString gnSystemLibraries}; do
@@ -243,8 +237,6 @@ let
       google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
       google_default_client_id = "404761575300.apps.googleusercontent.com";
       google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
-    } // optionalAttrs (versionRange "60" "70") {
-      use_gtk3 = true;
     } // optionalAttrs proprietaryCodecs {
       # enable support for the H.264 codec
       proprietary_codecs = true;
diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch
deleted file mode 100644
index cc380a55abe..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/third_party/freetype/BUILD.gn
-+++ b/third_party/freetype/BUILD.gn
-@@ -63,10 +63,12 @@ source_set("freetype_source") {
-     "src/src/base/ftbase.c",
-     "src/src/base/ftbbox.c",
-     "src/src/base/ftbitmap.c",
-+    "src/src/base/ftfntfmt.c",
-     "src/src/base/ftfstype.c",
-     "src/src/base/ftgasp.c",
-     "src/src/base/ftglyph.c",
-     "src/src/base/ftinit.c",
-+    "src/src/base/ftlcdfil.c",
-     "src/src/base/ftmm.c",
-     "src/src/base/ftstroke.c",
-     "src/src/base/fttype1.c",
diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch
index 3c80dbcec00..da6a4c92b46 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch
+++ b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch
@@ -50,15 +50,6 @@ index f4e119d..d9775bd 100644
          return false;
        cur = cur.Append(kPepperFlashBaseDirectory);
        break;
-@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) {
-     // We currently need a path here to look up whether the plugin is disabled
-     // and what its permissions are.
-     case chrome::FILE_NACL_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "NACL"))
-         return false;
-       cur = cur.Append(kInternalNaClPluginFileName);
-       break;
 @@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) {
          cur = cur.DirName();
        }
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index a26c8b8ddde..bca9231e866 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 = "16biicw86mnjrmjazfbml2pf4rykhbvsz854cyfnpjhcvmlh24jp";
-    sha256bin64 = "07jr1sqsxfdy3rymylkbpbgi79j9b2pax4igdzj943d0nbka84y5";
-    version = "70.0.3538.35";
+    sha256 = "0dqfwghl73gcmbnl9wb3i5wz8q65y1vhg7n0m2nh0hv33w1w4mp9";
+    sha256bin64 = "0x7npns1ng7p4w1qswcj889v9lplvy2wv1ccxrk4ilyqiwzvwy1z";
+    version = "70.0.3538.67";
   };
   dev = {
-    sha256 = "0fmkhvvydinv5f543n7rrmsv99rf0skwwhlpmszvspx6y4wz9smv";
-    sha256bin64 = "0plr8ph78kfg2dpyacjy3aw3msfif95fqpb8xx0n8whkkpbl9968";
-    version = "71.0.3559.6";
+    sha256 = "1kw0rn58s4nd43z2qkjph7aid0s3jnmm650d7k1yxppgmfsal246";
+    sha256bin64 = "0518qrghjk5jlzhmynk6nngp5i81bpxi3880gimpbd7bblj6dg7y";
+    version = "71.0.3578.10";
   };
   stable = {
-    sha256 = "0dcyzsb70ssx5hd2b25ab3ydpqh7crhxab9zzi5gn99ywxh1afg3";
-    sha256bin64 = "0w56k7hmdi9knjaw67kdmyz0fdkjmk2ldh2n4l1c6szkr66vq30q";
-    version = "69.0.3497.100";
+    sha256 = "0dqfwghl73gcmbnl9wb3i5wz8q65y1vhg7n0m2nh0hv33w1w4mp9";
+    sha256bin64 = "0ihs2xfb2zn8aq11kg7miw9rnjwc6l4k5jgf24dm661463xmd3ha";
+    version = "70.0.3538.67";
   };
 }
-- 
GitLab


From d7fcd1dcbfa8e39bb067e7232de4ef3ed82cae54 Mon Sep 17 00:00:00 2001
From: Jeff Slight <jslight90@gmail.com>
Date: Wed, 24 Oct 2018 10:38:56 -0700
Subject: [PATCH 0268/1065] nixos/users: fix users home directory with
 isNormalUser

---
 nixos/modules/config/users-groups.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 426e1666a81..137ee243813 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -266,7 +266,7 @@ let
         (mkIf config.isNormalUser {
           group = mkDefault "users";
           createHome = mkDefault true;
-          home = mkDefault "/home/${name}";
+          home = mkDefault "/home/${config.name}";
           useDefaultShell = mkDefault true;
           isSystemUser = mkDefault false;
         })
-- 
GitLab


From ca4b2d7e6502972e347636ab894bcf4681f4cc69 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Wed, 24 Oct 2018 19:44:51 +0200
Subject: [PATCH 0269/1065] mopidy-iris: 3.27.1 -> 3.28.1

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

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 546a47118a0..3649a0a6886 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.27.1";
+  version = "3.28.1";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "00qlvfwfn7kybrx6rlj5h862syw3d5yak4sjqpxvacp7i5n1arsk";
+    sha256 = "0yph01z8lw0r5bw3aa14w0l7z1ymxvpmb131gbaw3ib0srssgz64";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From c09c4b9ff185ce2a85e046174225c92c4a821eac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 10:48:46 -0700
Subject: [PATCH 0270/1065] python27Packages.ipaddr: 2.1.11 -> 2.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/python2.7-ipaddr/versions
---
 pkgs/development/python-modules/ipaddr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix
index 4325e6ea884..6aecf5959ff 100644
--- a/pkgs/development/python-modules/ipaddr/default.nix
+++ b/pkgs/development/python-modules/ipaddr/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "ipaddr";
-  version = "2.1.11";
+  version = "2.2.0";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v";
+    sha256 = "1ml8r8z3f0mnn381qs1snbffa920i9ycp6mm2am1d3aqczkdz4j0";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 0013bc3056604b25299e8601caf4f99cc1f4a910 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 10:55:19 -0700
Subject: [PATCH 0271/1065] python36Packages.google_api_core: 1.3.0 -> 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/python3.6-google-api-core/versions
---
 pkgs/development/python-modules/google_api_core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix
index ded728bdc0d..899a315da65 100644
--- a/pkgs/development/python-modules/google_api_core/default.nix
+++ b/pkgs/development/python-modules/google_api_core/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-api-core";
-  version = "1.3.0";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ac85fc7f6687bb0271f2f70ca298da90f35789f9de1fe3a11e8caeb571332b77";
+    sha256 = "16ximavy7zgg0427790fmyma03xnkywar9krp4lx6bcphvyiahh3";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From a57aabe18f0f927644ed4a9079458ab9627edaf2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 10:58:40 -0700
Subject: [PATCH 0272/1065] python36Packages.adal: 1.0.2 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
index ab9839a2103..003bd516657 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "adal";
-  version = "1.0.2";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4c020807b3f3cfd90f59203077dd5e1f59671833f8c3c5028ec029ed5072f9ce";
+    sha256 = "1hgm62wil1avc3h0dwbks2v6l19xfsjl3azai16llsyp70y92lms";
   };
 
   propagatedBuildInputs =  [ requests pyjwt dateutil ];
-- 
GitLab


From 9a9db29d750385a1e01853fc47171ce113b62ae9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 10:43:32 -0700
Subject: [PATCH 0273/1065] python36Packages.astropy: 3.0.4 -> 3.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/python3.6-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 acbd7c2ec65..84b43fbcfa9 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.4";
+  version = "3.0.5";
 
   disabled = !isPy3k; # according to setup.py
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f5d37d20632ba74bd0b12a85179c12f64a9ea037ffc916d8a2de3be4f4656c76";
+    sha256 = "0xldn6mh97pnkq915bacj8my9gy2kx58rrdm44496qla5i1gzlc2";
   };
 
   propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires
-- 
GitLab


From 5056933dd2321826e14f3b09ef8672bbc00288dc Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 24 Oct 2018 14:03:40 -0400
Subject: [PATCH 0274/1065] lollypop: 0.9.605 -> 0.9.607

---
 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 e999672f4ab..034d2059283 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -4,7 +4,7 @@
 , gobjectIntrospection, wrapGAppsHook }:
 
 python3.pkgs.buildPythonApplication rec  {
-  version = "0.9.605";
+  version = "0.9.607";
   name = "lollypop-${version}";
 
   format = "other";
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec  {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "10d9k7ssh4snrrjy1hb3y39by6175493cmn50aq88xby2mdy3p74";
+    sha256 = "04giwp4i7j1qad41fiqlb8s3w03f1ww0p2mhi8n162sajnflr1rd";
   };
 
   nativeBuildInputs = with python3.pkgs; [
-- 
GitLab


From 4e7933d6349d23337e8e130270ea6419e6584a0c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 11:05:27 -0700
Subject: [PATCH 0275/1065] mate.python-caja: 1.20.0 -> 1.20.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/python-caja/versions
---
 pkgs/desktops/mate/python-caja/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix
index 566245c4441..1659ebaae65 100644
--- a/pkgs/desktops/mate/python-caja/default.nix
+++ b/pkgs/desktops/mate/python-caja/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "python-caja-${version}";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0bcgg3p01zik53l5ns48575yw0k88fyc044yvp9fvwy5jqqg1ykk";
+    sha256 = "16y9xri92x7a40db2qakf20c80a6vqy21nwnjhwrki5rqk7nwbgx";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 1bf7c848d151535275ca1103d661109964064f36 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 09:38:59 -0700
Subject: [PATCH 0276/1065] python36Packages.augeas: 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/python3.6-augeas/versions
---
 pkgs/development/python-modules/augeas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix
index def46c7fccc..de041c0f4c8 100644
--- a/pkgs/development/python-modules/augeas/default.nix
+++ b/pkgs/development/python-modules/augeas/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, buildPythonPackage, fetchFromGitHub, augeas, cffi }:
 buildPythonPackage rec {
     pname = "augeas";
-    version = "1.0.2";
+    version = "1.0.3";
     name = pname + "-" + version;
 
     src = fetchFromGitHub {
       owner = "hercules-team";
       repo = "python-augeas";
       rev = "v${version}";
-      sha256 = "1xk51m58ym3qpf0z5y98kzxb5jw7s92rca0v1yflj422977najxh";
+      sha256 = "1fb904ym8g8hkd82zlibzk6wrldnfd5v5d0rkynsy1zlhcylq4f6";
     };
 
     # TODO: not very nice!
-- 
GitLab


From 653077b333300921043d3587f0a6e851c26b747c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 08:39:43 -0700
Subject: [PATCH 0277/1065] python36Packages.bjoern: 2.2.2 -> 2.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/python3.6-bjoern/versions
---
 pkgs/development/python-modules/bjoern/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix
index 22243edea9e..4a4a4a86d5e 100644
--- a/pkgs/development/python-modules/bjoern/default.nix
+++ b/pkgs/development/python-modules/bjoern/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "bjoern";
-  version = "2.2.2";
+  version = "2.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1w5z9agacci4shmkg9gh46ifj2a724rrgbykdv14830f7jq3dcmi";
+    sha256 = "1lbwqmqrl32jlfzhffxsb1fm7xbbjgbhjr21imk656agvpib2wx2";
   };
 
   buildInputs = [ libev ];
-- 
GitLab


From 91c0b03801d6847526847420028d0d1f9b85e78a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 09:00:21 -0700
Subject: [PATCH 0278/1065] python36Packages.django_hijack: 2.1.5 -> 2.1.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/python3.6-django-hijack/versions
---
 pkgs/development/python-modules/django-hijack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix
index 1634e676952..bdf503cd849 100644
--- a/pkgs/development/python-modules/django-hijack/default.nix
+++ b/pkgs/development/python-modules/django-hijack/default.nix
@@ -3,7 +3,7 @@
 }:
 buildPythonPackage rec {
   pname = "django-hijack";
-  version = "2.1.5";
+  version = "2.1.9";
   name = pname + "-" + version;
 
   # the pypi packages don't include everything required for the tests
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     owner = "arteria";
     repo = "django-hijack";
     rev = "v${version}";
-    sha256 = "1paiyxhc034336xcd9yzf3azpsapsv26j7w2baxiby71z2hhg0sj";
+    sha256 = "109xi93xj37ycdsvainybhg89pcb5sawv6w80px4r6fjvaq4732c";
   };
 
   checkInputs = [ django_nose ];
-- 
GitLab


From 34f3354ccdd4d6035780e95d25c8ece22608147b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 08:24:12 -0700
Subject: [PATCH 0279/1065] python36Packages.gnureadline: 6.3.3 -> 6.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/python3.6-gnureadline/versions
---
 pkgs/development/python-modules/gnureadline/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix
index 2feab78f6a8..b690faccf06 100644
--- a/pkgs/development/python-modules/gnureadline/default.nix
+++ b/pkgs/development/python-modules/gnureadline/default.nix
@@ -6,13 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "6.3.3";
+  version = "6.3.8";
   pname = "gnureadline";
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ghck2zz4xbqa3wz73brgjhrqj55p9hc1fq6c9zb09dnyhwb0nd2";
+    sha256 = "0ddhj98x2nv45iz4aadk4b9m0b1kpsn1xhcbypn5cd556knhiqjq";
   };
 
   buildInputs = [ pkgs.ncurses ];
-- 
GitLab


From 4188094106e420ac66cb32cc739225abd8b1db75 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 08:08:17 -0700
Subject: [PATCH 0280/1065] python36Packages.gsd: 1.5.2 -> 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/python3.6-gsd/versions
---
 pkgs/development/python-modules/gsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix
index d6c6a41ae08..6f07725520f 100644
--- a/pkgs/development/python-modules/gsd/default.nix
+++ b/pkgs/development/python-modules/gsd/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.5.2";
+  version = "1.5.4";
   pname = "gsd";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ce73a9bc7b79968a2b96cc2b0934e2cbe11700adbd02b4b492fea1e3d4d51f4";
+    sha256 = "1p1akwirxq809apxia6b9ndalpdfgv340ssnli78h74bkqnw1376";
   };
 
   propagatedBuildInputs = [ numpy ];
-- 
GitLab


From 85e92a943044609eedca128b11ebe4ee46f79349 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 07:57:16 -0700
Subject: [PATCH 0281/1065] python36Packages.IBMQuantumExperience: 2.0.3 ->
 2.0.4

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

diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix
index 22b809c46c2..dcf39dd24f0 100644
--- a/pkgs/development/python-modules/ibmquantumexperience/default.nix
+++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "IBMQuantumExperience";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c5dbcc140344c7bdf545ad59db87f31a90ca35107c40d6cae1489bb997a47ba9";
+    sha256 = "0szn743sbm3cs80982cf4994c1xcg6iz5xkhdbpm1kfv5qn1phja";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 073ded7c934ad037c4fa5c0f4e59fa9eb18ec016 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 09:45:17 -0700
Subject: [PATCH 0282/1065] python36Packages.celery: 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/python3.6-celery/versions
---
 pkgs/development/python-modules/celery/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index df260b3adb7..13038c5803c 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -15,11 +15,11 @@ let
 
 in buildPythonPackage rec {
   pname = "celery";
-  version = "4.2.0";
+  version = "4.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ff727c115533edbc7b81b2b4ba1ec88d1c2fc4836e1e2f4c3c33a76ff53e5d7f";
+    sha256 = "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp";
   };
 
   # Skip test_RedisBackend.test_timeouts_in_url_coerced
-- 
GitLab


From 27da6c5c50e893499730b419ebba4b18557c6b78 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 08:50:40 -0700
Subject: [PATCH 0283/1065] python36Packages.flask_oauthlib: 0.9.3 -> 0.9.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.6-flask-oauthlib/versions
---
 pkgs/development/python-modules/flask-oauthlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flask-oauthlib/default.nix b/pkgs/development/python-modules/flask-oauthlib/default.nix
index 2d34ce8583e..58705751415 100644
--- a/pkgs/development/python-modules/flask-oauthlib/default.nix
+++ b/pkgs/development/python-modules/flask-oauthlib/default.nix
@@ -3,13 +3,13 @@
 , mock, nose}:
 buildPythonPackage rec {
   pname = "Flask-OAuthlib";
-  version = "0.9.3";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "lepture";
     repo = "flask-oauthlib";
     rev = "v${version}";
-    sha256 = "1vnr2kmbwl6mv2fsv92jjxzfibq2m3pnbcs6ba9k32jr1ci7wfh7";
+    sha256 = "1l82niwrpm7411xvwh65bj263si90kcbrbfg5fa52mpixhxcp40f";
   };
 
   buildInputs = [ mock nose ];
-- 
GitLab


From e016039f981b6df4739a93d17fcdb5d475f401a7 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 24 Oct 2018 14:12:05 -0400
Subject: [PATCH 0284/1065] antibody: 3.7.0 -> 4.0.0

---
 pkgs/shells/zsh/antibody/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
index bf3d7773640..92a6628dcda 100644
--- a/pkgs/shells/zsh/antibody/default.nix
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "antibody-${version}";
-  version = "3.7.0";
+  version = "4.0.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/getantibody/antibody";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner  = "getantibody";
     repo   = "antibody";
-    sha256 = "1c7f0b1lgl4pm3cs39kr6dgr19lfykjhamg74k5ryrizag0j68l5";
+    sha256 = "0iq3dfwwh39hmk8qmhrfgkn8pcabxf67c03s7vh18n7w9aay4jfz";
   };
 
   goDeps = ./deps.nix;
-- 
GitLab


From df535a6fd12062bc38a0a1a855f773180f4fd94d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 09:26:32 -0700
Subject: [PATCH 0285/1065] python36Packages.django_environ: 0.4.0 -> 0.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.6-django-environ/versions
---
 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 15eafa6dd85..1e5936e6089 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.0";
+  version = "0.4.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0i32vsgk1xmwpi7i6f6v5hg653y9dl0fsz5qmv94skz6hwgm5kvh";
+    sha256 = "1ylw16v5z46ckn8ynbx2zjam6nvipl0xxcr6icrf6driv02q8bzf";
   };
 
   # The testsuite fails to modify the base environment
-- 
GitLab


From c41603ab1b4e3e6c4314be22080355234d6aa0f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 11:32:46 -0700
Subject: [PATCH 0286/1065] python36Packages.dlib: 19.13 -> 19.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/python3.6-dlib/versions
---
 pkgs/development/libraries/dlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index e5e3c2d662c..a88b3f1b9b6 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "19.13";
+  version = "19.16";
   name = "dlib-${version}";
 
   src = fetchFromGitHub {
     owner = "davisking";
     repo = "dlib";
     rev ="v${version}";
-    sha256 = "11ia4pd2lm2s9hzwrdvimj3r2qcnvjdp3g4fry2j1a6z9f99zvz3";
+    sha256 = "0ix52npsxfm6324jli7y0zkyijl5yirv2yzfncyd4sq0r9fcwb4p";
   };
 
   postPatch = ''
-- 
GitLab


From b47fccff0a9dc40193ea46c7c0bd189b4ccd9665 Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Wed, 24 Oct 2018 20:10:04 +0200
Subject: [PATCH 0287/1065] truecrypt: remove and alias to veracrypt

TrueCrypt has been retired for a while now and the source archive we
pointed to is gone. Moreover the VeraCrypt fork is available, maintained
and fixes issues previous audits found in TrueCrypt.
---
 nixos/doc/manual/release-notes/rl-1903.xml   |  9 ++
 pkgs/applications/misc/truecrypt/default.nix | 98 --------------------
 pkgs/applications/misc/truecrypt/gcc6.patch  | 61 ------------
 pkgs/top-level/aliases.nix                   |  1 +
 pkgs/top-level/all-packages.nix              |  7 +-
 5 files changed, 11 insertions(+), 165 deletions(-)
 delete mode 100644 pkgs/applications/misc/truecrypt/default.nix
 delete mode 100644 pkgs/applications/misc/truecrypt/gcc6.patch

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 839d75b53bd..3934ab63f40 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -155,6 +155,15 @@
      Matomo version.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The deprecated <literal>truecrypt</literal> package has been removed
+     and <literal>truecrypt</literal> attribute is now an alias for
+     <literal>veracrypt</literal>. VeraCrypt is backward-compatible with
+     TrueCrypt volumes. Note that <literal>cryptsetup</literal> also
+     supports loading TrueCrypt volumes.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix
deleted file mode 100644
index 5bb614ac68b..00000000000
--- a/pkgs/applications/misc/truecrypt/default.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-Requirements for Building TrueCrypt for Linux and macOS:
------------------------------------------------------------
-
-- GNU Make
-- GNU C++ Compiler 4.0 or compatible
-- Apple XCode (macOS only)
-- pkg-config
-- wxWidgets 2.8 library source code (available at http://www.wxwidgets.org)
-- FUSE library (available at http://fuse.sourceforge.net and
-  http://code.google.com/p/macfuse)
-
-
-Instructions for Building TrueCrypt for Linux and macOS:
------------------------------------------------------------
-
-1) Change the current directory to the root of the TrueCrypt source code.
-
-2) Run the following command to configure the wxWidgets library for TrueCrypt
-   and to build it:
-
-   $ make WX_ROOT=/usr/src/wxWidgets wxbuild
-
-   The variable WX_ROOT must point to the location of the source code of the
-   wxWidgets library. Output files will be placed in the './wxrelease/'
-   directory.
-
-3) To build TrueCrypt, run the following command:
-
-   $ make
-
-4) If successful, the TrueCrypt executable should be located in the directory
-   'Main'.
-
-By default, a universal executable supporting both graphical and text user
-interface is built. To build a console-only executable, which requires no GUI
-library, use the 'NOGUI' parameter:
-
-   $ make NOGUI=1 WX_ROOT=/usr/src/wxWidgets wxbuild
-   $ make NOGUI=1
-*/
-
-{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, lvm2,
-  wxGUI ? true
-}:
-
-stdenv.mkDerivation {
-  name = "truecrypt-7.1a";
-
-  patchPhase = "patch -p0 < ${./gcc6.patch}";
-
-  preBuild = ''
-    cp $pkcs11h pkcs11.h
-    cp $pkcs11th pkcs11t.h
-    cp $pkcs11fh pkcs11f.h
-  '';
-
-  makeFlags = [
-    ''PKCS11_INC="`pwd`"''
-    (if wxGUI then "" else "NOGUI=1")
-  ];
-
-  installPhase = ''
-    install -D -t $out/bin Main/truecrypt
-    install -D License.txt $out/share/$name/LICENSE
-  '';
-
-  src = fetchurl {
-    url = https://fossies.org/linux/misc/old/TrueCrypt-7.1a-Source.tar.gz;
-    sha256 = "e6214e911d0bbededba274a2f8f8d7b3f6f6951e20f1c3a598fc7a23af81c8dc";
-  };
-
-  pkcs11h = fetchurl {
-    url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11.h;
-    sha256 = "1563d877b6f8868b8eb8687358162bfb7f868104ed694beb35ae1c5cf1a58b9b";
-  };
-
-  pkcs11th = fetchurl {
-    url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11t.h;
-    sha256 = "8ce68616304684f92a7e267bcc8f486441e92a5cbdfcfd97e69ac9a0b436fb7b";
-  };
-
-  pkcs11fh = fetchurl {
-    url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11f.h;
-    sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ fuse lvm2 wxGTK nasm ];
-
-  meta = {
-    description = "Free Open-Source filesystem on-the-fly encryption";
-    homepage = http://www.truecrypt.org/;
-    license = "TrueCrypt License Version 2.6";
-    maintainers = with stdenv.lib.maintainers; [ ryantm ];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/applications/misc/truecrypt/gcc6.patch b/pkgs/applications/misc/truecrypt/gcc6.patch
deleted file mode 100644
index 6e8c7da69e8..00000000000
--- a/pkgs/applications/misc/truecrypt/gcc6.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- Main/Resources.cpp	2016-05-16 16:47:35.846462041 +0200
-+++ Main/Resources.cpp	2016-05-16 17:12:21.838202520 +0200
-@@ -45,13 +45,13 @@
- 		strBuf.CopyFrom (res);
- 		return string (reinterpret_cast <char *> (strBuf.Ptr()));
- #else
--		static const char LanguageXml[] =
-+		static byte LanguageXml[] =
- 		{
- #			include "Common/Language.xml.h"
- 			, 0
- 		};
- 
--		return string (LanguageXml);
-+		return string ((const char*) LanguageXml);
- #endif
- 	}
- 
-@@ -64,13 +64,13 @@
- 		strBuf.CopyFrom (res);
- 		return string (reinterpret_cast <char *> (strBuf.Ptr()));
- #else
--		static const char License[] =
-+		static byte License[] =
- 		{
- #			include "License.txt.h"
- 			, 0
- 		};
- 
--		return string (License);
-+		return string ((const char*) License);
- #endif
- 	}
- 
---- Main/Forms/PreferencesDialog.cpp	2016-05-16 17:14:47.704707908 +0200
-+++ Main/Forms/PreferencesDialog.cpp	2016-05-16 17:15:56.927964437 +0200
-@@ -414,11 +414,11 @@
- 		libExtension = wxDynamicLibrary::CanonicalizeName (L"x");
- 
- #ifdef TC_MACOSX
--		extensions.push_back (make_pair (L"dylib", LangString["DLL_FILES"]));
-+		extensions.push_back (make_pair (L"dylib", static_cast<const wchar_t*>(LangString["DLL_FILES"].wc_str())));
- #endif
- 		if (!libExtension.empty())
- 		{
--			extensions.push_back (make_pair (libExtension.Mid (libExtension.find (L'.') + 1), LangString["DLL_FILES"]));
-+			extensions.push_back (make_pair (static_cast<const wchar_t*>(libExtension.Mid (libExtension.find (L'.') + 1).wc_str()), static_cast<const wchar_t*>(LangString["DLL_FILES"].wc_str())));
- 			extensions.push_back (make_pair (L"*", L""));
- 		}
- 
---- Main/GraphicUserInterface.cpp	2016-05-16 17:16:38.724591342 +0200
-+++ Main/GraphicUserInterface.cpp	2016-05-16 17:17:09.854562653 +0200
-@@ -1445,7 +1445,7 @@
- 	FilePath GraphicUserInterface::SelectVolumeFile (wxWindow *parent, bool saveMode, const DirectoryPath &directory) const
- 	{
- 		list < pair <wstring, wstring> > extensions;
--		extensions.push_back (make_pair (L"tc", LangString["TC_VOLUMES"]));
-+		extensions.push_back (make_pair (L"tc", static_cast<const wchar_t*>(LangString["TC_VOLUMES"].wc_str())));
- 
- 		FilePathList selFiles = Gui->SelectFiles (parent, LangString[saveMode ? "OPEN_NEW_VOLUME" : "OPEN_VOL_TITLE"], saveMode, false, extensions, directory);
-
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c5cbc3abce9..b6f1954149a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -299,6 +299,7 @@ mapAliases ({
   trang = jing-trang; # added 2018-04-25
   transmission_gtk = transmission-gtk; # added 2018-01-06
   transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
+  truecrypt = veracrypt; # added 2018-10-24
   tshark = wireshark-cli; # added 2018-04-25
   ucsFonts = ucs-fonts; # added 2016-07-15
   ultrastardx-beta = ultrastardx; # added 2017-08-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16f1b80eef7..d80d4f73df2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6013,11 +6013,6 @@ with pkgs;
     libpng = libpng12;
   };
 
-  truecrypt = callPackage ../applications/misc/truecrypt {
-    stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];
-    wxGUI = config.truecrypt.wxGUI or true;
-  };
-
   ttmkfdir = callPackage ../tools/misc/ttmkfdir { };
 
   ttwatch = callPackage ../tools/misc/ttwatch { };
@@ -21137,7 +21132,7 @@ with pkgs;
   liblapackWithAtlas = liblapack;
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
-  
+
   lrs = callPackage ../development/libraries/science/math/lrs { };
 
   m4ri = callPackage ../development/libraries/science/math/m4ri { };
-- 
GitLab


From 923e2af1d49781010042086ac9e6d167c1efc061 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 24 Oct 2018 14:45:43 -0400
Subject: [PATCH 0288/1065] libsignon-glib: init at 2.0

---
 .../libraries/libsignon-glib/default.nix      | 57 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/libraries/libsignon-glib/default.nix

diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix
new file mode 100644
index 00000000000..2c0ef60bc63
--- /dev/null
+++ b/pkgs/development/libraries/libsignon-glib/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchgit, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  pname = "libsignon-glib";
+  version = "3639a2e90447e4640a03a44972560afe8f61aa48";
+
+  name = "${pname}-2018-10-24";
+
+  outputs = [ "out" "dev" "devdoc" "py" ];
+
+  src = fetchgit {
+    url = "https://gitlab.com/accounts-sso/${pname}";
+    rev = version;
+    fetchSubmodules = true;
+    sha256 = "1cq19zbsx4c57dc5gp3shp8lzcr1hw2ynylpn1nkvfyyrx80m60w";
+  };
+
+  nativeBuildInputs = [
+    check
+    docbook_xml_dtd_412
+    docbook_xml_dtd_43
+    docbook_xsl
+    gobjectIntrospection
+    gtk-doc
+    meson
+    ninja
+    pkgconfig
+    python3
+    vala
+  ];
+
+  buildInputs = [
+    glib
+    python3.pkgs.pygobject3
+  ];
+
+  mesonFlags = [
+    "-Dintrospection=true"
+    "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
+  ];
+
+  postPatch = ''
+    chmod +x build-aux/gen-error-map.py
+    patchShebangs build-aux/gen-error-map.py
+  '';
+
+  meta = with stdenv.lib; {
+    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 ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 684d354125a..465d21cf41e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10534,6 +10534,8 @@ with pkgs;
 
   libsignal-protocol-c = callPackage ../development/libraries/libsignal-protocol-c { };
 
+  libsignon-glib = callPackage ../development/libraries/libsignon-glib { };
+
   libsoundio = callPackage ../development/libraries/libsoundio {
     inherit (darwin.apple_sdk.frameworks) AudioUnit;
   };
-- 
GitLab


From 5e4541df7aac2ed8dd79e221706219eff946e5e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 11:09:52 -0700
Subject: [PATCH 0289/1065] python36Packages.mypy: 0.630 -> 0.641

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-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 2cd2e2484e6..854866f659b 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.630";
+  version = "0.641";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1p8rnap4ngczfm2q4035mcmn5nsprbljnhksx2jxzxrb9immh137";
+    sha256 = "0ma4l7px96zzb8x89dk9mkrrdzdhdqckvfsbld4fj9n25k1iw1wf";
   };
 
   disabled = !isPy3k;
-- 
GitLab


From d4a9c3aec444cdd764f63b23460c242cc538a336 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud@urkud.name>
Date: Wed, 24 Oct 2018 14:53:06 -0400
Subject: [PATCH 0290/1065] kile: 2017-02-09 -> 2.9.92

No need to use an old git snapshot, since upstream has a proper beta version.
---
 pkgs/applications/editors/kile/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index 259c319c70f..494ad686ee3 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation
 , lib
-, fetchgit
+, fetchurl
 , extra-cmake-modules
 , kdoctools
 , wrapGAppsHook
@@ -22,13 +22,11 @@
 }:
 
 mkDerivation rec {
-  name = "kile-${version}";
-  version = "2017-02-09";
+  name = "kile-2.9.92";
 
-  src = fetchgit {
-    url = git://anongit.kde.org/kile.git;
-    rev = "f77f6e627487c152f111e307ad6dc71699ade746";
-    sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
+  src = fetchurl {
+    url = "mirror://sourceforge/kile/${name}.tar.bz2";
+    sha256 = "177372dc25b1d109e037a7dbfc64b5dab2efe538320c87f4a8ceada21e9097f2";
 
   };
 
-- 
GitLab


From ce67a63dbec461ff91723b3037f015c28c701c07 Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Wed, 24 Oct 2018 20:57:03 +0200
Subject: [PATCH 0291/1065] veracrypt: 1.22 -> 1.23

Removed the wxGUI switch because it was never working.
To build VeraCrypt text-only you still need wxGTK _and_ you need to
rebuild wxGTK without GUI too...
Moreover, the normal build provides both GUI and text-only interfaces
so it is already usable in pure CLI contexts.
---
 pkgs/applications/misc/veracrypt/default.nix | 51 +++++++++-----------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix
index bc5b19e7737..8b64bcca667 100644
--- a/pkgs/applications/misc/veracrypt/default.nix
+++ b/pkgs/applications/misc/veracrypt/default.nix
@@ -1,43 +1,38 @@
-{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, lvm2, makeself,
-  wxGUI ? true
-}:
+{ stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "veracrypt-${version}";
-  version = "1.22";
+  pname = "veracrypt";
+  name = "${pname}-${version}";
+  version = "1.23";
 
   src = fetchurl {
-    url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2";
-    sha256 = "0w5qyxnx03vn93ach1kb995w2mdg43s82gf1isbk206sxp00qk4y";
+    url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2";
+    sha256 = "009lqi43n2w272sxv7y7dz9sqx15qkx6lszkswr8mwmkpgkm0px1";
   };
 
-  unpackPhase =
-    ''
-      tar xjf $src
-      cd src
-    '';
-
-  nativeBuildInputs = [ makeself yasm pkgconfig ];
-  buildInputs = [ fuse lvm2 ]
-    ++ optional wxGUI wxGTK30;
-  makeFlags = optionalString (!wxGUI) "NOGUI=1";
-
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      cp Main/veracrypt $out/bin
-      mkdir -p $out/share/$name
-      cp License.txt $out/share/$name/LICENSE
-      mkdir -p $out/share/applications
-      sed "s,Exec=.*,Exec=$out/bin/veracrypt," Setup/Linux/veracrypt.desktop > $out/share/applications/veracrypt.desktop
-    '';
+  sourceRoot = "src";
+
+  nativeBuildInputs = [ makeself pkgconfig yasm ];
+  buildInputs = [ fuse lvm2 wxGTK ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    install -Dm 755 Main/${pname} "$out/bin/${pname}"
+    install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/${pname}.xpm"
+    install -Dm 444 License.txt -t "$out/share/doc/${pname}/"
+    install -d $out/share/applications
+    substitute Setup/Linux/${pname}.desktop $out/share/applications/${pname}.desktop \
+      --replace "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \
+      --replace "Icon=veracrypt" "Icon=veracrypt.xpm"
+  '';
 
   meta = {
     description = "Free Open-Source filesystem on-the-fly encryption";
     homepage = https://www.veracrypt.fr/;
-    license = "VeraCrypt License";
+    license = [ licenses.asl20 /* or */ "TrueCrypt License version 3.0" ];
     maintainers = with maintainers; [ dsferruzza ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d80d4f73df2..d6a11d711df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6117,7 +6117,7 @@ with pkgs;
   };
 
   veracrypt = callPackage ../applications/misc/veracrypt {
-    wxGUI = true;
+    wxGTK = wxGTK30;
   };
 
   vlan = callPackage ../tools/networking/vlan { };
-- 
GitLab


From 55a82ffcd3090086a935d127c6fb5cd7eabe1f8a Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaume.bouchard@tweag.io>
Date: Wed, 24 Oct 2018 21:29:15 +0200
Subject: [PATCH 0292/1065] ghc: fix typo in 8.6.1 compiler name

---
 pkgs/development/compilers/ghc/8.6.1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index 62ea39791b9..2363953e35b 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -215,7 +215,7 @@ stdenv.mkDerivation (rec {
     inherit enableShared;
 
     # Our Cabal compiler name
-    haskellCompilerName = "ghc-8.4.3";
+    haskellCompilerName = "ghc-8.6.1";
   };
 
   meta = {
-- 
GitLab


From 7e814079533e0868589ab6267d9a4e4c5fe83b67 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 24 Oct 2018 21:34:55 +0200
Subject: [PATCH 0293/1065] urh: add support for airspy and limesdr

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

diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index 2d370113873..b406df5b1e2 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, python3Packages, hackrf, rtl-sdr }:
+{ stdenv, fetchFromGitHub, python3Packages
+, hackrf, rtl-sdr, airspy, limesuite }:
 
 python3Packages.buildPythonApplication rec {
   name = "urh-${version}";
@@ -11,7 +12,7 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0cwbqcv0yffg6fa3g4zknwffa6119i6827w6jm74fhlfa9kwy34c";
   };
 
-  buildInputs = [ hackrf rtl-sdr ];
+  buildInputs = [ hackrf rtl-sdr airspy limesuite ];
   propagatedBuildInputs = with python3Packages; [
     pyqt5 numpy psutil cython pyzmq
   ];
-- 
GitLab


From 0f144e41958b449ea49f78b1326113cf6a974a89 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Wed, 24 Oct 2018 14:40:20 -0700
Subject: [PATCH 0294/1065] wlroots.examples: prefix example binaries

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

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index c1f401d0bad..4aff6063183 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -71,11 +71,12 @@ in stdenv.mkDerivation rec {
     # screenshot output-layout multi-pointer rotation tablet touch pointer
     # simple
     mkdir -p $examples/bin
-    for binary in $(find ./examples -executable -type f | grep -vE '\.so'); do
+    cd ./examples
+    for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
       patchelf \
         --set-rpath "$examples/lib:${stdenv.lib.makeLibraryPath buildInputs}" \
         "$binary"
-      cp "$binary" $examples/bin/
+      cp "$binary" "$examples/bin/wlroots-$binary"
     done
   '';
 
-- 
GitLab


From da960bb8992fa051f2c40a60d2bbf5d3b85cf0cd Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Tue, 23 Oct 2018 15:17:51 -0700
Subject: [PATCH 0295/1065] sway-beta: module init

---
 nixos/modules/module-list.nix        |  1 +
 nixos/modules/programs/sway-beta.nix | 54 ++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 nixos/modules/programs/sway-beta.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ae7a3a783d3..eab3639d582 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -120,6 +120,7 @@
   ./programs/sysdig.nix
   ./programs/systemtap.nix
   ./programs/sway.nix
+  ./programs/sway-beta.nix
   ./programs/thefuck.nix
   ./programs/tmux.nix
   ./programs/udevil.nix
diff --git a/nixos/modules/programs/sway-beta.nix b/nixos/modules/programs/sway-beta.nix
new file mode 100644
index 00000000000..04f2e0662b8
--- /dev/null
+++ b/nixos/modules/programs/sway-beta.nix
@@ -0,0 +1,54 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.sway-beta;
+  swayPackage = cfg.package;
+in {
+  options.programs.sway-beta = {
+    enable = mkEnableOption ''
+      Sway, the i3-compatible tiling Wayland compositor. This module will be removed after the final release of Sway 1.0
+    '';
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.sway-beta;
+      defaultText = "pkgs.sway-beta";
+      description = ''
+        The package to be used for `sway`.
+      '';
+    };
+
+    extraPackages = mkOption {
+      type = with types; listOf package;
+      default = with pkgs; [
+        xwayland dmenu
+      ];
+      defaultText = literalExample ''
+        with pkgs; [ xwayland dmenu ];
+      '';
+      example = literalExample ''
+        with pkgs; [
+          xwayland
+          i3status i3status-rust
+          termite rofi light
+        ]
+      '';
+      description = ''
+        Extra packages to be installed system wide.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ swayPackage ] ++ cfg.extraPackages;
+    security.pam.services.swaylock = {};
+    hardware.opengl.enable = mkDefault true;
+    fonts.enableDefaultFonts = mkDefault true;
+    programs.dconf.enable = mkDefault true;
+  };
+
+  meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ];
+}
+
-- 
GitLab


From 4807e0428301d6e9a73feb3b3caccce8d896da93 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 24 Oct 2018 23:29:02 +0100
Subject: [PATCH 0296/1065] libmikmod: remove duplicate libpulseaudio dep

This is already included as a propagatedBuildInput, so no need to have
it also be a buildInput.
---
 pkgs/development/libraries/libmikmod/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index c509fcd2b4f..c83d2610dbf 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = [ texinfo ]
-    ++ optionals stdenv.isLinux [ alsaLib libpulseaudio ]
+    ++ optional stdenv.isLinux alsaLib
     ++ optional stdenv.isDarwin CoreAudio;
   propagatedBuildInputs =
     optional stdenv.isLinux libpulseaudio;
-- 
GitLab


From fcbaa7527d017b629c362cb4c9b1d65f86cb4bdc Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 25 Oct 2018 00:15:54 +0100
Subject: [PATCH 0297/1065] wxmac: 3.0.2 -> 3.0.4

---
 .../libraries/wxwidgets/3.0/mac.nix           | 46 ++-----------------
 1 file changed, 5 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index a13ade3bb74..040273e28b9 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -1,54 +1,18 @@
-{ stdenv, fetchurl, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib
+{ stdenv, fetchzip, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib
 # darwin only attributes
 , cf-private, derez, rez, setfile
 , AGL, Cocoa, Kernel
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.2";
+  version = "3.0.4";
   name = "wxmac-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2";
-    sha256 = "346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d";
+  src = fetchzip {
+    url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz";
+    sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1";
   };
 
-  patches =
-    [ # Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems
-      # with abiguous overloads for clang-3.8 and gcc6.
-      (fetchpatch {
-        name = "patch-stc-abs.diff";
-        url = https://github.com/wxWidgets/wxWidgets/commit/73e9e18ea09ffffcaac50237def0d9728a213c02.patch;
-        sha256 = "0w5whmfzm8waw62jmippming0zffa9064m5b3aw5nixph21rlcvq";
-      })
-
-      # Various fixes related to Yosemite. Revisit in next stable release.
-      # Please keep an eye on http://trac.wxwidgets.org/ticket/16329 as well
-      # Theoretically the above linked patch should still be needed, but it isn't.
-      # Try to find out why.
-      (fetchpatch {
-        name = "patch-yosemite.diff";
-        url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-yosemite.diff;
-        sha256 = "0ss66z2a79v976mvlrskyj1zmkyaz8hbwm98p29bscfvcx5845jb";
-      })
-
-      # Remove uncenessary <QuickTime/QuickTime.h> includes
-      # http://trac.wxwidgets.org/changeset/f6a2d1caef5c6d412c84aa900cb0d3990b350938/git-wxWidgets
-      (fetchpatch {
-        name = "patch-quicktime-removal.diff";
-        url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-quicktime-removal.diff;
-        sha256 = "0mzvdk8r70p9s1wj7qzdsqmdrlxlf2dalh9gqs8xjkqq2666yp0y";
-      })
-
-      # Patch for wxOSXPrintData, custom paper not applied
-      # http://trac.wxwidgets.org/ticket/16959
-      (fetchpatch {
-        name = "wxPaperCustomPatch.patch";
-        url = http://trac.wxwidgets.org/raw-attachment/ticket/16959/wxPaperCustomPatch.patch;
-        sha256 = "0xgscv86f8dhggn9n8bhlq9wlj3ydsicgy9v35sraxyma18cbjvl";
-      })
-    ];
-
   buildInputs = [
     expat libiconv libjpeg libpng libtiff zlib
     derez rez setfile
-- 
GitLab


From c0d90b57d68e8973c4bd94244cac0bf07a0368ff Mon Sep 17 00:00:00 2001
From: qolii <qoli@protonmail.com>
Date: Wed, 24 Oct 2018 17:57:33 -0700
Subject: [PATCH 0298/1065] Address more review feedback.

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

diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixos/modules/services/networking/eternal-terminal.nix
index 1d2dc5d23b9..be7337ece7e 100644
--- a/nixos/modules/services/networking/eternal-terminal.nix
+++ b/nixos/modules/services/networking/eternal-terminal.nix
@@ -77,7 +77,7 @@ in
 
             [Debug]
             verbose = ${toString cfg.verbosity}
-            silent = ${if cfg.silent then "true" else "false"}
+            silent = ${if cfg.silent then "1" else "0"}
             logsize = ${toString cfg.logSize}
           ''}";
           Restart = "on-failure";
-- 
GitLab


From 545131a7de57d56061e0ddc61fdba3ea424a5ab3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 24 Oct 2018 17:21:15 -0500
Subject: [PATCH 0299/1065] zsh-completions: 0.28.0 -> 0.29.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 ba65f90d909..29a2a653265 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.28.0";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-completions";
     rev = "${version}";
-    sha256 = "02n1svaw74y0za856w8zjb98nzg1h6bmy4xsar71irsk1mj3m5h2";
+    sha256 = "0a4fdh10rhhjcy06qiyyy0xjvg7fapvy3pgif38wrjqvrddaj6pv";
   };
 
   installPhase= ''
-- 
GitLab


From a45fa35742ac3bc109aa8516bf25a17759e84da9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 11 Oct 2018 17:03:32 +0800
Subject: [PATCH 0300/1065] mosquitto: 1.4.15 -> 1.5.3

Use cmake on all platforms instead of only macos.
---
 pkgs/servers/mqtt/mosquitto/default.nix | 61 +++++++++++++++----------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index bce69370d2b..231124a42ef 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -1,36 +1,51 @@
-{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets, c-ares, libuv }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, docbook_xsl, libxslt
+, openssl, libuuid, libwebsockets, c-ares, libuv }:
 
 stdenv.mkDerivation rec {
-  pname = "mosquitto";
-  version = "1.4.15";
+  name = "mosquitto-${version}";
+  version = "1.5.3";
 
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://mosquitto.org/files/source/mosquitto-${version}.tar.gz";
-    sha256 = "10wsm1n4y61nz45zwk4zjhvrfd86r2cq33370m5wjkivb8j3wfvx";
+  src = fetchFromGitHub {
+    owner  = "eclipse";
+    repo   = "mosquitto";
+    rev    = "v${version}";
+    sha256 = "0bknmnvssix7c1cps6mzjjnw9zxdlyfsy6ksqx4zfglcw41p8gnz";
   };
 
-  buildInputs = [ openssl libuuid libwebsockets c-ares libuv ]
-    ++ stdenv.lib.optional stdenv.isDarwin cmake;
-
-  makeFlags = stdenv.lib.optionals stdenv.isLinux [
-    "DESTDIR=$(out)"
-    "PREFIX="
+  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 config.mk \
-      --replace "/usr/local" ""
-    substituteInPlace config.mk \
-      --replace "WITH_WEBSOCKETS:=no" "WITH_WEBSOCKETS:=yes"
+    substituteInPlace man/manpage.xsl \
+      --replace /usr/share/xml/docbook/stylesheet/ ${docbook_xsl}/share/xml/
+
+    # the manpages are not generated when using cmake
+    pushd man
+    make
+    popd
   '';
 
-  meta = {
-    homepage = http://mosquitto.org/;
+  buildInputs = [ openssl libuuid libwebsockets c-ares libuv ];
+
+  nativeBuildInputs = [ cmake docbook_xsl libxslt ];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = [
+    "-DWITH_THREADING=ON"
+  ];
+
+  meta = with stdenv.lib; {
     description = "An open source MQTT v3.1/3.1.1 broker";
-    platforms = stdenv.lib.platforms.unix;
-    # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft)
-    license = stdenv.lib.licenses.epl10;
+    homepage = http://mosquitto.org/;
+    license = licenses.epl10;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From 02fb26136c72dbf942fbd30acb3ed943881ef98c Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <mateusz.kowalczyk@tweag.io>
Date: Thu, 25 Oct 2018 14:14:42 +0900
Subject: [PATCH 0301/1065] or-tools: new package (v6.9.1)

---
 .../science/math/or-tools/default.nix         | 63 +++++++++++++++++++
 .../math/or-tools/gflags-include.patch        | 12 ++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 77 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/or-tools/default.nix
 create mode 100644 pkgs/development/libraries/science/math/or-tools/gflags-include.patch

diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
new file mode 100644
index 00000000000..5294c779a32
--- /dev/null
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchFromGitHub, cmake, google-gflags, which
+, lsb-release, glog, protobuf, cbc, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "or-tools-${version}";
+  version = "v6.9.1";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "or-tools";
+    rev = version;
+    sha256 = "099j1mc7vvry0a2fiz9zvk6divivglzphv48wbw0c6nd5w8hb27c";
+  };
+
+  # The original build system uses cmake which does things like pull
+  # in dependencies through git and Makefile creation time. We
+  # obviously don't want to do this so instead we provide the
+  # dependencies straight from nixpkgs and use the make build method.
+  configurePhase = ''
+    cat <<EOF > Makefile.local
+    UNIX_GFLAGS_DIR=${google-gflags}
+    UNIX_GLOG_DIR=${glog}
+    UNIX_PROTOBUF_DIR=${protobuf}
+    UNIX_CBC_DIR=${cbc}
+    EOF
+  '';
+
+  buildPhase = ''
+    make cc
+  '';
+
+  installPhase = ''
+    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
+  ];
+  propagatedBuildInputs = [
+    google-gflags glog protobuf cbc
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/google/or-tools;
+    license = licenses.asl20;
+    description = ''
+      Google's software suite for combinatorial optimization.
+    '';
+    maintainers = with maintainers; [ fuuzetsu ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/development/libraries/science/math/or-tools/gflags-include.patch b/pkgs/development/libraries/science/math/or-tools/gflags-include.patch
new file mode 100644
index 00000000000..08f76180638
--- /dev/null
+++ b/pkgs/development/libraries/science/math/or-tools/gflags-include.patch
@@ -0,0 +1,12 @@
+diff --git a/ortools/data/jobshop_scheduling_parser.cc b/ortools/data/jobshop_scheduling_parser.cc
+index cb0a360b..c2f055eb 100644
+--- a/ortools/data/jobshop_scheduling_parser.cc
++++ b/ortools/data/jobshop_scheduling_parser.cc
+@@ -14,6 +14,7 @@
+ #include "ortools/data/jobshop_scheduling_parser.h"
+ 
+ #include <cmath>
++#include <gflags/gflags.h>
+ 
+ #include "google/protobuf/wrappers.pb.h"
+ #include "ortools/base/filelineiter.h"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16f1b80eef7..435a5c90e25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21189,6 +21189,8 @@ with pkgs;
 
   nauty = callPackage ../applications/science/math/nauty {};
 
+  or-tools = callPackage ../development/libraries/science/math/or-tools {};
+
   rubiks = callPackage ../development/libraries/science/math/rubiks { };
 
   petsc = callPackage ../development/libraries/science/math/petsc { };
-- 
GitLab


From c640f024dd0a90d760f67b9c40cea7b6bfeceaff Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 25 Oct 2018 05:35:55 +0000
Subject: [PATCH 0302/1065] ocamlPackages.vg: 0.9.0 -> 0.9.1

---
 pkgs/development/ocaml-modules/vg/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix
index 8a8668df74e..582b2dc8a2c 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/pkgs/development/ocaml-modules/vg/default.nix
@@ -11,7 +11,7 @@ let
   inherit (stdenv.lib) optionals versionAtLeast;
 
   pname = "vg";
-  version = "0.9.0";
+  version = "0.9.1";
   webpage = "http://erratique.ch/software/${pname}";
 in
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "1czd2fq85hy24w5pllarsq4pvbx9rda5zdikxfxdng8s9kff2h3f";
+    sha256 = "07h9a464v0x066mjg3ldkaq94ah47b7rvh54z4rndrg7v6bk7kyp";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild topkg ];
@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
     module. An API allows to implement new renderers.
     '';
     homepage = "${webpage}";
-    platforms = ocaml.meta.platforms or [];
-    license = licenses.bsd3;
+    inherit (ocaml.meta) platforms;
+    license = licenses.isc;
     maintainers = [ maintainers.jirkamarsik ];
   };
 }
-- 
GitLab


From eb3240f112da94b678ff94d804491719d0aa0ca6 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 25 Oct 2018 09:40:39 +0200
Subject: [PATCH 0303/1065] Revert "ocamlPackages.ocamlbuild: 0.12.0 -> 0.13.0"

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

diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
index 8f5948c3c11..3f42e71e778 100644
--- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, ocaml, findlib }:
 let
-  version = "0.13.0";
+  version = "0.12.0";
 in
 stdenv.mkDerivation {
   name = "ocamlbuild-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     owner = "ocaml";
     repo = "ocamlbuild";
     rev = version;
-    sha256 = "13r9q8c209gkgcmbjhj9z4r5bmi90rxahdsiqm5jx8sr2pia5xbh";
+    sha256 = "1shyim50ms0816fphc4mk0kldcx3pnba2i6m10q0cbm18m9d7chq";
   };
 
   createFindlibDestdir = true;
-- 
GitLab


From 7c2b6b0afee1acddf37f860982617502bb9ae10f Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 25 Oct 2018 10:33:37 +0200
Subject: [PATCH 0304/1065] steam: made update-runtime.py nicer

---
 pkgs/games/steam/update-runtime.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/steam/update-runtime.py b/pkgs/games/steam/update-runtime.py
index c225d6bf8ad..aed42cdd566 100755
--- a/pkgs/games/steam/update-runtime.py
+++ b/pkgs/games/steam/update-runtime.py
@@ -1,5 +1,6 @@
-#!/usr/bin/env python2
-#
+#! /usr/bin/env nix-shell
+#! nix-shell -i python2 -p "with python2Packages; [python debian]"
+
 # Script to build a Nix script to actually build a Steam runtime.
 # Patched version of https://github.com/ValveSoftware/steam-runtime/blob/master/build-runtime.py
 
@@ -20,7 +21,7 @@ REPO="http://repo.steampowered.com/steamrt"
 DIST="scout"
 COMPONENT="main"
 
-out = open("runtime-generated.nix", "w");
+out = open("runtime-generated.nix", "w")
 out.write("# This file is autogenerated! Do not edit it yourself, use update-runtime.py for regeneration.\n")
 out.write("{ fetchurl }:\n")
 out.write("\n")
-- 
GitLab


From 714b6e3d17ae6d9b9e372b1e33d5577161bb4185 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 25 Oct 2018 10:34:00 +0200
Subject: [PATCH 0305/1065] steam: ran update-runtime.py

---
 pkgs/games/steam/runtime-generated.nix | 2334 ++++++++++++------------
 1 file changed, 1158 insertions(+), 1176 deletions(-)

diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix
index 694274053bf..ac24f0c15a5 100644
--- a/pkgs/games/steam/runtime-generated.nix
+++ b/pkgs/games/steam/runtime-generated.nix
@@ -4,1746 +4,1737 @@
 {
   amd64 = [
     rec {
-      name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64";
-      sha256 = "03yfjxzsyf14zqwxb43piyh78xxap7yxh5f4gx649qv28h7ygfrm";
-      url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64.deb";
+      name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_amd64";
+      sha256 = "074vbkdxaylb36ljkxz586jfcn7ghxzfivyiz703li1dw54jaq87";
+      url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "dconf-gsettings-backend.deb";
       };
     }
     rec {
-      name = "freeglut3_2.6.0-1ubuntu3+srt4_amd64";
-      sha256 = "1wi5fad0f7nqps55isvbb42njqssbhyzmd38q8413afjyhmm6icc";
-      url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_amd64.deb";
+      name = "freeglut3_2.6.0-1ubuntu3+srt5_amd64";
+      sha256 = "08mpxxd12c2kwlab47nfz25vpn7ag2xkmxp2zn48ymxab7qhvr5r";
+      url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "freeglut3.deb";
       };
     }
     rec {
-      name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64";
-      sha256 = "1za8f7wkwcww4wacydqq3fvi5p1ivgcr2n3npirqir1gr25cbxaj";
-      url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64.deb";
+      name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64";
+      sha256 = "1iknyb54mn8l1gcm9pg47hlra7y5x9awrgd431hzvig44c34vv9m";
+      url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "gcc-4.6-base.deb";
       };
     }
     rec {
-      name = "gtk2-engines_2.20.2-1ubuntu1+srt4_amd64";
-      sha256 = "03y4239swznwlgdx6yc58sj6w5irqq7432hxcmcw8608m3w0m29h";
-      url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_amd64.deb";
+      name = "gtk2-engines_2.20.2-1ubuntu1+srt5_amd64";
+      sha256 = "1w2aaddcrfg37fw7bl2jcbx14bp7ar8lyaq25j9pi8298wvbikly";
+      url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "gtk2-engines.deb";
       };
     }
     rec {
-      name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64";
-      sha256 = "1iwmgzkdxjvr2q2kz5bjz64r4qjqbcf6ynz3sy5y81dl254pjnmh";
-      url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64.deb";
+      name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_amd64";
+      sha256 = "0fqbm6502zqw64lbzywz0cllxkj9n44fxb2gg8q160vcqzyvb8jf";
+      url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "gtk2-engines-murrine.deb";
       };
     }
     rec {
-      name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64";
-      sha256 = "0md5vjz8wnayppcxkl5x7874w2z4w7pjz96gprv24hid4azmyci8";
-      url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb";
+      name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_amd64";
+      sha256 = "05d43583lj3ffskvmzcr6yb8a3jz1l8gc12mrmaix8w71bv81nr1";
+      url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "gtk2-engines-pixbuf.deb";
       };
     }
     rec {
-      name = "libacl1_2.2.51-5ubuntu1+srt6_amd64";
-      sha256 = "02xwrfzspf58j9lr6b128jq1klkvd4b69lrclpqzwm9cqddg6mr5";
-      url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_amd64.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libacl1.deb";
       };
     }
     rec {
-      name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64";
-      sha256 = "08m1w5mhzl613gbjg6lvf7wcm7bs00xddaaci8f1944icl8pdibb";
-      url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64.deb";
+      name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_amd64";
+      sha256 = "19s3s3fc4vcj5cg7fh40w35vjyhi7097vv83lwjzrzhz5jlgczmp";
+      url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libappindicator1.deb";
       };
     }
     rec {
-      name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
-      sha256 = "0m69ar6w3lzsggn79lyc3614p9rr2dy29vwqvl4w3gmshp6aqhs4";
-      url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
+      name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64";
+      sha256 = "0mib9hy38mbiz40dr7x7c9c0liqswmnnykij7xpp7kbfqlvlshb8";
+      url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libasn1-8-heimdal.deb";
       };
     }
     rec {
-      name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64";
-      sha256 = "1bh911nx5a2abn38h9sa90ji358r6is2n7ymm10v94yibdf63rwg";
-      url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64.deb";
+      name = "libasound2_1.1.0-0ubuntu1+steamos1+srt2_amd64";
+      sha256 = "05d4ijlc20ss4rm2jxr5lxkgwbn0qcv5a7pj9aizl66klpbzsgay";
+      url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libasound2.deb";
       };
     }
     rec {
-      name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64";
-      sha256 = "1l36hxgnml9pglrihm17vkgqp3jpqslicg1mpycixzz9cpgfyxbz";
-      url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64.deb";
+      name = "libasound2-plugins_1.1.0-0ubuntu1+srt2_amd64";
+      sha256 = "1dsa9z7ssf39c039a60axh36wgykyapv65gmlxnvxpkhqnw4zywm";
+      url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libasound2-plugins.deb";
       };
     }
     rec {
-      name = "libasyncns0_0.8-4+srt4_amd64";
-      sha256 = "154bh8mpslr4xwf54h1xds4v2yjf8rbyvv1lc0azl9gnkan1y0an";
-      url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_amd64.deb";
+      name = "libasyncns0_0.8-4+srt5_amd64";
+      sha256 = "00nglm7sryy3y1pagjhv1mq6rvqiawmhf3kgwv0g7bqwgxcpia7p";
+      url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libasyncns0.deb";
       };
     }
     rec {
-      name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64";
-      sha256 = "0kky7mfkx38lj4gafrv886z0vbf17xnpymq6qas59x8f35bzx742";
-      url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64.deb";
+      name = "libatk1.0-0_2.18.0-1+steamrt1+srt1_amd64";
+      sha256 = "1rs9k9pcxmpwlwbxgalsqhiv7baqylaxpkhy4524a4b8dw1qx0k4";
+      url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libatk1.0-0.deb";
       };
     }
     rec {
-      name = "libattr1_2.4.46-5ubuntu1+srt4_amd64";
-      sha256 = "11hn8q45pddm4khq0qp1qj19c1syfawscnvrl6cv1xmahpb3nm3i";
-      url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_amd64.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libattr1.deb";
       };
     }
     rec {
-      name = "libavahi-client3_0.6.30-5ubuntu2+srt4_amd64";
-      sha256 = "0yrgvh80i1gpcq2w64hkqnmiymgrn7r2v67wyd1iijc2zyb4x0c3";
-      url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_amd64.deb";
+      name = "libavahi-client3_0.6.30-5ubuntu2.2+srt1_amd64";
+      sha256 = "04rkaiapl13rxlr2bwxz2q7z6i0091nm1c49kjnl1yckg64d7548";
+      url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libavahi-client3.deb";
       };
     }
     rec {
-      name = "libavahi-common3_0.6.30-5ubuntu2+srt4_amd64";
-      sha256 = "1r1rqpqdqmqxn3g1iifc77jgrhfkr5275s7d5h3p1hvkmlzyvwd2";
-      url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_amd64.deb";
+      name = "libavahi-common3_0.6.30-5ubuntu2.2+srt1_amd64";
+      sha256 = "1a2x57s3072na65gr7ys0wl5cm2f1j2m5kkhlhq4i8ms6hxssgrk";
+      url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libavahi-common3.deb";
       };
     }
     rec {
-      name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64";
-      sha256 = "09fwqr29dxhxkkf1gd9f9sph2jgv0qx3p7k6qxxwq3bg4lh2971n";
-      url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
+      name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64";
+      sha256 = "0wpmnsnq5njv65iwq2g6819m2j5fda7jm8450qs3lmyc963ds0i2";
+      url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libavcodec53.deb";
       };
     }
     rec {
-      name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64";
-      sha256 = "0fynn6g6mc4raj144hg9r7qbiz7b2s4p7aidjpy34xkbxcn2vq45";
-      url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
+      name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64";
+      sha256 = "1xpxmhhhgc7ap7f2ijlsgx9p58qqyvk2lgfn61dhlibq046px816";
+      url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libavfilter2.deb";
       };
     }
     rec {
-      name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64";
-      sha256 = "0qdfr19xfxwab9q5w4bvwgv873cs8zgm4s10hwg6741xr6qifnhg";
-      url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
+      name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64";
+      sha256 = "0b8vx5lhsbynivm58zhxd0w6g7c7bqjvsr891wbqizbi325yja2b";
+      url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libavformat53.deb";
       };
     }
     rec {
-      name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64";
-      sha256 = "0pfgxnrf1jjlb7gvwklwn7m61n591yfzqfzzqb76gyr20r6v6dzw";
-      url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
+      name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64";
+      sha256 = "1g3bdnfs0rgwnzrnwpj5hamynj1z0qs8wmxlfd0iqkah74ymgaaa";
+      url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libavutil51.deb";
       };
     }
     rec {
-      name = "libbz2-1.0_1.0.6-1+srt4_amd64";
-      sha256 = "13rsp2cyayvnh2755kjbs6g6j85rdpl6cwlx22b97hid5pq5nk60";
-      url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_amd64.deb";
+      name = "libbz2-1.0_1.0.6-1+srt5_amd64";
+      sha256 = "046y04ynczpydlrablks51mx4jc1313k89hsi8x4sj2a355819nz";
+      url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libbz2-1.0.deb";
       };
     }
     rec {
-      name = "libcairo2_1.10.2-6.1ubuntu3+srt4_amd64";
-      sha256 = "0iv16gfc1b8n4p088jbask9i8i56agip8dd5b1r22r52hg28gi9y";
-      url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_amd64.deb";
+      name = "libcairo2_1.10.2-6.1ubuntu3+srt5_amd64";
+      sha256 = "1j82gzl9hfxsrk2s3nxx1dpq6jlmkz5y5mkvxw9d166v0mlvxkq4";
+      url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcairo2.deb";
       };
     }
     rec {
-      name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64";
-      sha256 = "19gl25hjzxw375qqbckmgfr14qd48zaccnny4zbddlz8aj5w4wig";
-      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64.deb";
+      name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_amd64";
+      sha256 = "1x36zmsb7wcmgli75sfqamw5gmsv47if56f1vljjgak3jn2vlmm2";
+      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcanberra-gtk-module.deb";
       };
     }
     rec {
-      name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64";
-      sha256 = "1kgq90l6rafqk7zfxafvzkh8msys5mlc95qr3rcv6l0f03w785dy";
-      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb";
+      name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_amd64";
+      sha256 = "0g68j9w3xn0vnjgznq2avmzk8rykas0a6749ldq99yq9afccjfcp";
+      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcanberra-gtk0.deb";
       };
     }
     rec {
-      name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64";
-      sha256 = "01x6y4gq1ivpdywglx418gr4m56qvm05nicmavwimnafxga3c5sk";
-      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb";
+      name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt5_amd64";
+      sha256 = "0qzyjrr5nmc72pfbalh9s22s51c5c10f0h23viyjrk77kk0ysc3f";
+      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcanberra0.deb";
       };
     }
     rec {
-      name = "libcap2_2.22-1ubuntu3+srt4_amd64";
-      sha256 = "1rhfhq1n45fq40p6c2aipkica2dw8w95w7bsdrxfby48gdppgzy7";
-      url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_amd64.deb";
+      name = "libcap2_2.22-1ubuntu3+srt5_amd64";
+      sha256 = "0bsjpbv2p7ir6w7dpjvs8y25skha72406mhgjrff9dvdvc9mwwpy";
+      url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcap2.deb";
       };
     }
     rec {
-      name = "libcg_3.0.0016-0ubuntu1+srt4_amd64";
-      sha256 = "0yifiwr2hc7rvvd6snf530gma05v2qpiyl652drdc9rvcfjrj9zi";
-      url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_amd64.deb";
+      name = "libcg_3.0.0016-0ubuntu1+srt5_amd64";
+      sha256 = "1d4lc4krkphvmlvmd4z60l6cg37gd62x9m700s83jxbsz0fhwmrb";
+      url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcg.deb";
       };
     }
     rec {
-      name = "libcomerr2_1.42-1ubuntu2.2+srt1_amd64";
-      sha256 = "1cll5iwdply1lz211j83n22aidsxfx2jvy09a02qa79a7g1qv6c3";
-      url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_amd64.deb";
+      name = "libcomerr2_1.42-1ubuntu2.3+srt1_amd64";
+      sha256 = "0ar9lzaxlmhqxpp6v2b3jz3lblkqhqwy0ywbwkdq4zs5za69kh1b";
+      url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcomerr2.deb";
       };
     }
     rec {
-      name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64";
-      sha256 = "1xaxim0df5713hj4kq141rnf51zvyhvpv015q4q41c3nh4d9bz7w";
-      url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libcups2.deb";
       };
     }
     rec {
-      name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64";
-      sha256 = "0vwdpkiisnbrm1j22qzjj2g5vsiv4wdja3j34j16pc30088f4c3i";
-      url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb";
+      name = "libcurl3_7.22.0-3ubuntu4.17+srt1_amd64";
+      sha256 = "1nzbxzrkqnnzhml2fyjzpaifsm3whq78bxjqnhs9ljs3jwhl59p5";
+      url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcurl3.deb";
       };
     }
     rec {
-      name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64";
-      sha256 = "0rvrjcxpmnbq42aq6x31gxxglwiccm059r2q78hqiw82i86b7j28";
-      url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb";
+      name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_amd64";
+      sha256 = "0mgxy0vninsv7yi3wiqjkdz8ap52y4zlkzxwyijcvbwkxp33rq68";
+      url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcurl3-gnutls.deb";
       };
     }
     rec {
-      name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64";
-      sha256 = "1nkzsi04m1icwb3b1nky15d0frnc0hpfsyrm3xx1hriv02iqwgvw";
-      url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64.deb";
+      name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt1_amd64";
+      sha256 = "1m1q2q2s6b98x1zbk31hnd80dakfqg2g8yaj662vxrdrr85j6nza";
+      url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libdbus-1-3.deb";
       };
     }
     rec {
-      name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64";
-      sha256 = "19xnslykd4y22ff5mfs2rg4rjppmcrmrbwynzx4v2rvxckvvq77f";
-      url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64.deb";
+      name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_amd64";
+      sha256 = "1f36vyq505hrfqmhizgplvvk17zhf1230wlrzibdwi04j275sahk";
+      url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libdbus-glib-1-2.deb";
       };
     }
     rec {
-      name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64";
-      sha256 = "1x1szx7m6y6i0d6ahffnrdhs693rk4wi4hrhbmmn2g1sizr9qhmb";
-      url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64.deb";
+      name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_amd64";
+      sha256 = "064wwqbjrdvwkjpyi0k6vj7rrwkwcy49mrlsgrv3q4gckiqhjhbz";
+      url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libdbusmenu-glib4.deb";
       };
     }
     rec {
-      name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64";
-      sha256 = "0nrydq0mjjsx1v9gk78j5xcgdaay5dhxn5rj9ydkbkw7ih4xm2m1";
-      url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64.deb";
+      name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_amd64";
+      sha256 = "0vagal7jh6biarjf9sy219p2njb5k8ycv4v7glni8prli0c1zzxq";
+      url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libdbusmenu-gtk4.deb";
       };
     }
     rec {
-      name = "libexif12_0.6.20-2ubuntu0.1+srt4_amd64";
-      sha256 = "09pjkyjykvsmddx20ji4wgr5gnqbshj1hpm77129ini9qp61wxig";
-      url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_amd64.deb";
+      name = "libexif12_0.6.20-2ubuntu0.1+srt5_amd64";
+      sha256 = "15rk2yfvsy16azpcwl8xsxigmrdhl0pkg6dvyq2pknp08c72r5r7";
+      url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libexif12.deb";
       };
     }
     rec {
-      name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64";
-      sha256 = "0axky1v55yalkng9mn22ignmapv100gkcfb0xs82pllzaws32yhb";
-      url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64.deb";
+      name = "libexpat1_2.0.1-7.2ubuntu1.4+srt2_amd64";
+      sha256 = "0pdn5f20pbmklnvsyl83x0rjafsjy8vxn4zd2nl7h0aabzng9vy2";
+      url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libexpat1.deb";
       };
     }
     rec {
-      name = "libffi6_3.0.11~rc1-5+srt4_amd64";
-      sha256 = "1brqpwjbf6dd6crvs32b7q73m11anlq1s1r1m0p5cv17sc89q3q4";
-      url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_amd64.deb";
+      name = "libffi6_3.0.11~rc1-5+srt5_amd64";
+      sha256 = "0i428a37s9lma09psy0d7vj2amnimwgx4izmmac4dlzyy6qpfn9s";
+      url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libffi6.deb";
       };
     }
     rec {
-      name = "libflac8_1.2.1-6+srt4_amd64";
-      sha256 = "1sdbbm4gdq0mw103z3nwhywvix1z21gdq6lc5xf4s12zpj1zq2gc";
-      url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_amd64.deb";
+      name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_amd64";
+      sha256 = "13hkikwbxsm3nf91rc1xa98apwx9y4mr9h20cd0206gm43qfyvh2";
+      url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libflac8.deb";
       };
     }
     rec {
-      name = "libfltk1.1_1.1.10-10+srt4_amd64";
-      sha256 = "0x5xxxkkj7g5wyhxl1rv846irn3r8hh744fqyn8hgmbp4mdgils0";
-      url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_amd64.deb";
+      name = "libfltk1.1_1.1.10-10+srt5_amd64";
+      sha256 = "0zrx2mb5rl5hcyh6p0sglark6rh7s993sg26klizkswn2w53rv8j";
+      url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libfltk1.1.deb";
       };
     }
     rec {
-      name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64";
-      sha256 = "0mcdd9x8dc153sk2dqixxy4rxvl9hvc7dz0msfwiywrgbilzfbl4";
-      url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64.deb";
+      name = "libfontconfig1_2.8.0-3ubuntu9.2+srt2_amd64";
+      sha256 = "047sq7342mqvc84qx8dayf282yh84zdj4azqp1c0h4hczc73jwv9";
+      url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libfontconfig1.deb";
       };
     }
     rec {
-      name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64";
-      sha256 = "08x0fg01qbycdwdgqj3xal0fi676pnkkgsk0kbvxfg3i4ln944l1";
-      url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64.deb";
+      name = "libfreetype6_2.4.8-1ubuntu2.6+srt1_amd64";
+      sha256 = "01z4dwib9d7i7187yw1b0vji587hrj354cz6ll2iybrbg25w510w";
+      url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libfreetype6.deb";
       };
     }
     rec {
-      name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64";
-      sha256 = "05pg02l16fj7fdv8gkx95jy4j4cikqwmdkyq65a8qf20in3qs04m";
-      url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb";
+      name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_amd64";
+      sha256 = "1300z3mjxxcl718mjdfppv53s42ba88gm0izbfn6wqvrj7wrz5wq";
+      url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgcc1.deb";
       };
     }
     rec {
-      name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64";
-      sha256 = "0mmgmnzyi9rlk7k6ir3f127brml366bbk7v5aq75y90z6qdp5h62";
-      url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64.deb";
+      name = "libgconf-2-4_3.2.5-0ubuntu2+srt5_amd64";
+      sha256 = "163jbgkz66crkkjdqc0axj4sjfmd6kfkglwlk3d52rf3bc7mvimb";
+      url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgconf-2-4.deb";
       };
     }
     rec {
-      name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64";
-      sha256 = "0qpxrm37js3pgi8hwcfqyqgkipypb0gw6nvsbz5dd112hmnpkp37";
-      url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64.deb";
+      name = "libgcrypt11_1.5.0-3ubuntu0.6+srt2_amd64";
+      sha256 = "0p1vywfx5l9zhibr8c20by9w646przfjfaci5c6ifi7f4v5nn9hc";
+      url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgcrypt11.deb";
       };
     }
     rec {
-      name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64";
-      sha256 = "00kq05jzlrvd4gx8pz54k1i8sm9v8l07vih4if6wanr45ifsjqlp";
-      url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64.deb";
+      name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_amd64";
+      sha256 = "1km2w0haybwal9zkhwsrx4i9yi2zkhbbfhh2xljhfw5m5g6s4mq5";
+      url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgdk-pixbuf2.0-0.deb";
       };
     }
     rec {
-      name = "libglew1.10_1.10.0-3+srt4_amd64";
-      sha256 = "0ybry9jiyp0bgfm9b0bznf5qllyf7jc6avd8rcc20ai7yf719mwc";
-      url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_amd64.deb";
+      name = "libglew1.10_1.10.0-3+srt6_amd64";
+      sha256 = "19w95wfzzr909jgjg8w6fqff8x00izawqicw896fqbf44zmsc2l0";
+      url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt6_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libglew1.10.deb";
       };
     }
     rec {
-      name = "libglew1.6_1.6.0-4+srt4_amd64";
-      sha256 = "1y4ywi4lp5df3nasxz8p5rmybl2vbv8bbww1s8alin5waidl7qav";
-      url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_amd64.deb";
-      source = fetchurl {
-        inherit url sha256;
-        name = "libglew1.6.deb";
-      };
-    }
-    rec {
-      name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64";
-      sha256 = "1imdb4wyy7qndg8xmlrfnj0x3a6fg7dv0izn2rajp5q77ivry51v";
-      url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64.deb";
+      name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_amd64";
+      sha256 = "1zhb0cpyl3vq5hg63j7wgw6bmwrn8xnq1ybnbigw439c0nq4f333";
+      url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libglib2.0-0.deb";
       };
     }
     rec {
-      name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64";
-      sha256 = "1bgks33ck18asizisa5d7wj4wsv8hxccpshl0f2ihdvs6qgxgs76";
-      url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64.deb";
+      name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt5_amd64";
+      sha256 = "02fywg8h5jlkrh1qiqd0hpjv4v1hxggm3vjhnfn5rdj3xxmbvr2y";
+      url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libglu1-mesa.deb";
       };
     }
     rec {
-      name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64";
-      sha256 = "1la9938zrqrf8v4bcn5063xxxwwankhzh69m0sy8csixfg480c1a";
-      url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64.deb";
+      name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt5_amd64";
+      sha256 = "0vmx8ybnbf4rilylk1kxhq6c1z5wbxh77garwf79jm0jx3xamzrh";
+      url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgmp10.deb";
       };
     }
     rec {
-      name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64";
-      sha256 = "1zrrprip93m9r2c7zd54pz8f5jvdgb0jir6ifvqbl60d521lfbl7";
-      url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64.deb";
+      name = "libgnutls26_2.12.14-5ubuntu3.14+srt1_amd64";
+      sha256 = "19jl1ril1h2r66ilwi45j49g2ag9b4x5090ld0gqp4hbx6f67x9g";
+      url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgnutls26.deb";
       };
     }
     rec {
-      name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64";
-      sha256 = "094y3af19hg7s0hklh9slhmb19h2hhbfl4fpfpqcvbagkh6gwxl1";
-      url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb";
+      name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_amd64";
+      sha256 = "06x5j6rvv5g8brsmgpxikjb9fs6gjpd31g2iw3b313k9c6fl7z9x";
+      url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgomp1.deb";
       };
     }
     rec {
-      name = "libgpg-error0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "0zw0zrl50y86y292zjcgpxiqjwyw0krnrmi28qvb0ba2ahp18f7v";
-      url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libgpg-error0_1.10-2ubuntu1+srt5_amd64";
+      sha256 = "1pgv5svrqvsyiakqqnbb1ph6sk5yd6lgk53k2isyyz44vdjch9py";
+      url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgpg-error0.deb";
       };
     }
     rec {
-      name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64";
-      sha256 = "1mmd16fh58gnyyjwg9ac1br0xia670xc0ag65bfgxwnpfnkr7nyj";
-      url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb";
+      name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64";
+      sha256 = "1nv973s0h9vmnmslxyddd28p4yv8k47d685m8lxv1irc4skqxzzc";
+      url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgssapi-krb5-2.deb";
       };
     }
     rec {
-      name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
-      sha256 = "063k09yyr9mn0lacp29cgwagpiix220p7ahs5shpyigkjk5bp174";
-      url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
+      name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64";
+      sha256 = "02h7fqwwg7jpz8b86dbjhh067ah34x3ys9n5df1rksbzpvmqcbiy";
+      url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgssapi3-heimdal.deb";
       };
     }
     rec {
-      name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64";
-      sha256 = "0r60n1xym2alg4jr1icgzvd8x614p7vky0zxfvn8x9qd2hzr8k5q";
-      url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64.deb";
+      name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_amd64";
+      sha256 = "186hxj0jvgbxki0v6fx499pp796kcwiz86gqfhkd94k434aaqz1f";
+      url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgstreamer-plugins-base0.10-0.deb";
       };
     }
     rec {
-      name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64";
-      sha256 = "0xynq7jgb0x8npb6apj58ag5zccl0gh4npyrfvs0ys4hzlv2fkmm";
-      url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64.deb";
+      name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_amd64";
+      sha256 = "1ddfd661703jgd8xai2ysh2gdvf0pkbvg46iazlg5jqr17i1b1sx";
+      url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgstreamer0.10-0.deb";
       };
     }
     rec {
-      name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64";
-      sha256 = "0zbsr09xam3sl5qpnl34hgiir98g3rcfg2nblzwp8yr9kkrsb7zk";
-      url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb";
+      name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_amd64";
+      sha256 = "1bb7yf3ld99a9amdb6r8slw7g3xnj72za2nbpsrm6cwlw9nyxli0";
+      url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgtk2.0-0.deb";
       };
     }
     rec {
-      name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all";
-      sha256 = "0xgh9nrvj1hf3wj9pqm9x3ykw95v9bsh5k2vgr3cr9135rrj0dp5";
-      url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb";
+      name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all";
+      sha256 = "0rw8iy16ij86abh444jk1xw78b5z81qjxm1292jin3sfhck4bd4x";
+      url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgtk2.0-common.deb";
       };
     }
     rec {
-      name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64";
-      sha256 = "1bv962vi9x8m41ss6g73q91xlxhf1pd733wsywflllkxa5qyabpl";
-      url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64.deb";
+      name = "libgudev-1.0-0_175-0ubuntu9.10+srt1_amd64";
+      sha256 = "1i8k7y464zj3vb17kwim69kh57y9hnlx40xfs0hrfvjjlj3ih30w";
+      url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgudev-1.0-0.deb";
       };
     }
     rec {
-      name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
-      sha256 = "1s67jx924c06arhf18dpqncphlih26a7frshzd4ndwzp8xp87xyc";
-      url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
+      name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64";
+      sha256 = "1ihzd3ihylrbrwxqx8sam6lwkhkk2c9ys7vxah2yvj43fl8piiz8";
+      url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libhcrypto4-heimdal.deb";
       };
     }
     rec {
-      name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
-      sha256 = "0zchyajpd78rflfh4md3i0cvzd0gbkwf6l8kqcyavvib42mmdga8";
-      url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
+      name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64";
+      sha256 = "1z4h6zdh5h9yvq4dfizy8ndskny94c86m5b4g9lpypfpzj259kpi";
+      url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libheimbase1-heimdal.deb";
       };
     }
     rec {
-      name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
-      sha256 = "0lz83zkg4f1rjhf0sigk09s4kbksm9j2lalf7k04bci1sxs2wj2y";
-      url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
+      name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64";
+      sha256 = "13fgm887ycb1l5w1hxvlf906wr4k834drykg36ink6g9fi1smn79";
+      url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libheimntlm0-heimdal.deb";
       };
     }
     rec {
-      name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
-      sha256 = "0bcn57af9g4psxfiqqfsmfv7z3a713z86760lspgl63xfxlsm4d5";
-      url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
+      name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64";
+      sha256 = "0alagksf7h181r86iiddvb9sil9zwf7d8lhnikq2x1i1ncxnwbj9";
+      url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libhx509-5-heimdal.deb";
       };
     }
     rec {
-      name = "libice6_1.0.7-2build1+srt4_amd64";
-      sha256 = "0lygkw0my7diasqyw7m5a0rfcpp38pb8jq7iqks195j21sy95h0s";
-      url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_amd64.deb";
+      name = "libice6_1.0.7-2build1+srt5_amd64";
+      sha256 = "0v1a4dbs6by8n3yi23xqs4qqvjjdhh1qqmacc2bybjd2qi8dps8y";
+      url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libice6.deb";
       };
     }
     rec {
-      name = "libidn11_1.23-2+steamrt1+srt4_amd64";
-      sha256 = "0530ygdsq840kmqm1mlqk19a7wxpvwgrbary2dpflzqvclx4gfr1";
-      url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_amd64.deb";
+      name = "libidn11_1.23-2+steamrt1+srt5_amd64";
+      sha256 = "19s5pm1w8idc52hcj07fd52hw4fxl8hda9rm5gdbgginrl1naibp";
+      url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libidn11.deb";
       };
     }
     rec {
-      name = "libindicator7_0.5.0-0ubuntu1+srt4_amd64";
-      sha256 = "0j89i9hgdh93a6m71ji3rrhlnyanjb7dbxy460shn38v4f3ax735";
-      url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_amd64.deb";
+      name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_amd64";
+      sha256 = "0fcj1fmk70y8j1jcbr9dian2zrwf5m7yis4zpq8cc77838cdx0pg";
+      url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libindicator7.deb";
       };
     }
     rec {
-      name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64";
-      sha256 = "0l7h8z8fx0pqkbdh5x3v6azz6ddxdlzchgs97h5babrknkfkiar4";
-      url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64.deb";
+      name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_amd64";
+      sha256 = "0qpipr1anfy4y6m1syznmarsh3ni6db9dc7a1w0n11zfhp8lpihg";
+      url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libjack-jackd2-0.deb";
       };
     }
     rec {
-      name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64";
-      sha256 = "0z2df70v2ggw2la3yr4ll926wj6pc84li1x2bxwz9ysw7xsgalg0";
-      url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64.deb";
+      name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_amd64";
+      sha256 = "10r393m5xxqjd6hpvlnfvnba081crhs88x1knhi3s6mhg2xhg35y";
+      url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libjpeg-turbo8.deb";
       };
     }
     rec {
-      name = "libjpeg62_6b1-2ubuntu1.1+srt4_amd64";
-      sha256 = "0n6qsfk42nhwvg8r9win7a90zvb31ba7cp7jvbbc4bhv7ygxxm7f";
-      url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_amd64.deb";
+      name = "libjpeg62_6b1-2ubuntu1.1+srt5_amd64";
+      sha256 = "0wn9lgqc95gvck5k8qds9908j5ip3s3bz85a8l2bdprgg1q4rsrl";
+      url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libjpeg62.deb";
       };
     }
     rec {
-      name = "libjson0_0.9-1ubuntu1.1+srt2_amd64";
-      sha256 = "10r817kzxcviqvrajmi33pdbqss1qxpkmjxda7cclamnnawbcd17";
-      url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_amd64.deb";
+      name = "libjson0_0.9-1ubuntu1.1+srt3_amd64";
+      sha256 = "1pqncc63z9w3jg41xqklappyirajfrchdjp81bldrnmbpbj69xha";
+      url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt3_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libjson0.deb";
       };
     }
     rec {
-      name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64";
-      sha256 = "1xsl1nwsm6r1gjfkl7x71h8p9qkq7gi624277cj3k68b31qh3g4z";
-      url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb";
+      name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64";
+      sha256 = "18xfi5c04s3z9brj1rrmvl9s67apd4d6ax7vfwwjzwh7ygnkp8h8";
+      url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libk5crypto3.deb";
       };
     }
     rec {
-      name = "libkeyutils1_1.5.2-2+srt4_amd64";
-      sha256 = "0khwz7jqw9yq157r675sjii3bqk2i66dh6wn43b7vhh0wjz6nbdc";
-      url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_amd64.deb";
+      name = "libkeyutils1_1.5.2-2+srt5_amd64";
+      sha256 = "14mv4r05r0fzkbl3r4jaa7wwmmaprv3q5w36pyf3xqc3iynxnj2p";
+      url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libkeyutils1.deb";
       };
     }
     rec {
-      name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
-      sha256 = "0lfhwqsxpzaapz71rldi2zhsxkdy55krcmfbli06qs4mqx9mf691";
-      url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
+      name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64";
+      sha256 = "0xhz42f7lnsc69sfnj2w0917jwm82nbc9i56qq3s1g2sw7z6kb3q";
+      url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libkrb5-26-heimdal.deb";
       };
     }
     rec {
-      name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64";
-      sha256 = "0aqwf07c818apd5md4gxwzx67xvbvv8s6fm890vibqhsrmymi621";
-      url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb";
+      name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64";
+      sha256 = "1k3d1775ran10y79s7n5lmdlqlr7kscvxmj1887bnn4yxbwlgy73";
+      url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libkrb5-3.deb";
       };
     }
     rec {
-      name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64";
-      sha256 = "04wacj307jcy8ykyq6w3xw9phmprmfz6cpwv1wyfarxf4gr7nyii";
-      url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb";
+      name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64";
+      sha256 = "1xml3gfn253lydqaqk27209sr1x0vvrbbkmb63z5cyy4i1yfpvmr";
+      url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libkrb5support0.deb";
       };
     }
     rec {
-      name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64";
-      sha256 = "12kva7qrghlj65khzcmj6xqszij9186ly0iwjjqjs5xl5821aic4";
-      url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64.deb";
+      name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_amd64";
+      sha256 = "0wj24yi2ws12lfs0pi0bq9rbr1gyk2nv30rf46bav41mpn2fj9mg";
+      url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "liblcms2-2.deb";
       };
     }
     rec {
-      name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64";
-      sha256 = "1xnhh3s2cm4vjny964bsznnk2a6zj9n8ygkxfyrraib3wy61lidv";
-      url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libldap-2.4-2.deb";
       };
     }
     rec {
-      name = "libltdl7_2.4.2-1ubuntu1+srt4_amd64";
-      sha256 = "069s7km994c2z89jndwwrpspq0z7jyxr56ma057hbrilfpp4r7yd";
-      url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_amd64.deb";
+      name = "libltdl7_2.4.2-1ubuntu1+srt5_amd64";
+      sha256 = "0ly9p5xilsf0d214mrx96nc3gn1xm1b68dzizsimhqa3bfpckzbb";
+      url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libltdl7.deb";
       };
     }
     rec {
-      name = "libmikmod2_3.1.12-2+srt4_amd64";
-      sha256 = "11flm0w3vwf66yi9mqf43ma3bc6jwg6xcz71h4a3jgqahsg3skfb";
-      url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_amd64.deb";
+      name = "libmikmod2_3.1.12-2+srt5_amd64";
+      sha256 = "1i6kwzy1dz0a78jm0vpa0hjqahkwnj8yab8aky2srsf07y8bz2r8";
+      url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libmikmod2.deb";
       };
     }
     rec {
-      name = "libncurses5_5.9-4+srt4_amd64";
-      sha256 = "08wb0y9dizj7ngsivl2rpikjfl246q1jib6r0nqg7c6r05h8k46m";
-      url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_amd64.deb";
+      name = "libncurses5_5.9-4+srt5_amd64";
+      sha256 = "1b4j17npqdhj6afcw7cj37k6dr2kmbgpjyv7c0viq82165bjacfp";
+      url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libncurses5.deb";
       };
     }
     rec {
-      name = "libncursesw5_5.9-4+srt4_amd64";
-      sha256 = "1gv0w7jrx9zd59zg7z38qzlcp48h7yyfj4jrbfsifl54ryn4fgwh";
-      url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_amd64.deb";
+      name = "libncursesw5_5.9-4+srt5_amd64";
+      sha256 = "0gavz5rh8hz6ir3x09p57balxl8zprjsglgf2craq340qpgqw4s6";
+      url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libncursesw5.deb";
       };
     }
     rec {
-      name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64";
-      sha256 = "0f3h1hh4vn0ysr099lgwk8dx3462cpvmz3ig8r6d4vhxyzyh5a9z";
-      url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb";
+      name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64";
+      sha256 = "0dw0mfwia3z6icj01558xgdjmi7g6g4nig4vrjbmlz05f9l2rck3";
+      url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libnm-glib4.deb";
       };
     }
     rec {
-      name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64";
-      sha256 = "1dlfym38qs8m3g38z776vvpxg77xx2mjab7qipsc0lnppjn8gnss";
-      url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb";
+      name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64";
+      sha256 = "1r9qw0mx38zisj6lr9bk8yv9f3yf2l80y4rvgxq6k28ccz5sahvs";
+      url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libnm-util2.deb";
       };
     }
     rec {
-      name = "libnotify4_0.7.5-1+srt4_amd64";
-      sha256 = "1d61w65qxs93hpn4a8awzhjqcv7yva96n65309630axsm48cqxbd";
-      url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_amd64.deb";
+      name = "libnotify4_0.7.5-1+srt5_amd64";
+      sha256 = "15ny5m925wrn0m394gn88288zgdjf99m5jg9pxyfirhvjmpp8pmf";
+      url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libnotify4.deb";
       };
     }
     rec {
-      name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64";
-      sha256 = "1k08330f3fhr7c6bpm4b5qdyc2kkmz8fa5bgk1a8psxqvfdlsyap";
-      url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64.deb";
+      name = "libnspr4_4.12-0ubuntu0.12.04.1+srt2_amd64";
+      sha256 = "11y0nj7pc94gs3ndxph50whs1yx8lys48c44vj1207m2mkw3xdq7";
+      url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libnspr4.deb";
       };
     }
     rec {
-      name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64";
-      sha256 = "1bxg7wk179gwi7s4xrn1bkl2amnbqrf11qsdw384cyq9c2hwfagr";
-      url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64.deb";
+      name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt1_amd64";
+      sha256 = "0a5mqk6fry96jgpn27fv66mzg7s7mn00jhiayh73q4ddlv52p1r6";
+      url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libnss3.deb";
       };
     }
     rec {
-      name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64";
-      sha256 = "0829hivgxzmhck0l16lg16qbphkhsrnqb2px4ksrzbspmg6b5rb1";
-      url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libogg0.deb";
       };
     }
     rec {
-      name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64";
-      sha256 = "08gj208gfh37lfnxz1xksbmm1g78ax812z0rk12ahl4w72jm1yjy";
-      url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64.deb";
+      name = "libopenal1_1.16.0-3+srt1_amd64";
+      sha256 = "02dc0xfwh1jmhm0l4wig3ybs2yy48hdarnbfjv69m9aryjpbh6gj";
+      url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libopenal1.deb";
       };
     }
     rec {
-      name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64";
-      sha256 = "0pgiha65y3rrqm095vmwc27498drqcgadiqyh4zyq2h2zi2ki60j";
-      url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64.deb";
+      name = "liborc-0.4-0_0.4.16-1ubuntu2+srt5_amd64";
+      sha256 = "13s7ni24igdkvmcs3d13ncll36clfmm14ggjqd23dsgyzmip5n18";
+      url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "liborc-0.4-0.deb";
       };
     }
     rec {
-      name = "libp11-kit0_0.12-2ubuntu1+srt4_amd64";
-      sha256 = "1hsncmfp6h3ca5w2bhaxbr6y2ck8fpzp0zhjijgfnyaqvsjc6wwa";
-      url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_amd64.deb";
+      name = "libp11-kit0_0.12-2ubuntu1+srt5_amd64";
+      sha256 = "00x01l29gh4zl0nfsyh90ixgvln6kcs2963vmmjaql4h1cgvi27g";
+      url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libp11-kit0.deb";
       };
     }
     rec {
-      name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64";
-      sha256 = "16hwn8a30ydarlw3rvpda48m0z0k5y1qw5vdg6syjaqcbwx15mll";
-      url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64.deb";
+      name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_amd64";
+      sha256 = "0dcimf6vsiv51lkavwbw980fll3vpki86i3rqm8vr37iz59798zf";
+      url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libpango1.0-0.deb";
       };
     }
     rec {
-      name = "libpci3_3.1.8-2ubuntu5+srt4_amd64";
-      sha256 = "041hxfsk0r7rh02h16igcr0141gmci4ljadljcxsa1yiyn41b4rr";
-      url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_amd64.deb";
+      name = "libpci3_3.1.8-2ubuntu6+srt1_amd64";
+      sha256 = "167a5rgzyss746s07fkal7vy89i0m5syjm2vdwfiln3ncil4s86y";
+      url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libpci3.deb";
       };
     }
     rec {
-      name = "libpcre3_8.12-4+srt4_amd64";
-      sha256 = "1m53qvhqbicybi43zjjblhaqxfnlvq1m61mkvdhwskcxh1y5zpic";
-      url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_amd64.deb";
+      name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64";
+      sha256 = "0x3yzmxvlg2xyy2sm03vvr4c46r7ywbns7gqbshzgn656zqdid00";
+      url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libpcre3.deb";
       };
     }
     rec {
-      name = "libpcrecpp0_8.12-4+srt4_amd64";
-      sha256 = "0dv8a32dsvklrnvw66rxb7xim9ylhr9w4qvns527v6fl98rvg08l";
-      url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_amd64.deb";
+      name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64";
+      sha256 = "1rlkj982w99x0mz008snkyqr1v13h165yj2z4jwdczpd1bsrra9h";
+      url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libpcrecpp0.deb";
       };
     }
     rec {
-      name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64";
-      sha256 = "0bljhrivr6dw181gisvy8dz6y9mjn0g9w3d5s2f5h8772g80mx7f";
-      url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64.deb";
+      name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_amd64";
+      sha256 = "15sa863fia26lclp821j0c747dv8a8igz5l86n5ff1m3dmlb5hp3";
+      url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libpixman-1-0.deb";
       };
     }
     rec {
-      name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64";
-      sha256 = "00wis5q2xpdfh5z42rfl95j63lbsz5l3i5hvsyvim8r2h1r2nyn0";
-      url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64.deb";
+      name = "libpng12-0_1.2.46-3ubuntu4.2+srt2_amd64";
+      sha256 = "0gnjsh72c9w1229fk5fx753lpmcqzizx7dizrdh3wk1qmivhddl1";
+      url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libpng12-0.deb";
       };
     }
     rec {
-      name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64";
-      sha256 = "150gpmn1gb0ykd3cgggc9zkb070figgwrcdqx89qa2kwvkxlg6vl";
-      url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64.deb";
+      name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_amd64";
+      sha256 = "17d3f6gwbdyn058bbd8f0hj4ywp8rmhy9wsf2pnfkh219r5b98h2";
+      url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libpulse0.deb";
       };
     }
     rec {
-      name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
-      sha256 = "07ldw9iyy9akp5zq2h7l85q3x8ggsx2hah51d0j41lfqrysyig63";
-      url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
+      name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64";
+      sha256 = "16j666k8l85icbgy9ds9hdmcm60axsp8nxjc1n11jd64d9slb792";
+      url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libroken18-heimdal.deb";
       };
     }
     rec {
-      name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64";
-      sha256 = "0lzgsydisj6z7dgjgkmr42mzv11j61r9wny1m31vgm990p5zkh7n";
-      url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64.deb";
+      name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt5_amd64";
+      sha256 = "0g07a8vxxglsh7sswqznsi7lmq5ibchhkhrmfywcdinxniwcr7ha";
+      url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "librtmp0.deb";
       };
     }
     rec {
-      name = "libsamplerate0_0.1.8-4+srt4_amd64";
-      sha256 = "1g6nh8p3q8bsqw9w0ifpl86gql9lqqwxk7zn9bl62pq393h107mg";
-      url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_amd64.deb";
+      name = "libsamplerate0_0.1.8-4+srt5_amd64";
+      sha256 = "1xr5k6zyfw8lc5s6sbg57d7v33045hg9l6a1rh5f46v99hi8k1rr";
+      url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsamplerate0.deb";
       };
     }
     rec {
-      name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64";
-      sha256 = "0sp76gcpw1zgqpyq7bp3gmavlncflkrxiyg738nsf9mb65xy4v94";
-      url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64.deb";
+      name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_amd64";
+      sha256 = "1i7hh43fiadg1y35dmjm03s8mcbanv8jfnnjrcccabahsk8fpdj0";
+      url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsasl2-2.deb";
       };
     }
     rec {
-      name = "libsdl-image1.2_1.2.10-3+srt4_amd64";
-      sha256 = "0jhlbn5jfap15d8nr2fz2hcwlv32ax29gddd5jg08vmfga767sqi";
-      url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_amd64.deb";
+      name = "libsdl-image1.2_1.2.10-3+srt5_amd64";
+      sha256 = "180sia6zc48y2f3l1sywp8am0gqzc9swm711fq8b2kdd4rn3wicm";
+      url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl-image1.2.deb";
       };
     }
     rec {
-      name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64";
-      sha256 = "0cb84d0x3fjsl3w48jmxjzc7xq9c6g73p99baxdg50vhqssr7dmw";
-      url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64.deb";
+      name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_amd64";
+      sha256 = "0z3zxvsvlnvzsvprvy5q4y99irjkzm4ilv0znaic5x967k3zpjp0";
+      url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl-mixer1.2.deb";
       };
     }
     rec {
-      name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64";
-      sha256 = "1dqp16qi413xpv8nmyrbgx2x3dcxsyk2giifz7pa6jyvawcx7ghv";
-      url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64.deb";
+      name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_amd64";
+      sha256 = "11ks71izg46k2pjnd5jdk03xkzz7jmxm5k3mkwq8b42grdiadd6a";
+      url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl-ttf2.0-0.deb";
       };
     }
     rec {
-      name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64";
-      sha256 = "1zcy3njzkahd5rq4yh7i07q3x1wyfpzl6kzynbsqkx9cnf53342k";
-      url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64.deb";
+      name = "libsdl1.2debian_1.2.15-5+steamrt1+srt5_amd64";
+      sha256 = "1i2072wzjmrz97pqxm9mfdqqvx6q6x6w8xqa5f4jxmhm9sb7x7wb";
+      url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl1.2debian.deb";
       };
     }
     rec {
-      name = "libsdl2_2.0.4+steamrt2+srt1_amd64";
-      sha256 = "04v4znqksg9qj4hnz20czwx4qy4i6p9csqql4yd299wvjl9k61j5";
-      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_amd64.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2.deb";
       };
     }
     rec {
-      name = "libsdl2-image_2.0.1+steamrt2+srt1_amd64";
-      sha256 = "01kwm3yjq275j7hnd52hfjbhj5ijfz5wxmc1vpdp88q89zbkw227";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_amd64.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2-image.deb";
       };
     }
     rec {
-      name = "libsdl2-mixer_2.0.1+steamrt1+srt1_amd64";
-      sha256 = "0bzv3spjksn504ma7haywyi3dlb5nl35wxp83if9n58i4850j6sd";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_amd64.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2-mixer.deb";
       };
     }
     rec {
-      name = "libsdl2-net_2.0.1+srt1_amd64";
-      sha256 = "16zx9cj56m939x3zrvq1ypxsd26vnc81gmkpkg5j80jl2lwz6b6v";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_amd64.deb";
+      name = "libsdl2-net_2.0.1+srt2_amd64";
+      sha256 = "1850n1zv9cpbnv5n3nk5knk30pm0f4g8x2cx70kyxbprfkq7894v";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2-net.deb";
       };
     }
     rec {
-      name = "libsdl2-ttf_2.0.14+srt1_amd64";
-      sha256 = "14sfnmb0zz0mhvl3jl45jqc2sci59gmzdn5kif08ai8ri2bk9sza";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_amd64.deb";
+      name = "libsdl2-ttf_2.0.14+srt2_amd64";
+      sha256 = "1bwhm58zqh452szjjj3m3ny2samx19qw3x6q7f18h7164d5vvm4a";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2-ttf.deb";
       };
     }
     rec {
-      name = "libselinux1_2.1.0-4.1ubuntu1+srt4_amd64";
-      sha256 = "1y2a5f9qsxgdhak7vf72jsd6drjim172qp6m897yx7xbbk8ikpnr";
-      url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_amd64.deb";
+      name = "libselinux1_2.1.0-4.1ubuntu1+srt5_amd64";
+      sha256 = "001wfrryd549gh1qd4v8fz3m78vpjwdx1vh34cw0dgi3kxmjxp0q";
+      url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libselinux1.deb";
       };
     }
     rec {
-      name = "libsm6_1.2.0-2build1+srt4_amd64";
-      sha256 = "0fjb9grh86vz58g6cb5d89hxnppqf7w5apivqb3h6sd5axkg2z1r";
-      url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_amd64.deb";
+      name = "libsm6_1.2.0-2build1+srt5_amd64";
+      sha256 = "0k0hyh6b36wvcn8ss24f7lqp2pb0wdvb5zh57y7zfxglgr9vj083";
+      url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsm6.deb";
       };
     }
     rec {
-      name = "libsndfile1_1.0.25-4+srt4_amd64";
-      sha256 = "0fdv7ca60s23qc5azjsg7aaznqksx5xh0bngzc6sl8bqvnnc8z1g";
-      url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_amd64.deb";
+      name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_amd64";
+      sha256 = "17sds50cyvpfrm6x8hddb0ir5xsch79k8gyghkzi59dav2j4j2f4";
+      url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsndfile1.deb";
       };
     }
     rec {
-      name = "libspeex1_1.2~rc1-3ubuntu2+srt4_amd64";
-      sha256 = "1as44g6g5li8q6mdxwnwfbqg9f779vyjh2bqygv5xm339viaj510";
-      url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_amd64.deb";
+      name = "libspeex1_1.2~rc1-3ubuntu2+srt5_amd64";
+      sha256 = "0b0lrg7arrnszc1hzya04ch3j4lbcrpxqf5hxxz2wm5k5qb9f6rv";
+      url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libspeex1.deb";
       };
     }
     rec {
-      name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64";
-      sha256 = "0rsrl5z379bls6bhb0nqc92ilkd7jkg7bdmxw0xg6vw9l66w78ln";
-      url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64.deb";
+      name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt5_amd64";
+      sha256 = "1vks6i3ipggcd2b4ayhkpzj70rdwvlmgh20z7ac8hcnhfnsmvmbc";
+      url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libspeexdsp1.deb";
       };
     }
     rec {
-      name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64";
-      sha256 = "1x1byhdvr0zdfl9dj07qpndifbs9x416vxl7rpmig9g0makxvsmx";
-      url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64.deb";
+      name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt2_amd64";
+      sha256 = "0yavzpx56kf27pfjif6s86bg9wmr9078d7p34dpvbzp0aibjifs8";
+      url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsqlite3-0.deb";
       };
     }
     rec {
-      name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64";
-      sha256 = "11n8iwsc562i1glpisjs9xvlmz4a4xibq6axkhi0xnvv0pbfnxiw";
-      url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64.deb";
+      name = "libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_amd64";
+      sha256 = "149wrr5k7hx5lbgkyi4rh2sgr15m9k8x075gilab60mj1b6cv439";
+      url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libssl1.0.0.deb";
       };
     }
     rec {
-      name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64";
-      sha256 = "0fdmjsyl8a5n14gkwhvkr3xfcfr7q9djapsk8gj56d6r0ydg9yxc";
-      url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb";
+      name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_amd64";
+      sha256 = "0fnqw21m8byigf4303z7qvficral6ar3lsxrsx4ai9r8d6bmmgdn";
+      url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libstdc++6.deb";
       };
     }
     rec {
-      name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64";
-      sha256 = "1yn54vcd5hxx7rxzvshbfidfksl1c0pvl8xv427lkf7xni3jx0xb";
-      url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64.deb";
+      name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64";
+      sha256 = "0km4v33pzknjq0ah7w03s8xny21qggx6pc2q1ah9dlra5dwv4nsm";
+      url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libstdc++6-4.6-pic.deb";
       };
     }
     rec {
-      name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64";
-      sha256 = "0y0k0glqnmsq69sbp3s47pw37vvf969n3chniv3jmrjkjghkp44h";
-      url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
+      name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64";
+      sha256 = "1shni0sdcv1jqkfsqy5j3kkr73lifb3ip9lqz8cxx23dlvbllly9";
+      url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libswscale2.deb";
       };
     }
     rec {
-      name = "libtasn1-3_2.10-1ubuntu1.4+srt1_amd64";
-      sha256 = "0kqv3ndnw1lcz5p190bxpq6rglpcxdsz44wyr6yl7w5wpfwcbs61";
-      url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_amd64.deb";
+      name = "libtasn1-3_2.10-1ubuntu1.5+srt2_amd64";
+      sha256 = "1sjklhs977mrvs7qci0hc3w6x3gjrq5c6lfxjma7bjg731xwdivp";
+      url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libtasn1-3.deb";
       };
     }
     rec {
-      name = "libtbb2_4.0+r233-1+srt4_amd64";
-      sha256 = "1ngm0nkzk8w5s7dp01983lybd256130kdc8f4jmlyikhvyx0khgh";
-      url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_amd64.deb";
+      name = "libtbb2_4.0+r233-1+steamrt2+srt1_amd64";
+      sha256 = "18rc6jhkpqnqvrw29zffahmjihrdrwmh4ydnx3433j6wc29m8p4v";
+      url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libtbb2.deb";
       };
     }
     rec {
-      name = "libtdb1_1.2.9-4+srt4_amd64";
-      sha256 = "112dq62phrd3czhi27kdk4ra9is5phxpzbn26x4bis4y3ccm0cfm";
-      url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_amd64.deb";
+      name = "libtdb1_1.2.9-4+srt5_amd64";
+      sha256 = "1wq2956jmq9zhd7gcpgvqq7d1rdjk954hgcx540zwgxs57brzkrw";
+      url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libtdb1.deb";
       };
     }
     rec {
-      name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64";
-      sha256 = "01zvb8msi6pkjs85y4j78a110fzlmnjp69m7z7qwr2r7rr05w6r0";
-      url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64.deb";
+      name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_amd64";
+      sha256 = "15b6sg3dhamlgaq28w3zlwif5aps0ybi0hc29k3vv2s48f6vqfi8";
+      url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libtheora0.deb";
       };
     }
     rec {
-      name = "libtiff4_3.9.5-2ubuntu1.8+srt1_amd64";
-      sha256 = "13j4pqqba0bf2fq0871s8b4wkw8zyv0q80x0n07lkjiv7bvrrkcw";
-      url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_amd64.deb";
+      name = "libtiff4_3.9.5-2ubuntu1.9+srt2_amd64";
+      sha256 = "038wcp777pj2y3scwkqfdnb6yjsag5dnqajrdiv7pxmvkgn3bc2l";
+      url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libtiff4.deb";
       };
     }
     rec {
-      name = "libtinfo5_5.9-4+srt4_amd64";
-      sha256 = "07pp7dgp33yjdk0i3s7q73qq0pd0ylfbpvr5jssjap0wsp3aqq66";
-      url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_amd64.deb";
+      name = "libtinfo5_5.9-4+srt5_amd64";
+      sha256 = "1w22aqm9zla5cfcvkridgzwnkhj3lyjqf61dl8ppnnbk8rhj07x4";
+      url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libtinfo5.deb";
       };
     }
     rec {
-      name = "libudev0_175-0ubuntu9.2+srt4_amd64";
-      sha256 = "07jvb8ghflb87f4dvgii5jv5qzz31g9s7c3k8wb9w9jp574y7079";
-      url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_amd64.deb";
+      name = "libudev0_175-0ubuntu9.10+srt1_amd64";
+      sha256 = "146kdj719rkgj5v2g0lzs7qqb59a2xgplkqrrafpkssqangvfmq1";
+      url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libudev0.deb";
       };
     }
     rec {
-      name = "libusb-1.0-0_1.0.19-1+srt1_amd64";
-      sha256 = "19f9mhbjm6r4yxdr3fvsn0ad8j7dm07y4bzwqf0n5i715jcc0qaf";
-      url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_amd64.deb";
+      name = "libusb-1.0-0_1.0.19-1+srt2_amd64";
+      sha256 = "0vnsr4syd7alas356hv1radm5rb8vlh69h5ljlh24sqs923vgg28";
+      url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libusb-1.0-0.deb";
       };
     }
     rec {
-      name = "libuuid1_2.20.1-1ubuntu3+srt4_amd64";
-      sha256 = "060wnsbhxl0aqyh1ymbcdma59v10b1vgi3h3xvvilzl869ivwr1p";
-      url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_amd64.deb";
+      name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_amd64";
+      sha256 = "03d2jj9l3k31wb2wrvcjpa79cp7yjsqqms58vqh9pksbnmyrddr2";
+      url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libuuid1.deb";
       };
     }
     rec {
-      name = "libva-glx1_1.3.1-3+steamrt4+srt1_amd64";
-      sha256 = "1v6n0ryr48d8f25vy06d9vh84z2zf3kmg6k8pg89j0s3spdyb44v";
-      url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_amd64.deb";
+      name = "libva-glx1_1.7.0-1+steamos1+srt1_amd64";
+      sha256 = "15scnb989xybb4l8gspbjvs058kjfw0r7ajqak3gxrx7vgqb3i92";
+      url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libva-glx1.deb";
       };
     }
     rec {
-      name = "libva-x11-1_1.3.1-3+steamrt4+srt1_amd64";
-      sha256 = "03s9kbprf6r48y4ycfixx96ga0n8vfjn7v74sv88kl0lrs8xzjy8";
-      url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_amd64.deb";
+      name = "libva-x11-1_1.7.0-1+steamos1+srt1_amd64";
+      sha256 = "0f1hmz4218isrwx8823sm7v08dlvyjwphvbjqsgg9qgim0f13j8a";
+      url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libva-x11-1.deb";
       };
     }
     rec {
-      name = "libva1_1.3.1-3+steamrt4+srt1_amd64";
-      sha256 = "0700lprd2c636dhqs000amw0nkys77h8mb7698bg30j25yd5kqr4";
-      url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_amd64.deb";
+      name = "libva1_1.7.0-1+steamos1+srt1_amd64";
+      sha256 = "0p3548fnf47vj5kxzrqqpdxvip35xyydkxj7d5iiw9f26fz06drd";
+      url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libva1.deb";
       };
     }
     rec {
-      name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64";
-      sha256 = "0a519njbsdwpvc49pn08sya34z2wcd8hpl0j44plr4bd2df010g2";
-      url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64.deb";
+      name = "libvdpau1_0.4.1-3ubuntu1.2+srt2_amd64";
+      sha256 = "1f1h77y6mf7xs8biaz77kfimp98v9cpjrbfg0qyi4wafwn7jmnsr";
+      url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libvdpau1.deb";
       };
     }
     rec {
-      name = "libvorbis0a_1.3.2-1ubuntu3+srt4_amd64";
-      sha256 = "1jdvxgvlwnjcvg6009qfklr8mf3678ydrg855smgv8a0nd7v5qiv";
-      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_amd64.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libvorbis0a.deb";
       };
     }
     rec {
-      name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64";
-      sha256 = "1ysm1ika8cymh7gmd3p2hdfsnm3jrzyn4g2r12r4m9m6q3l9knz7";
-      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libvorbisenc2.deb";
       };
     }
     rec {
-      name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64";
-      sha256 = "0y4r9s5cjcjxi6hy0svzfbqlkaxklb883vcsqn1j0kp9li3jpkbx";
-      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libvorbisfile3.deb";
       };
     }
     rec {
-      name = "libvpx1_1.0.0-1+srt4_amd64";
-      sha256 = "1275437ph91i67q6naigz4nhmw2a330q72mjv282slk7y187ana5";
-      url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_amd64.deb";
+      name = "libvpx1_1.0.0-2+srt1_amd64";
+      sha256 = "02r8yklax0nd9z9s0c2iv1pdnwaq7h3ys46vf0wcwfc8n1p6jj9j";
+      url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libvpx1.deb";
       };
     }
     rec {
-      name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64";
-      sha256 = "18v5vbrvg6l9m768k4cb4xwbxahqrr7zspx1b5a8fv6bw8h3d9l4";
-      url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64.deb";
+      name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_amd64";
+      sha256 = "1f58xi83frcxpq62yfyqjhxzg2ali4hafv8zinial4ixh5nk2a07";
+      url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libvulkan1.deb";
       };
     }
     rec {
-      name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
-      sha256 = "02baqaxcpw306cgr5dvz5pcir7ys08r603m8ahk22bzgxpzl6xk4";
-      url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
+      name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64";
+      sha256 = "0wfs33djnx2k5clhwn6rq17pmqv7d2xyr5mihhylc4fs7q179pg0";
+      url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libwind0-heimdal.deb";
       };
     }
     rec {
-      name = "libwrap0_7.6.q-21+srt4_amd64";
-      sha256 = "12wq77h9jczq974fh3c8n4fkqa876kbizvai96jizh7c90z94kvk";
-      url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_amd64.deb";
+      name = "libwrap0_7.6.q-21+srt5_amd64";
+      sha256 = "1rvgmwh2m633mmz78lccs97sr489bc2qv1vvwl1gf6rd01cmgd99";
+      url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libwrap0.deb";
       };
     }
     rec {
-      name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64";
-      sha256 = "0qp2q9q1z9sz0pyc7l1n6xa0bc22xsml3vf2yhdls71im3ks7bi9";
-      url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb";
+      name = "libx11-6_1.6.3-1ubuntu2.1+srt1_amd64";
+      sha256 = "0lf1k902i59f3v9jgjav9gzsiq7pnrfnlzmlmyxkcfwkd8pvkign";
+      url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libx11-6.deb";
       };
     }
     rec {
-      name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all";
-      sha256 = "17mygha6q5480ajgv1f4wmgwr3l3zxh92yagh4qfsm6r1j2a5dma";
-      url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb";
+      name = "libx11-data_1.6.3-1ubuntu2.1+srt1_all";
+      sha256 = "1imsbk4mg6n1083gjjv6kssm5g842xlbg40vsc4dw97myxycpncw";
+      url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.6.3-1ubuntu2.1+srt1_all.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libx11-data.deb";
       };
     }
     rec {
-      name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64";
-      sha256 = "1vsvf6ihz8jbnsarygnfrjb1y7pg44gpk89b8sk449p0c1kmv4yz";
-      url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb";
+      name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt1_amd64";
+      sha256 = "0l9zprciyrgn4aq91ddmmfhffvms8p9258vv109l62bar4mmg9sz";
+      url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libx11-xcb1.deb";
       };
     }
     rec {
-      name = "libxau6_1.0.6-4+srt4_amd64";
-      sha256 = "1bm0jp69kfnirvlsyj7qxf7dg5b1n53875kxr9asdpw4aqmfj3a6";
-      url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_amd64.deb";
+      name = "libxau6_1.0.6-4+srt5_amd64";
+      sha256 = "1l4ij8c6gmv54yfv24dw9903zjczasd6z9lvzd07c5zj4rj7gx62";
+      url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxau6.deb";
       };
     }
     rec {
-      name = "libxaw7_1.0.9-3ubuntu1+srt4_amd64";
-      sha256 = "15r0f6zhjr13pca7mdxfhk0v48923q0kndp23kpxw8rz75nc15s7";
-      url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_amd64.deb";
+      name = "libxaw7_1.0.9-3ubuntu1+srt5_amd64";
+      sha256 = "1a15brx602gg6jq708ymngyr3rcbapmk5620wdx094vdclc665g9";
+      url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxaw7.deb";
       };
     }
     rec {
-      name = "libxcb-composite0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "072z8vwk4gmbnyf5acn6y4rjiidk7rvi1k05za1j5hlqzlydb6x9";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "0h0yfv4ana590x038lwbz4cxfb3smcqbd394ggir0kv9m1przp78";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-composite0.deb";
       };
     }
     rec {
-      name = "libxcb-damage0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "1062g911skvvlvxr6ihxkb0inyg6xg1j4m4k5rfqs333rw4npc2i";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "1431qrr9kg3mdbag9sfdcqy0g84w074k01r2nyr3bq0w5q8px15l";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-damage0.deb";
       };
     }
     rec {
-      name = "libxcb-doc_1.10-2ubuntu1+srt4_all";
-      sha256 = "0zq3xcrlr2wjp3386bf5h1z63hapmkpnw45l1fz17chdngcmj358";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb";
+      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.10-2ubuntu1+srt4_amd64";
-      sha256 = "1xq6zh8val8mc7wcry0jwdx11aagm4af383c6vs2z6a8vz97c6sj";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "1p2hd14zb1zvqkvgs0apc6m2dwh7kwbxv12py10nr6rzmkr75z1k";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-dpms0.deb";
       };
     }
     rec {
-      name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "1kipdyw3wgdywznr5qxbdl85igizc40hwjd3s5f3y5pvd8kprarz";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "1ixndxxr7ff48p4sp6rim5bjjvncyc2qcld13az56hjybyq90ka1";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-dri2-0.deb";
       };
     }
     rec {
-      name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "04bqidf71j55qp2b83bfjm26sa62gslidzhzg81knynlqi8kk00q";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "0l4j5ydzfnzl5wmabwh8jv2qcdgi5blks8ys06cjri8dq4fqq3gg";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-dri3-0.deb";
       };
     }
     rec {
-      name = "libxcb-glx0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "03wndp2gkjw016rl6k4jhkcpbs1njg74flnb0ppk30j7nxnxqcm9";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "1shd1g43pq5hqpmxkfp8lykpqzzdn0a0w53m20bkz133jgjwqq1i";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-glx0.deb";
       };
     }
     rec {
-      name = "libxcb-present0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "18f38c275h2y9221mn7x0s8ap5fhlry6rdz34lz0rr3pn83fhpvf";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "1m3xf4vkbk2iwy64y8ak51b8wrd5g8hyfbankvfaf123dyyk8z7x";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-present0.deb";
       };
     }
     rec {
-      name = "libxcb-randr0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "08c7fx2vc35l7s72f2z02j0wh0b728ibn3zf103jc0yri9pgfinz";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "047j08nl310s4m8d2gk555bhf1q0s78pq882dqqla2skhfslg645";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-randr0.deb";
       };
     }
     rec {
-      name = "libxcb-record0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "1ddr52m5x9ah4j313fvq2ira96l13w8dd4qi0z38llarmrhw2p2y";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "0qfh1wnd11z8r9a7zyrvsa4banisvmi3vj5zvihppz2698ln53rv";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-record0.deb";
       };
     }
     rec {
-      name = "libxcb-render0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "07kyplilgxk0dj9gxk9zdf5l108d8ya9j4j1ji0frn0mk06i45kl";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "1yj9hxmdjqqinkx8a1gm7nwyxpj6adxphl2f3i863m0gp679bvag";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-render0.deb";
       };
     }
     rec {
-      name = "libxcb-res0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "0pxpgam9xjzf0m6hrqhl0679qa10qk91ami0p7k899b5b1573j6d";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "1v8ipbhabg72mc3rf378l0c8x5apndkgjqbvg5qzp4s591w251np";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-res0.deb";
       };
     }
     rec {
-      name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "1i09z5nszbh9ikjpviwcixayicbq0v9rdg7gygxhs54zxxjccw8y";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "04cm77may727miynsqw0937cvs5kjbh85csrdr86yyayvlqygs02";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-screensaver0.deb";
       };
     }
     rec {
-      name = "libxcb-shape0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "02c87qhymk8ncywaw7zrs73spl1x1byklnafk2drfw76gpf2pa26";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "1z0jlvv25ya5v4rn7cmpwpdbafjmhrb9b7hp6x9nlwrhbpwjh6q2";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-shape0.deb";
       };
     }
     rec {
-      name = "libxcb-shm0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "0yzk3yx3c20ms7np2g956m1j3y5xf241gnvpsv37z173a4j7hlhn";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "0sdajn0sxkvqpy69ccl3l7f7ky4yhj4z304b19wplqfy0qal2gn7";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-shm0.deb";
       };
     }
     rec {
-      name = "libxcb-sync1_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "1lkch9qhzlx8hpv6msvfa2nd7qqkx6xj86akxwgj1wbl10lbqv47";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "1dvq7n1jrsj07hikqvbbbc4wmmk5i9vsvgfcg39vaywmx5fdmfw8";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-sync1.deb";
       };
     }
     rec {
-      name = "libxcb-xevie0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "0f4g04lrbyfjgcphv12zcmsvxa6krjk33kjn4lfdfq3440znvkig";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "07qsfdyym47shm3n6m7i9flb339xannxlch2h0i5p9ca2z1a34g2";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xevie0.deb";
       };
     }
     rec {
-      name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "11c6yh1kax9d5qp17znbvll41q953x4ymx5yvhkjx23z6ra8skbb";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "06ha588as5j1njqga4xamfnw79z6y13i596syl0h34pdmsqd2jll";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xf86dri0.deb";
       };
     }
     rec {
-      name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "0fhprxkv94sgyghcif81dzng5jwyrb6g1y8z78g0wrppjf0k2ixc";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "1npk19k2qhqm89hk2jhf49acig330myvksamd3xw2gjxa99xz7lz";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xfixes0.deb";
       };
     }
     rec {
-      name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "0wbs15dy8zr45d1jqnky6kki6slv150hqlylglva5n0cs2ami0si";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "0s117w3a3ql7d6k2bp88hzni3k9cg24qcmbqz50z8b1gqhpw9y6b";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xinerama0.deb";
       };
     }
     rec {
-      name = "libxcb-xkb1_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "1y6h2awv9h5h09xzhbfr9cd500928knx38ixc28q9v3r0xbw8i8k";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "0kximpl89ks2simxnz10z836rnvaysys7c2jddhsy1z7z30gpb9h";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xkb1.deb";
       };
     }
     rec {
-      name = "libxcb-xprint0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "0ifmby85fzcazzlw36mliz8ylmbxdxxqbpibzlzn65dj3fmmkmhl";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "1l2lxnwp129sa268n3xbrifq8yyfn292nz9arqp95za091zj2rri";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xprint0.deb";
       };
     }
     rec {
-      name = "libxcb-xtest0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "09ia0zfb63wmr7a7hlgyn5dnq2dv78apkd834150pzbz83yr00vz";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "1pybcn6rwwg6b4l7a1sn0nxkp2lb5ar9vzwn6ggd8vwrwnppjvq4";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xtest0.deb";
       };
     }
     rec {
-      name = "libxcb-xv0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "0r4yhw2h3clkscpxfg9vpl3x7sh89lxrqmddfvz2mwbqxs64i44q";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "13jyd5jkz8wmbz6n7azxdnbw48c9i5zkwysza50d1c3rlxalpq82";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xv0.deb";
       };
     }
     rec {
-      name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "0fjms3ram2zjg4b6njwqj37dyfw9m39syhw78w0p5q97my4vcrs2";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "0l4wagp619qar8g9yji1sf4schlclyl1zvdmp3w2cp9lnnwx1p1w";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xvmc0.deb";
       };
     }
     rec {
-      name = "libxcb1_1.10-2ubuntu1+srt4_amd64";
-      sha256 = "18d9armijpdncqv8crz969dgrana0cw6f81di0clqwhx3sgmm29v";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_amd64.deb";
+      name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt1_amd64";
+      sha256 = "1a8x128bgbz9gy2wsmhijg4di99k18ybs9mwvv37hkpw6mlfaxdx";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb1.deb";
       };
     }
     rec {
-      name = "libxcomposite1_0.4.3-2build1+srt4_amd64";
-      sha256 = "0xiqwrgsz6dfa0pd9and19gyvmpha8x2sgh5hg3j6kn04cza8523";
-      url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_amd64.deb";
+      name = "libxcomposite1_0.4.3-2build1+srt5_amd64";
+      sha256 = "01kkvnndzkzqx9pacrlirn435z7dky7lkm0clv7yya3xaw5fslv4";
+      url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcomposite1.deb";
       };
     }
     rec {
-      name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64";
-      sha256 = "0zzj3j8k1ci94y3kydyia61crfw31qg4gqj10lih0m86ci5asyyw";
-      url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64.deb";
+      name = "libxcursor1_1.1.12-1ubuntu0.1+srt5_amd64";
+      sha256 = "0n9dgdi8hb1w5dpasi2pmm5ysrckfch930yvx9grs026dgz3s2g7";
+      url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcursor1.deb";
       };
     }
     rec {
-      name = "libxdamage1_1.1.3-2build1+srt4_amd64";
-      sha256 = "12bb67z98j857wixl51bjg0mgq59zid69ng5lkdjwl5a7cqjgl0f";
-      url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_amd64.deb";
+      name = "libxdamage1_1.1.3-2build1+srt5_amd64";
+      sha256 = "0l088wzpyn15nmy8c6nx3p97qhklxhyaxm8bhafv9sddpr407p4k";
+      url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxdamage1.deb";
       };
     }
     rec {
-      name = "libxdmcp6_1.1.0-4+srt4_amd64";
-      sha256 = "1sw99jdxdafl57y67nssd0ninmiycfgmd8vbi7q3rpp545vc878p";
-      url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_amd64.deb";
+      name = "libxdmcp6_1.1.0-4+srt5_amd64";
+      sha256 = "1jx1i0i6vrm6h2sq99f61dix0v8j1f6nq4d2a1hqaw5f1bsra4q7";
+      url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxdmcp6.deb";
       };
     }
     rec {
-      name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64";
-      sha256 = "0z9jhx6jplin6fzbj4v11aq3d1wqvy2rb2p3g952kymi9372mnr3";
-      url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64.deb";
+      name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_amd64";
+      sha256 = "0ip72ys964g5569rbgsrcv8b1afmwm1mrskgrgiqjs93bhr5i4c4";
+      url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxext6.deb";
       };
     }
     rec {
-      name = "libxfixes3_5.0-4ubuntu4.4+srt1_amd64";
-      sha256 = "0531x9n6p5b9n8isjwmfnr8kmwxyjp81mxrdkmxf6v0k4j0y9sgg";
-      url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_amd64.deb";
+      name = "libxfixes3_5.0-4ubuntu4.4+srt2_amd64";
+      sha256 = "1x2255fch7g2skiz1x94vrm63ahcwf258w2qjkadnbqwivyf8crz";
+      url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxfixes3.deb";
       };
     }
     rec {
-      name = "libxft2_2.2.0-3ubuntu2+srt4_amd64";
-      sha256 = "1bipk6d6dw57pdcybbyhvszjad68qckg4i8s9hkn3kn89d2s46bc";
-      url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_amd64.deb";
+      name = "libxft2_2.2.0-3ubuntu2+srt5_amd64";
+      sha256 = "0ylsvvd28qwz442scylrp9gmmp1y6lvyj1bcjd5d4g0fc9iwm37d";
+      url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxft2.deb";
       };
     }
     rec {
-      name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64";
-      sha256 = "0m9h9k5qbqjiay4003v51vbbm9i24j7g3nx6q901csndjk5aq6ss";
-      url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64.deb";
+      name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt2_amd64";
+      sha256 = "0g3nazw6w77q91c0dsn040y79d1rmg4njg2n3cv871630zghz6rs";
+      url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxi6.deb";
       };
     }
     rec {
-      name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64";
-      sha256 = "03dqvmdvcdraw0p483qrqv6xchr6a96vpmbbni6qcdak1gic2xkb";
-      url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64.deb";
+      name = "libxinerama1_1.1.1-3ubuntu0.1+srt5_amd64";
+      sha256 = "1icp7syxhfgwpiabl7503ylw66m7z3sq5pn7wkxb2yriqxfj3nmp";
+      url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxinerama1.deb";
       };
     }
     rec {
-      name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64";
-      sha256 = "0c5acgsr7as7afjwvl6qbqbgn3wpima2k55awgga6prvhzkas60p";
-      url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64.deb";
+      name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_amd64";
+      sha256 = "0k5wagjkf60ys0cg639758c1h0cjmziyxvp5597vavbds32sl2hm";
+      url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxml2.deb";
       };
     }
     rec {
-      name = "libxmu6_1.1.0-3+srt4_amd64";
-      sha256 = "1l08mkf2kwgskhzh9s43g5vcl4v1qphn68ila8g9gfw05gq7r0j1";
-      url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_amd64.deb";
+      name = "libxmu6_1.1.0-3+srt5_amd64";
+      sha256 = "0pabx6pyazssqfs775k4l19frqv20225n7jmr1ncvwfikiw48gsl";
+      url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxmu6.deb";
       };
     }
     rec {
-      name = "libxpm4_3.5.9-4+srt4_amd64";
-      sha256 = "1z72sbc802sanhagf0w26hkk3yw0zdahw7dk89hjcgp57qmyyb08";
-      url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_amd64.deb";
+      name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_amd64";
+      sha256 = "0nv7v30mh3j53h7lcvqm2ixnsbn8328vcfbd2ysx2r2fac9waw7j";
+      url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxpm4.deb";
       };
     }
     rec {
-      name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64";
-      sha256 = "1yqfa0nllfqk9rnwj65nx8ni5xy4pn2nfasbkhzs8cfcyfd96y4x";
-      url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64.deb";
+      name = "libxrandr2_1.5.0-1+srt1_amd64";
+      sha256 = "1i55vzgaalxlm0mgi7c52nmpmksyffbf93isg3i2syg5nzain8v2";
+      url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxrandr2.deb";
       };
     }
     rec {
-      name = "libxrender1_0.9.6-2ubuntu0.2+srt1_amd64";
-      sha256 = "06v7qfp10gfzx04znksc1mhx5a90za29hi90vinjrzccv096ak99";
-      url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_amd64.deb";
+      name = "libxrender1_0.9.6-2ubuntu0.2+srt2_amd64";
+      sha256 = "0zd4kd5235vn575msfgl48j4czfp4fc44y439gcclpadkhvciviz";
+      url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxrender1.deb";
       };
     }
     rec {
-      name = "libxss1_1.2.1-2+srt4_amd64";
-      sha256 = "0w0idnk6i94klavy80bv83pvkg2m8qvjaa9w641995r6drm9nag7";
-      url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_amd64.deb";
+      name = "libxss1_1.2.1-2+srt5_amd64";
+      sha256 = "1k7248hb63ml79nqzij65rmg8x0ayi41zpl9ls6my87a6gzswyhr";
+      url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxss1.deb";
       };
     }
     rec {
-      name = "libxt6_1.1.1-2ubuntu0.1+srt4_amd64";
-      sha256 = "1blcs2ngp6k5g87y10f2wgshr7m44943ks1ykpb59ss1w5j6cmx6";
-      url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_amd64.deb";
+      name = "libxt6_1.1.1-2ubuntu0.1+srt5_amd64";
+      sha256 = "0gd81vk2bzjc9zcdbgj57hwhs6v9dmzajrmngmaxavyzv2fgamka";
+      url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxt6.deb";
       };
     }
     rec {
-      name = "libxtst6_1.2.0-4ubuntu0.1+srt4_amd64";
-      sha256 = "0mff4swa68mldsv915hirllccybbgjn3i4j23bj4bf26hasr0m6x";
-      url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_amd64.deb";
+      name = "libxtst6_1.2.0-4ubuntu0.1+srt5_amd64";
+      sha256 = "1l1l2073b9cd76ckn5f2d4qb4w1k48s0dlki93bfikph8ms6px8d";
+      url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxtst6.deb";
       };
     }
     rec {
-      name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64";
-      sha256 = "0ahk7z05sshj649vanr2hvarwqp3aphqwbdzf3hjd5rb9cg061fm";
-      url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64.deb";
+      name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt5_amd64";
+      sha256 = "1diqhhj91knlz02b6ha940091yjris46d5swy3zi3r389w2b2crm";
+      url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxxf86vm1.deb";
       };
     }
     rec {
-      name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64";
-      sha256 = "1sgjxdgx8fd780imrqwiwqlhwlmgrndam8km9visymcr431yjbnb";
-      url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64.deb";
+      name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_amd64";
+      sha256 = "0cr24gybxz7h8s9rijr75dayahy1kx4i6gn5q2q6h4z29v046nc4";
+      url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "nvidia-cg-toolkit.deb";
       };
     }
     rec {
-      name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64";
-      sha256 = "12csbx3bzziygw2xa0w4d0i3gh7l2h1sc93npvsmqnjxs6qmwnnz";
-      url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64.deb";
+      name = "zenity_3.4.0-0ubuntu4+steamrt2+srt5_amd64";
+      sha256 = "0ajisfqvlajw0m6kq3yv8j6f38dfhlavrmmfdq5yqmb70wmmkk71";
+      url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt5_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "zenity.deb";
       };
     }
     rec {
-      name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64";
-      sha256 = "06l2s654sg4z16g2b1whrjkz2gwqd0mjgf9w3jzvwwdbprc71gmg";
-      url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64.deb";
+      name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_amd64";
+      sha256 = "0962hhdg3knxnjinkv7m3h510fq8vghjyaxnsnsyijqzfawi4rfj";
+      url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "zlib1g.deb";
@@ -1752,1746 +1743,1737 @@
   ];
   i386 = [
     rec {
-      name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386";
-      sha256 = "0i6phg3gmiqx4in4ym5iv3l15x396d0gkrs57x5p7mw8ahb5fq7q";
-      url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386.deb";
+      name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_i386";
+      sha256 = "1899b2x8kfallda1i0m1hph7v088q7px0rpxm8w6qwp5mwqy4rip";
+      url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "dconf-gsettings-backend.deb";
       };
     }
     rec {
-      name = "freeglut3_2.6.0-1ubuntu3+srt4_i386";
-      sha256 = "1vsm25lzylxf4mvqs5p171qrl8aspdi5rvlnpfhc35cx3vhkxg79";
-      url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_i386.deb";
+      name = "freeglut3_2.6.0-1ubuntu3+srt5_i386";
+      sha256 = "0jdn9nvjmhphv9iw1h589cy5q1iq0gp9q4ibm0m69lkazi2v1blb";
+      url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "freeglut3.deb";
       };
     }
     rec {
-      name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386";
-      sha256 = "1s7wvx23xnv3i3mw6a2pk9nr9s9wzpc99cr6rzgq3jxfmph78c4r";
-      url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386.deb";
+      name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_i386";
+      sha256 = "0zsb0kn2kn64hvf33xnp94k5i9c1269qyla8p5q8vzwplcl0qrx9";
+      url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "gcc-4.6-base.deb";
       };
     }
     rec {
-      name = "gtk2-engines_2.20.2-1ubuntu1+srt4_i386";
-      sha256 = "0rlhcsx8lvnmd6hx4iqh6z49jqxb2wlzl8n74qcbkx8vzg3jyffn";
-      url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_i386.deb";
+      name = "gtk2-engines_2.20.2-1ubuntu1+srt5_i386";
+      sha256 = "06h5229y2md6d73imgy5wg4msv6s9vl056p97jq2hrf4di0q6a76";
+      url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "gtk2-engines.deb";
       };
     }
     rec {
-      name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386";
-      sha256 = "1jkma0v5z7i7plamg49ljk0mhg3qf92k1disdj8yjjlgjf3d0isl";
-      url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386.deb";
+      name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_i386";
+      sha256 = "1fyha082h0jr26gjnsxzj1c6rl63c9xc2kgf6cfb86dmsmbvpqqg";
+      url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "gtk2-engines-murrine.deb";
       };
     }
     rec {
-      name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386";
-      sha256 = "00p0qi47nnzlh31ajwalfh5kimsmdzjicgl5lnfg4viwb0r07vmd";
-      url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb";
+      name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_i386";
+      sha256 = "0ix60pix5cnzd807v8q9mqhyhhksqndd7vc6brs1daknhxn5dsi4";
+      url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "gtk2-engines-pixbuf.deb";
       };
     }
     rec {
-      name = "libacl1_2.2.51-5ubuntu1+srt6_i386";
-      sha256 = "188r323k4y6jvq64qywhglllxfbcpji15zvws1qlicv4nrjh2yk2";
-      url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_i386.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libacl1.deb";
       };
     }
     rec {
-      name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386";
-      sha256 = "049qhih0dl0z13ag1kradvwydwz90pllwriwnyjx78726fvcsa56";
-      url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386.deb";
+      name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_i386";
+      sha256 = "1bbf9k50d3df4sjn2idizk2bcpkcxkg0wz8mczgzkh634753pkld";
+      url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libappindicator1.deb";
       };
     }
     rec {
-      name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
-      sha256 = "0gp2falswr4hfcrfj7avp1g216mf5sargqflwyxl6ixxy1yxp22w";
-      url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
+      name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386";
+      sha256 = "1qgap0ha5vlpz1fnf2fppprzh4lyrvy7k9sj0whhb3f48ass8mh5";
+      url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libasn1-8-heimdal.deb";
       };
     }
     rec {
-      name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386";
-      sha256 = "0cy9s4wpnq2yd08shvip5mzg5a5mk76zmwyq68brqblaf1yqw907";
-      url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386.deb";
+      name = "libasound2_1.1.0-0ubuntu1+steamos1+srt2_i386";
+      sha256 = "0wa019012di6slf29ambq249fn6w9ldmyxx80k564j9s1k510ivc";
+      url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libasound2.deb";
       };
     }
     rec {
-      name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_i386";
-      sha256 = "10qhsgcsabp0mrihssj7znw67kjfmw9kv2sbplpwl8bc52pxdz6z";
-      url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_i386.deb";
+      name = "libasound2-plugins_1.1.0-0ubuntu1+srt2_i386";
+      sha256 = "0hrrpjp4wg13vfam863hwkhzv7ngcydx0iysmfkxjzhmpf3j4ghd";
+      url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libasound2-plugins.deb";
       };
     }
     rec {
-      name = "libasyncns0_0.8-4+srt4_i386";
-      sha256 = "1h2fs8azxz9z2wa45igxwvfaarp50pqx26jznyrv35ayxhnzsg8w";
-      url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_i386.deb";
+      name = "libasyncns0_0.8-4+srt5_i386";
+      sha256 = "0k8rngiq74b574fc1jqfwf77f57qcflimbs63pa2jx1jqg7gxjx2";
+      url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libasyncns0.deb";
       };
     }
     rec {
-      name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_i386";
-      sha256 = "08sbk32cv4r0nmhp8ydbmjy8mcnsi4y2wjm606d1hrqqnvhlk1yi";
-      url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_i386.deb";
+      name = "libatk1.0-0_2.18.0-1+steamrt1+srt1_i386";
+      sha256 = "0ldl3jsmf16mbf1bs94zkmaa1b1p9d9rvajlyp7iqkbqw6qkszlz";
+      url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libatk1.0-0.deb";
       };
     }
     rec {
-      name = "libattr1_2.4.46-5ubuntu1+srt4_i386";
-      sha256 = "06ms0pfsb85y53l83fvs2zh39dqzh7bw0jh6zsf5wi9g47y2kzhd";
-      url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_i386.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libattr1.deb";
       };
     }
     rec {
-      name = "libavahi-client3_0.6.30-5ubuntu2+srt4_i386";
-      sha256 = "0gsbwnc5s6hd412djs257fgy50ayjph5gg1jhmvgz0nf0wqqy60g";
-      url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_i386.deb";
+      name = "libavahi-client3_0.6.30-5ubuntu2.2+srt1_i386";
+      sha256 = "1yyq436zsx8hbfhhv4l8ji85narl6ws8flhfcbqvxldaxlzv4ls7";
+      url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libavahi-client3.deb";
       };
     }
     rec {
-      name = "libavahi-common3_0.6.30-5ubuntu2+srt4_i386";
-      sha256 = "0cfn660pngq7ackkcid410g8245grcs0izawwlmkhr6y19nma0jg";
-      url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_i386.deb";
+      name = "libavahi-common3_0.6.30-5ubuntu2.2+srt1_i386";
+      sha256 = "0lhvj64i4dqy0lh73kyk32992fqkhxxr7k1cr97a03hdpaa06ycq";
+      url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libavahi-common3.deb";
       };
     }
     rec {
-      name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386";
-      sha256 = "0dz4d63whrhlsylvd1mqzz5v3xpwf88cgga8qr8vgf2vaz7ns0k1";
-      url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
+      name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386";
+      sha256 = "129g8jgy4va5gszrq9pxd4p51zja9svcm0hqx8g12ryx5lfkjjc5";
+      url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libavcodec53.deb";
       };
     }
     rec {
-      name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386";
-      sha256 = "1rxbm4n09q4brhklaa5hwzaipv3y34a3jphrc724s29dg178bb6y";
-      url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
+      name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386";
+      sha256 = "1vnj97sl686wlkkxbhvn5s3ck60nzrqr60y4wxg9a2hxxf7ba1gf";
+      url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libavfilter2.deb";
       };
     }
     rec {
-      name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386";
-      sha256 = "0f38h7h4m1g63jh9lsnq9win2k5zvg8i5khsadwb154y4iragm2f";
-      url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
+      name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386";
+      sha256 = "12zikl29fcq5vc0k5n4l8db8q0f95h13hlqgka3cy13nf31kbk06";
+      url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libavformat53.deb";
       };
     }
     rec {
-      name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386";
-      sha256 = "05lh422gvhl990yvlp4a0l3mfqn4n0l41fdaq4m4r5i23izcl3s0";
-      url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
+      name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386";
+      sha256 = "1brfvbqwga1hmmyarbwksbrj6kabnfnrk8hv9xrvd99jak3wsipl";
+      url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libavutil51.deb";
       };
     }
     rec {
-      name = "libbz2-1.0_1.0.6-1+srt4_i386";
-      sha256 = "1hh77sg2pan5qlvxg82my0h1dy53rxrgnl84bggn2kiz9i61ls2m";
-      url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_i386.deb";
+      name = "libbz2-1.0_1.0.6-1+srt5_i386";
+      sha256 = "1nngc07hwr96n1k56bi3i2yffad8dhf1zfblqlz8pffi1yl92vjz";
+      url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libbz2-1.0.deb";
       };
     }
     rec {
-      name = "libcairo2_1.10.2-6.1ubuntu3+srt4_i386";
-      sha256 = "141rbp47gkvzfqzrwg4j80m1ay2l573p4q3x2ym5nxzw3f9jb00a";
-      url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_i386.deb";
+      name = "libcairo2_1.10.2-6.1ubuntu3+srt5_i386";
+      sha256 = "0vnz2d66q9pkn8ry2ixbmqcyz0kpqqmimaxnrfq42g1lz8k44cs6";
+      url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcairo2.deb";
       };
     }
     rec {
-      name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386";
-      sha256 = "1mfv3q731b0sjl2axc5qf1drp4dfwsmg2i0c222bs3ccvk9m7bcr";
-      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386.deb";
+      name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_i386";
+      sha256 = "10bw3fha2nc8lb3md5l8yj8c40rx7gm7vg9lk76359p06z3ypvvf";
+      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcanberra-gtk-module.deb";
       };
     }
     rec {
-      name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386";
-      sha256 = "0iddn7f56g1lajd1f0s77s06qwh5nk0iv2ai2r5rcanhq693k3jp";
-      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386.deb";
+      name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_i386";
+      sha256 = "1yg1hllxp2m5rv6hlgh714yhcb9l5ggg4lfwv33yaw4fnzz387km";
+      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcanberra-gtk0.deb";
       };
     }
     rec {
-      name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386";
-      sha256 = "0qpil9xifaq1kkmrga6v9sz4sl9dh78rp9kzm8p6c9hq2f4w5j4i";
-      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386.deb";
+      name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt5_i386";
+      sha256 = "03b6rk9gkxx4d75cjr27w229nsc1jjp2fy8ln5gxp2bbhywgxl4a";
+      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcanberra0.deb";
       };
     }
     rec {
-      name = "libcap2_2.22-1ubuntu3+srt4_i386";
-      sha256 = "0llaf4hgb4v66hwkc6ibrhpadhjxkiz3frl00f6yagm9g6z2yxvy";
-      url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_i386.deb";
+      name = "libcap2_2.22-1ubuntu3+srt5_i386";
+      sha256 = "1qy9ggswl8cbp0zbaryc7cd4bcq17qb4llv8v3zcj08wxr6v2ram";
+      url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcap2.deb";
       };
     }
     rec {
-      name = "libcg_3.0.0016-0ubuntu1+srt4_i386";
-      sha256 = "0ka9z2sq315xvdbqmbqg76j3wknfa88hk41jg94svnqf4fbawbrz";
-      url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_i386.deb";
+      name = "libcg_3.0.0016-0ubuntu1+srt5_i386";
+      sha256 = "0gs2q5ql7wq28y2qrs9v9gs75r6ycq7c6xghf4s6g5s8q4cq205k";
+      url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcg.deb";
       };
     }
     rec {
-      name = "libcomerr2_1.42-1ubuntu2.2+srt1_i386";
-      sha256 = "0d0zpm7qx1p4zpi5xk585hxfirn6i3v53r0br7dlaiqfy0divv5z";
-      url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_i386.deb";
+      name = "libcomerr2_1.42-1ubuntu2.3+srt1_i386";
+      sha256 = "12c8gxi0l0qysbiw81hbysf5hn1kgv956csvrn71yf52zwqwr388";
+      url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcomerr2.deb";
       };
     }
     rec {
-      name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386";
-      sha256 = "1l49h8v8dgi4n2j32012zzxkyqgg7b9z7d9lxijj0cqwwjq6fzpx";
-      url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libcups2.deb";
       };
     }
     rec {
-      name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386";
-      sha256 = "0z5qnjgmz9c917vm6r1m3856a10brdwx3d0k4qcv9vlv1gj1ln0j";
-      url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb";
+      name = "libcurl3_7.22.0-3ubuntu4.17+srt1_i386";
+      sha256 = "14yb0a5cglgqvwa75kb6lbhfpmpj4xjgxz6dm27q27pcxv9xx5km";
+      url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcurl3.deb";
       };
     }
     rec {
-      name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386";
-      sha256 = "09bx2gxldswb63nql2b7x5mq55miaz7x5gbzscrc1kybnm0vvv75";
-      url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb";
+      name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_i386";
+      sha256 = "027dgd9ik9zxy2ixi1272mskbax10cg0k7flljhcx5zmnwvrhxhx";
+      url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcurl3-gnutls.deb";
       };
     }
     rec {
-      name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386";
-      sha256 = "1lp548l33i3c7wavq9q0n9jhxm44mg0jlrgi89ngfm705141zw4f";
-      url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386.deb";
+      name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt1_i386";
+      sha256 = "1m8aqb9hvprl0hbswha0raz6pp3gs84cmqg40fblbfqya8nibdlk";
+      url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libdbus-1-3.deb";
       };
     }
     rec {
-      name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386";
-      sha256 = "13dcsf3ipayvrzj1ksmxph31gk2zs3m0ghy5jh3aq648s5ql2jj9";
-      url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386.deb";
+      name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_i386";
+      sha256 = "0slsk7cqdrbnm35zqir21ms0vv1hv44i184x8ip1lg936vrvbxka";
+      url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libdbus-glib-1-2.deb";
       };
     }
     rec {
-      name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386";
-      sha256 = "14glmvc6923djpcn2a9kwhqm4myg1y9mp38n7gkby1wz6y63zvp5";
-      url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386.deb";
+      name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_i386";
+      sha256 = "0g4zmrwpifl4kxv311spwyia1xrd76m0aizb3jzv6q8cc4hla3ii";
+      url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libdbusmenu-glib4.deb";
       };
     }
     rec {
-      name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386";
-      sha256 = "19ijz82wkk9z8w4yjp628hga6dsv7qr7x37kr8j8fq430gbl5y8s";
-      url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386.deb";
+      name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_i386";
+      sha256 = "0kj6pfpgybkkb5bjfr9qgczwddx5lkbwhknlcymhhi94jcfbcnbc";
+      url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libdbusmenu-gtk4.deb";
       };
     }
     rec {
-      name = "libexif12_0.6.20-2ubuntu0.1+srt4_i386";
-      sha256 = "1dh1idpqqh66l2awfim17vk94238wb073d3xj74ci8gxfp0rxkvr";
-      url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_i386.deb";
+      name = "libexif12_0.6.20-2ubuntu0.1+srt5_i386";
+      sha256 = "06br49sn30hrxlq479xi3vxw3blkr558kz4d7gym3fxnwfa6im9w";
+      url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libexif12.deb";
       };
     }
     rec {
-      name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386";
-      sha256 = "0wv8iym5bhwlvnsljxfjwhl8z39wh5nba6li1i7nnzqj365hmdc4";
-      url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386.deb";
+      name = "libexpat1_2.0.1-7.2ubuntu1.4+srt2_i386";
+      sha256 = "0av7wcy104jz6pci7lgwpmvb528v9idx660qrrabdqhpd1m4hv8s";
+      url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libexpat1.deb";
       };
     }
     rec {
-      name = "libffi6_3.0.11~rc1-5+srt4_i386";
-      sha256 = "1064kf252d1v8asi59m67bz7zg2k7fmgkqzbib872yb6qyrgj7p2";
-      url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_i386.deb";
+      name = "libffi6_3.0.11~rc1-5+srt5_i386";
+      sha256 = "0gvhndr5y4zl097h105fr4q60sg38mhkhlw8ha51ypzcm9f8na6d";
+      url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libffi6.deb";
       };
     }
     rec {
-      name = "libflac8_1.2.1-6+srt4_i386";
-      sha256 = "17hb02f5yapkfkasamx6whxm76p1gpjrz7nq7i59zv0lfxwgjry7";
-      url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_i386.deb";
+      name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_i386";
+      sha256 = "1rdfykm113vps893xdkcrpphb06winv2566yb9myg9m3aybcldrx";
+      url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libflac8.deb";
       };
     }
     rec {
-      name = "libfltk1.1_1.1.10-10+srt4_i386";
-      sha256 = "1vz2b02asscpr155v516zclawfi28m4yxf1ya33848ydg067iz35";
-      url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_i386.deb";
+      name = "libfltk1.1_1.1.10-10+srt5_i386";
+      sha256 = "1j0bhpgsaw6rphy1wqp40wn8yr6qzrxdmwarc2amryqw7bqslmy5";
+      url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libfltk1.1.deb";
       };
     }
     rec {
-      name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386";
-      sha256 = "1dm12wk4pj2h4y0ykyvv9fs6s0vix1iy3hkvz2fvqx8wdb8710n6";
-      url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386.deb";
+      name = "libfontconfig1_2.8.0-3ubuntu9.2+srt2_i386";
+      sha256 = "1ls25q28jk9znmi0fhm30cqilx9bmm463zfq1jmj5apw96wk64n4";
+      url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libfontconfig1.deb";
       };
     }
     rec {
-      name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_i386";
-      sha256 = "0661g4ghhynz49kkbr5kds1ms8prqmpm5rz0qv3c7cf62a2lb3x1";
-      url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_i386.deb";
+      name = "libfreetype6_2.4.8-1ubuntu2.6+srt1_i386";
+      sha256 = "1zahvr5h833mppcpg648jv28dywx9jiqdv58wlv1vpsk6d9599bh";
+      url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libfreetype6.deb";
       };
     }
     rec {
-      name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386";
-      sha256 = "19qracxc45irfmsbcn668zwdxx37avp1igj1z4c6xq8bmp6w685d";
-      url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb";
+      name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_i386";
+      sha256 = "0bsm95m17f9lxrknl11jmaz9mqrbkd40p29z44497fw8miw736r2";
+      url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgcc1.deb";
       };
     }
     rec {
-      name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_i386";
-      sha256 = "1srwysvh165hwiqxyl0aac3j39zzg2v4g3alix51cbvc4s6yzhy3";
-      url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_i386.deb";
+      name = "libgconf-2-4_3.2.5-0ubuntu2+srt5_i386";
+      sha256 = "07b1w4ww3xb5r13px85f8rv4nsc08rz8w3741zdk0vacq8scw4pb";
+      url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgconf-2-4.deb";
       };
     }
     rec {
-      name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386";
-      sha256 = "1cg2kps7cfmildp9hlijxsj7bc2j71xal6bm57ldz2vjcv6k06hl";
-      url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386.deb";
+      name = "libgcrypt11_1.5.0-3ubuntu0.6+srt2_i386";
+      sha256 = "1wbaml6cjdijcaq6c9m0lcdlh350fk9a2prh6z4k7fjhsms60ppc";
+      url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgcrypt11.deb";
       };
     }
     rec {
-      name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386";
-      sha256 = "1n5pyqw2v87xw32lj73aywhfgcmnzi2wvxxw2gqv52d56vzj254s";
-      url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386.deb";
+      name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_i386";
+      sha256 = "0fis055pnc01rb5v9vdqc17w4ijdb6sksf2qjysc4q2j33gvh6d5";
+      url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgdk-pixbuf2.0-0.deb";
       };
     }
     rec {
-      name = "libglew1.10_1.10.0-3+srt4_i386";
-      sha256 = "1aswani1ymq52jyr4yhw4vi42gzw6xqk5ygh1d7zycakgrfs179b";
-      url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_i386.deb";
+      name = "libglew1.10_1.10.0-3+srt6_i386";
+      sha256 = "17ki8vb4nbg140fg7vdfyb092lcr3hpsjx0z1gz13bvmzxcff3lf";
+      url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt6_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libglew1.10.deb";
       };
     }
     rec {
-      name = "libglew1.6_1.6.0-4+srt4_i386";
-      sha256 = "0yxnfi8arnp3cphxdviyqslw7nxnd1mx11v9i5i2xnl907iyaxpq";
-      url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_i386.deb";
-      source = fetchurl {
-        inherit url sha256;
-        name = "libglew1.6.deb";
-      };
-    }
-    rec {
-      name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386";
-      sha256 = "1lmxm2gfz0mkjafpw8f98y73f0lj5m5nfdarqlpbb8dqbmpabwvk";
-      url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386.deb";
+      name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_i386";
+      sha256 = "0l0vjcff86mw1mv5kizg3pcjr8rk9bn2gjf0d22jgljisq47f607";
+      url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libglib2.0-0.deb";
       };
     }
     rec {
-      name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386";
-      sha256 = "11sdfs3zphb8ks2cpb646z4vza6s4zpbfgaq99drn5z9b8d109zi";
-      url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386.deb";
+      name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt5_i386";
+      sha256 = "1bc2hb2cb05j4iw9lrskrqkdh8iy7wv3d1sknqn1ya847w98h9hr";
+      url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libglu1-mesa.deb";
       };
     }
     rec {
-      name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386";
-      sha256 = "1f6ss23vybyqkifjr9nam0y6va34m2vdpaxbwjmwi2z4wwj7pn9k";
-      url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386.deb";
+      name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt5_i386";
+      sha256 = "0y6qrw7n41szpi8p2fpilx20wmqk3arw0m7kr35isy0y3icpryka";
+      url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgmp10.deb";
       };
     }
     rec {
-      name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_i386";
-      sha256 = "0580r5n6z9s147q4bkkm75a2pwb1ganz9msbp440rwwh6xahrh56";
-      url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_i386.deb";
+      name = "libgnutls26_2.12.14-5ubuntu3.14+srt1_i386";
+      sha256 = "1f5dv4bk2g9ldqfjm7a2a6mx2ignzgxy42ghl9yny6x9xz39g56h";
+      url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgnutls26.deb";
       };
     }
     rec {
-      name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386";
-      sha256 = "04mywbz2lmxap8nq1rvj7aggkrvrgfz4869q41f0d6dnsmnbsj5k";
-      url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb";
+      name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_i386";
+      sha256 = "0p6gj53jdk3d4nmhkiiqvh8sk3pm2g99iqfmlc7br1gxvmpjjj3s";
+      url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgomp1.deb";
       };
     }
     rec {
-      name = "libgpg-error0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "0hjfgcmrjr02xk788chyafg7j8viwmp2vrqyfjdjf79kvpy0354s";
-      url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libgpg-error0_1.10-2ubuntu1+srt5_i386";
+      sha256 = "19wh8hdp5lcf68w2hwmj8z55j2bcp61ydf37cs796rvzsxbsbamr";
+      url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgpg-error0.deb";
       };
     }
     rec {
-      name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386";
-      sha256 = "06sqdxf38qm6cd76gdir6m9rvbg4xv70jhh36zshxxhi50lhpjcx";
-      url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb";
+      name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386";
+      sha256 = "1zkvqbm3i297b6pj0japgs3jcvps8my6icsh2n1ka6nvflvdr87h";
+      url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgssapi-krb5-2.deb";
       };
     }
     rec {
-      name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
-      sha256 = "015jb2j56ia3zvfmjlx72yjlvfv8z8bg0ff4z5nh1d25cambqcbs";
-      url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
+      name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386";
+      sha256 = "0q2r4fmpql34hpd061289ijl40y66wp8rlh78b2ysg8dkvycni0k";
+      url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgssapi3-heimdal.deb";
       };
     }
     rec {
-      name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386";
-      sha256 = "14z4v2j7lc5xnzbfpf8b3b5qg0d2yg917v4ighxy2nydf2zy0mrs";
-      url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386.deb";
+      name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_i386";
+      sha256 = "0nq6hvv00b3s5fmay2nm4s869y6lws8v2w9lrqlpgs08z6fh6mjp";
+      url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgstreamer-plugins-base0.10-0.deb";
       };
     }
     rec {
-      name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386";
-      sha256 = "06lp4ajhnczb5salf6njgi1q24zv3yrkqhgvbyq45dvsax76kafj";
-      url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386.deb";
+      name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_i386";
+      sha256 = "0arypn4k1wvaiqqxc271r5w7bkdk0f4mh88l4np3ngfyzn2w6z61";
+      url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgstreamer0.10-0.deb";
       };
     }
     rec {
-      name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386";
-      sha256 = "0qhvr5pyjj0vh2c1658gmx9r7h194py8qbcx69qfca2czp9hhacs";
-      url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb";
+      name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_i386";
+      sha256 = "0swmpdf7872z0nb3rsfixspg11nvf0k7sm4xcdgvcliaqjhyv570";
+      url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgtk2.0-0.deb";
       };
     }
     rec {
-      name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all";
-      sha256 = "0xgh9nrvj1hf3wj9pqm9x3ykw95v9bsh5k2vgr3cr9135rrj0dp5";
-      url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb";
+      name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all";
+      sha256 = "0rw8iy16ij86abh444jk1xw78b5z81qjxm1292jin3sfhck4bd4x";
+      url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgtk2.0-common.deb";
       };
     }
     rec {
-      name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_i386";
-      sha256 = "0z8ncxaqxna0ihlp19i7b59k9vbkynak49kim821rwxsxvjqsfcd";
-      url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_i386.deb";
+      name = "libgudev-1.0-0_175-0ubuntu9.10+srt1_i386";
+      sha256 = "09gjla6gsx8whbvhzwvgjnm19md7bgpvb76kjfmxzm54hakcjxla";
+      url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgudev-1.0-0.deb";
       };
     }
     rec {
-      name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
-      sha256 = "195yrcwrw8bnai5kkvhdq7nnjv643af5dyc97qcnfnvnvs20az42";
-      url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
+      name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386";
+      sha256 = "18v3rqaclhdmbh25p48sa6qidi3birnymdfzg2c8z5bpg1giis83";
+      url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libhcrypto4-heimdal.deb";
       };
     }
     rec {
-      name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
-      sha256 = "0g2dml08mw4yy9llnn2149x1niy97mqbz56rphw3g3zv5nivnbp3";
-      url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
+      name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386";
+      sha256 = "1546i5h5137ysvcgvyi6hplfx54wqya8sr233vgn838xd2bz024r";
+      url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libheimbase1-heimdal.deb";
       };
     }
     rec {
-      name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
-      sha256 = "0dbs4gxbfdhn2sbzfny75fzxiab9k8l1vd3vm7i4zfkbkx3lbr2x";
-      url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
+      name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386";
+      sha256 = "1yk0ap8wsi5k2wz5i9vcdw332kbhnlbf5hb8la9pckfrxy6bca82";
+      url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libheimntlm0-heimdal.deb";
       };
     }
     rec {
-      name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
-      sha256 = "01z9qr5r7n7vfkkb95apmkcc35va43qxsf0nzxff8x1ll82l3n7a";
-      url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
+      name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386";
+      sha256 = "0y6awbyl4w56qa8vkn9dzsnb3162x4p5nr1cf7ir119nl05987cp";
+      url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libhx509-5-heimdal.deb";
       };
     }
     rec {
-      name = "libice6_1.0.7-2build1+srt4_i386";
-      sha256 = "1gmykmbbxk9590snli45dcvj00v77xn2za8v8193v020qa8hvmik";
-      url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_i386.deb";
+      name = "libice6_1.0.7-2build1+srt5_i386";
+      sha256 = "02nygw4q330jgrfgbp46fjpa97bmgzk7sg9ikh97k4c743lshija";
+      url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libice6.deb";
       };
     }
     rec {
-      name = "libidn11_1.23-2+steamrt1+srt4_i386";
-      sha256 = "1xmv6kqn3zpnls7nyqd2bjqzc03y4w2gp0xmq6l8wwi659dkr4vz";
-      url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_i386.deb";
+      name = "libidn11_1.23-2+steamrt1+srt5_i386";
+      sha256 = "1wv5rfk5a9y6w5wylvbxj8kbmav61y5w3j413kvf373xnhp79gaf";
+      url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libidn11.deb";
       };
     }
     rec {
-      name = "libindicator7_0.5.0-0ubuntu1+srt4_i386";
-      sha256 = "0j1v3ljb01wyy5v8a5ad8ar9wmx2hf6qd50k7cl95si60zs79bk6";
-      url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_i386.deb";
+      name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_i386";
+      sha256 = "1qiyw54y8yra871vzvdlj2cqhf1yvg68h9zckyyv87s753x98kkq";
+      url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libindicator7.deb";
       };
     }
     rec {
-      name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386";
-      sha256 = "06gz25p9qm0lbxaqzag2y2lhc0wx9cnkxz7zdm2yfdcx1y4vbymx";
-      url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386.deb";
+      name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_i386";
+      sha256 = "02c4fj82svlkh9whsasclshjlvgbcabsz64ac47hvs2ccaap0gis";
+      url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libjack-jackd2-0.deb";
       };
     }
     rec {
-      name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386";
-      sha256 = "1m1986mn0ad5basd8hlby4d6jxpps4v0ib2g2pwqxdlil39gmar5";
-      url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386.deb";
+      name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_i386";
+      sha256 = "0bcp6bxrgdbcgwrg2qgrax111w6xfwyf3rwrpf8j9mwd91hzm0c8";
+      url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libjpeg-turbo8.deb";
       };
     }
     rec {
-      name = "libjpeg62_6b1-2ubuntu1.1+srt4_i386";
-      sha256 = "1fjbscq7qp895z5g5aw5l98rfj0qpr66rl5r4m0f1ilrjn83i96y";
-      url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_i386.deb";
+      name = "libjpeg62_6b1-2ubuntu1.1+srt5_i386";
+      sha256 = "1l3hm9p30w2kwbjyri452h9v0nprznsl9jh32l9hg4php8kjfidw";
+      url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libjpeg62.deb";
       };
     }
     rec {
-      name = "libjson0_0.9-1ubuntu1.1+srt2_i386";
-      sha256 = "0nlhsclyxqa1s05hnzid6j8h0986v9viv6dysg22bc16gfdg9i1j";
-      url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_i386.deb";
+      name = "libjson0_0.9-1ubuntu1.1+srt3_i386";
+      sha256 = "0jnbwf7j7fmrylav1dck17kajxdyc67gfmpn09wrrqy0zgdbg3zi";
+      url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt3_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libjson0.deb";
       };
     }
     rec {
-      name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386";
-      sha256 = "0h2iv7p0w5ydd9nqfwmm4avjhcnki7nl000gpsdnrpfjrbv4rnlb";
-      url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb";
+      name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386";
+      sha256 = "0czc7vf1q84k252wsx9v9na2jn8vqym62dnb100992cpzj2956c1";
+      url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libk5crypto3.deb";
       };
     }
     rec {
-      name = "libkeyutils1_1.5.2-2+srt4_i386";
-      sha256 = "1v9b3dg1s3ykj5abi4y2392m12dw2n7zrays6sv1n2dw46f2lj4k";
-      url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_i386.deb";
+      name = "libkeyutils1_1.5.2-2+srt5_i386";
+      sha256 = "0vmd87b8kk579fi99di79p94nkl0584bsdhgw2gw03czbainq9rx";
+      url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libkeyutils1.deb";
       };
     }
     rec {
-      name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
-      sha256 = "0h4mnxfsf8j12g33lca2nlrcma9d8gdchxckzr916yp4snzjk0bb";
-      url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
+      name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386";
+      sha256 = "1hjdfsvqzvssxiamjq9dddlzjjz54grzva2a7rsipbmmvnw254yd";
+      url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libkrb5-26-heimdal.deb";
       };
     }
     rec {
-      name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386";
-      sha256 = "1ay1g283y3y6czm56r7wiibarwv267bg707ncaq4m7a9bxa0fmy2";
-      url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb";
+      name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386";
+      sha256 = "1cr6z0jv6mchs82p6iyskdq6ppbfpyixanxwdbjdg76cpb5as3ii";
+      url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libkrb5-3.deb";
       };
     }
     rec {
-      name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386";
-      sha256 = "031qjg6aajyrdj7ny9dl2v6p9syyngqfrdy277351814zcclhm1l";
-      url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb";
+      name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386";
+      sha256 = "11v68jp8f24abx7i6b69jimlmv0lvpb5hnlxnj3f281zsz2smpyw";
+      url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libkrb5support0.deb";
       };
     }
     rec {
-      name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386";
-      sha256 = "03ix9r3mxvgq5i5qv7zhjmmg8bki8gvgg4n8r79az5zbp4nxmi4f";
-      url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386.deb";
+      name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_i386";
+      sha256 = "1bpb8gfach74nibzzd2mk7mkdhlw1j27yrgckpl9pgzq8jd0ch70";
+      url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "liblcms2-2.deb";
       };
     }
     rec {
-      name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386";
-      sha256 = "0aycpf6xkr4fxr72np52jg6y384sy5b2r68kmmnzixqifykgc7jx";
-      url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libldap-2.4-2.deb";
       };
     }
     rec {
-      name = "libltdl7_2.4.2-1ubuntu1+srt4_i386";
-      sha256 = "1kjphpfqjr5zsa1z1zq4dibxwhm5861vardc3xic4izqf05vd6nj";
-      url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_i386.deb";
+      name = "libltdl7_2.4.2-1ubuntu1+srt5_i386";
+      sha256 = "1jv01xk4bf0sbq8jawa0zm1q0imc7nmzdwcmkhgscld02rzwwffs";
+      url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libltdl7.deb";
       };
     }
     rec {
-      name = "libmikmod2_3.1.12-2+srt4_i386";
-      sha256 = "1rm18888n955wgh75srgrfhm0zgxz0n5sr030zc4lpp3bx4x2pfd";
-      url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_i386.deb";
+      name = "libmikmod2_3.1.12-2+srt5_i386";
+      sha256 = "12dmbmkv3gmi1cz0bs3fsbhgnhzvf8cjp0b6zj2a2dgplw1h6qdr";
+      url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libmikmod2.deb";
       };
     }
     rec {
-      name = "libncurses5_5.9-4+srt4_i386";
-      sha256 = "1lc9s9rapyq6ld0xzlagqi5ah07gh59lixg0sh4xxm4sz75z6h21";
-      url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_i386.deb";
+      name = "libncurses5_5.9-4+srt5_i386";
+      sha256 = "1jsi7qvwy4h1z1mf9qlhp5pizbn84qgnpgi2y1qjlgym8428k0ga";
+      url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libncurses5.deb";
       };
     }
     rec {
-      name = "libncursesw5_5.9-4+srt4_i386";
-      sha256 = "1j5r17ph0z43npv4nh5xgz0fdw9magas5ryr6qpi2pcqf5x9pp9r";
-      url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_i386.deb";
+      name = "libncursesw5_5.9-4+srt5_i386";
+      sha256 = "17hfrf97qcrw1n7p4nwwwiw3jpqpjphqwnq73pb7p8bsp53qa4h4";
+      url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libncursesw5.deb";
       };
     }
     rec {
-      name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386";
-      sha256 = "1jr5nysd947lvk39ki1lx1y8csyaw10vlm9db7djrn20b1a6dsns";
-      url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb";
+      name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386";
+      sha256 = "0vsd00x0wvqw84zqlqrbmdxfmzshrvwbr2az3ynkaz8azkxj1d6d";
+      url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libnm-glib4.deb";
       };
     }
     rec {
-      name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386";
-      sha256 = "01gf2wf722mc28hyfh3g45p2qq0v04nrhkhz96xd8mwa7jdx0cb9";
-      url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb";
+      name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386";
+      sha256 = "1vaqqgxzvixvh8cvdspyr7azfn8dmknvsypz628h2xvbldf0p156";
+      url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libnm-util2.deb";
       };
     }
     rec {
-      name = "libnotify4_0.7.5-1+srt4_i386";
-      sha256 = "00nfvgckkdfal6qfbj4hcp5jc0rs57ksl48ciy87v46inxgp67z5";
-      url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_i386.deb";
+      name = "libnotify4_0.7.5-1+srt5_i386";
+      sha256 = "0420awfss4r2j8ncrvnapdj9gbh68z7qlp1vbq9wiaqraqy7zccw";
+      url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libnotify4.deb";
       };
     }
     rec {
-      name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386";
-      sha256 = "00di7dw9a124ahc04m1rs8w3mdx1kpjhf696zvgxprn8qrwwp84n";
-      url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386.deb";
+      name = "libnspr4_4.12-0ubuntu0.12.04.1+srt2_i386";
+      sha256 = "1kfs3afaqrfhajbp6dlwzcbzvl8xsg2c04c6b5l1bby1l4ynmqv2";
+      url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libnspr4.deb";
       };
     }
     rec {
-      name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386";
-      sha256 = "1n46ln69sny735q75sn8g7sp23ahdav277bp0d0bl62k11xa3fnm";
-      url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386.deb";
+      name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt1_i386";
+      sha256 = "00m55f14ih9xyri197hnslw2mnzgl0dxwqvwiba0hnhfl3qvqi99";
+      url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libnss3.deb";
       };
     }
     rec {
-      name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386";
-      sha256 = "0bnsrk44pwzwjs7yw44kzbr5b10kq3jsvrskzxxr2sv12ljhxmrj";
-      url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libogg0.deb";
       };
     }
     rec {
-      name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386";
-      sha256 = "18g56z1s8yyxhklqmpy6l22zcbzkvws26v6b1xgg4w3k33hbcjng";
-      url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386.deb";
+      name = "libopenal1_1.16.0-3+srt1_i386";
+      sha256 = "1barqvh4klpdabc1v9kb2q4l8pnmdx97h00hln32zca5z4y5ff9i";
+      url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libopenal1.deb";
       };
     }
     rec {
-      name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386";
-      sha256 = "0yfqakir28jnn873xxqdickf54mnlpp25946fi1malvxadjcqjll";
-      url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386.deb";
+      name = "liborc-0.4-0_0.4.16-1ubuntu2+srt5_i386";
+      sha256 = "0n9fkxs3qkd4mwhm4cwlnljww1yalwqjcgia420ls3h7i4p7ss4v";
+      url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "liborc-0.4-0.deb";
       };
     }
     rec {
-      name = "libp11-kit0_0.12-2ubuntu1+srt4_i386";
-      sha256 = "1f97dfd0z1fzk1l4zphdabxq7q02pdql03ifc265chzq4zpaghbh";
-      url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_i386.deb";
+      name = "libp11-kit0_0.12-2ubuntu1+srt5_i386";
+      sha256 = "1nfcccnsn7x44wqwgkz0h9b3hzy3a0cknc51syniabsqds5w2i8p";
+      url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libp11-kit0.deb";
       };
     }
     rec {
-      name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386";
-      sha256 = "0xda2k934wpfq01lrc9yw6fy6bispnfyyp5k0iszzh8awfjghrjj";
-      url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386.deb";
+      name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_i386";
+      sha256 = "0w6m9ycpmlir2wvb7jj0w1p6sh84bjng9i0549bn0afq58f05biw";
+      url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libpango1.0-0.deb";
       };
     }
     rec {
-      name = "libpci3_3.1.8-2ubuntu5+srt4_i386";
-      sha256 = "1zi4g80r8cgy4zawdddfkklp6q98xm3qlad1a27rfw6zlg66a028";
-      url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_i386.deb";
+      name = "libpci3_3.1.8-2ubuntu6+srt1_i386";
+      sha256 = "1jdakz038hxpkfh0g10acwlaaiqys7c546srdjhmhl9jxizw9ck8";
+      url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libpci3.deb";
       };
     }
     rec {
-      name = "libpcre3_8.12-4+srt4_i386";
-      sha256 = "1v1jj9vwsd6k0f6l9a72pbx3idlnjs32zxd1gci2fanma7fsp4vj";
-      url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_i386.deb";
+      name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_i386";
+      sha256 = "12ycdj8pwxlhhqbg89h6smgvnik2pvy6bqyx9szqmpdcjzddagp5";
+      url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libpcre3.deb";
       };
     }
     rec {
-      name = "libpcrecpp0_8.12-4+srt4_i386";
-      sha256 = "01qklrzg9mprb45mn0bj9r5p5d3lmrz0mhiqwjxg07w533gycyr6";
-      url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_i386.deb";
+      name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_i386";
+      sha256 = "0ml6bh7banikn75hzy68s2yx6y6924if4zar10lra1akl63by80l";
+      url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libpcrecpp0.deb";
       };
     }
     rec {
-      name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386";
-      sha256 = "004abdax9r66z0a359rik8dqc9bsx177m8z5ygjsh40yv7fjgc9g";
-      url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386.deb";
+      name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_i386";
+      sha256 = "06ch7dsjmjx2c67f932930rawn1cil6vxfnc0xcx937iwd3sq8i7";
+      url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libpixman-1-0.deb";
       };
     }
     rec {
-      name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_i386";
-      sha256 = "0ahap0mzqdl51ia615j09yaawi36khv9bj9z5bd0wspfyjls0a74";
-      url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_i386.deb";
+      name = "libpng12-0_1.2.46-3ubuntu4.2+srt2_i386";
+      sha256 = "0vv10bzxqxnfmp1p4wl9c19kravqa7pcpcc6xar5przgwfv75fd8";
+      url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libpng12-0.deb";
       };
     }
     rec {
-      name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386";
-      sha256 = "1gwsfmr80r59y7ic21shbflf505wl0izsm1mvld3yif80vfz4hdn";
-      url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386.deb";
+      name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_i386";
+      sha256 = "0frhw8cw2ima5j40grmdk0hjf6hg6b029wr3f2g2252wzbhzx6ac";
+      url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libpulse0.deb";
       };
     }
     rec {
-      name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
-      sha256 = "0lfzgjyp4gxs6ns3v0xx82gpr784b7rwnhh37njq9zmhaq7mxpn6";
-      url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
+      name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386";
+      sha256 = "1284xglgq9j0dqrgggs6455p0qidq5dxd7axgvi22zhzq3h5adfd";
+      url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libroken18-heimdal.deb";
       };
     }
     rec {
-      name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386";
-      sha256 = "0x6dkzfc9bdcjr0sq6dl0vk0sjjm9pwp4hb2m8wjynykpinbzbxi";
-      url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386.deb";
+      name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt5_i386";
+      sha256 = "04wg1b9i77hv87ra7xbhqzcx6m9xdpx72b6d7pxnkrxxxc8sp35d";
+      url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "librtmp0.deb";
       };
     }
     rec {
-      name = "libsamplerate0_0.1.8-4+srt4_i386";
-      sha256 = "10dm5k8c6f8q6vgk0ab52kvikbrgiflbmkflbix42rm5l44bz8hd";
-      url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_i386.deb";
+      name = "libsamplerate0_0.1.8-4+srt5_i386";
+      sha256 = "070cz870znj9584a9y9npp7zzkkcb049ar2g6m3v1dzf8ijha38x";
+      url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsamplerate0.deb";
       };
     }
     rec {
-      name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386";
-      sha256 = "19pkr848bjg2zg43z2l5npx97ydx4jgf7c5n33ckj6wbgxvzbn1s";
-      url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386.deb";
+      name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_i386";
+      sha256 = "10hnrhzfxbg2ka3wlhbvg1qd15k5vdbpfxhdi3ip6yynr00zb9zs";
+      url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsasl2-2.deb";
       };
     }
     rec {
-      name = "libsdl-image1.2_1.2.10-3+srt4_i386";
-      sha256 = "1d3m36a58iwpykc442axj4bd6s4h7f9qq269qfv07i6cyfp2j87l";
-      url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_i386.deb";
+      name = "libsdl-image1.2_1.2.10-3+srt5_i386";
+      sha256 = "0iam5axnl4is7avn37jc95c3qxb5zacl5kl2zg5mbnm4wgcywr08";
+      url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl-image1.2.deb";
       };
     }
     rec {
-      name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386";
-      sha256 = "0wij7i9d5g9bbjq4xrvrbzqcsdpjn6dhj1pjn997lpgxsfwyl0nd";
-      url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386.deb";
+      name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_i386";
+      sha256 = "1zv4iq7743y2g0zmycq1aj48s06lcmv60f0xig5s9zj8kj5nbg36";
+      url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl-mixer1.2.deb";
       };
     }
     rec {
-      name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386";
-      sha256 = "1ih95dgbaksgj12x6p7528hywm4zqalv0zyg7k5mp3yfgdxi37xr";
-      url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386.deb";
+      name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_i386";
+      sha256 = "15rbl3zbmg053ach4d25c988m3kj4gjndj5bz1v1spv46798lya8";
+      url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl-ttf2.0-0.deb";
       };
     }
     rec {
-      name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386";
-      sha256 = "1qsmhdzs2rr13vgagma0yn39x4njx2gixw82l3zmp6b0rp8x0ff9";
-      url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386.deb";
+      name = "libsdl1.2debian_1.2.15-5+steamrt1+srt5_i386";
+      sha256 = "1da6gg64n9x86ldxns4dfnixxa4sc6bci34sgy08fa3r05aqh84a";
+      url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl1.2debian.deb";
       };
     }
     rec {
-      name = "libsdl2_2.0.4+steamrt2+srt1_i386";
-      sha256 = "1xxj20q6kv4n8g1d1f5pbg1qaqdaq4nigqi2sq4lzmnvzkm8nj91";
-      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_i386.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2.deb";
       };
     }
     rec {
-      name = "libsdl2-image_2.0.1+steamrt2+srt1_i386";
-      sha256 = "0s7gyc3d0acddzipc4pc89k5cdyjl8ik7pk1znrq0292rnmnwbk4";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_i386.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2-image.deb";
       };
     }
     rec {
-      name = "libsdl2-mixer_2.0.1+steamrt1+srt1_i386";
-      sha256 = "0hqqxqnh8pyvaqhb9rhk20qnf4plrmh3w0n80sfzcn1vjrdcg8mr";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_i386.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2-mixer.deb";
       };
     }
     rec {
-      name = "libsdl2-net_2.0.1+srt1_i386";
-      sha256 = "14cn8v8bnllkbj88qy2chlj44m4qrdd6h1x705plwy10qma18iln";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_i386.deb";
+      name = "libsdl2-net_2.0.1+srt2_i386";
+      sha256 = "0fk45d366021s31b8vlry93crm1c30fqiq2r4a4yvp9gkhlkww4a";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2-net.deb";
       };
     }
     rec {
-      name = "libsdl2-ttf_2.0.14+srt1_i386";
-      sha256 = "06r8vsji64dcswd7mwy9yyacp6pkza8lsa3dwz07yqyb49md9xrv";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_i386.deb";
+      name = "libsdl2-ttf_2.0.14+srt2_i386";
+      sha256 = "0v9myv9d04h5rs9x216qjg2lf6pwnngsbyylzc0fs5rlzshwdk9s";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsdl2-ttf.deb";
       };
     }
     rec {
-      name = "libselinux1_2.1.0-4.1ubuntu1+srt4_i386";
-      sha256 = "19vfb4zlpv25x5428zfm5mkwqgdc229mc3saq32pas3b2faxfan7";
-      url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_i386.deb";
+      name = "libselinux1_2.1.0-4.1ubuntu1+srt5_i386";
+      sha256 = "0s5x224hx0q6j49pvb3bflzyzzi4ryl60sx6sf7y6wi7kplvibvg";
+      url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libselinux1.deb";
       };
     }
     rec {
-      name = "libsm6_1.2.0-2build1+srt4_i386";
-      sha256 = "0c1rca5w1m1cqi2a5g9k7zpvkvky6da9hkfg1ar5c8xw4ilw304j";
-      url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_i386.deb";
+      name = "libsm6_1.2.0-2build1+srt5_i386";
+      sha256 = "07vrs3rarjah3q06yfqqpb38j67s7dv2p30izhjzps7xxj2qfw6d";
+      url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsm6.deb";
       };
     }
     rec {
-      name = "libsndfile1_1.0.25-4+srt4_i386";
-      sha256 = "0pbb7yv86am1x1fd2s15s7ybyz3q1xjlxij8in9dal1bkpj6yhsj";
-      url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_i386.deb";
+      name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_i386";
+      sha256 = "0y4hlf67cdlgcfsw03sjsvm2vch8gsasid58y77rzix43saay229";
+      url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsndfile1.deb";
       };
     }
     rec {
-      name = "libspeex1_1.2~rc1-3ubuntu2+srt4_i386";
-      sha256 = "1n2146dh1famhl58i1s4cdp0gyfz89w8vj5msh8hsdjjr8csa83s";
-      url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_i386.deb";
+      name = "libspeex1_1.2~rc1-3ubuntu2+srt5_i386";
+      sha256 = "0d662dxr5dh6dvnz49pii1mqd8k2xk0jaw07sgl7nnd01926xa9p";
+      url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libspeex1.deb";
       };
     }
     rec {
-      name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386";
-      sha256 = "0gk0b28d9f7zya9vbmg1kj5xm3k3339ky2n16id3w6aks7lc5y8w";
-      url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386.deb";
+      name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt5_i386";
+      sha256 = "1924dczm2sxlfn9ibmp7yvn0chd3y201zhw0a6dv65fwngmzk725";
+      url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libspeexdsp1.deb";
       };
     }
     rec {
-      name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386";
-      sha256 = "160pzj7hmqm5hkixj002q81gcqybkv7xn8z8746dw7h90cvlyvrh";
-      url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386.deb";
+      name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt2_i386";
+      sha256 = "05cihfj3ap1xwpnlmvl3wdbqrbbm6ic10zbja98c429xxx7y8bgv";
+      url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libsqlite3-0.deb";
       };
     }
     rec {
-      name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386";
-      sha256 = "142c6vwq852mra2i2jp802wfsprd5jia80xn09ms0rxxa1aa7xsk";
-      url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386.deb";
+      name = "libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_i386";
+      sha256 = "06gc6qpm51jx0x1imf5nccc3r9x2d41xvfi0wl3p9wvrx6nsna7d";
+      url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libssl1.0.0.deb";
       };
     }
     rec {
-      name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386";
-      sha256 = "187nknssd0x7r0qsw71f3d06pvwbkqanajah4f7a01xk3hc8cxh1";
-      url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb";
+      name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_i386";
+      sha256 = "13kvxng82xz171y3q0i12bvy8z77cqk6s088bjil4b5fq81aaxns";
+      url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libstdc++6.deb";
       };
     }
     rec {
-      name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386";
-      sha256 = "1j2wsczzlh5jpqyr8k6j72107kmhxa3hdiqm0s648i0fyrks54wp";
-      url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386.deb";
+      name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_i386";
+      sha256 = "1xh0hvgw6rrg6k1fbpblxvfdaslwkjlqbgaqjkavkkvl0xmk5k4b";
+      url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libstdc++6-4.6-pic.deb";
       };
     }
     rec {
-      name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386";
-      sha256 = "0x3xbbzf643mia8cx9py8vrn9d8c5njxh7x233ylmh8lybac9z5x";
-      url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
+      name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386";
+      sha256 = "1cj7zfhxrb6mvsd8np6q1s1wja2rdd85h2cs9b2pbnlffbr0b9ad";
+      url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libswscale2.deb";
       };
     }
     rec {
-      name = "libtasn1-3_2.10-1ubuntu1.4+srt1_i386";
-      sha256 = "050w4qc87h9kvniknk62jxpx2i40pl8djbmzbhj2w2lmjbzr7g83";
-      url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_i386.deb";
+      name = "libtasn1-3_2.10-1ubuntu1.5+srt2_i386";
+      sha256 = "12lfinrk76laq7hiddsvi0gskyfgrf7nk2kflqryxwrpf1y34bcl";
+      url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libtasn1-3.deb";
       };
     }
     rec {
-      name = "libtbb2_4.0+r233-1+srt4_i386";
-      sha256 = "1ava8m0iv62cb1gi28l486nibd981lsnjbx08b7cg7dd8hjw5lnj";
-      url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_i386.deb";
+      name = "libtbb2_4.0+r233-1+steamrt2+srt1_i386";
+      sha256 = "0ap5ar8v4ljv138p6kga1vzy96v5ilicxsk8lhp1scvcrcaqfppz";
+      url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libtbb2.deb";
       };
     }
     rec {
-      name = "libtdb1_1.2.9-4+srt4_i386";
-      sha256 = "17q687bsc7v2jkcvp1y85mnzdq8kdxwlvxib0h5i6v6qvwrj01hn";
-      url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_i386.deb";
+      name = "libtdb1_1.2.9-4+srt5_i386";
+      sha256 = "0snf08x6fsjqxs2gzfa7sdxbznq7h347ndawmras84zi0g0bgj6q";
+      url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libtdb1.deb";
       };
     }
     rec {
-      name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386";
-      sha256 = "0viaqm59q9qbj23s5b4s4mq99imyfv799b6ph78cz2yi6l94qvqx";
-      url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386.deb";
+      name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_i386";
+      sha256 = "1jjbd6yyyw5v5wnvsdc3s4gywm9q0mq32n2dr444qs030nkfvcrp";
+      url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libtheora0.deb";
       };
     }
     rec {
-      name = "libtiff4_3.9.5-2ubuntu1.8+srt1_i386";
-      sha256 = "1zyggf4hp7xxd7jn2rahg27vxk1pxpwcvjlrmc3lnp4d2krnf0pq";
-      url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_i386.deb";
+      name = "libtiff4_3.9.5-2ubuntu1.9+srt2_i386";
+      sha256 = "0law24ini5ailgykff6blxqfj6zz0lfx5a2s5fzgf06s4j1n2cjv";
+      url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libtiff4.deb";
       };
     }
     rec {
-      name = "libtinfo5_5.9-4+srt4_i386";
-      sha256 = "0iy5lalmyr9lv8vm7mc5zdis70ir3x82aav798s4dvwmhzw7a45a";
-      url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_i386.deb";
+      name = "libtinfo5_5.9-4+srt5_i386";
+      sha256 = "1476jzkd5mcipafc8cfb03z9yzkxvdxnfc0qa34xq5rbjwcximmd";
+      url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libtinfo5.deb";
       };
     }
     rec {
-      name = "libudev0_175-0ubuntu9.2+srt4_i386";
-      sha256 = "1wxkfv34nqch3zi4hyshmwbg9s33q7inlz8zl396p22m1q5m5sfx";
-      url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_i386.deb";
+      name = "libudev0_175-0ubuntu9.10+srt1_i386";
+      sha256 = "089z7vv229w6gnnzwwagixxwn2qcl8gfim1zbagg266vlwqvcyka";
+      url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libudev0.deb";
       };
     }
     rec {
-      name = "libusb-1.0-0_1.0.19-1+srt1_i386";
-      sha256 = "0mmn9l99i595l4fd446jjyh301airh17wbc4wfiigsmz4b4mylb0";
-      url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_i386.deb";
+      name = "libusb-1.0-0_1.0.19-1+srt2_i386";
+      sha256 = "1rjnir1gm768xhn4lqb4rdai6wabdfysnlzb47qxxzshpfphycmh";
+      url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libusb-1.0-0.deb";
       };
     }
     rec {
-      name = "libuuid1_2.20.1-1ubuntu3+srt4_i386";
-      sha256 = "1hcrpngalirqbzqfn209akkizqnm4qpkhp42mcys78xx0i0p5kxr";
-      url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_i386.deb";
+      name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_i386";
+      sha256 = "1hi8gq8jws689pacx8m0pzjfhrswh8jng39m7vnx2clj7xzfsk5b";
+      url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libuuid1.deb";
       };
     }
     rec {
-      name = "libva-glx1_1.3.1-3+steamrt4+srt1_i386";
-      sha256 = "0g7vra6wlgrvpn1cqx1xnckfxn7r2lzh8bk2gs32cdxc4qy7w22r";
-      url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_i386.deb";
+      name = "libva-glx1_1.7.0-1+steamos1+srt1_i386";
+      sha256 = "1q1aasyqlllhj0jhkf7mfcs4n83kj7yddxlsldl77v5x2rhn6ksx";
+      url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libva-glx1.deb";
       };
     }
     rec {
-      name = "libva-x11-1_1.3.1-3+steamrt4+srt1_i386";
-      sha256 = "0m5p4ciafgdvm4a29z07bcy8gx5n9vr634bwg1x2fj8z5w1y2bnx";
-      url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_i386.deb";
+      name = "libva-x11-1_1.7.0-1+steamos1+srt1_i386";
+      sha256 = "1pk78g722w8j2zl0hij59p4v3j70am167mdd7f58d179j34v7y8p";
+      url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libva-x11-1.deb";
       };
     }
     rec {
-      name = "libva1_1.3.1-3+steamrt4+srt1_i386";
-      sha256 = "1k44nikbgll3zh94p0zgnajjwkaxc0lzc1ss24frq1pzj76jgg54";
-      url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_i386.deb";
+      name = "libva1_1.7.0-1+steamos1+srt1_i386";
+      sha256 = "17rlsh8sv8qymd17c8k1mlk5gb8fkjlgi2swxiaqnyzw40k52bi5";
+      url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libva1.deb";
       };
     }
     rec {
-      name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_i386";
-      sha256 = "0yya462g7ar6k54bb8aw9qw6zcnzqlzrqjni9w77pm5vbiy1r0yp";
-      url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_i386.deb";
+      name = "libvdpau1_0.4.1-3ubuntu1.2+srt2_i386";
+      sha256 = "1qa6bssw4rnyjxw79pfpbhhlwzkxcxg2cx5i8lns5sxg072as5sj";
+      url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libvdpau1.deb";
       };
     }
     rec {
-      name = "libvorbis0a_1.3.2-1ubuntu3+srt4_i386";
-      sha256 = "0s2m9sa8gyqk56icsb8y65fhfnmbay56a8gy8znz690l8aq6fcvl";
-      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_i386.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libvorbis0a.deb";
       };
     }
     rec {
-      name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_i386";
-      sha256 = "1848325zzklbdc03a738jvs0jpgypjd11sw80qv47i73zmc0wnfz";
-      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_i386.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libvorbisenc2.deb";
       };
     }
     rec {
-      name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_i386";
-      sha256 = "0p63wgif2h9q6pd61mfpl63qa1m12344d5nkrd6daq47hmldfibw";
-      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_i386.deb";
+      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";
       source = fetchurl {
         inherit url sha256;
         name = "libvorbisfile3.deb";
       };
     }
     rec {
-      name = "libvpx1_1.0.0-1+srt4_i386";
-      sha256 = "1dkpqaaclks24kw4wdbzfnkdbsf4yz3j8ygfl6w0y3w2sxwcxldl";
-      url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_i386.deb";
+      name = "libvpx1_1.0.0-2+srt1_i386";
+      sha256 = "08yngwr92m787ycpsc798kgpyw6ixks55kmqmadjp8zx43pjzaai";
+      url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libvpx1.deb";
       };
     }
     rec {
-      name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386";
-      sha256 = "1fir2kw66z14pfs6zqa5i620c9rli075dk9mj9802d723hr78ylh";
-      url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386.deb";
+      name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_i386";
+      sha256 = "0g9f3nk2bq8knqqs6qplw39p729zxqnxyyhipnziqy8h38bilj86";
+      url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libvulkan1.deb";
       };
     }
     rec {
-      name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
-      sha256 = "06vhdm7d6h7cihk97v5bf2b8mb5z1ncca1yfahcxmgykm0amq89w";
-      url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
+      name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386";
+      sha256 = "1xzj4q5wk1pjflqqd85cx1788sd89fjdjgwv4qlwyn76magxi7kh";
+      url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libwind0-heimdal.deb";
       };
     }
     rec {
-      name = "libwrap0_7.6.q-21+srt4_i386";
-      sha256 = "07qszw3j351x9vwz5q6qvzanp291xn27zif1ir5khdwidr5lb58b";
-      url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_i386.deb";
+      name = "libwrap0_7.6.q-21+srt5_i386";
+      sha256 = "1lhp9v9cpi5dgk0wdrivr50b0g3l4fy8cjgnjai25hb65w2hj33n";
+      url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libwrap0.deb";
       };
     }
     rec {
-      name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386";
-      sha256 = "0wsr47fjfvjxz0ks07va0mqs8d6b8prll5512hvivj6hf6x8cngm";
-      url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb";
+      name = "libx11-6_1.6.3-1ubuntu2.1+srt1_i386";
+      sha256 = "0mvg378ja1znf6qf5228bmijrznhhzw3r7lxizk9iwhz5pm6h2pm";
+      url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libx11-6.deb";
       };
     }
     rec {
-      name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all";
-      sha256 = "17mygha6q5480ajgv1f4wmgwr3l3zxh92yagh4qfsm6r1j2a5dma";
-      url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb";
+      name = "libx11-data_1.6.3-1ubuntu2.1+srt1_all";
+      sha256 = "1imsbk4mg6n1083gjjv6kssm5g842xlbg40vsc4dw97myxycpncw";
+      url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.6.3-1ubuntu2.1+srt1_all.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libx11-data.deb";
       };
     }
     rec {
-      name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386";
-      sha256 = "11fhyqvfbs0jf71cnmld09q23abvnrzgp20zabrvi2r5vk0ai6f9";
-      url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb";
+      name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt1_i386";
+      sha256 = "0vpnnsa4ayvin11c9gl5c8bbaplz1z6pm28k0fhfhla5ggq1kd46";
+      url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libx11-xcb1.deb";
       };
     }
     rec {
-      name = "libxau6_1.0.6-4+srt4_i386";
-      sha256 = "0pw507i7nfr1zqjf8ysjzqgml053bwlac2jxv78b2rp3l3xky4sp";
-      url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_i386.deb";
+      name = "libxau6_1.0.6-4+srt5_i386";
+      sha256 = "1q5qryha5ng0cjcalz5qxd38djxd5n7kb2fnz9mnp4cy2vk5jhmq";
+      url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxau6.deb";
       };
     }
     rec {
-      name = "libxaw7_1.0.9-3ubuntu1+srt4_i386";
-      sha256 = "172kg32mck6v60cy7bxb3wpmhn09jay6lg0mghb65f57bkqb539v";
-      url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_i386.deb";
+      name = "libxaw7_1.0.9-3ubuntu1+srt5_i386";
+      sha256 = "17085yj7x9hncbgxw5jsi4inn17f6wzdx2akzv9v3l6hvhy8kmkl";
+      url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxaw7.deb";
       };
     }
     rec {
-      name = "libxcb-composite0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "0m28k3pwgscxzbp4vhrncv12l0940s22qc8lrgzb0vi5ha4vb1zk";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "00zfy06nf78gs7ji222lcy1cwzsqfbng9119cgkw5c1z25x0q6a5";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-composite0.deb";
       };
     }
     rec {
-      name = "libxcb-damage0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "0z180s301vq0bpnv18hqad3n5hsipv6svjgiwacq9c4srryn22af";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "09y48s64kp0maldv9bwwpj8ahrssvrik8xmqzjgvxcxpblb1zfb7";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-damage0.deb";
       };
     }
     rec {
-      name = "libxcb-doc_1.10-2ubuntu1+srt4_all";
-      sha256 = "0zq3xcrlr2wjp3386bf5h1z63hapmkpnw45l1fz17chdngcmj358";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb";
+      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.10-2ubuntu1+srt4_i386";
-      sha256 = "1k66jz8ms3mwbmkfdg9xb9wn77igwrkhjrvg6lw847c2f5rrxwp7";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "085b0qhf15kaw9msmsk8jxp4rk7fym506jmiaqxh1i6wgr66ys86";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-dpms0.deb";
       };
     }
     rec {
-      name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "00r0pcda8hc7sq1nj93621p55743dys424fi3n26hdmdky9j0rks";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "1nwdr550axxca7p438c3g9jb4y2zf8gxyd3756vav4jp1n57i1rq";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-dri2-0.deb";
       };
     }
     rec {
-      name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "0lgg6b8sxd6s22vn7vwiyb9vz39v124y9w74g6krxqmfvbkfva2x";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "1vjklblpkdrki48dn890920nx8gcj25sxqp24qkpxja8samvl6gr";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-dri3-0.deb";
       };
     }
     rec {
-      name = "libxcb-glx0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "142f73f4mkvad2l238kyf0xl4kwzgcpcww33ah3rx4qjz7q3ails";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "0zwc8c896bka6wi5jri78q1pq5ppsi5dwih9rwfl5c96p6r4lbr6";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-glx0.deb";
       };
     }
     rec {
-      name = "libxcb-present0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "0rlnxwazwrp7kpgh6d6dbfzk5cjvlqp31qxgifd4b8fryjnan91f";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "0cd4jsyj1r6b7nm8g6342f8dafghzd1dc0k61iw3qncwx949j3gy";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-present0.deb";
       };
     }
     rec {
-      name = "libxcb-randr0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "0qg20vdidpbl6jar9w4n65jfmg907fkqrk2nwh6qj0l3xd90pm61";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "1vfrbkq1qqjp0278j70jcldls2g9rmkh9ifb6pnqznagqsrrhwy7";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-randr0.deb";
       };
     }
     rec {
-      name = "libxcb-record0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "1kyjdazkvykcg76yp3gyy2pgj07nwbjld7q0ci96q1zka3a3m4sz";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "0gy7l161idc59a6q8vhgq1krknwmd1cyh5ss2vhp7qznxwh9bd7j";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-record0.deb";
       };
     }
     rec {
-      name = "libxcb-render0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "1r77z60hz0bblg07szl6yir6ll697w0w1y37bd66wv9n4cdlijqd";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "0gl7389h5ppfd3p30v8vmwl4kxvsqjhmhazszs7mdgalfjwkf9rf";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-render0.deb";
       };
     }
     rec {
-      name = "libxcb-res0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "1xnnyczipj30kzkyrwngkra2m3xc8jchzd88a3afgy4m6cy6qyyy";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "1ca5lk12qncrfkjakjb7yl5f5x41b3ynn3d9wk6paqrchhfn7yir";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-res0.deb";
       };
     }
     rec {
-      name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "155m47mnjbn9b5p895syyfxk9pk1sh76qj614k554rf77nwdx8rq";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "0sz49j0z7zl2mx7cf6kw4ljzsbik92az35yj9i0426p1zaqzx0vs";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-screensaver0.deb";
       };
     }
     rec {
-      name = "libxcb-shape0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "0wm9mm8xyh70zdc7iz8j3y89n2c5yhd72kq68nbxqpnwrz3kyzcz";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "1mycsk8ixdn7c8c4ma4vbrilhcdjxqz92nzv9rwxf96vr0dj4bhd";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-shape0.deb";
       };
     }
     rec {
-      name = "libxcb-shm0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "0ifvwv0jq4crsgzfpbssa4p9r1jk7mck4wlpfq5j11aiijyw5fq6";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "1w0d53d8hgzr5ql9is7x4dap6ny6bfp041qa6hldmg8jbw3x8wc3";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-shm0.deb";
       };
     }
     rec {
-      name = "libxcb-sync1_1.10-2ubuntu1+srt4_i386";
-      sha256 = "0wsf356qiv9frxky8c503bb7nsksrgn9zii7h2yp7v5wsxpi20p5";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "1pd0pw5q7h28p0j6h4889dq7fpvkjwclsmg96m6sl7a3459cp6b0";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-sync1.deb";
       };
     }
     rec {
-      name = "libxcb-xevie0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "1qynissbyb4ihyyy61nhlm4nqsm5akyfkdfyw38id6qiyh1hnml9";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "0nf3s5jff5psab8mv9avkflgwfj2pmbrvc3pyy743b9cwzv7q85p";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xevie0.deb";
       };
     }
     rec {
-      name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "013mhdbavmaqvw99k52p45lzfri1fhyclg6hdzb3xgswzilq1wn4";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "149dgslf6hhngjjkhdvrsl3hjx3l2llvnwv6jgnc8hqvz7ck1i1h";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xf86dri0.deb";
       };
     }
     rec {
-      name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "0szrbzqjks1g77x572r3dvkv791k1c8lckcgk6a7wl4pygsksd3m";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "1rjynbvfxxzm5x07xxfq40qhs7b5pwassn1f7j02q3685swqmk0z";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xfixes0.deb";
       };
     }
     rec {
-      name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "0h01rmw1h93xd1vhz06v7ckjzy89ingi6c6b2sl6sxdd7ii9fkni";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "0m0v4c50104c2khx9vcsf3v3xyl031xv2yladxfp168gchrczyk9";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xinerama0.deb";
       };
     }
     rec {
-      name = "libxcb-xkb1_1.10-2ubuntu1+srt4_i386";
-      sha256 = "07yq1khdrisvgkpbvl39kq1f3kwaqxvyn6jfcib2lcg6w5cbk9n8";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "0d56vivs4ykanc1v3pbn9mzgcyw4ffx7c59ck1758g2vxfvi837w";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xkb1.deb";
       };
     }
     rec {
-      name = "libxcb-xprint0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "13dxk56nga9imkx07fb1s4fmgki0dnhcbb41pzr1r0ybxg6crnk9";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "0gclf7sgd661820bqqj3aabykxp0m38y3wd9m25znqgqqg5bk6im";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xprint0.deb";
       };
     }
     rec {
-      name = "libxcb-xtest0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "11ajwd0456dr4nwhkib31zwgk7xpyzir86pvjrgpydnh6yj3dic0";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "0swkpx39gd9n553qrc8dhdv4vvnan1byrkvy935zzimzxv8phxfm";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xtest0.deb";
       };
     }
     rec {
-      name = "libxcb-xv0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "0xkj414c0svlndqck1ghddc424a7mpxwaw44sdjw25iwsidzqi7i";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "0mi49k0xfk34x71ap4q9wy4p7cs31z25pg0p41yr859q4y49461r";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xv0.deb";
       };
     }
     rec {
-      name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_i386";
-      sha256 = "109bkl63vbsmhflqw3ivjdas96jamq5jjh67rf4lvpgxnlscxsgw";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "068y30y9ry4hlfc4dsza47z6lakfz2cy0zkdq5rn3nbs59d7f2nh";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb-xvmc0.deb";
       };
     }
     rec {
-      name = "libxcb1_1.10-2ubuntu1+srt4_i386";
-      sha256 = "1n3ppygmfjy4hwgi4lq2xlm1ldlp47g67ksafbs3zd06a7lyq2rb";
-      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_i386.deb";
+      name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt1_i386";
+      sha256 = "0sga5mjr5bk5w0mdq0y2hxfdhpfpzv9m9anfy2zkaw60gy6n0qk6";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcb1.deb";
       };
     }
     rec {
-      name = "libxcomposite1_0.4.3-2build1+srt4_i386";
-      sha256 = "1ga6g4mdz02p4m6l3q7fa8404243qhqfrvvcwinbm9hj8fyshliz";
-      url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_i386.deb";
+      name = "libxcomposite1_0.4.3-2build1+srt5_i386";
+      sha256 = "1c23iswcyi5axg5hql3kkfmcvxkzjl1db9klrlsqb2c0455pjlsf";
+      url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcomposite1.deb";
       };
     }
     rec {
-      name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_i386";
-      sha256 = "0nalkn0hql9v13b48685jrlcx607n5bn6gk5vmhbq0zpcs2ww709";
-      url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_i386.deb";
+      name = "libxcursor1_1.1.12-1ubuntu0.1+srt5_i386";
+      sha256 = "18321skl4h2s3izzaaw1jk2blfq93ygk4b2f2g4mnkipn1i9rybx";
+      url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxcursor1.deb";
       };
     }
     rec {
-      name = "libxdamage1_1.1.3-2build1+srt4_i386";
-      sha256 = "0qysvz8hwcra2kr8sd9iyk1x73wawfnhsq5yspjphq08kg2k5gmq";
-      url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_i386.deb";
+      name = "libxdamage1_1.1.3-2build1+srt5_i386";
+      sha256 = "01pam4srj0d3vyrrhlsnfkznpxgil3p674i0armxqfydzh4bww8q";
+      url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxdamage1.deb";
       };
     }
     rec {
-      name = "libxdmcp6_1.1.0-4+srt4_i386";
-      sha256 = "0hxixf0y2l3wc6flfg2gwlfc3fp40rg570lwkr0r6hwj1z0zwyf8";
-      url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_i386.deb";
+      name = "libxdmcp6_1.1.0-4+srt5_i386";
+      sha256 = "0vz6w11yld3ii0b3i68wwzx7qsgd64yj8709h32db08izc1a2wdh";
+      url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxdmcp6.deb";
       };
     }
     rec {
-      name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386";
-      sha256 = "0s6jc1zw6n2m3bmis62pr3mkzd64migzrj5wcl9hmq5yrnc46shs";
-      url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386.deb";
+      name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_i386";
+      sha256 = "11jjds6qk9wvx446rph5n2qsr9b36jlr99ayw98zr89b3y6y8lyf";
+      url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxext6.deb";
       };
     }
     rec {
-      name = "libxfixes3_5.0-4ubuntu4.4+srt1_i386";
-      sha256 = "0y5fb7nrnydlxbflhxqw065qz337m2i87sdn4730pd8y693sinyz";
-      url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_i386.deb";
+      name = "libxfixes3_5.0-4ubuntu4.4+srt2_i386";
+      sha256 = "19rm8s1dq7vysijlksbac04045x5j4g30s377im4ydljjh2vajh6";
+      url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxfixes3.deb";
       };
     }
     rec {
-      name = "libxft2_2.2.0-3ubuntu2+srt4_i386";
-      sha256 = "087wclc31napmxc7l09gc73dgjczdkcyrld6zdcq6jq8jm1aq4vk";
-      url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_i386.deb";
+      name = "libxft2_2.2.0-3ubuntu2+srt5_i386";
+      sha256 = "0pcd8bvdlh41bixbdkrl0sm6libgns7ndjzyvj86s3qks7k11g97";
+      url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxft2.deb";
       };
     }
     rec {
-      name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386";
-      sha256 = "0zx652d5gr6dvviwpn5v0mhd9812pcha7xs9z7il3s01d75qcysk";
-      url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386.deb";
+      name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt2_i386";
+      sha256 = "0pykpahh9j7cp91mbkqw22drl5npq3pbd712chbrmkdjdqm14x9p";
+      url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxi6.deb";
       };
     }
     rec {
-      name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_i386";
-      sha256 = "16dci5p6amsj1d474ih3avpjc1kc406wz6ywb9f6m44qrnm96w9m";
-      url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_i386.deb";
+      name = "libxinerama1_1.1.1-3ubuntu0.1+srt5_i386";
+      sha256 = "0xd0rfr6h25s3h6n8in5kby4fm88s1ykw2y8clymk79znmgby0av";
+      url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxinerama1.deb";
       };
     }
     rec {
-      name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386";
-      sha256 = "0gld5pbh1qh93nafvw6fx319av0hpfxp54pg3w4svi1cg7hj9rk2";
-      url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386.deb";
+      name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_i386";
+      sha256 = "1ss7fpdqdgm8hmcgm1d59x5mfr4n7zps8bjg1304nn29a3cck26z";
+      url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxml2.deb";
       };
     }
     rec {
-      name = "libxmu6_1.1.0-3+srt4_i386";
-      sha256 = "0vvxp9fr2rykqny2r1qz6h5vqw26zv5lkh9nyw8jvrv9gx01rma0";
-      url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_i386.deb";
+      name = "libxmu6_1.1.0-3+srt5_i386";
+      sha256 = "0z39zacqis2cq1gdwam1wk5xmisdhsrly7r1a8g5h8h6hbrri72w";
+      url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxmu6.deb";
       };
     }
     rec {
-      name = "libxpm4_3.5.9-4+srt4_i386";
-      sha256 = "0s7pxkhfx84axldwpznv1wj9z05zm90fpp11702lm3qic6829sk1";
-      url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_i386.deb";
+      name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_i386";
+      sha256 = "02k70n6v245l0kqf7gjjv4bm12zmxcw8cayjv9xh8cp6svsxdzsq";
+      url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxpm4.deb";
       };
     }
     rec {
-      name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_i386";
-      sha256 = "08392ac5sqsdq4r4p8n88c3d2nn0078y510grdrxp9z006f89846";
-      url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_i386.deb";
+      name = "libxrandr2_1.5.0-1+srt1_i386";
+      sha256 = "10nqrxs2dxs06wah8dy48v7v8vdllpg9wwhcn67i7dkgfli27ykj";
+      url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxrandr2.deb";
       };
     }
     rec {
-      name = "libxrender1_0.9.6-2ubuntu0.2+srt1_i386";
-      sha256 = "08dj2kx2kr50jxcyfdj9y9gajkz1lnm6jn9z2pvqf43hzfa4pmp2";
-      url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_i386.deb";
+      name = "libxrender1_0.9.6-2ubuntu0.2+srt2_i386";
+      sha256 = "0i48bi4zfv90dgc190mr8wd8hymbhdldrk1q2qag0l9fmn5hkwqv";
+      url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxrender1.deb";
       };
     }
     rec {
-      name = "libxss1_1.2.1-2+srt4_i386";
-      sha256 = "1zf5ifqq8s6xr3iiwhjk3g2ifrb9srwanffsdjab28jzfpsb4a9h";
-      url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_i386.deb";
+      name = "libxss1_1.2.1-2+srt5_i386";
+      sha256 = "015n1l1hl4vvgb53zx6gisl44p2pjj339adabqlfy1fqwjf0ff4z";
+      url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxss1.deb";
       };
     }
     rec {
-      name = "libxt6_1.1.1-2ubuntu0.1+srt4_i386";
-      sha256 = "1f01dzslhcm0r89p6wzs1pv32gaqxhxs3jim4jbzrkv18d4pyyc6";
-      url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_i386.deb";
+      name = "libxt6_1.1.1-2ubuntu0.1+srt5_i386";
+      sha256 = "0yqb6j6rh9y65bfbqv1hrggl1719lsm6yzydbmpnilz15p3f4sa9";
+      url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxt6.deb";
       };
     }
     rec {
-      name = "libxtst6_1.2.0-4ubuntu0.1+srt4_i386";
-      sha256 = "0w64xxfakharkmh0w9y6pg5446a7zypqhs3wgj6dbsa7clly8ir8";
-      url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_i386.deb";
+      name = "libxtst6_1.2.0-4ubuntu0.1+srt5_i386";
+      sha256 = "1h21nyc2bigm3brpzmdaafvry4wszmykbs13vagmibwhb6rls7xd";
+      url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxtst6.deb";
       };
     }
     rec {
-      name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386";
-      sha256 = "1xbxlzmhl8j64k2aayrmpdz9bxn7b6jirdk84qibwh96fna4gd2x";
-      url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386.deb";
+      name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt5_i386";
+      sha256 = "133xi181g1pcd08px9yz7wqz93axy0cq9x5y76qp34dj7i9pscsg";
+      url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libxxf86vm1.deb";
       };
     }
     rec {
-      name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386";
-      sha256 = "1m4r0mp1i44rlddjjrmmbqi1phg2ksdn5zb4bxjrf55m2zfkgkx3";
-      url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386.deb";
+      name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_i386";
+      sha256 = "0nvhk0xyi1cc12j2j97x763irk2d9l8n0p3fjyg7s3jgm4va3yjj";
+      url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "nvidia-cg-toolkit.deb";
       };
     }
     rec {
-      name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386";
-      sha256 = "162554nhfmpjyyf1pzc35gsbawz4f6n1bm4s8n0923g1hmafpf6g";
-      url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386.deb";
+      name = "zenity_3.4.0-0ubuntu4+steamrt2+srt5_i386";
+      sha256 = "04j0mbdcv8891apw3lak161fbvpyl8qykvqvn6ljl3mimf3qabcd";
+      url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt5_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "zenity.deb";
       };
     }
     rec {
-      name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386";
-      sha256 = "0gcw3qr6w418idwd69i12hjr90ixnab81d1p3wi7d0rwl1227ihv";
-      url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386.deb";
+      name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_i386";
+      sha256 = "1qbqclnhhwfxj5ajsb05c3pg5iq5imf4pl6yisx5hw5jndgmzch7";
+      url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "zlib1g.deb";
-- 
GitLab


From d81e10ab83d1539a624bfde2a420073706c3e5bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Oct 2018 12:21:54 +0200
Subject: [PATCH 0306/1065] LTS Haskell 12.14

---
 .../configuration-hackage2nix.yaml            | 81 ++++++++++---------
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 8b469e6c0f5..b5f5e1f3675 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.13
+  # LTS Haskell 12.14
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -78,7 +78,7 @@ default-package-overrides:
   - alarmclock ==0.5.0.2
   - alerts ==0.1.0.0
   - alex ==3.2.4
-  - alg ==0.2.7.0
+  - alg ==0.2.8.0
   - algebra ==4.3.1
   - algebraic-graphs ==0.2
   - Allure ==0.8.3.0
@@ -233,7 +233,7 @@ default-package-overrides:
   - base64-bytestring ==1.0.0.1
   - base64-bytestring-type ==1
   - base64-string ==0.2
-  - base-compat ==0.10.4
+  - base-compat ==0.10.5
   - base-compat-batteries ==0.10.1
   - basement ==0.0.8
   - base-orphans ==0.7
@@ -253,7 +253,7 @@ default-package-overrides:
   - bimap ==0.3.3
   - bimap-server ==0.1.0.1
   - binary-bits ==0.5
-  - binary-conduit ==1.3
+  - binary-conduit ==1.3.1
   - binary-ext ==2.0.4
   - binary-ieee754 ==0.1.0.0
   - binary-list ==1.1.1.2
@@ -335,7 +335,7 @@ default-package-overrides:
   - Cabal ==2.2.0.1
   - cabal2spec ==2.1.1
   - cabal-doctest ==1.0.6
-  - cabal-rpm ==0.12.5
+  - cabal-rpm ==0.12.6
   - cache ==0.1.1.1
   - cachix ==0.1.2
   - cachix-api ==0.1.0.2
@@ -404,7 +404,7 @@ default-package-overrides:
   - clr-marshal ==0.2.0.0
   - clumpiness ==0.17.0.0
   - ClustalParser ==1.2.3
-  - cmark-gfm ==0.1.5
+  - cmark-gfm ==0.1.6
   - cmdargs ==0.10.20
   - code-builder ==0.1.3
   - codec ==0.2.1
@@ -461,7 +461,7 @@ default-package-overrides:
   - contravariant ==1.4.1
   - contravariant-extras ==0.3.4
   - control-bool ==0.2.1
-  - control-dsl ==0.2.1.1
+  - control-dsl ==0.2.1.3
   - control-monad-free ==0.6.2
   - control-monad-omega ==0.3.1
   - convertible ==1.1.1.0
@@ -486,7 +486,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.13
+  - crypto-enigma ==0.0.2.14
   - cryptohash ==0.11.9
   - cryptohash-cryptoapi ==0.1.4
   - cryptohash-md5 ==0.11.100.1
@@ -576,7 +576,7 @@ default-package-overrides:
   - dhall ==1.15.1
   - dhall-bash ==1.0.15
   - dhall-json ==1.2.3
-  - dhall-text ==1.0.12
+  - dhall-text ==1.0.13
   - di ==1.0.1
   - diagrams ==1.4
   - diagrams-builder ==0.8.0.3
@@ -659,7 +659,7 @@ default-package-overrides:
   - eliminators ==0.4.1
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
-  - email-validate ==2.3.2.7
+  - email-validate ==2.3.2.8
   - enclosed-exceptions ==1.0.3
   - entropy ==0.4.1.3
   - enummapset ==0.5.2.2
@@ -702,7 +702,7 @@ default-package-overrides:
   - exp-pairs ==0.1.6.0
   - extensible ==0.4.9
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.12
+  - extra ==1.6.13
   - extractable-singleton ==0.0.1
   - extrapolate ==0.3.3
   - facts ==0.0.1.0
@@ -784,7 +784,7 @@ default-package-overrides:
   - fuzzcheck ==0.1.1
   - fuzzy-dates ==0.1.1.1
   - fuzzyset ==0.1.0.6
-  - gauge ==0.2.3
+  - gauge ==0.2.4
   - gc ==0.0.2
   - gd ==3000.7.3
   - gdax ==0.6.0.0
@@ -896,7 +896,7 @@ default-package-overrides:
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.6.0
+  - hapistrano ==0.3.6.1
   - happstack-server ==7.5.1.1
   - happy ==1.19.9
   - hasbolt ==0.1.3.0
@@ -982,7 +982,7 @@ default-package-overrides:
   - hmpfr ==0.4.4
   - Hoed ==0.5.1
   - hoopl ==3.10.2.2
-  - hOpenPGP ==2.7.3
+  - hOpenPGP ==2.7.4.1
   - hopenpgp-tools ==0.21.2
   - hopfli ==0.2.2.1
   - hostname ==1.0
@@ -1004,8 +1004,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
@@ -1044,7 +1044,7 @@ default-package-overrides:
   - htaglib ==1.2.0
   - HTF ==0.13.2.4
   - html ==1.0.1.2
-  - html-conduit ==1.3.1
+  - html-conduit ==1.3.2
   - html-email-validate ==0.2.0.0
   - html-entities ==1.1.4.2
   - html-entity-map ==0.1.0.0
@@ -1118,7 +1118,7 @@ default-package-overrides:
   - Imlib ==0.1.2
   - immortal ==0.3
   - include-file ==0.1.0.3
-  - incremental-parser ==0.3.1.1
+  - incremental-parser ==0.3.2
   - indentation-core ==0.0.0.2
   - indentation-parsec ==0.0.0.2
   - indents ==0.5.0.0
@@ -1136,7 +1136,7 @@ default-package-overrides:
   - integration ==0.2.1
   - intern ==0.9.2
   - interpolate ==0.2.0
-  - interpolatedstring-perl6 ==1.0.0
+  - interpolatedstring-perl6 ==1.0.1
   - interpolation ==0.1.0.3
   - IntervalMap ==0.6.0.0
   - intervals ==0.8.1
@@ -1154,7 +1154,7 @@ default-package-overrides:
   - io-streams-haproxy ==1.0.0.2
   - ip ==1.3.0
   - ip6addr ==1.0.0
-  - iproute ==1.7.5
+  - iproute ==1.7.6
   - IPv6Addr ==1.1.1
   - IPv6DB ==0.3.1
   - ipython-kernel ==0.9.1.0
@@ -1228,7 +1228,7 @@ default-package-overrides:
   - lawful ==0.1.0.0
   - lazyio ==0.1.0.4
   - lca ==0.3.1
-  - leancheck ==0.7.5
+  - leancheck ==0.7.7
   - leapseconds-announced ==2017.1.0.1
   - learn-physics ==0.6.3
   - lens ==4.16.1
@@ -1283,7 +1283,7 @@ default-package-overrides:
   - loop ==0.3.0
   - lrucache ==1.2.0.0
   - lrucaching ==0.3.3
-  - lucid ==2.9.10
+  - lucid ==2.9.11
   - lucid-extras ==0.1.0.1
   - lxd-client-config ==0.1.0.1
   - lz4 ==0.2.3.1
@@ -1303,7 +1303,7 @@ default-package-overrides:
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
   - marvin-interpolate ==1.1.2
-  - massiv ==0.2.1.0
+  - massiv ==0.2.2.0
   - massiv-io ==0.1.4.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.2.1.0
@@ -1351,7 +1351,7 @@ default-package-overrides:
   - mintty ==0.1.2
   - miso ==0.21.2.0
   - missing-foreign ==0.1.1
-  - MissingH ==1.4.0.1
+  - MissingH ==1.4.1.0
   - mixed-types-num ==0.3.1.4
   - mltool ==0.2.0.1
   - mmap ==0.5.9
@@ -1370,7 +1370,7 @@ default-package-overrides:
   - monadic-arrays ==0.2.2
   - monad-journal ==0.8.1
   - monadlist ==0.0.2
-  - monad-logger ==0.3.29
+  - 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
@@ -1522,8 +1522,8 @@ default-package-overrides:
   - pagination ==0.2.1
   - palette ==0.3.0.1
   - pandoc ==2.2.1
-  - pandoc-citeproc ==0.14.5
-  - pandoc-types ==1.17.5.1
+  - pandoc-citeproc ==0.14.8
+  - pandoc-types ==1.17.5.2
   - pango ==0.13.5.0
   - papillon ==0.1.0.6
   - parallel ==3.2.2.0
@@ -1754,7 +1754,7 @@ default-package-overrides:
   - rethinkdb-client-driver ==0.0.25
   - retry ==0.7.7.0
   - rev-state ==0.1.2
-  - rfc5051 ==0.1.0.3
+  - rfc5051 ==0.1.0.4
   - rhine ==0.4.0.1
   - riak ==1.1.2.5
   - riak-protobuf ==0.23.0.0
@@ -1841,7 +1841,7 @@ default-package-overrides:
   - servant-streaming ==0.3.0.0
   - servant-streaming-client ==0.3.0.0
   - servant-streaming-server ==0.3.0.0
-  - servant-swagger ==1.1.5
+  - servant-swagger ==1.1.6
   - servant-swagger-ui ==0.3.0.3.13.2
   - servant-swagger-ui-core ==0.3.1
   - servant-tracing ==0.1.0.2
@@ -1859,7 +1859,7 @@ default-package-overrides:
   - SHA ==1.6.4.4
   - shake ==0.16.4
   - shake-language-c ==0.12.0
-  - shakespeare ==2.0.18
+  - shakespeare ==2.0.19
   - shell-conduit ==4.7.0
   - shell-escape ==0.2.0
   - shelltestrunner ==1.9
@@ -1871,6 +1871,7 @@ default-package-overrides:
   - siggy-chardust ==1.0.0
   - signal ==0.1.0.4
   - silently ==1.2.5
+  - simple-cmd ==0.1.1
   - simple-reflect ==0.3.3
   - simple-sendfile ==0.2.27
   - simplest-sqlite ==0.1.0.0
@@ -1880,11 +1881,11 @@ default-package-overrides:
   - singleton-nats ==0.4.2
   - singletons ==2.4.1
   - siphash ==1.0.3
-  - size-based ==0.1.1.0
+  - size-based ==0.1.2.0
   - skein ==1.0.9.4
   - skylighting ==0.7.4
   - skylighting-core ==0.7.4
-  - slack-web ==0.2.0.6
+  - slack-web ==0.2.0.7
   - slave-thread ==1.0.2
   - smallcheck ==1.1.5
   - smoothie ==0.4.2.9
@@ -2152,7 +2153,7 @@ default-package-overrides:
   - unicode-show ==0.1.0.3
   - unicode-transforms ==0.3.4
   - unification-fd ==0.10.0.1
-  - union ==0.1.1.2
+  - union ==0.1.2
   - union-find ==0.2
   - uniplate ==1.6.12
   - uniprot-kb ==0.1.2.0
@@ -2332,29 +2333,29 @@ default-package-overrides:
   - xxhash-ffi ==0.2.0.0
   - yaml ==0.8.32
   - yeshql ==4.1.0.1
-  - yeshql-core ==4.1.0.1
-  - yeshql-hdbc ==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.4.1
+  - yesod-auth ==1.6.5
   - yesod-auth-fb ==1.9.1
   - yesod-auth-hashdb ==1.7
   - yesod-bin ==1.6.0.3
-  - yesod-core ==1.6.8
+  - yesod-core ==1.6.8.1
   - yesod-csp ==0.2.4.0
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0
-  - yesod-form ==1.6.2
+  - yesod-form ==1.6.3
   - yesod-form-bootstrap4 ==1.0.2
   - yesod-gitrepo ==0.3.0
   - yesod-gitrev ==0.2.0.0
   - yesod-newsfeed ==1.6.1.0
   - yesod-paginator ==1.1.0.1
-  - yesod-persistent ==1.6.0
+  - yesod-persistent ==1.6.0.1
   - yesod-recaptcha2 ==0.2.4
   - yesod-sitemap ==1.6.0
-  - yesod-static ==1.6.0
-  - yesod-test ==1.6.5
+  - 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
-- 
GitLab


From 19013d809297cb9dbba69bda24e52a2833f4e05a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 20 Oct 2018 02:30:39 +0200
Subject: [PATCH 0307/1065] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1-1-g9fae38b from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/5124fd5742add6fe8bcbe6434202cd322c3483c6.
---
 .../haskell-modules/hackage-packages.nix      | 1298 ++++++-----------
 1 file changed, 452 insertions(+), 846 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index fd19a506d15..fe488d0447e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -12291,31 +12291,6 @@ self: {
      }) {};
 
   "MissingH" = callPackage
-    ({ mkDerivation, array, base, containers, directory
-     , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
-     , old-locale, old-time, parsec, process, QuickCheck, random
-     , regex-compat, testpack, time, unix
-     }:
-     mkDerivation {
-       pname = "MissingH";
-       version = "1.4.0.1";
-       sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8";
-       revision = "1";
-       editedCabalFile = "04syc14nz11fay6fm6nlixyflrfhpg4jiyxx6mnxrl6asd3cl989";
-       libraryHaskellDepends = [
-         array base containers directory filepath hslogger HUnit mtl network
-         old-locale old-time parsec process random regex-compat time unix
-       ];
-       testHaskellDepends = [
-         array base containers directory errorcall-eq-instance filepath
-         hslogger HUnit mtl network old-locale old-time parsec process
-         QuickCheck random regex-compat testpack time unix
-       ];
-       description = "Large utility library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "MissingH_1_4_1_0" = callPackage
     ({ mkDerivation, array, base, containers, directory
      , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
      , old-locale, old-time, parsec, process, QuickCheck, random
@@ -12336,7 +12311,6 @@ self: {
        ];
        description = "Large utility library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MissingK" = callPackage
@@ -18676,8 +18650,8 @@ self: {
      }:
      mkDerivation {
        pname = "Villefort";
-       version = "0.1.2.14";
-       sha256 = "0hwlm91dlhbl0g6axpqx3pbr89icaqmrgnnn6lhcwd7sd8rzycbg";
+       version = "0.1.2.16";
+       sha256 = "00ngq1i7f1sqksfl9cg1qzhp4fxv9h6mmjfljj3cahcw50h4al64";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -18687,7 +18661,7 @@ self: {
          transformers unix uri-encode
        ];
        executableHaskellDepends = [
-         base HDBC HDBC-sqlite3 random scotty split text time
+         base HDBC HDBC-sqlite3 mtl random scotty split text time
        ];
        testHaskellDepends = [
          base concurrent-extra HDBC HDBC-sqlite3 hspec mtl QuickCheck
@@ -19634,8 +19608,8 @@ self: {
     ({ mkDerivation, base, deepseq, random }:
      mkDerivation {
        pname = "Yampa";
-       version = "0.11.1";
-       sha256 = "0zzhp0h9z9xz7ipiyd6ygnhb6h50dwh268zamx6qdf6zzpywsya1";
+       version = "0.12";
+       sha256 = "077fnazzcv7gckpklmdgk4hz6nnfnims11c1r4dwpnb0z6n31wcg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq random ];
@@ -23137,17 +23111,6 @@ self: {
      }) {};
 
   "alg" = callPackage
-    ({ mkDerivation, base, util }:
-     mkDerivation {
-       pname = "alg";
-       version = "0.2.7.0";
-       sha256 = "00ih68mh1494s856ygkc887m0vhrs2sfchjgqrsgw8v7lqcqjsx6";
-       libraryHaskellDepends = [ base util ];
-       description = "Algebraic structures";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "alg_0_2_8_0" = callPackage
     ({ mkDerivation, base, util }:
      mkDerivation {
        pname = "alg";
@@ -23156,7 +23119,6 @@ self: {
        libraryHaskellDepends = [ base util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alga" = callPackage
@@ -29163,6 +29125,8 @@ self: {
        pname = "ascii";
        version = "0.0.5.1";
        sha256 = "06z63pr5g1wcsyii3pr8svz23cl9n4srspbkvby595pxfcbzkirn";
+       revision = "1";
+       editedCabalFile = "1v8pgvhl47c4sf226pg175wydw5a60lssz0876haqkqm5h7bjm7g";
        libraryHaskellDepends = [
          base blaze-builder bytestring case-insensitive hashable semigroups
          text
@@ -29677,8 +29641,8 @@ self: {
        pname = "ast-monad";
        version = "0.1.0.0";
        sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i";
-       revision = "3";
-       editedCabalFile = "0lj9g3vhlx42hsirxcwfjksy5w6981gpyms7r5xpih7bnz91cxk7";
+       revision = "4";
+       editedCabalFile = "131ynmpy5y0c4maj0cp0n3sbbs4k40j7dybgcsad5kv58i63kw23";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "A library for constructing AST by using do-notation";
@@ -33029,17 +32993,6 @@ self: {
      }) {invalid-cabal-flag-settings = null;};
 
   "base-compat" = callPackage
-    ({ mkDerivation, base, unix }:
-     mkDerivation {
-       pname = "base-compat";
-       version = "0.10.4";
-       sha256 = "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d";
-       libraryHaskellDepends = [ base unix ];
-       description = "A compatibility layer for base";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "base-compat_0_10_5" = callPackage
     ({ mkDerivation, base, unix }:
      mkDerivation {
        pname = "base-compat";
@@ -33048,7 +33001,6 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "A compatibility layer for base";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-compat-batteries" = callPackage
@@ -34234,8 +34186,8 @@ self: {
      }:
      mkDerivation {
        pname = "bench-show";
-       version = "0.2.0";
-       sha256 = "17d7dk5r697r9fls14labciwp3rwykv6n5mkhljrjszf2z2c6j65";
+       version = "0.2.1";
+       sha256 = "1afx5vck4b57r6kanr5g46rk5n8hf9vw4vg2sfqgdb3fhc9979g5";
        libraryHaskellDepends = [
          ansi-wl-pprint base Chart Chart-diagrams csv directory filepath
          mwc-random split statistics transformers vector
@@ -34925,27 +34877,6 @@ self: {
      }) {};
 
   "binary-conduit" = callPackage
-    ({ mkDerivation, base, binary, bytestring, conduit, exceptions
-     , hspec, QuickCheck, quickcheck-assertions, resourcet, vector
-     }:
-     mkDerivation {
-       pname = "binary-conduit";
-       version = "1.3";
-       sha256 = "1kfc421r8p0zxn5dkm9kzj4n9pharnl809hkjnr55dbrnr3vvya3";
-       revision = "1";
-       editedCabalFile = "0y08nw3y5jgrw5waa25b75iwsibnd1m9rbpqrvz5j4xq6baqw6kx";
-       libraryHaskellDepends = [
-         base binary bytestring conduit exceptions vector
-       ];
-       testHaskellDepends = [
-         base binary bytestring conduit hspec QuickCheck
-         quickcheck-assertions resourcet
-       ];
-       description = "data serialization/deserialization conduit library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "binary-conduit_1_3_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, conduit, exceptions
      , hspec, QuickCheck, quickcheck-assertions, resourcet, vector
      }:
@@ -34962,7 +34893,6 @@ self: {
        ];
        description = "data serialization/deserialization conduit library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-derive" = callPackage
@@ -41935,17 +41865,18 @@ self: {
 
   "cabal-rpm" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
-     , http-client, http-client-tls, http-conduit, process, time, unix
+     , http-client, http-client-tls, http-conduit, process, simple-cmd
+     , time, unix
      }:
      mkDerivation {
        pname = "cabal-rpm";
-       version = "0.12.5";
-       sha256 = "0xz2qjj52m8pkazy3dbkh0pqhsg3727x9blka24naibgfl1h7vaa";
+       version = "0.12.6";
+       sha256 = "1k602v7v87w6xcd9a5m8n5grnjbkyn79rdi9azl7djna0rs129ns";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring Cabal directory filepath http-client
-         http-client-tls http-conduit process time unix
+         http-client-tls http-conduit process simple-cmd time unix
        ];
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
@@ -46622,8 +46553,8 @@ self: {
     ({ mkDerivation, base, criterion, QuickCheck, random }:
      mkDerivation {
        pname = "cl3";
-       version = "1.0.0.3";
-       sha256 = "16jllcyqdd6i0gq730c88ls47d2334ywr317pm7q6d6vgrjc4gjj";
+       version = "1.0.0.4";
+       sha256 = "18q5r2m4sr7h8z35nivq2fndmxamyw3217j11na4gq361rq1340v";
        libraryHaskellDepends = [ base random ];
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -48361,23 +48292,6 @@ self: {
      }) {};
 
   "cmark-gfm" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, cheapskate
-     , criterion, discount, HUnit, markdown, sundown, text
-     }:
-     mkDerivation {
-       pname = "cmark-gfm";
-       version = "0.1.5";
-       sha256 = "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7";
-       libraryHaskellDepends = [ base bytestring text ];
-       testHaskellDepends = [ base HUnit text ];
-       benchmarkHaskellDepends = [
-         base blaze-html cheapskate criterion discount markdown sundown text
-       ];
-       description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cmark-gfm_0_1_6" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, cheapskate
      , criterion, discount, HUnit, markdown, sundown, text
      }:
@@ -48392,7 +48306,6 @@ self: {
        ];
        description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmark-highlight" = callPackage
@@ -52952,8 +52865,8 @@ self: {
     ({ mkDerivation, base, deepseq, primitive }:
      mkDerivation {
        pname = "contiguous";
-       version = "0.3.0.0";
-       sha256 = "15v53w85f8bxnnrjsj46nfnjshf91b8sld76jcqffzj5nfjxkv28";
+       version = "0.3.1.0";
+       sha256 = "1x1rv1r05v725xbax2qig36h03gah7mx8r8vd1dcdcy6lm6lsc4i";
        libraryHaskellDepends = [ base deepseq primitive ];
        description = "Unified interface for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -53141,24 +53054,6 @@ self: {
      }) {};
 
   "control-dsl" = callPackage
-    ({ mkDerivation, base, containers, doctest, doctest-discover
-     , temporary
-     }:
-     mkDerivation {
-       pname = "control-dsl";
-       version = "0.2.1.1";
-       sha256 = "0nfbipf26kkkjbxb9mqbjxqg99z3dfmpada28ajqjvz6n3mg4grg";
-       revision = "1";
-       editedCabalFile = "11rjly75f57a1818hjzy18pms51jicnzn99kx2mqzf7c7lygnsgg";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base containers doctest doctest-discover temporary
-       ];
-       description = "An alternative to monads for control flow DSLs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "control-dsl_0_2_1_3" = callPackage
     ({ mkDerivation, base, containers, doctest, doctest-discover
      , temporary
      }:
@@ -53172,7 +53067,6 @@ self: {
        ];
        description = "An alternative to monads for control flow DSLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-event" = callPackage
@@ -55482,20 +55376,6 @@ self: {
      }) {};
 
   "crypto-enigma" = callPackage
-    ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
-     , split
-     }:
-     mkDerivation {
-       pname = "crypto-enigma";
-       version = "0.0.2.13";
-       sha256 = "0w82f9hbhhksqkgj3d846l3cgg210ra5133rji2k41mc74l0r0dl";
-       libraryHaskellDepends = [ base containers MissingH mtl split ];
-       testHaskellDepends = [ base HUnit QuickCheck ];
-       description = "An Enigma machine simulator with display";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "crypto-enigma_0_0_2_14" = callPackage
     ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
      , split
      }:
@@ -55507,7 +55387,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
@@ -59381,15 +59260,15 @@ self: {
      }) {};
 
   "data-timeout" = callPackage
-    ({ mkDerivation, base, data-textual, parsers, tagged, text-printer
-     , transformers-base
+    ({ mkDerivation, base, data-textual, parsers, stm, tagged
+     , text-printer, transformers-base
      }:
      mkDerivation {
        pname = "data-timeout";
-       version = "0.3";
-       sha256 = "1b6af2x19hb1kynsv7ypc2q6b71cazcg86gf1yhq0rr0fjj478ah";
+       version = "0.3.1";
+       sha256 = "1pnynkk99d2bhg2l2qd9x4ksp8nc2l7zii3gk6sch1svnbg0liv6";
        libraryHaskellDepends = [
-         base data-textual parsers tagged text-printer transformers-base
+         base data-textual parsers stm tagged text-printer transformers-base
        ];
        description = "64-bit timeouts of nanosecond precision";
        license = stdenv.lib.licenses.bsd3;
@@ -62196,8 +62075,8 @@ self: {
      }:
      mkDerivation {
        pname = "dfinity-radix-tree";
-       version = "0.5.0";
-       sha256 = "0c721d4vcar7h5alrigi9q63pwwvp0xqwwrvfh6pa9p2y90p820b";
+       version = "0.5.2";
+       sha256 = "16w7na8sh5fvwrps0wa3m80yzrdg7znx8jgw2i64glvjjs7d5c61";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62507,21 +62386,6 @@ self: {
      }) {};
 
   "dhall-text" = callPackage
-    ({ mkDerivation, base, dhall, optparse-applicative, text }:
-     mkDerivation {
-       pname = "dhall-text";
-       version = "1.0.12";
-       sha256 = "1k68s83cqlwgivliag9n2vhin385k08f8vd506dcbix5farv9dp6";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base dhall optparse-applicative text
-       ];
-       description = "Template text using Dhall";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-text_1_0_13" = callPackage
     ({ mkDerivation, base, dhall, optparse-applicative, text }:
      mkDerivation {
        pname = "dhall-text";
@@ -62534,7 +62398,6 @@ self: {
        ];
        description = "Template text using Dhall";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-to-cabal" = callPackage
@@ -64322,6 +64185,8 @@ self: {
        pname = "discord-gateway";
        version = "0.2.2";
        sha256 = "1pc8j2pqrpmgvf31kx24gwj6n96npxdjj6mjf2w9wzh500rdrrzy";
+       revision = "1";
+       editedCabalFile = "0aw47024gk2hvj0zzy7h01rvv6wxhnjqqjg8prb4x1pajjalg9l5";
        libraryHaskellDepends = [
          aeson base discord-types hslogger transformers url websockets wuss
        ];
@@ -64377,6 +64242,8 @@ self: {
        pname = "discord-rest";
        version = "0.2.2";
        sha256 = "02sg05zf2m83d6hq5z51cjvw7ycarrmwx9y00c71wiw3hvb84fb3";
+       revision = "1";
+       editedCabalFile = "0hwiwzgh359cha0j97mwhdjmg1y2zppppbn538pn4ggfn6i7ma11";
        libraryHaskellDepends = [
          aeson base bytestring comonad data-default discord-types hashable
          hslogger http-client mtl req stm text time url
@@ -64394,6 +64261,8 @@ self: {
        pname = "discord-types";
        version = "0.2.2";
        sha256 = "12smb4z6mrj9hhk7jc9r2cz6p4lcix2016ahwp9qapklrql539sc";
+       revision = "1";
+       editedCabalFile = "015i65pzkxrx6pring1q0fv772r54xrbrbrwa339yqjgzm7c7z7w";
        libraryHaskellDepends = [
          aeson base hashable text time transformers unordered-containers
          vector
@@ -67425,6 +67294,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dunai-core" = callPackage
+    ({ mkDerivation, base, MonadRandom, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "dunai-core";
+       version = "0.5.1.0";
+       sha256 = "1p8161m671dgf13q0rnpp797nymdxpi5nf6xl9mh9zj495libbzz";
+       libraryHaskellDepends = [
+         base MonadRandom transformers transformers-base
+       ];
+       description = "Generalised reactive framework supporting classic, arrowized and monadic FRP. (Core library fork.)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "duplo" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
      , base64-bytestring, bytestring, containers, directory
@@ -69856,22 +69739,6 @@ self: {
      }) {};
 
   "email-validate" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
-     , QuickCheck, template-haskell
-     }:
-     mkDerivation {
-       pname = "email-validate";
-       version = "2.3.2.7";
-       sha256 = "1qdl0g8nbngr6kz4xrgi06rn1zf1np55ipk3wwdrg9hpfaaazcs3";
-       libraryHaskellDepends = [
-         attoparsec base bytestring template-haskell
-       ];
-       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
-       description = "Email address validation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "email-validate_2_3_2_8" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
      , QuickCheck, template-haskell
      }:
@@ -69885,7 +69752,6 @@ self: {
        testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
        description = "Email address validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-validate-json" = callPackage
@@ -73452,8 +73318,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects-concurrent";
-       version = "0.5.0.1";
-       sha256 = "00gr2x00byfc842p8b5apzc4qi8l0fx8cgrvsi73f1mshkiqs9sp";
+       version = "0.6.2";
+       sha256 = "11cqk78c0lfsa8mkq7ymxsral0g24p1im4r1ndqsf7rxczjmc37c";
        libraryHaskellDepends = [
          base containers data-default deepseq directory extensible-effects
          filepath lens logging-effect monad-control mtl parallel process
@@ -73504,22 +73370,6 @@ self: {
      }) {};
 
   "extra" = callPackage
-    ({ mkDerivation, base, clock, directory, filepath, process
-     , QuickCheck, time, unix
-     }:
-     mkDerivation {
-       pname = "extra";
-       version = "1.6.12";
-       sha256 = "177m9f3hdc8sy6m791q6bmns01avzb0j9wj113rm4748k0bnqngz";
-       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_13" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, time, unix
      }:
@@ -73533,7 +73383,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
@@ -75299,8 +75148,8 @@ self: {
      }:
      mkDerivation {
        pname = "fficxx";
-       version = "0.5";
-       sha256 = "16r7pbfxr1xf5jxwyk2qv50yishpk0mzndl88hv9bwpz7gbj55yy";
+       version = "0.5.0.1";
+       sha256 = "01rvg7y9c0jczypjgrq7b6cbl79n10flsllkbgm9z5hhymwga38s";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring Cabal containers data-default
          directory either errors filepath hashable haskell-src-exts lens mtl
@@ -77693,6 +77542,8 @@ self: {
        pname = "fmt";
        version = "0.6";
        sha256 = "14hk6ra8j1zzw7ibimj207mi1xl5pmln6kyz0y66j4bg1r8invsy";
+       revision = "1";
+       editedCabalFile = "0xmi4qxq12qfj4ry1ifb0za7jdlvj65v16bzdqi8r7p1xrxy5cki";
        libraryHaskellDepends = [
          base base64-bytestring bytestring containers formatting microlens
          text time time-locale-compat
@@ -81101,8 +80952,8 @@ self: {
      }:
      mkDerivation {
        pname = "gauge";
-       version = "0.2.3";
-       sha256 = "0slsimv2zn9yhakxy2wdyfj6bgjd1p65wp6nr8j0ba7df64xykjs";
+       version = "0.2.4";
+       sha256 = "1p8accsrv0njiqgybz2plwiglg90nazibggc270j7gmqxqna0zr9";
        libraryHaskellDepends = [
          base basement deepseq directory process vector
        ];
@@ -82098,6 +81949,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generics-sop_0_4_0_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "generics-sop";
+       version = "0.4.0.0";
+       sha256 = "0blx09k173qgaghqnsvz6v2r6san1kn62k5c57wilya94l1996ra";
+       libraryHaskellDepends = [
+         base ghc-prim sop-core template-haskell
+       ];
+       testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq template-haskell
+       ];
+       description = "Generic Programming using True Sums of Products";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generics-sop-lens" = callPackage
     ({ mkDerivation, base, generics-sop, lens }:
      mkDerivation {
@@ -82935,8 +82806,8 @@ self: {
      }:
      mkDerivation {
        pname = "geos";
-       version = "0.1.1.2";
-       sha256 = "1kggbm3hdg1x0ci3lfps1nglr5hk56ws96yfrv257zaz8kq64s1d";
+       version = "0.2.1";
+       sha256 = "15dhxhqswi9h8zas0x27hma7pz4c7rn40pppjraax29pi4alaiq9";
        libraryHaskellDepends = [
          base bytestring mtl transformers vector
        ];
@@ -85446,6 +85317,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gingersnap" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-types
+     , postgresql-simple, resource-pool, snap-core
+     }:
+     mkDerivation {
+       pname = "gingersnap";
+       version = "0.1.1.0";
+       sha256 = "0aqb9ikh21q13mnwf6vcg6chv73vphyag62zhkd4mkhbnlpr816i";
+       libraryHaskellDepends = [
+         aeson base bytestring http-types postgresql-simple resource-pool
+         snap-core
+       ];
+       description = "snap-core + aeson + postgresql-simple = delicious";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ginsu" = callPackage
     ({ mkDerivation, array, async, base, binary, bytestring, containers
      , directory, hashable, hashtables, mtl, network, old-locale
@@ -86019,8 +85906,8 @@ self: {
      }:
      mkDerivation {
        pname = "githash";
-       version = "0.1.1.0";
-       sha256 = "14532rljfzlkcbqpi69wj31cqlzid0rwwy0kzlwvxp06zh8lq2a0";
+       version = "0.1.2.0";
+       sha256 = "0pwh0s4gfddy0ixx92ww00v9qam2cx047ivqcm373fw5h2h1vrq8";
        libraryHaskellDepends = [
          base bytestring directory filepath process template-haskell
        ];
@@ -90683,8 +90570,8 @@ self: {
     ({ mkDerivation, base, containers, json, text }:
      mkDerivation {
        pname = "graphql-w-persistent";
-       version = "0.1.0.3";
-       sha256 = "0yinjcd74hdxfvph760cvf319hnrb5skkc174ih7fqjjllrp5din";
+       version = "0.1.0.4";
+       sha256 = "1ivdh8l6snb2d3g1f7fb46fd9fz6ib2i94b1596pmp38hryl8in0";
        libraryHaskellDepends = [ base containers json text ];
        description = "Haskell GraphQL query parser-interpreter-data processor";
        license = stdenv.lib.licenses.isc;
@@ -92667,56 +92554,6 @@ self: {
      }) {};
 
   "hOpenPGP" = callPackage
-    ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
-     , base16-bytestring, base64-bytestring, bifunctors, binary
-     , binary-conduit, bytestring, bzlib, conduit, conduit-extra
-     , containers, criterion, crypto-cipher-types, cryptonite, errors
-     , hashable, incremental-parser, ixset-typed, lens, memory
-     , monad-loops, nettle, network, network-uri, newtype
-     , openpgp-asciiarmor, prettyprinter, QuickCheck
-     , quickcheck-instances, resourcet, semigroups, split, tasty
-     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
-     , transformers, unliftio-core, unordered-containers, zlib
-     }:
-     mkDerivation {
-       pname = "hOpenPGP";
-       version = "2.7.3";
-       sha256 = "0qxqq46p4l61chkxk7c6lhnscik3gzsgcvszp6ywspk8zp1yhbi8";
-       libraryHaskellDepends = [
-         aeson asn1-encoding attoparsec base base16-bytestring
-         base64-bytestring bifunctors binary binary-conduit bytestring bzlib
-         conduit conduit-extra containers crypto-cipher-types cryptonite
-         errors hashable incremental-parser ixset-typed lens memory
-         monad-loops nettle network-uri newtype openpgp-asciiarmor
-         prettyprinter resourcet semigroups split text time
-         time-locale-compat transformers unliftio-core unordered-containers
-         zlib
-       ];
-       testHaskellDepends = [
-         aeson asn1-encoding attoparsec base base16-bytestring bifunctors
-         binary binary-conduit bytestring bzlib conduit conduit-extra
-         containers crypto-cipher-types cryptonite errors hashable
-         incremental-parser ixset-typed lens memory monad-loops nettle
-         network network-uri newtype prettyprinter QuickCheck
-         quickcheck-instances resourcet semigroups split tasty tasty-hunit
-         tasty-quickcheck text time time-locale-compat transformers
-         unliftio-core unordered-containers zlib
-       ];
-       benchmarkHaskellDepends = [
-         aeson base base16-bytestring base64-bytestring bifunctors binary
-         binary-conduit bytestring bzlib conduit conduit-extra containers
-         criterion crypto-cipher-types cryptonite errors hashable
-         incremental-parser ixset-typed lens memory monad-loops nettle
-         network network-uri newtype openpgp-asciiarmor prettyprinter
-         resourcet semigroups split text time time-locale-compat
-         transformers unliftio-core unordered-containers zlib
-       ];
-       description = "native Haskell implementation of OpenPGP (RFC4880)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hOpenPGP_2_7_4_1" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
      , base16-bytestring, base64-bytestring, bifunctors, binary
      , binary-conduit, bytestring, bzlib, conduit, conduit-extra
@@ -95564,32 +95401,6 @@ self: {
      }) {};
 
   "hapistrano" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath
-     , formatting, gitrev, hspec, mtl, optparse-applicative, path
-     , path-io, process, stm, temporary, time, transformers, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
-       version = "0.3.6.0";
-       sha256 = "094jv3plkh515mn49hp5bylpxfn7c74n9bdk4843bm88q5hxlnk2";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base filepath formatting gitrev mtl path process time transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base formatting gitrev optparse-applicative path
-         path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
-       ];
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_6_1" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath
      , formatting, gitrev, hspec, mtl, optparse-applicative, path
      , path-io, process, stm, temporary, time, transformers, yaml
@@ -95613,7 +95424,6 @@ self: {
        ];
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -97721,8 +97531,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-dap";
-       version = "0.0.8.0";
-       sha256 = "1zj1lkvxhn7l9pgivl7bgzs5mzg8kbzriixwpf8si2nrfx20avkf";
+       version = "0.0.9.0";
+       sha256 = "1flsz93wbhd61yfydbfbb3q8brhh0d0gzfsdd3xscwvcbdzgw9qr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -114589,8 +114399,8 @@ self: {
      }:
      mkDerivation {
        pname = "html-conduit";
-       version = "1.3.1";
-       sha256 = "0dg3sblihi93qn6ax1cwha0cng4zlpmic83ckdylq7s7kwa3rhbi";
+       version = "1.3.2";
+       sha256 = "0l5hc7bf57p5jiqh3wvnqapc27ibnlv00zm6szc0nqbvknzvvz85";
        libraryHaskellDepends = [
          attoparsec base bytestring conduit conduit-extra containers
          resourcet text transformers xml-conduit xml-types
@@ -117054,17 +116864,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-json_0_9_0_0" = callPackage
+  "hw-json_0_9_0_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
-     , bytestring, containers, criterion, directory, dlist, generic-lens
-     , hspec, hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim
+     , bytestring, containers, criterion, directory, dlist, hspec
+     , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim
      , hw-rankselect, hw-rankselect-base, lens, mmap
-     , optparse-applicative, resourcet, text, vector, word8
+     , optparse-applicative, text, vector, word8
      }:
      mkDerivation {
        pname = "hw-json";
-       version = "0.9.0.0";
-       sha256 = "0465pc8k4wvvih4z5klq3ign2cznrb837ivqxg9nrzbx8szsnsc7";
+       version = "0.9.0.1";
+       sha256 = "00prvi3jrb02g92vq1ghyxpdpqangj482x1k3l13s385804grgqw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117073,9 +116883,9 @@ self: {
          hw-rankselect-base mmap text vector word8
        ];
        executableHaskellDepends = [
-         base bytestring criterion dlist generic-lens hw-balancedparens
-         hw-bits hw-mquery hw-prim hw-rankselect hw-rankselect-base lens
-         mmap optparse-applicative resourcet vector
+         base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery
+         hw-prim hw-rankselect hw-rankselect-base lens mmap
+         optparse-applicative vector
        ];
        testHaskellDepends = [
          attoparsec base bytestring containers hspec hw-balancedparens
@@ -120490,28 +120300,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.1.1";
-       sha256 = "1p7m897bavh45h755ra97jk06jprls7vrnpzv1kjklgj19vbz1vz";
-       revision = "1";
-       editedCabalFile = "0g6haprqb1w06bazjj107frraxc6bbj8i98im16k66wlx7c9f99i";
-       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" = callPackage
     ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
      , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
      }:
@@ -121900,22 +121688,6 @@ self: {
      }) {};
 
   "interpolatedstring-perl6" = callPackage
-    ({ mkDerivation, base, bytestring, haskell-src-meta
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "interpolatedstring-perl6";
-       version = "1.0.0";
-       sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring haskell-src-meta template-haskell text
-       ];
-       description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "interpolatedstring-perl6_1_0_1" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, haskell-src-meta, process
      , template-haskell, text
      }:
@@ -121930,7 +121702,6 @@ self: {
        ];
        description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interpolatedstring-qq" = callPackage
@@ -122477,8 +122248,8 @@ self: {
        pname = "io-streams-haproxy";
        version = "1.0.0.2";
        sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp";
-       revision = "3";
-       editedCabalFile = "03pwnb66mlx1b8z2d4mn262i2s5mprfr49m0crnssd2nlvm82ifa";
+       revision = "4";
+       editedCabalFile = "06c51a057n5bc9xfbp2m4jz5ds4z1xvmsx5mppch6qfwbz7x5i9l";
        libraryHaskellDepends = [
          attoparsec base bytestring io-streams network transformers
        ];
@@ -122788,25 +122559,6 @@ self: {
      }) {};
 
   "iproute" = callPackage
-    ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
-     , network, QuickCheck, safe
-     }:
-     mkDerivation {
-       pname = "iproute";
-       version = "1.7.5";
-       sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd";
-       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_6" = callPackage
     ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
      , network, QuickCheck, safe
      }:
@@ -122823,7 +122575,6 @@ self: {
        ];
        description = "IP Routing Table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iptables-helpers" = callPackage
@@ -126416,8 +126167,8 @@ self: {
      }:
      mkDerivation {
        pname = "jvm-binary";
-       version = "0.1.0";
-       sha256 = "0s64cwr86ipl7gpcgdgx50l7mm5h91njgir4mn2d82fzzq08x881";
+       version = "0.2.0";
+       sha256 = "1pq4v3xzbb9673rvr8qbvyln155v5ric712pf08vvkw1aihwgpa4";
        libraryHaskellDepends = [
          attoparsec base binary bytestring containers data-binary-ieee754
          deepseq deriving-compat mtl template-haskell text vector
@@ -129702,6 +129453,29 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "language-docker_7_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
+     }:
+     mkDerivation {
+       pname = "language-docker";
+       version = "7.0.0";
+       sha256 = "0c63la3739fbcf50vy1cp245fk7x723gviyykd3dmggm1jwgm515";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-dockerfile" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath, free
      , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
@@ -131386,18 +131160,6 @@ self: {
      }) {};
 
   "leancheck" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "leancheck";
-       version = "0.7.5";
-       sha256 = "01hmbcp5kn4k0mgv7y5jap54d65ljdd3sm954s5y28h4xvk6dn7g";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base ];
-       description = "Enumerative property-based testing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "leancheck_0_7_7" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "leancheck";
@@ -131407,7 +131169,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Enumerative property-based testing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leankit-api" = callPackage
@@ -133413,8 +133174,8 @@ self: {
      }:
      mkDerivation {
        pname = "lifted-stm";
-       version = "0.1";
-       sha256 = "1rjz8mkj17w9b7b10qx1ijj4x45abkgzp4khyl3gjmzb654zzym0";
+       version = "0.2";
+       sha256 = "115yh4rpm7z97jrc088g5jb49amr31kz5sdllpydq3h1yi1wlmbq";
        libraryHaskellDepends = [
          array base monad-finally stm transformers transformers-abort
          transformers-base transformers-compat
@@ -135137,8 +134898,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-extra";
-       version = "0.8";
-       sha256 = "0gy7zl3ln64aypkci5gc1bxy1j98zfj9wj7z07lk9n07s6ddm9k2";
+       version = "0.8.0.1";
+       sha256 = "0hnad3cqrvaijnczjy0krbf0szxf0573c5g37746xspwsjy42srd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137280,10 +137041,8 @@ self: {
      }:
      mkDerivation {
        pname = "lucid";
-       version = "2.9.10";
-       sha256 = "14238cnrvkbr81hpaqg1r342sryj8k0p6igkwf140s9phfpdzry0";
-       revision = "1";
-       editedCabalFile = "0n94x2havrvks85z8azsa4pvz33amhb444cias3kfxmkyvypn5ah";
+       version = "2.9.11";
+       sha256 = "13xz21hf9ywbyqwm33z8pfrjq03rzffhqswi30xsi13rrawj99cc";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers hashable mmorph mtl text
          transformers unordered-containers
@@ -139179,6 +138938,8 @@ self: {
        pname = "map-syntax";
        version = "0.3";
        sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k";
+       revision = "1";
+       editedCabalFile = "1qfjficc7b6hbg44r3czk8iqgkjmgnp14wmzcdcz4ai93kx8dp44";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [
          base containers deepseq hspec HUnit mtl QuickCheck transformers
@@ -139651,27 +139412,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.1.0";
-       sha256 = "0x5qf5hp6ncrjc28xcjd2v4w33wpyy69whmgvvp163y0q3v1n3q7";
-       libraryHaskellDepends = [
-         base bytestring data-default-class deepseq ghc-prim primitive
-         vector
-       ];
-       testHaskellDepends = [
-         base bytestring data-default deepseq hspec QuickCheck
-         safe-exceptions vector
-       ];
-       description = "Massiv (Массив) is an Array Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "massiv_0_2_2_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default, data-default-class
      , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
      , vector
@@ -139690,7 +139430,6 @@ self: {
        ];
        description = "Massiv (Массив) is an Array Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "massiv-io" = callPackage
@@ -140952,7 +140691,7 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "megaparsec_7_0_1" = callPackage
+  "megaparsec_7_0_2" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-expectations, mtl
      , parser-combinators, QuickCheck, scientific, text, transformers
@@ -140960,8 +140699,8 @@ self: {
      }:
      mkDerivation {
        pname = "megaparsec";
-       version = "7.0.1";
-       sha256 = "0b60gyd58n5ql7fnwmxvdz2n3h1nxmxjad52vh9b3ddzm1g3ifvb";
+       version = "7.0.2";
+       sha256 = "1ny54saxiz0md50mp24gz267gmqjbl8d8b1zi74hi6bcxyhzd278";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -144237,8 +143976,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-logger";
-       version = "0.3.29";
-       sha256 = "1z516s4pa9n94zf0l45mylssg07xr1d1m6zrz900p0iv3vfd07mv";
+       version = "0.3.30";
+       sha256 = "102l0v75hbvkmrypiyg4ybb6rbc7nij5nxs1aihmqfdpg04rkkp7";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra exceptions fast-logger
          lifted-base monad-control monad-loops mtl resourcet stm stm-chans
@@ -145666,6 +145405,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "monus" = callPackage
+    ({ mkDerivation, base, containers, smallcheck, tasty
+     , tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "monus";
+       version = "0.2.0.0";
+       sha256 = "1iyzq3ivw6brjf45d3023n8x7hq0ihy8gvjh8hjdsmc6pnm26gw9";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
+         base containers smallcheck tasty tasty-quickcheck tasty-smallcheck
+       ];
+       description = "a 'Monus' is a commutative monoid that allows a notion of substraction";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "monzo" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
      , containers, hspec, http-client, http-client-tls, mtl, network
@@ -146140,22 +145895,20 @@ self: {
      }) {inherit (pkgs) mpg123;};
 
   "mpi-hs" = callPackage
-    ({ mkDerivation, base, c2hs, criterion, monad-loops, openmpi, tasty
-     , tasty-hspec, tasty-hunit, unix
+    ({ mkDerivation, base, bytestring, c2hs, criterion, monad-loops
+     , openmpi, store
      }:
      mkDerivation {
        pname = "mpi-hs";
-       version = "0.1.0.1";
-       sha256 = "19by906z7ccfai23dr61ckzcvv3ccd8l1slf21r7g07zlmjkdrvf";
+       version = "0.3.0.0";
+       sha256 = "1a8vlsrpvgyzq4p0qa90l4ck3v9a0pncy9bmmn6kjf6j2wa5j9qx";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base ];
+       libraryHaskellDepends = [ base bytestring monad-loops store ];
        librarySystemDepends = [ openmpi ];
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base monad-loops tasty tasty-hspec tasty-hunit unix
-       ];
+       testHaskellDepends = [ base monad-loops ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "MPI bindings for Haskell";
        license = stdenv.lib.licenses.asl20;
@@ -148593,8 +148346,8 @@ self: {
      }:
      mkDerivation {
        pname = "nakadi-client";
-       version = "0.6.0.0";
-       sha256 = "15hcaccm25frzar2fwyrrhai9kpja7xdcpi2ibl6gf3drp6z65jy";
+       version = "0.6.1.0";
+       sha256 = "0y6mvw10cbiqib309v38ldjq14xryccs8mhi41zkwpnqldmkyd1x";
        libraryHaskellDepends = [
          aeson aeson-casing async async-timer base bytestring conduit
          conduit-extra containers exceptions hashable http-client
@@ -151051,8 +150804,8 @@ self: {
     ({ mkDerivation, base, doctest, network-uri, template-haskell }:
      mkDerivation {
        pname = "network-uri-static";
-       version = "0.1.0.0";
-       sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9";
+       version = "0.1.1.0";
+       sha256 = "1fjw3a9ypmqf7kl8s9mgwa9jlswz98igp830f1hsyc1hdh9xlrqw";
        libraryHaskellDepends = [ base network-uri template-haskell ];
        testHaskellDepends = [ base doctest ];
        description = "A small utility to declare type-safe static URIs";
@@ -151807,6 +151560,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nixpkgs-update" = callPackage
+    ({ mkDerivation, base, directory, doctest, errors, filepath, github
+     , mtl, neat-interpolation, optparse-applicative, regex-applicative
+     , shelly, text, time, unix, vector
+     }:
+     mkDerivation {
+       pname = "nixpkgs-update";
+       version = "0.2.0";
+       sha256 = "1vlvkyvvykzcss5w4snmwa9lrd50rss8d2gsv36a69w4y0k2ms5z";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory errors filepath github mtl neat-interpolation
+         optparse-applicative regex-applicative shelly text time unix vector
+       ];
+       testHaskellDepends = [
+         base directory doctest errors filepath github mtl
+         neat-interpolation optparse-applicative regex-applicative shelly
+         text time unix vector
+       ];
+       description = "Tool for semi-automatic updating of nixpkgs repository";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "nkjp" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-named, filepath
      , polysoup, tar, text, zlib
@@ -156894,42 +156671,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.14.5";
-       sha256 = "0iiai5f2n8f29p52h4fflhngbh8fj9rrgwfz4nnfhjbrdc0irmz8";
-       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_14_7" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , Cabal, containers, data-default, directory, filepath, hs-bibutils
-     , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
-     , setenv, split, syb, tagsoup, temporary, text, time
-     , unordered-containers, vector, xml-conduit, yaml
-     }:
-     mkDerivation {
-       pname = "pandoc-citeproc";
-       version = "0.14.7";
-       sha256 = "18r0pqv170yrsvgarj4xlpgmanydycqq9akxlnp1pkinqhs24iyd";
+       version = "0.14.8";
+       sha256 = "1zxd6n6lsfqdm5w64v2w6wnm70jj9d4n9nqw5pxnmclad1hc38zl";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -156951,7 +156694,6 @@ self: {
        doCheck = false;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -157243,8 +156985,31 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-types";
-       version = "1.17.5.1";
-       sha256 = "1q6v2bynij724fv347mhqxdscwifzrx5jb9mq80608qf638fn717";
+       version = "1.17.5.2";
+       sha256 = "0hppl6drhl4xqav35jybji8g8cpy336mqkp0zb66kdsjya9inpqb";
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq ghc-prim QuickCheck syb
+         transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers HUnit QuickCheck string-qq syb
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Types for representing a structured document";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "pandoc-types_1_17_5_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pandoc-types";
+       version = "1.17.5.3";
+       sha256 = "1yrbad67jz8mgdyhl2hvah42g31iwnbvldp16jw87v96y0cbdl72";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
          transformers
@@ -157256,6 +157021,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Types for representing a structured document";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-unlit" = callPackage
@@ -158944,8 +158710,8 @@ self: {
      }:
      mkDerivation {
        pname = "patch-image";
-       version = "0.3.2";
-       sha256 = "00zjpbhw5886zc4cmflqw4721kvndyc7r3i7p5493visqr0d1hvk";
+       version = "0.3.2.1";
+       sha256 = "1z8m3lfdd2izb6riqzscc40kk8wc7588l24214sg0bkampss1ysg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -160825,6 +160591,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "persistent-mysql-haskell_0_5_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, containers
+     , io-streams, monad-logger, mysql-haskell, network, persistent
+     , persistent-template, resource-pool, resourcet, text, time, tls
+     , transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "persistent-mysql-haskell";
+       version = "0.5.0";
+       sha256 = "047mlzrav06pm7fpz2x6v6il1gbbm8g0f5s1lvsa2kzmmbvbl4fg";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring conduit containers io-streams monad-logger
+         mysql-haskell network persistent resource-pool resourcet text time
+         tls transformers unliftio-core
+       ];
+       executableHaskellDepends = [
+         base monad-logger persistent persistent-template transformers
+       ];
+       description = "A pure haskell backend for the persistent library using MySQL database server";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent-odbc" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , convertible, HDBC, HDBC-odbc, monad-control, monad-logger
@@ -161650,8 +161441,8 @@ self: {
      }:
      mkDerivation {
        pname = "phoityne-vscode";
-       version = "0.0.26.0";
-       sha256 = "168qshbiawj1i7d676y2x5l2bmkhfvnf0fs2abr75v8g7hsa8imq";
+       version = "0.0.27.0";
+       sha256 = "1kx06kf700a849ivfnr36zs1sk7a5al71hx1h7w8b1agklf1kvzn";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -163699,52 +163490,73 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, aeson-qq, ansi-terminal
      , approximate, array, async, atomic-primops, base, base-orphans
      , base16-bytestring, bits, bytestring, bytestring-lexing
-     , case-insensitive, cborg, comonad, compact, constraints
-     , containers, contravariant, contravariant-extras, deepseq
-     , distributive, dlist, double-conversion, Earley, envparse, erf
-     , exceptions, extra, fgl, filepath, foldl, free, gauge
-     , generic-aeson, half, hashable, heaps, hedgehog
+     , case-insensitive, cborg, comonad, compact, compactable
+     , constraints, containers, contravariant, contravariant-extras
+     , deepseq, Diff, distributive, dlist, double-conversion, Earley
+     , email-validate, erf, exact-pi, exceptions, extra, fast-digits
+     , fgl, filepath, foldl, free, generic-aeson, generic-lens, half
+     , hashable, heaps, ilist, insert-ordered-containers
      , integer-logarithms, lens, lens-aeson, list-transformer, logict
      , managed, megaparsec, mmorph, monad-ste, mtl, multiset, mwc-random
-     , network, network-info, network-uri, nf, optparse-applicative
-     , parallel, parser-combinators, pointed, prettyprinter
-     , prettyprinter-ansi-terminal, primitive, profunctors, psqueues
-     , reactive-banana, reflection, regex-applicative, scientific
+     , neat-interpolation, network, network-info, network-uri, nf
+     , optparse-applicative, parallel, parser-combinators, pointed
+     , prettyprinter, prettyprinter-ansi-terminal, primitive
+     , profunctors, psqueues, random-bytestring, reactive-banana
+     , reflection, regex-applicative, safe, say, scientific
      , semigroupoids, semigroups, semilattices, serialise, split, stm
-     , stm-chans, stm-containers, tagged, text, text-short, time
-     , transformers, transformers-base, transformers-compat
-     , typed-process, unagi-chan, unix, unliftio, unordered-containers
-     , utf8-string, uuid, uuid-types, vault, vector, vector-builder
-     , weigh, writer-cps-mtl
+     , stm-chans, stm-containers, stringsearch, tagged, text
+     , text-metrics, text-short, time, transformers, transformers-base
+     , transformers-compat, typed-process, unagi-chan, unique, unix
+     , unliftio, unordered-containers, utf8-string, uuid, uuid-types
+     , vault, vector, vector-builder, writer-cps-mtl
      }:
      mkDerivation {
        pname = "planet-mitchell";
-       version = "0.0.0";
-       sha256 = "1grz5vbcz169bw9w4b85w7g59hfsif99qg11x0nwm5jb9a6chkhp";
+       version = "0.1.0";
+       sha256 = "0i9fhv17q6i7gim7k3kklivyg5c4kmxfhlfsdljpdv5sy8hl3jh1";
        libraryHaskellDepends = [
          aeson aeson-pretty aeson-qq ansi-terminal approximate array async
          atomic-primops base base-orphans base16-bytestring bits bytestring
          bytestring-lexing case-insensitive cborg comonad compact
-         constraints containers contravariant contravariant-extras deepseq
-         distributive dlist double-conversion Earley envparse erf exceptions
-         extra fgl filepath foldl free gauge generic-aeson half hashable
-         heaps hedgehog integer-logarithms lens lens-aeson list-transformer
-         logict managed megaparsec mmorph monad-ste mtl multiset mwc-random
-         network network-info network-uri nf optparse-applicative parallel
-         parser-combinators pointed prettyprinter
-         prettyprinter-ansi-terminal primitive profunctors psqueues
-         reactive-banana reflection regex-applicative scientific
-         semigroupoids semigroups semilattices serialise split stm stm-chans
-         stm-containers tagged text text-short time transformers
-         transformers-base transformers-compat typed-process unagi-chan unix
-         unliftio unordered-containers utf8-string uuid uuid-types vault
-         vector vector-builder weigh writer-cps-mtl
+         compactable constraints containers contravariant
+         contravariant-extras deepseq Diff distributive dlist
+         double-conversion Earley email-validate erf exact-pi exceptions
+         extra fast-digits fgl filepath foldl free generic-aeson
+         generic-lens half hashable heaps ilist insert-ordered-containers
+         integer-logarithms lens lens-aeson list-transformer logict managed
+         megaparsec mmorph monad-ste mtl multiset mwc-random
+         neat-interpolation network network-info network-uri nf
+         optparse-applicative parallel parser-combinators pointed
+         prettyprinter prettyprinter-ansi-terminal primitive profunctors
+         psqueues random-bytestring reactive-banana reflection
+         regex-applicative safe say scientific semigroupoids semigroups
+         semilattices serialise split stm stm-chans stm-containers
+         stringsearch tagged text text-metrics text-short time transformers
+         transformers-base transformers-compat typed-process unagi-chan
+         unique unix unliftio unordered-containers utf8-string uuid
+         uuid-types vault vector vector-builder writer-cps-mtl
        ];
        description = "Planet Mitchell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "planet-mitchell-test" = callPackage
+    ({ mkDerivation, gauge, hedgehog, hspec-expectations, tasty
+     , tasty-hedgehog, tasty-hunit, tasty-rerun, weigh
+     }:
+     mkDerivation {
+       pname = "planet-mitchell-test";
+       version = "0.0.0";
+       sha256 = "09nmdz34nz7gdq7x48pmimn966vrnlicg3q74a6m3r29vn9wh47d";
+       libraryHaskellDepends = [
+         gauge hedgehog hspec-expectations tasty tasty-hedgehog tasty-hunit
+         tasty-rerun weigh
+       ];
+       description = "Planet Mitchell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "plankton" = callPackage
     ({ mkDerivation, adjunctions, base, protolude }:
      mkDerivation {
@@ -168981,8 +168793,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "5.4.1";
-       sha256 = "13adj770k3awgsdipjkwgfja6b1hkxdphf0aa4jayxm2jz9gkpbd";
+       version = "5.5.0";
+       sha256 = "0mcj3xsi125vcxf605h8fm4swg84b79iv01qnhv5vmp872dhmwbv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173761,8 +173573,10 @@ self: {
     ({ mkDerivation, base, stm, time, time-units }:
      mkDerivation {
        pname = "rate-limit";
-       version = "1.4.0";
-       sha256 = "0p0bnfnn790kkpgj6v6646fbczznf28a65zsf92xyiab00jw6ilb";
+       version = "1.4.1";
+       sha256 = "0gm5jmi779niqsbgmkqqx6dsfw6yvfp4wlfibg9fzzmcc4i968g2";
+       revision = "1";
+       editedCabalFile = "01f3wf7q6117g2q5b9pp2rranxqyccmyl961r81151dpx21fiar7";
        libraryHaskellDepends = [ base stm time time-units ];
        description = "A basic library for rate-limiting IO actions";
        license = stdenv.lib.licenses.bsd3;
@@ -175077,8 +174891,8 @@ self: {
      }:
      mkDerivation {
        pname = "records-sop";
-       version = "0.1.0.1";
-       sha256 = "1832cgh1ry1slj10ff2qpxr6ibbvii7z1hvvdcwhyj55c31zrhlc";
+       version = "0.1.0.2";
+       sha256 = "187x3cq7h1rkmbv8qp810fcnr5y4byqwgw329v7f0s0px2vmg4h5";
        libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ];
        testHaskellDepends = [
          base deepseq generics-sop hspec should-not-typecheck
@@ -179199,19 +179013,6 @@ self: {
      }) {};
 
   "rfc5051" = callPackage
-    ({ mkDerivation, base, bytestring, containers }:
-     mkDerivation {
-       pname = "rfc5051";
-       version = "0.1.0.3";
-       sha256 = "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base bytestring containers ];
-       description = "Simple unicode collation as per RFC5051";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rfc5051_0_1_0_4" = callPackage
     ({ mkDerivation, base, bytestring, containers }:
      mkDerivation {
        pname = "rfc5051";
@@ -179222,7 +179023,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        description = "Simple unicode collation as per RFC5051";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rgb-color-model" = callPackage
@@ -186548,6 +186348,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-http2-client" = callPackage
+    ({ mkDerivation, aeson, async, base, binary, bytestring
+     , case-insensitive, containers, data-default-class, exceptions
+     , http-media, http-types, http2, http2-client, mtl, servant
+     , servant-client-core, text, tls, transformers
+     }:
+     mkDerivation {
+       pname = "servant-http2-client";
+       version = "0.1.0.1";
+       sha256 = "0jlbczbgbkjx4hai24csnd07r074s36g5hbpizhdxiqr3dcjk8pw";
+       libraryHaskellDepends = [
+         base binary bytestring case-insensitive containers exceptions
+         http-media http-types http2 http2-client mtl servant-client-core
+         text transformers
+       ];
+       testHaskellDepends = [
+         aeson async base binary bytestring case-insensitive containers
+         data-default-class exceptions http-media http-types http2
+         http2-client mtl servant servant-client-core text tls transformers
+       ];
+       description = "Generate HTTP2 clients from Servant API descriptions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-iCalendar" = callPackage
     ({ mkDerivation, base, data-default, http-media, iCalendar, servant
      }:
@@ -187329,34 +187153,6 @@ self: {
      }) {};
 
   "servant-swagger" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal
-     , cabal-doctest, directory, doctest, filepath, hspec
-     , hspec-discover, http-media, insert-ordered-containers, lens
-     , QuickCheck, servant, singleton-bool, swagger2, text, time
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-swagger";
-       version = "1.1.5";
-       sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg";
-       revision = "5";
-       editedCabalFile = "1c160wf4q0jyjg03w7hkwkbz0aprvmvzpwa5m944msik2kbvnyl5";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson base bytestring hspec http-media insert-ordered-containers
-         lens QuickCheck servant singleton-bool swagger2 text
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base directory doctest filepath hspec lens
-         QuickCheck servant swagger2 text time
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Generate Swagger specification for your servant API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-swagger_1_1_6" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , Cabal, cabal-doctest, directory, doctest, filepath, hspec
      , hspec-discover, http-media, insert-ordered-containers, lens
@@ -187380,7 +187176,6 @@ 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
@@ -188883,31 +188678,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.18";
-       sha256 = "1ny9j1p12c134q5y7k2lg8qgf8sqa328vrb8md9ib44w3xwy6wjr";
-       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_19" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
      , process, scientific, template-haskell, text, time, transformers
@@ -188929,7 +188699,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 ];
      }) {};
 
@@ -191378,23 +191147,6 @@ self: {
      }) {};
 
   "size-based" = callPackage
-    ({ mkDerivation, base, dictionary-sharing, template-haskell
-     , testing-type-modifiers
-     }:
-     mkDerivation {
-       pname = "size-based";
-       version = "0.1.1.0";
-       sha256 = "1z6w3qdx34c6y4gbs0b9zshn5al55lxzc7mfyywm91vcwi361xki";
-       revision = "1";
-       editedCabalFile = "1rw9ddw1vyv9k47p0d79qbvngym005fmz00hqrg3p1rq2vlfjdv2";
-       libraryHaskellDepends = [
-         base dictionary-sharing template-haskell testing-type-modifiers
-       ];
-       description = "Sized functors, for size-based enumerations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "size-based_0_1_2_0" = callPackage
     ({ mkDerivation, base, dictionary-sharing, template-haskell
      , testing-type-modifiers
      }:
@@ -191407,7 +191159,6 @@ self: {
        ];
        description = "Sized functors, for size-based enumerations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sized" = callPackage
@@ -191863,30 +191614,6 @@ self: {
      }) {};
 
   "slack-web" = callPackage
-    ({ mkDerivation, aeson, base, containers, errors, hspec
-     , http-api-data, http-client, http-client-tls, megaparsec, mtl
-     , servant, servant-client, servant-client-core, text, time
-     , transformers
-     }:
-     mkDerivation {
-       pname = "slack-web";
-       version = "0.2.0.6";
-       sha256 = "1rydw71na7qninys7nqyn36mld5a5csvlsf01yzansnn2gvpdh2a";
-       libraryHaskellDepends = [
-         aeson base containers errors http-api-data http-client
-         http-client-tls megaparsec mtl servant servant-client
-         servant-client-core text time transformers
-       ];
-       testHaskellDepends = [
-         aeson base containers errors hspec http-api-data megaparsec text
-         time
-       ];
-       description = "Bindings for the Slack web API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "slack-web_0_2_0_7" = callPackage
     ({ mkDerivation, aeson, base, containers, errors, hspec
      , http-api-data, http-client, http-client-tls, megaparsec, mtl
      , servant, servant-client, servant-client-core, text, time
@@ -194652,6 +194379,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sop-core" = callPackage
+    ({ mkDerivation, base, deepseq }:
+     mkDerivation {
+       pname = "sop-core";
+       version = "0.4.0.0";
+       sha256 = "07ci2mh8cbjvipb576rxsj3iyhkj5c5dnsns4xkdppp2p3pv10d3";
+       libraryHaskellDepends = [ base deepseq ];
+       description = "True Sums of Products";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sophia" = callPackage
     ({ mkDerivation, base, binary, bindings-sophia, bytestring
      , criterion, directory, tasty, tasty-hunit
@@ -199102,6 +198840,58 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "store_0_5_0_1" = callPackage
+    ({ mkDerivation, array, async, base, base-orphans
+     , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
+     , clock, containers, contravariant, criterion, cryptohash, deepseq
+     , directory, filepath, free, ghc-prim, hashable, hspec
+     , hspec-smallcheck, integer-gmp, lifted-base, monad-control
+     , mono-traversable, network, primitive, resourcet, safe, semigroups
+     , smallcheck, store-core, syb, template-haskell, text, th-lift
+     , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
+     , transformers, unordered-containers, vector
+     , vector-binary-instances, void, weigh
+     }:
+     mkDerivation {
+       pname = "store";
+       version = "0.5.0.1";
+       sha256 = "0dpm7752p8lhlwq5nlhqxwq1c5nyi97rnj83j2im3i9wvs2qb3i3";
+       libraryHaskellDepends = [
+         array async base base-orphans base64-bytestring bifunctors
+         bytestring containers contravariant cryptohash deepseq directory
+         filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
+         lifted-base monad-control mono-traversable network primitive
+         resourcet safe semigroups smallcheck store-core syb
+         template-haskell text th-lift th-lift-instances th-orphans
+         th-reify-many th-utilities time transformers unordered-containers
+         vector void
+       ];
+       testHaskellDepends = [
+         array async base base-orphans base64-bytestring bifunctors
+         bytestring cereal cereal-vector clock containers contravariant
+         criterion cryptohash deepseq directory filepath free ghc-prim
+         hashable hspec hspec-smallcheck integer-gmp lifted-base
+         monad-control mono-traversable network primitive resourcet safe
+         semigroups smallcheck store-core syb template-haskell text th-lift
+         th-lift-instances th-orphans th-reify-many th-utilities time
+         transformers unordered-containers vector vector-binary-instances
+         void weigh
+       ];
+       benchmarkHaskellDepends = [
+         array async base base-orphans base64-bytestring bifunctors
+         bytestring containers contravariant criterion cryptohash deepseq
+         directory filepath free ghc-prim hashable hspec hspec-smallcheck
+         integer-gmp lifted-base monad-control mono-traversable network
+         primitive resourcet safe semigroups smallcheck store-core syb
+         template-haskell text th-lift th-lift-instances th-orphans
+         th-reify-many th-utilities time transformers unordered-containers
+         vector void
+       ];
+       description = "Fast binary serialization";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "store-core" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, primitive, text
      , transformers
@@ -207331,8 +207121,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-format-heavy";
-       version = "0.1.5.1";
-       sha256 = "14hmzsxhbqr95r7sbpziv897akdw8p54fhwh56j0h9hqnpwxxwgd";
+       version = "0.1.5.2";
+       sha256 = "1rzzdbi16zndbsbsc83zd24ni2z1g6ndvjn3ylwagxr9xhh0iwp5";
        libraryHaskellDepends = [
          base bytestring containers data-default parsec text time
        ];
@@ -211412,6 +211202,8 @@ self: {
        pname = "toodles";
        version = "0.1.0.9";
        sha256 = "01gjxd4pclilm19iw7nkr23pmyavd7d9k0wa1c63hwhdzm1591f7";
+       revision = "3";
+       editedCabalFile = "08zadf5r79dpw9g0hg6lsnyvcnpprzb9d0lfs67kpyigm5ih9w8w";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -216497,22 +216289,6 @@ self: {
      }) {};
 
   "union" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, lens, profunctors
-     , tagged, vinyl
-     }:
-     mkDerivation {
-       pname = "union";
-       version = "0.1.1.2";
-       sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw";
-       revision = "5";
-       editedCabalFile = "0mphzzvvr8lh1x8mb6n9nzzskx32cmr6ycihdy68qw35ybrqb0aj";
-       libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ];
-       benchmarkHaskellDepends = [ base criterion deepseq lens ];
-       description = "Extensible type-safe unions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "union_0_1_2" = callPackage
     ({ mkDerivation, base, criterion, deepseq, hashable, lens
      , profunctors, tagged, vinyl
      }:
@@ -216526,7 +216302,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq lens ];
        description = "Extensible type-safe unions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "union-find" = callPackage
@@ -229632,8 +229407,8 @@ self: {
        pname = "yampa-canvas";
        version = "0.2.2";
        sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n";
-       revision = "6";
-       editedCabalFile = "05bfjzmfvy4ir1bkky8iq4m988z4yww2k7h8s1na5i9w60c26d20";
+       revision = "7";
+       editedCabalFile = "1bj5ncrkwjpvjvrx0s23ksvwwsrybj7zl3sghl1d034wd9r89mxx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
@@ -229696,6 +229471,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yampa-test" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-test-quickcheck
+     , normaldistribution, QuickCheck, random, Yampa
+     }:
+     mkDerivation {
+       pname = "yampa-test";
+       version = "0.1.0.0";
+       sha256 = "1d69qa8dzwsj6pawlg88vwv1r2ig2vnx11zbaq0pbl5hczfnknpd";
+       libraryHaskellDepends = [
+         base normaldistribution QuickCheck Yampa
+       ];
+       testHaskellDepends = [
+         base Cabal cabal-test-quickcheck QuickCheck random Yampa
+       ];
+       description = "Testing library for Yampa";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yampa2048" = callPackage
     ({ mkDerivation, base, gloss, random, Yampa }:
      mkDerivation {
@@ -229974,24 +229767,6 @@ self: {
      }) {};
 
   "yeshql-core" = callPackage
-    ({ mkDerivation, base, containers, convertible, filepath, parsec
-     , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     }:
-     mkDerivation {
-       pname = "yeshql-core";
-       version = "4.1.0.1";
-       sha256 = "1v15n7h69j6v3zgvdbvy08l8in9z3yl9cbbfny4998i4p7fl2nzn";
-       libraryHaskellDepends = [
-         base containers convertible filepath parsec template-haskell
-       ];
-       testHaskellDepends = [
-         base containers stm tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "YesQL-style SQL database abstraction (core)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yeshql-core_4_1_0_2" = callPackage
     ({ mkDerivation, base, containers, convertible, filepath, parsec
      , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
      }:
@@ -230007,30 +229782,9 @@ self: {
        ];
        description = "YesQL-style SQL database abstraction (core)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yeshql-hdbc" = callPackage
-    ({ mkDerivation, base, containers, convertible, filepath, HDBC
-     , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, yeshql-core
-     }:
-     mkDerivation {
-       pname = "yeshql-hdbc";
-       version = "4.1.0.1";
-       sha256 = "0a5wkjkq1lfqk5cv7wmxbx28j6r3xqj8bbkafxfjvs2s02x4qvvc";
-       libraryHaskellDepends = [
-         base containers convertible filepath HDBC parsec template-haskell
-         yeshql-core
-       ];
-       testHaskellDepends = [
-         base containers HDBC stm tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "YesQL-style SQL database abstraction (HDBC backend)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yeshql-hdbc_4_1_0_2" = callPackage
     ({ mkDerivation, base, containers, convertible, filepath, HDBC
      , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
      , template-haskell, yeshql-core
@@ -230048,7 +229802,6 @@ self: {
        ];
        description = "YesQL-style SQL database abstraction (HDBC backend)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yeshql-postgresql-simple" = callPackage
@@ -230196,34 +229949,6 @@ self: {
      }) {};
 
   "yesod-auth" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
-     , base64-bytestring, binary, blaze-builder, blaze-html
-     , blaze-markup, bytestring, conduit, conduit-extra, containers
-     , cryptonite, data-default, email-validate, file-embed, http-client
-     , http-client-tls, http-conduit, http-types, memory, network-uri
-     , nonce, persistent, random, safe, shakespeare, template-haskell
-     , text, time, transformers, unliftio, unliftio-core
-     , unordered-containers, wai, yesod-core, yesod-form
-     , yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-auth";
-       version = "1.6.4.1";
-       sha256 = "1s1z39j7csp57py15w0il5bhi60y05b81abwfmccjllzzgs97m7j";
-       libraryHaskellDepends = [
-         aeson authenticate base base16-bytestring base64-bytestring binary
-         blaze-builder blaze-html blaze-markup bytestring conduit
-         conduit-extra containers cryptonite data-default email-validate
-         file-embed http-client http-client-tls http-conduit http-types
-         memory network-uri nonce persistent random safe shakespeare
-         template-haskell text time transformers unliftio unliftio-core
-         unordered-containers wai yesod-core yesod-form yesod-persistent
-       ];
-       description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth_1_6_5" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
@@ -230249,7 +229974,6 @@ self: {
        ];
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -230782,42 +230506,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";
-       sha256 = "010wjhf053bhivxascvlrxfmsqirhx6mf54aph3xblrkq8sx64hy";
-       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_8_1" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, byteable, bytestring, case-insensitive, cereal
      , clientsession, conduit, conduit-extra, containers, cookie
@@ -230851,7 +230539,6 @@ self: {
        ];
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -231113,28 +230800,6 @@ self: {
      }) {};
 
   "yesod-form" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, containers, data-default
-     , email-validate, hspec, network-uri, persistent, resourcet
-     , semigroups, shakespeare, text, time, transformers, wai
-     , xss-sanitize, yesod-core, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-form";
-       version = "1.6.2";
-       sha256 = "1p1x1hffvarplc82ykdk7rm6p5isqgqf78bvxzpfhncxs4kwx057";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder blaze-html blaze-markup
-         byteable bytestring containers data-default email-validate
-         network-uri persistent resourcet semigroups shakespeare text time
-         transformers wai xss-sanitize yesod-core yesod-persistent
-       ];
-       testHaskellDepends = [ base hspec text time ];
-       description = "Form handling support for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form_1_6_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
@@ -231154,7 +230819,6 @@ self: {
        testHaskellDepends = [ base hspec text time ];
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-bootstrap4" = callPackage
@@ -231520,27 +231184,6 @@ self: {
      }) {};
 
   "yesod-persistent" = callPackage
-    ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
-     , persistent-sqlite, persistent-template, resource-pool, resourcet
-     , text, transformers, wai-extra, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-persistent";
-       version = "1.6.0";
-       sha256 = "1gd59xf7b6v3cald58mzwnfbdzjr49cz60rm4wc5w9pvfx12pgj2";
-       libraryHaskellDepends = [
-         base blaze-builder conduit persistent persistent-template
-         resource-pool resourcet transformers yesod-core
-       ];
-       testHaskellDepends = [
-         base blaze-builder conduit hspec persistent persistent-sqlite text
-         wai-extra yesod-core
-       ];
-       description = "Some helpers for using Persistent from Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-persistent_1_6_0_1" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
      , persistent-sqlite, persistent-template, resource-pool, resourcet
      , text, transformers, wai-extra, yesod-core
@@ -231559,7 +231202,6 @@ self: {
        ];
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-platform" = callPackage
@@ -231985,40 +231627,6 @@ self: {
      }) {};
 
   "yesod-static" = callPackage
-    ({ mkDerivation, async, attoparsec, base, base64-bytestring
-     , blaze-builder, byteable, bytestring, conduit, containers
-     , cryptonite, cryptonite-conduit, css-text, data-default, directory
-     , exceptions, file-embed, filepath, hashable, hjsmin, hspec
-     , http-types, HUnit, memory, mime-types, old-time, process
-     , resourcet, template-haskell, text, transformers, unix-compat
-     , unordered-containers, wai, wai-app-static, wai-extra, yesod-core
-     , yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-static";
-       version = "1.6.0";
-       sha256 = "03l8jjn3pw7j38i91hakf1lgr4lf2lc610a783i7zhmr9f9ga2xx";
-       libraryHaskellDepends = [
-         async attoparsec base base64-bytestring blaze-builder byteable
-         bytestring conduit containers cryptonite cryptonite-conduit
-         css-text data-default directory exceptions file-embed filepath
-         hashable hjsmin http-types memory mime-types old-time process
-         resourcet template-haskell text transformers unix-compat
-         unordered-containers wai wai-app-static yesod-core
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring byteable bytestring conduit containers
-         cryptonite cryptonite-conduit data-default directory exceptions
-         file-embed filepath hjsmin hspec http-types HUnit memory mime-types
-         old-time process resourcet template-haskell text transformers
-         unix-compat unordered-containers wai wai-app-static wai-extra
-         yesod-core yesod-test
-       ];
-       description = "Static file serving subsite for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-static_1_6_0_1" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, conduit, containers, cryptonite
      , cryptonite-conduit, css-text, data-default, directory, file-embed
@@ -232048,7 +231656,6 @@ self: {
        ];
        description = "Static file serving subsite for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-static-angular" = callPackage
@@ -232131,31 +231738,6 @@ self: {
      }) {};
 
   "yesod-test" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , bytestring, case-insensitive, conduit, containers, cookie, hspec
-     , hspec-core, html-conduit, http-types, HUnit, network, pretty-show
-     , semigroups, text, time, transformers, unliftio, wai, wai-extra
-     , xml-conduit, xml-types, yesod-core, yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-test";
-       version = "1.6.5";
-       sha256 = "1n03h7rx9ixgvlf8isnr7b1g73fkpg8paiklr20b40x0yzvlc0my";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html bytestring
-         case-insensitive conduit containers cookie hspec-core html-conduit
-         http-types HUnit network pretty-show semigroups text time
-         transformers wai wai-extra xml-conduit xml-types yesod-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec html-conduit http-types HUnit text
-         unliftio wai wai-extra xml-conduit yesod-core yesod-form
-       ];
-       description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-test_1_6_5_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , bytestring, case-insensitive, conduit, containers, cookie, hspec
      , hspec-core, html-conduit, http-types, HUnit, network, pretty-show
@@ -232178,7 +231760,6 @@ self: {
        ];
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test-json" = callPackage
@@ -233928,6 +233509,31 @@ self: {
        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
+     , zlib
+     }:
+     mkDerivation {
+       pname = "zip-stream";
+       version = "0.2.0.1";
+       sha256 = "11x58s5w1lr8hw86grxijd94sw5r8k376b8n4dlm8lqz5xhmri5p";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary binary-conduit bytestring conduit conduit-extra digest
+         exceptions mtl primitive resourcet text time transformers-base zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring conduit conduit-extra directory filepath resourcet
+         text time transformers
+       ];
+       description = "ZIP archive streaming using conduits";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "zipedit" = callPackage
     ({ mkDerivation, base, directory, mtl, process }:
      mkDerivation {
-- 
GitLab


From 8089b93697a69f74fe70e65c0421868a7a0480d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Oct 2018 14:12:41 +0200
Subject: [PATCH 0308/1065] all-cabal-hashes: update snapshot to Hackage at
 2018-10-22T08:31:54Z

---
 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 079fccadfcb..0be9abba71d 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/70f02ad82349a18e1eff41eea4949be532486f7b.tar.gz";
-  sha256 = "1ajqybsl8hfzbhziww57zp9a8kgypj96ngxrargk916v3xpf3x15";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/420a405e4dbccd78b2a471b632b9fe1a1e04502b.tar.gz";
+  sha256 = "01vdbp1yh2s0afijz9ap4590mlpiica7l6k0mpfc0jwzymn9w86n";
 }
-- 
GitLab


From c66c169f8150d6c8ed5c5c2993c7de197b7ec48a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Oct 2018 13:52:22 +0200
Subject: [PATCH 0309/1065] stack: fix the ghc 8.4.x build

---
 .../configuration-ghc-8.4.x.nix                | 18 +++++++++++++++---
 pkgs/top-level/all-packages.nix                |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 8d0669ca2ac..052779e9a1e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -56,8 +56,20 @@ self: super: {
           };
     in appendPatch super.hadoop-rpc patch;
 
-  # Version 1.9.1 needs Cabal 2.4.x or later, so
-  # we use the one from the ghc-8.6.1 package set.
-  stack = markBroken super.stack;
+  # stack-1.9.1 needs Cabal 2.4.x, a recent version of hpack, and a non-recent
+  # version of yaml. Go figure. We avoid overrideScope here because using it to
+  # change Cabal would re-compile every single package instead of just those
+  # that have it as an actual library dependency. The explicit overrides are
+  # more verbose but friendlier for Hydra.
+  stack = (doJailbreak super.stack).override {
+    Cabal = self.Cabal_2_4_0_1;
+    hpack = self.hpack_0_31_0;
+    yaml = self.yaml_0_11_0_0;
+    hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_0_1; };
+  };
+  hpack_0_31_0 = super.hpack_0_31_0.override {
+    Cabal = self.Cabal_2_4_0_1;
+    yaml = self.yaml_0_11_0_0;
+  };
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 435a5c90e25..dea13be70d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6848,7 +6848,7 @@ with pkgs;
 
   cabal-install = haskell.lib.justStaticExecutables haskellPackages.cabal-install;
 
-  stack = haskell.lib.justStaticExecutables haskell.packages.ghc861.stack;
+  stack = haskell.lib.justStaticExecutables haskellPackages.stack;
   hlint = haskell.lib.justStaticExecutables haskellPackages.hlint;
 
   all-cabal-hashes = callPackage ../data/misc/hackage { };
-- 
GitLab


From cfbf9cbf39d48c60b5af97cabe2b56a60a9204cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Oct 2018 14:16:57 +0200
Subject: [PATCH 0310/1065] haskell-yesod-core: 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 2cb95a397c6..33f498d922b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1147,9 +1147,6 @@ self: super: {
 
   arbtt = doJailbreak super.arbtt;
 
-  # https://github.com/yesodweb/yesod/issues/1563
-  yesod-core = self.yesod-core_1_6_8_1;
-
   # https://github.com/danfran/cabal-macosx/issues/13
   cabal-macosx = dontCheck super.cabal-macosx;
 
-- 
GitLab


From 84b6bf8226df22b6e7c00fa115060871329f2874 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Oct 2018 14:29:38 +0200
Subject: [PATCH 0311/1065] haskell-pandoc-types: drop obsolete override

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 5 +----
 1 file changed, 1 insertion(+), 4 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 ca2c8849dc6..63babd8b282 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -109,10 +109,7 @@ self: super: {
   # https://github.com/skogsbaer/HTF/issues/69
   HTF = markBrokenVersion "0.13.2.4" super.HTF;
 
-  # https://github.com/jgm/pandoc-types/issues/52
-  pandoc-types = doJailbreak super.pandoc-types;
-
-  #
+  # https://github.com/jgm/skylighting/issues/55
   skylighting-core = dontCheck super.skylighting-core;
 
   # https://github.com/joelburget/easytest/issues/12
-- 
GitLab


From f1fd7da4067f0ee17e3d19b5a2cb200321c50e86 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Oct 2018 14:32:40 +0200
Subject: [PATCH 0312/1065] haskell-lucid: drop obsolete override

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 1 -
 1 file changed, 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 63babd8b282..61f188aeddb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -90,7 +90,6 @@ self: super: {
   data-clist = doJailbreak super.data-clist;  # won't cope with QuickCheck 2.12.x
   Diff = dontCheck super.Diff;
   http-api-data = doJailbreak super.http-api-data;
-  lucid = doJailbreak super.lucid;
   persistent-sqlite = dontCheck super.persistent-sqlite;
   psqueues = dontCheck super.psqueues;    # won't cope with QuickCheck 2.12.x
   system-fileio = dontCheck super.system-fileio;  # avoid dependency on broken "patience"
-- 
GitLab


From 26974e962ebc5c1e3dfd8f6a84402ad72dc43d24 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 24 Oct 2018 21:49:32 +0200
Subject: [PATCH 0313/1065] cabal2nix: fix build with ghc 8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 052779e9a1e..213651405f3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -63,12 +63,11 @@ self: super: {
   # more verbose but friendlier for Hydra.
   stack = (doJailbreak super.stack).override {
     Cabal = self.Cabal_2_4_0_1;
-    hpack = self.hpack_0_31_0;
+    hpack = self.hpack_0_31_0.override { Cabal = self.Cabal_2_4_0_1; };
     yaml = self.yaml_0_11_0_0;
     hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_0_1; };
   };
   hpack_0_31_0 = super.hpack_0_31_0.override {
-    Cabal = self.Cabal_2_4_0_1;
     yaml = self.yaml_0_11_0_0;
   };
 
-- 
GitLab


From 84e915a779b456b51a5368d6b0ec8d095ffedeb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 22 Jun 2018 12:41:29 +0100
Subject: [PATCH 0314/1065] cntr: init at 1.2.0

---
 .../virtualization/cntr/default.nix           | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/virtualization/cntr/default.nix

diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix
new file mode 100644
index 00000000000..79dbddfab55
--- /dev/null
+++ b/pkgs/applications/virtualization/cntr/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  name = "cntr-${version}";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "Mic92";
+    repo = "cntr";
+    rev = version;
+    sha256 = "0lmbsnjia44h4rskqkv9yc7xb6f3qjgbg8kcr9zqnr7ivr5fjcxg";
+  };
+
+  cargoSha256 = "0gainr5gfy0bbhr6078zvgx0kzp53slxjp37d3da091ikgzgfn51";
+
+  meta = with stdenv.lib; {
+    description = "A container debugging tool based on FUSE";
+    homepage = https://github.com/Mic92/cntr;
+    license = licenses.mit;
+    # aarch64 support will be fixed soon
+    platforms = [ "x86_64-linux" ];
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07068cc2917..1175915d6f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15994,6 +15994,8 @@ with pkgs;
   cni = callPackage ../applications/networking/cluster/cni {};
   cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {};
 
+  cntr = callPackage ../applications/virtualization/cntr { };
+
   communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
 
   confclerk = callPackage ../applications/misc/confclerk { };
-- 
GitLab


From f10b935f84d068f616f335ad75a99f13af35337a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 22 Jun 2018 12:12:40 +0100
Subject: [PATCH 0315/1065] breakpointHook: add for debugging failing builds

Usuage: Add breakpointHook to your `buildInputs` like this:

  stdenv.mkDerivation rec {
    # ...
    buildInputs = [ breakpointHook ];
  });

When the build fails as show in this example:

  pkgs.hello.overrideAttrs (old: {
    buildInputs = [ breakpointHook ];
    postPatch = ''
      false
    '';
  });

It will halt execution printing the following message:

build failed in patchPhase with exit code 1
To attach to this build run the following command as root:

   cntr attach -t command cntr-/nix/store/ynyb4n82x2r7sldd58pbb405jdqh5f00-hello-2.10

Installing cntr and running the command will provide shell access to the
build sandbox of failed build:

sudo cntr attach -t command cntr-/nix/store/ynyb4n82x2r7sldd58pbb405jdqh5f00-hello-2.10
WARNING: bad ownership on /nix/var/nix/profiles/per-user/root, should be 1000
[nixbld@localhost:/var/lib/cntr]$

At /var/lib/cntr the sandbox 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.
---
 pkgs/build-support/setup-hooks/breakpoint-hook.sh | 9 +++++++++
 pkgs/top-level/all-packages.nix                   | 3 +++
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/build-support/setup-hooks/breakpoint-hook.sh

diff --git a/pkgs/build-support/setup-hooks/breakpoint-hook.sh b/pkgs/build-support/setup-hooks/breakpoint-hook.sh
new file mode 100644
index 00000000000..6bef786ac3a
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/breakpoint-hook.sh
@@ -0,0 +1,9 @@
+breakpointHook() {
+    local red='\033[0;31m'
+    local no_color='\033[0m'
+
+    echo -e "${red}build failed in ${curPhase} with exit code ${exitCode}${no_color}"
+    printf "To attach install cntr and run the following command as root:\n\n"
+    sh -c "echo '   cntr attach -t command cntr-${out}'; while true; do sleep 99999999; done"
+}
+failureHooks+=(breakpointHook)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1175915d6f9..5a345407705 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -977,6 +977,9 @@ with pkgs;
 
   bruteforce-luks = callPackage ../tools/security/bruteforce-luks { };
 
+  breakpointHook = assert stdenv.isLinux;
+    makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh;
+
   bsod = callPackage ../misc/emulators/bsod { };
 
   btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
-- 
GitLab


From 325a5699cb0002b135f778497486366c92e3f8e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 25 Oct 2018 09:52:21 +0100
Subject: [PATCH 0316/1065] doc/breakpointHook: add documentation

---
 doc/stdenv.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index cc0c13c5447..c3b155ab0e9 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -2445,6 +2445,25 @@ addEnvHooks "$hostOffset" myBashFunction
       </para>
      </listitem>
     </varlistentry>
+    <varlistentry>
+     <term>
+      breakpointHook
+     </term>
+     <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 allows the user to attach
+       to a build environemnt using the <varname>cntr</varname> command.
+       On build error it will print the instruction that are neccessary for cntr.
+       Note that <varname>cntr</varname> is not installed by default and
+       needs to be installed seperatly. <varname>cntr</varname> also needs to be executed
+       on the machine that is doing the build, which might be not the case
+       when remote builders are enabled. <varname>cntr</varname> is only supported
+       on linux based platforms.
+      </para>
+     </listitem>
+    </varlistentry>
    </variablelist>
   </para>
  </section>
-- 
GitLab


From 2702772d2d10dc482cbe20d766d214bf89d1ed71 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 25 Oct 2018 11:42:48 +0000
Subject: [PATCH 0317/1065] weechat: 2.2 -> 2.3

Fixes https://github.com/NixOS/nixpkgs/issues/48798.
---
 .../applications/networking/irc/weechat/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 513407a0b71..7ed237ce6aa 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -30,12 +30,12 @@ let
   weechat =
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
-      version = "2.2";
+      version = "2.3";
       name = "weechat-${version}";
 
       src = fetchurl {
-        url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
-        sha256 = "0p4nhh7f7w4q77g7jm9i6fynndqlgjkc9dk5g1xb4gf9imiisqlg";
+        url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
+        sha256 = "0mi4pfnyny0vqc35r0scn6yy21y790a5iwq8ms7kch7b7z11jn9w";
       };
 
       outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
@@ -70,13 +70,6 @@ let
         done
       '';
 
-      # remove when bumping to the latest version.
-      # This patch basically rebases `fcf7469d7664f37e94d5f6d0b3fe6fce6413f88c`
-      # from weechat upstream to weechat-2.2.
-      patches = [
-        ./aggregate-commands.patch
-      ];
-
       meta = {
         homepage = http://www.weechat.org/;
         description = "A fast, light and extensible chat client";
-- 
GitLab


From e9f1ca0cb1773473211b815545519b6d69f20170 Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <ignat.loskutov@gmail.com>
Date: Thu, 25 Oct 2018 15:08:28 +0300
Subject: [PATCH 0318/1065] aircrack-ng: 1.2 -> 1.4

---
 pkgs/tools/networking/aircrack-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index ab8d257d7c7..a0c44b0341c 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -3,18 +3,18 @@
 , autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "aircrack-ng-1.2";
+  name = "aircrack-ng-1.4";
 
   src = fetchurl {
     url = "https://download.aircrack-ng.org/${name}.tar.gz";
-    sha256 = "0z7sl1ihgrnc98bpqa1mmkh51w26fnsanvj6ydwcnd8g83azwkvr";
+    sha256 = "0fz1g6sd7dkfgcxrfrnqbygpx8d4ziyidm9wjb0ws9xgyy52l2cn";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ];
   buildInputs = [ libpcap openssl zlib libnl iw ethtool pciutils ];
 
   patchPhase = ''
-    sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/osdep/linux.c
+    sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/aircrack-osdep/linux.c
   '';
 
   postFixup = ''
-- 
GitLab


From a9c0329c08152fffed29239ea42ae8a9f3f50fbc Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 25 Oct 2018 15:28:17 +0200
Subject: [PATCH 0319/1065] containerd: 1.1.4 -> 1.2.0

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 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 a1ff9bde3ed..bd44b4fcbfe 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -5,13 +5,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "containerd-${version}";
-  version = "1.1.4";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "1d4qnviv20zi3zk17zz8271mlfqqgfrxblw86izwwfvj3cvsyrah";
+    sha256 = "03d244v85975bavmlg66kd283jdb22yyvwkwcgy91n63jhvvbadk";
   };
 
   hardeningDisable = [ "fortify" ];
-- 
GitLab


From eec630fb1ecba8ef971372301e4e4048b6ff952a Mon Sep 17 00:00:00 2001
From: David Costa <david@zarel.net>
Date: Thu, 25 Oct 2018 14:34:11 +0100
Subject: [PATCH 0320/1065] mailcatcher: repackage using bundlerApp

---
 pkgs/development/web/mailcatcher/default.nix | 30 ++++----------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/web/mailcatcher/default.nix b/pkgs/development/web/mailcatcher/default.nix
index 49c5c4d81af..a2fa509232d 100644
--- a/pkgs/development/web/mailcatcher/default.nix
+++ b/pkgs/development/web/mailcatcher/default.nix
@@ -1,29 +1,11 @@
-{ stdenv, bundlerEnv, ruby, makeWrapper }:
+{ lib, bundlerApp }:
 
-stdenv.mkDerivation rec {
-  name = "mailcatcher-${version}";
+bundlerApp {
+  pname = "mailcatcher";
+  gemdir = ./.;
+  exes = [ "mailcatcher" "catchmail" ];
 
-  version = (import ./gemset.nix).mailcatcher.version;
-
-  env = bundlerEnv {
-    name = "${name}-gems";
-
-    inherit ruby;
-
-    gemdir = ./.;
-  };
-
-  buildInputs = [ makeWrapper ];
-
-  unpackPhase = ":";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    makeWrapper ${env}/bin/mailcatcher $out/bin/mailcatcher
-    makeWrapper ${env}/bin/catchmail $out/bin/catchmail
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "SMTP server and web interface to locally test outbound emails";
     homepage    = https://mailcatcher.me/;
     license     = licenses.mit;
-- 
GitLab


From cbd9a35a13bed95b4510682064238af56db8ebab Mon Sep 17 00:00:00 2001
From: Tim Digel <tim.digel@active-group.de>
Date: Thu, 25 Oct 2018 15:54:44 +0200
Subject: [PATCH 0321/1065] elixir: 1.7.3 -> 1.7.4

---
 pkgs/development/interpreters/elixir/1.7.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix
index d97d416bc27..adbbbaff890 100644
--- a/pkgs/development/interpreters/elixir/1.7.nix
+++ b/pkgs/development/interpreters/elixir/1.7.nix
@@ -1,7 +1,7 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "1.7.3";
-  sha256 = "0d7rj4khmvy76z12njzwzknm1j9rhjadgj9k1chjd4gnjffkb1aa";
+  version = "1.7.4";
+  sha256 = "0f8j4pib13kffiihagdwl3xqs3a1ak19qz3z8fpyfxn9dnjiinla";
   minimumOTPVersion = "19";
 }
-- 
GitLab


From e3927861d64ef3de05517332dd6e3a798650cdc5 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 25 Oct 2018 17:07:03 +0200
Subject: [PATCH 0322/1065] grafana: 5.3.1 -> 5.3.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 b3a31d2d1ba..70112732d27 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.1";
+  version = "5.3.2";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0k4jsqgk0wbp1xc159vrs855d42kcdc4d38v498imp6a90idniyp";
+    sha256 = "1p2vapyaf11d7zri73vnq1rsgwb018pqbjzdkdgppcm5xfrrjh8y";
   };
 
   srcStatic = fetchurl {
     url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "133ckn5f4l6vqy65y1z3mzhzhy8xcyq65nqb34mwn2zsi7pzvssz";
+    sha256 = "067rj2lrdwxda1clcg89m1cnl9sfrl2l9ia5fx2bcxq3yzhchazh";
   };
 
   postPatch = ''
-- 
GitLab


From 5ab10923d653de14ec8c4f1c6b7619fa876dd1e4 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Thu, 25 Oct 2018 17:51:39 +0200
Subject: [PATCH 0323/1065] mapmap: mark broken

the mapmap binary segfaults at the moment at master and nixos-18.09. I
will speak with upstream for a fix and mark this broken in the meantime.
---
 pkgs/applications/video/mapmap/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix
index c44bd25b91a..4dd2e019d1d 100644
--- a/pkgs/applications/video/mapmap/default.nix
+++ b/pkgs/applications/video/mapmap/default.nix
@@ -57,6 +57,8 @@ mkDerivation rec {
     license = licenses.gpl3;
     maintainers = [ maintainers.erictapen ];
     platforms = platforms.linux;
+    # binary segfaults at the moment
+    broken = true;
   };
 
 }
-- 
GitLab


From 8ddefe857dbbb909248f5225156c65f7ee457fdd Mon Sep 17 00:00:00 2001
From: Marwan Aljubeh <marwan.aljubeh@gmail.com>
Date: Thu, 25 Oct 2018 15:55:33 +0100
Subject: [PATCH 0324/1065] nixos/nextcloud: fix a typo

The NextCloud `adminpass` option sets the admin password, not the database password.
---
 nixos/modules/services/web-apps/nextcloud.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 797d410dbeb..c7e97bbeba9 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -192,7 +192,7 @@ in {
         type = types.nullOr types.str;
         default = null;
         description = ''
-          Database password.  Use <literal>adminpassFile</literal> to avoid this
+          Admin password.  Use <literal>adminpassFile</literal> to avoid this
           being world-readable in the <literal>/nix/store</literal>.
         '';
       };
-- 
GitLab


From 23a017fbca748e717ef695f7ee817af6f7aeefed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 25 Oct 2018 17:08:44 +0100
Subject: [PATCH 0325/1065] nix-review: 0.5.2 -> 0.5.3

---
 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 da32aca28aa..126673ad9cc 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.5.2";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-review";
     rev = version;
-    sha256 = "0csd7dkdv0csc63dz1h08c8xifxwv5fdz5dyk37sr6vh1ccjdapi";
+    sha256 = "14ak0qfc5faamnp4fmrqmb1ikpv656nr830rja89yzc96s73337z";
   };
 
   makeWrapperArgs = [
-- 
GitLab


From 2595be06af5c174aae5abee4f07bb050f88c13f7 Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@web.de>
Date: Thu, 25 Oct 2018 19:04:14 +0200
Subject: [PATCH 0326/1065] tikzit: init at 2.0 (#48479)

* tikzit: init at 2.0

* tikzit: Parallel building and qualification
---
 pkgs/tools/typesetting/tikzit/default.nix | 31 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/typesetting/tikzit/default.nix

diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix
new file mode 100644
index 00000000000..23d8093606b
--- /dev/null
+++ b/pkgs/tools/typesetting/tikzit/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, qmake, qttools, qtbase, flex, bison }:
+
+stdenv.mkDerivation rec {
+  name = "tikzit-${version}";
+  version = "2.0";
+
+  src = fetchFromGitHub {
+    owner = "tikzit";
+    repo = "tikzit";
+    rev = "v${version}";
+    sha256 = "0fwxr9rc9vmw2jzpj084rygzyhp4xm3vm737668az600ln2scyad";
+  };
+
+  nativeBuildInputs = [ qmake qttools flex bison ];
+  buildInputs = [ qtbase ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A graphical tool for rapidly creating graphs and diagrams using PGF/TikZ";
+    longDescription = ''
+      TikZiT is a simple GUI editor for graphs and string diagrams.
+      Its native file format is a subset of PGF/TikZ, which means TikZiT files
+      can be included directly in papers typeset using LaTeX.
+    '';
+    homepage = https://tikzit.github.io/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.all;
+    maintainers = [ maintainers.iblech maintainers.mgttlinger ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc12e6b0c7e..24d61f87322 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5633,6 +5633,8 @@ with pkgs;
 
   tie = callPackage ../development/tools/misc/tie { };
 
+  tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { };
+
   tilix = callPackage ../applications/misc/tilix { };
 
   tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };
-- 
GitLab


From 2da9bb8b4d4b90f5ad8cf32c653ee8d5ae3e9b77 Mon Sep 17 00:00:00 2001
From: qolii <qoli@protonmail.com>
Date: Thu, 25 Oct 2018 10:10:22 -0700
Subject: [PATCH 0327/1065] eternal-terminal: 5.1.6 -> 5.1.7.

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

diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index fda5d25aa17..f9f67f59abf 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "eternal-terminal-${version}";
-  version = "5.1.6";
+  version = "5.1.7";
 
   src = fetchFromGitHub {
     owner = "MisterTea";
     repo = "EternalTCP";
     rev = "refs/tags/et-v${version}";
-    sha256 = "0df573c5hi3hxa0d3m02zf2iyh841540dklj9lmp6faik8cp39jz";
+    sha256 = "17ndpkpyh8hwr6v7ac6029sja95nhn9c1g8r93g20rp0vz3r6lpa";
   };
 
   nativeBuildInputs = [ cmake ninja ];
-- 
GitLab


From d09961c22ba58e737737c7aa0b9e88b9f15359b4 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 25 Oct 2018 17:28:05 +0000
Subject: [PATCH 0328/1065] openjpeg_2: rename from openjpeg_2_1 at 2.3.0

---
 pkgs/development/libraries/openjpeg/{2.1.nix => 2.x.nix} | 0
 pkgs/top-level/aliases.nix                               | 1 +
 pkgs/top-level/all-packages.nix                          | 4 ++--
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/openjpeg/{2.1.nix => 2.x.nix} (100%)

diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.x.nix
similarity index 100%
rename from pkgs/development/libraries/openjpeg/2.1.nix
rename to pkgs/development/libraries/openjpeg/2.x.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c5cbc3abce9..4a8c4f1334d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -205,6 +205,7 @@ mapAliases ({
   opencascade_oce = opencascade; # added 2018-04-25
   opencl-icd = ocl-icd; # added 2017-01-20
   openexr_ctl = ctl; # added 2018-04-25
+  openjpeg_2_1 = openjpeg_2; # added 2018-10-25
   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 24d61f87322..8e21829c262 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11590,8 +11590,8 @@ with pkgs;
   openh264 = callPackage ../development/libraries/openh264 { };
 
   openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { };
-  openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { };
-  openjpeg = openjpeg_2_1;
+  openjpeg_2 = callPackage ../development/libraries/openjpeg/2.x.nix { };
+  openjpeg = openjpeg_2;
 
   openpa = callPackage ../development/libraries/openpa { };
 
-- 
GitLab


From 62ce2bb42a3c92c99f366eb35bc686abb7273996 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 25 Oct 2018 17:44:19 +0000
Subject: [PATCH 0329/1065] eccodes: build with openjpeg

It did not look for openjpeg-2.3 and was built without openjpeg support.
---
 pkgs/development/libraries/eccodes/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 01600f90f28..23d20f418c3 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -3,7 +3,7 @@
 , enablePython ? false, pythonPackages
 , enablePosixThreads ? false
 , enableOpenMPThreads ? false}:
-with stdenv.lib; 
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "eccodes-${version}";
   version = "2.9.0";
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
     sha256 = "1mh9zkfb5dj3j8fk3gdhz2bp6z13nik5pmynpf5l6qy3lhgyn17z";
   };
 
+  postPatch = ''
+    substituteInPlace cmake/FindOpenJPEG.cmake --replace openjpeg-2.1 ${openjpeg.incDir}
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ netcdf
-- 
GitLab


From 950608bae0b4fd15d603c5ec4686c170df85a1d3 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Mon, 22 Oct 2018 16:00:14 -0700
Subject: [PATCH 0330/1065] androidsdk: 25.2.5 -> 26.1.1, license agreement

---
 .../mobile/androidenv/androidsdk.nix          | 61 +++++++++----------
 .../development/mobile/androidenv/default.nix |  4 +-
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 5f61f25d54e..feef5a787bf 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -4,10 +4,18 @@
 , freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus
 , zlib, glxinfo, xkeyboardconfig
 , includeSources
+, licenseAccepted
 }:
 { platformVersions, abiVersions, useGoogleAPIs, 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";
@@ -20,16 +28,16 @@ in
 
 stdenv.mkDerivation rec {
   name = "android-sdk-${version}";
-  version = "25.2.5";
+  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/tools_r${version}-linux.zip";
-      sha256 = "0gnk49pkwy4m0nqwm1xnf3w4mfpi9w0kk7841xlawpwbkj0icxap";
+      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 = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip";
-      sha256 = "0yg7wjmyw70xsh8k4hgbqb5rilam2a94yc8dwbh7fjwqcmpxgwqb";
+      url = "https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip";
+      sha256 = "0gl5c30m40kx0vvrpbaa8cw8wq2vb89r14hgzb1df4qgpic97cpc";
     }
     else throw "platform not ${stdenv.hostPlatform.system} supported!";
 
@@ -39,7 +47,7 @@ stdenv.mkDerivation rec {
     unpackFile $src
     cd tools
 
-    for f in android traceview draw9patch hierarchyviewer monitor ddms screenshot2 uiautomatorviewer monkeyrunner jobb lint
+    for f in monitor bin/monkeyrunner bin/uiautomatorviewer
     do
         sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" "$f"
     done
@@ -54,24 +62,6 @@ stdenv.mkDerivation rec {
           patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib $i
       done
 
-      ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
-        for i in bin64/{mkfs.ext4,fsck.ext4,e2fsck,tune2fs,resize2fs}
-        do
-            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
-      ''}
-
-      ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
-        # We must also patch the 64-bit emulator instances, if needed
-
-        for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service emulator-check qemu/linux-x86_64/qemu-system-*
-        do
-            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
-      ''}
-
       # The following scripts used SWT and wants to dynamically load some GTK+ stuff.
       # Creating these wrappers ensure that they can be found:
 
@@ -79,22 +69,18 @@ stdenv.mkDerivation rec {
         --prefix PATH : ${jdk}/bin \
         --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk2 libXtst ]}
 
-      wrapProgram `pwd`/uiautomatorviewer \
-        --prefix PATH : ${jdk}/bin \
-        --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]}
-
-      wrapProgram `pwd`/hierarchyviewer \
+      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") ''
-        for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service
+        for i in emulator emulator-check
         do
             wrapProgram `pwd`/$i \
               --prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \
-              --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext libGLU_combined alsaLib zlib libpulseaudio dbus.lib ]} \
+              --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
       ''}
@@ -245,6 +231,14 @@ stdenv.mkDerivation rec {
         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 ]
@@ -260,6 +254,11 @@ stdenv.mkDerivation rec {
             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 ];
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 1f61be9440b..bd369200bd5 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -1,5 +1,5 @@
 { buildPackages, pkgs, pkgs_i686, targetPackages
-, includeSources ? true
+, includeSources ? true, licenseAccepted ? false
 }:
 
 # TODO: use callPackage instead of import to avoid so many inherits
@@ -57,7 +57,7 @@ rec {
 
     inherit platformTools buildTools support
             supportRepository platforms sysimages
-            addons sources includeSources;
+            addons sources includeSources licenseAccepted;
 
     stdenv_32bit = pkgs_i686.stdenv;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e50ad0a0b45..9a04bd44f0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -766,6 +766,7 @@ with pkgs;
 
   androidenv = callPackage ../development/mobile/androidenv {
     pkgs_i686 = pkgsi686Linux;
+    licenseAccepted = (config.android_sdk.accept_license or false);
   };
 
   inherit (androidenv) androidndk;
-- 
GitLab


From ad501e4c2fc1f98ee3146c19d8ab38a27b5ebceb Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Mon, 22 Oct 2018 16:01:40 -0700
Subject: [PATCH 0331/1065] androidenv.buildtools: 28.0.2 -> 28.0.3

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

diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 85e604bd3f4..a607ed31900 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -1,16 +1,16 @@
 {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}:
 
 stdenv.mkDerivation rec {
-  version = "26.0.2";
+  version = "28.0.3";
   name = "android-build-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/build-tools_r${version}-linux.zip";
-      sha256 = "1kii880bwhjkc343zwx1ysxyisxhczrwhphnxbwsgi45mjgq8lm7";
+      sha256 = "16klhw9yk8znvbgvg967km4y5sb87z1cnf6njgv8hg3381m9am3r";
     }
     else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl {
       url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip";
-      sha256 = "1x0ycprl6hgsm23kck5ind7x00hzydc5k3h3ch4a13407xbpvzvx";
+      sha256 = "1src9g7058bl2z9y6v404gwqwpixb8b71awxhrb0w5iwnfabhymq";
     }
     else throw "System ${stdenv.hostPlatform.system} not supported!";
 
-- 
GitLab


From b28552d58f7da31bddf78c3e70082b36114adfdc Mon Sep 17 00:00:00 2001
From: Richard Lupton <rlupton20@users.noreply.github.com>
Date: Thu, 25 Oct 2018 20:08:49 +0100
Subject: [PATCH 0332/1065] signify: init at 24 (#48927)

---
 pkgs/tools/security/signify/default.nix | 34 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/security/signify/default.nix

diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix
new file mode 100644
index 00000000000..68db242f40a
--- /dev/null
+++ b/pkgs/tools/security/signify/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, libbsd, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "signify-${version}";
+  version = "24";
+
+  src = fetchFromGitHub {
+    owner = "aperezdc";
+    repo = "signify";
+    rev = "v${version}";
+    sha256 = "0grdlrpxcflzmzzc30r8rvsmamvbsgqyni59flzzk4w5hpjh464w";
+  };
+
+  doCheck = true;
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libbsd ];
+
+  preInstall = ''
+    export PREFIX=$out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "OpenBSD signing tool";
+    longDescription = ''
+      OpenBSDs signing tool, which uses the Ed25519 public key signature system
+      for fast signing and verification of messages using small public keys.
+    '';
+    homepage = https://www.tedunangst.com/flak/post/signify;
+    license = licenses.isc;
+    maintainers = [ maintainers.rlupton20 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e21829c262..fec956657e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5286,6 +5286,8 @@ with pkgs;
 
   signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { };
 
+  signify = callPackage ../tools/security/signify { };
+
   # aka., pgp-tools
   signing-party = callPackage ../tools/security/signing-party { };
 
-- 
GitLab


From 2cc4200de0b88fcbb2a0101fe69751c3a802de6d Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 9 Oct 2018 20:47:07 +0200
Subject: [PATCH 0333/1065] cdb: init at 0.75
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We check in the docs from a mirror repository, because the upstream
release doesn’t provide them.
---
 .../tools/database/cdb/default.nix            | 57 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/tools/database/cdb/default.nix

diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix
new file mode 100644
index 00000000000..8def71568e7
--- /dev/null
+++ b/pkgs/development/tools/database/cdb/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, lib, fetchurl, fetchFromGitHub, writeText }:
+
+let
+  version = "0.75";
+  sha256 = "1iajg55n47hqxcpdzmyq4g4aprx7bzxcp885i850h355k5vmf68r";
+  # Please don’t forget to update the docs:
+  # clone https://github.com/Profpatsch/cdb-docs
+  # and create a pull request with the result of running
+  # ./update <version>
+  # from the repository’s root folder.
+  docRepo = fetchFromGitHub {
+    owner = "Profpatsch";
+    repo = "cdb-docs";
+    rev = "359b6c55c9e170ebfc88f3f38face8ae2315eacb";
+    sha256 = "1y0ivviy58i0pmavhvrpznc4yjigjknff298gnw9rkg5wxm0gbbq";
+  };
+
+in stdenv.mkDerivation {
+  name = "cdb-${version}";
+
+  src = fetchurl {
+    url = "https://cr.yp.to/cdb/cdb-${version}.tar.gz";
+    inherit sha256;
+  };
+
+  outputs = [ "bin" "doc" "out" ];
+
+  postPatch = ''
+    # A little patch, borrowed from Archlinux AUR, borrowed from Gentoo Portage
+    sed -e 's/^extern int errno;$/#include <errno.h>/' -i error.h
+  '';
+
+  postInstall = ''
+    # don't use make setup, but move the binaries ourselves
+    mkdir -p $bin/bin
+    install -m 755 -t $bin/bin/ cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest
+
+    # patch paths in scripts
+    function cdbmake-subst {
+      substituteInPlace $bin/bin/$1 \
+        --replace /usr/local/bin/cdbmake $bin/bin/cdbmake
+    }
+    cdbmake-subst cdbmake-12
+    cdbmake-subst cdbmake-sv
+
+    # docs
+    mkdir -p $doc/share/cdb
+    cp -r "${docRepo}/docs" $doc/share/cdb/html
+  '';
+
+  meta = {
+    homepage = "https://cr.yp.to/cdb";
+    license = lib.licenses.publicDomain;
+    maintainers = [ lib.maintainers.Profpatsch ];
+    platforms = [ lib.platforms.unix ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fec956657e9..e4293c40ba0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6463,6 +6463,8 @@ with pkgs;
     inherit (darwin) bootstrap_cmds;
   };
 
+  cdb = callPackage ../development/tools/database/cdb { };
+
   chez = callPackage ../development/compilers/chez {
     inherit (darwin) cctools;
   };
-- 
GitLab


From 19d1cafb9e1bcddeae3cd8839cf8ad36d73832a7 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 21:34:08 +0200
Subject: [PATCH 0334/1065] neon: add license

---
 pkgs/development/libraries/neon/0.29.nix    | 5 +++--
 pkgs/development/libraries/neon/default.nix | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix
index d0f992efb2b..87f9b5effac 100644
--- a/pkgs/development/libraries/neon/0.29.nix
+++ b/pkgs/development/libraries/neon/0.29.nix
@@ -40,9 +40,10 @@ stdenv.mkDerivation rec {
   checkInputs = [ perl ];
   doCheck = false; # fails, needs the net
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An HTTP and WebDAV client library";
     homepage = http://www.webdav.org/neon/;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.lgpl2;
   };
 }
diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix
index 7aad5be36f7..61a40753a56 100644
--- a/pkgs/development/libraries/neon/default.nix
+++ b/pkgs/development/libraries/neon/default.nix
@@ -40,9 +40,10 @@ stdenv.mkDerivation rec {
   checkInputs = [ perl ];
   doCheck = false; # fails, needs the net
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An HTTP and WebDAV client library";
     homepage = http://www.webdav.org/neon/;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.lgpl2;
   };
 }
-- 
GitLab


From 46a495ac75c29b072d85a921aeb03b081ac841be Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 21:41:35 +0200
Subject: [PATCH 0335/1065] netcdf: add url to license

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

diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index 7d0e934d911..0c597fc4b33 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -43,5 +43,8 @@ in stdenv.mkDerivation rec {
   meta = {
       platforms = stdenv.lib.platforms.unix;
       homepage = https://www.unidata.ucar.edu/software/netcdf/;
+      license = {
+        url = https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html;
+      };
   };
 }
-- 
GitLab


From e999d40cef10a0b01eddf28484a11ea3529cac80 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 21:42:49 +0200
Subject: [PATCH 0336/1065] notify-sharp: add license

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

diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix
index c7e133d94b2..3c5ae8537a4 100644
--- a/pkgs/development/libraries/notify-sharp/default.nix
+++ b/pkgs/development/libraries/notify-sharp/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "D-Bus for .NET";
     platforms = platforms.linux;
+    license = licenses.mit;
   };
 }
-- 
GitLab


From 395931cefe43e9d66b10cf0bd0ec04155473ed02 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 21:44:57 +0200
Subject: [PATCH 0337/1065] nspr: add license

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

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 9cb7d701b9d..cdbd57d785f 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -35,9 +35,10 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.mozilla.org/projects/nspr/;
     description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.mpl20;
   };
 }
-- 
GitLab


From b21b369c6da50d1b02e90c031b2c0a6a42322ac6 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 21:46:20 +0200
Subject: [PATCH 0338/1065] ntrack: add license

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

diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index 44c8f51e856..25e084bfb74 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
     sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Network Connectivity Tracking library for Desktop Applications";
     homepage = https://launchpad.net/ntrack;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ ];
+    platforms = platforms.linux;
+    license = licenses.lgpl3Plus;
   };
 }
-- 
GitLab


From 8e7f191c27d5261c3822678558a3bf5507d7db31 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 21:50:01 +0200
Subject: [PATCH 0339/1065] ode: add licenes

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

diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix
index b6728829660..aa188650860 100644
--- a/pkgs/development/libraries/ode/default.nix
+++ b/pkgs/development/libraries/ode/default.nix
@@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Open Dynamics Engine";
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://sourceforge.net/projects/opende;
+    platforms = platforms.linux;
+    license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ];
   };
 }
-- 
GitLab


From d9e6d6ac33252ac01220159b477051ca6ff6ab62 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 21:54:43 +0200
Subject: [PATCH 0340/1065] opal: add licenes

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

diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix
index f86e4d12097..1658e831ddd 100644
--- a/pkgs/development/libraries/opal/default.nix
+++ b/pkgs/development/libraries/opal/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ptlib srtp libtheora speex
                   ffmpeg x264 cyrus_sasl openldap openssl expat unixODBC ];
-  propagatedBuildInputs = [ speex ]; 
+  propagatedBuildInputs = [ speex ];
 
   configureFlags = [ "--enable-h323" ];
 
@@ -21,11 +21,12 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1 -std=gnu++98";
 
   patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ];
-      
+
   meta = with stdenv.lib; {
     description = "VoIP library";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
+    license = with licenses; [ bsdOriginal mpl10 gpl2Plus lgpl21 ];
   };
 
   passthru = {
-- 
GitLab


From 8ff5a85c453c6463f914520b55fda5184885a8c6 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 21:56:50 +0200
Subject: [PATCH 0341/1065] opencascade: add license

---
 pkgs/development/libraries/opencascade/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix
index 6af15d90cef..4a12217443c 100644
--- a/pkgs/development/libraries/opencascade/default.nix
+++ b/pkgs/development/libraries/opencascade/default.nix
@@ -25,10 +25,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
     homepage = http://www.opencascade.org/;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = [ maintainers.viric ];
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
   };
 }
-- 
GitLab


From 4afe65f253d1b5abcb3867a3fae6cde1f6710c12 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 21:58:46 +0200
Subject: [PATCH 0342/1065] opencsg: add license

---
 pkgs/development/libraries/opencsg/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix
index 2724976c5ae..e0a6c6a5705 100644
--- a/pkgs/development/libraries/opencsg/default.nix
+++ b/pkgs/development/libraries/opencsg/default.nix
@@ -26,13 +26,12 @@ stdenv.mkDerivation rec {
     cp license.txt "$out/share/doc/opencsg"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Constructive Solid Geometry library";
     homepage = http://www.opencsg.org/;
-    platforms = with stdenv.lib.platforms;
-      linux;
-    maintainers = with stdenv.lib.maintainers; 
-      [raskin];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.raskin ];
+    license = licenses.gpl2;
   };
 }
 
-- 
GitLab


From 2d4b7f26e1f7888fb53425e4ce574345b2730bd7 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 22:06:24 +0200
Subject: [PATCH 0343/1065] opendbx: add meta data

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

diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix
index a073a29b507..f954aaf7245 100644
--- a/pkgs/development/libraries/opendbx/default.nix
+++ b/pkgs/development/libraries/opendbx/default.nix
@@ -15,4 +15,10 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ readline mysql.connector-c postgresql sqlite ];
+
+  meta = with stdenv.lib; {
+    description = "Extremely lightweight but extensible database access library written in C";
+    license = licenses.lgpl21;
+    platforms = platforms.all;
+  };
 }
-- 
GitLab


From 165f090e10e5c388cf0985034703996ef8dc3dfb Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 22:07:31 +0200
Subject: [PATCH 0344/1065] openpam: add license

---
 pkgs/development/libraries/openpam/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix
index 7d84392d204..339f6064999 100644
--- a/pkgs/development/libraries/openpam/default.nix
+++ b/pkgs/development/libraries/openpam/default.nix
@@ -9,10 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2";
   };
 
-  meta = {
+  meta = with lib; {
     homepage = https://www.openpam.org;
     description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness";
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ matthewbauer ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ matthewbauer ];
+    license = licenses.bsd3;
   };
 }
-- 
GitLab


From 598ed197db923a39be6ac80d6b0cf17fc1eea71e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 22:09:50 +0200
Subject: [PATCH 0345/1065] openssl-chacha: add license

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

diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
index 86015abb981..973f8304273 100644
--- a/pkgs/development/libraries/openssl/chacha.nix
+++ b/pkgs/development/libraries/openssl/chacha.nix
@@ -76,6 +76,7 @@ stdenv.mkDerivation rec {
     description = "A cryptographic library that implements the SSL and TLS protocols";
     platforms = [ "x86_64-linux" ];
     maintainers = [ stdenv.lib.maintainers.cstrahan ];
+    license = licenses.openssl;
     priority = 10; # resolves collision with ‘man-pages’
   };
 }
-- 
GitLab


From d00487cad5c9ec08374f91848c4485bfae86b01a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 22:12:57 +0200
Subject: [PATCH 0346/1065] pangoxsl: add meta data

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

diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix
index aae6ed0f688..b69ded64839 100644
--- a/pkgs/development/libraries/pangoxsl/default.nix
+++ b/pkgs/development/libraries/pangoxsl/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation {
     pango
   ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango.";
+    homepage = https://sourceforge.net/projects/pangopdf;
+    platforms = platforms.unix;
+    license = licenses.lgpl2;
   };
 }
-- 
GitLab


From 0badfc2b6ec8d9d9d8c0dae594c523d765ecd896 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 22:16:40 +0200
Subject: [PATCH 0347/1065] phonon-backend-gstreamer: add license

---
 pkgs/development/libraries/phonon/backends/gstreamer.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index b29388790d0..67f343d6038 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
     description = "GStreamer backend for Phonon";
     platforms = platforms.linux;
     maintainers = with maintainers; [ ttuegel ];
+    license = licenses.lgpl21;
   };
 
   src = fetchurl {
-- 
GitLab


From 78b12734eed5d2aed12dce2a53bbdeda3019d3a4 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 22:19:19 +0200
Subject: [PATCH 0348/1065] phonon-backend-vlc: add license

---
 pkgs/development/libraries/phonon/backends/vlc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix
index 0487886a896..773478f4dc0 100644
--- a/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
     homepage = https://phonon.kde.org/;
     description = "GStreamer backend for Phonon";
     platforms = platforms.linux;
+    license = with licenses; [ bsd3 lgpl2Plus ];
   };
 
   src = fetchurl {
-- 
GitLab


From 91eea7482dfe6318a2037fada9ad28b77deaaa36 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 22:22:03 +0200
Subject: [PATCH 0349/1065] podofo: add licenses

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

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index acf53139022..1704703f801 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -37,10 +37,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://podofo.sourceforge.net;
     description = "A library to work with the PDF file format";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ ];
+    platforms = platforms.all;
+    license = with licenses; [ gpl2 lgpl2 ];
   };
 }
-- 
GitLab


From 6ff2c83d9f9f4d3bb7b422df7869b614ccf90226 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 22:23:38 +0200
Subject: [PATCH 0350/1065] polkit-qt-1: add license

---
 pkgs/development/libraries/polkit-qt-1/qt-4.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix
index 54e10b96592..b13335561ac 100644
--- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix
+++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix
@@ -25,9 +25,10 @@ stdenv.mkDerivation {
       done
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A Qt wrapper around PolKit";
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = [ maintainers.ttuegel ];
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
   };
 }
-- 
GitLab


From f1fe677ab2b626d485253fea165bc9fe32330633 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 22:26:53 +0200
Subject: [PATCH 0351/1065] popt: add license

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

diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index edec0b7f069..592a1f1470a 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Command line option parsing library";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.mit;
   };
 }
-- 
GitLab


From 5383753beb44ada12ee19ea627d216f71b7687bf Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 22:28:10 +0200
Subject: [PATCH 0352/1065] prison: add license

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

diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix
index 29ff988a226..d40b4442e38 100644
--- a/pkgs/development/libraries/prison/default.nix
+++ b/pkgs/development/libraries/prison/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Qt4 library for QR-codes";
-    maintainers = [ ];
+    license = stdenv.lib.licenses.mit;
     inherit (qt4.meta) platforms;
   };
 }
-- 
GitLab


From 1f46779eda4a2f55ab3171b55fc151fcd9cc6b95 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 22:30:34 +0200
Subject: [PATCH 0353/1065] ptlib: add licenses

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

diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix
index ae60a6f69d6..d425de243f5 100644
--- a/pkgs/development/libraries/ptlib/default.nix
+++ b/pkgs/development/libraries/ptlib/default.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
     description = "Portable Tools from OPAL VoIP";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
+    license = with licenses; [ beerware bsdOriginal mpl10 ];
   };
 
   passthru = {
-- 
GitLab


From 3cd8c2240b012c91f3a5bcf2c784a4d0fa820733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 25 Oct 2018 18:27:49 -0300
Subject: [PATCH 0354/1065] vivaldi: 2.0.1309.29-2 -> 2.1.1337.36-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 8a21f2f0cc2..7ef2bde68f2 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.0.1309.29-2";
+  version = "2.1.1337.36-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
-    sha256 = "09vaf191djbrfijvhklivh2ifj8w68car2vz956gsw4lhz07kzck";
+    sha256 = "14qf3gk46m65yfc7q7gsnkj6av8yhg7byi0h1yv24sr7n4rrnrsc";
   };
 
   unpackPhase = ''
-- 
GitLab


From 34964d6f3b709e2ebc33ce5c0f348aaf37a8f658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 25 Oct 2018 18:28:59 -0300
Subject: [PATCH 0355/1065] vivaldi-ffmpeg-codecs: 69.0.3497.73 -> 70.0.3538.77

---
 .../networking/browsers/vivaldi/ffmpeg-codecs.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index 87ca350731d..349ef233ae2 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "vivaldi-ffmpeg-codecs";
-  version = "69.0.3497.73";
+  version = "70.0.3538.77";
 
   src = fetchurl {
     url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
-    sha512 = "3qyzxdybiszwy62izr35wffnh1a1plg9y536vrmd4b2xl8p4nz18c7439blr0cdzsr5qplgrdl64446a27mkyhbw8c3iy0gb4zgb5j9";
+    sha512 = "128hvkcbyw70j31dj4jviqqjrzyfx38689nb8v0kk5vi2zlgfy5ibz2gyrv4bvrb53ld262y9pvam51nbdmrx2vqd9xrs173py7v0a0";
   };
 
   buildInputs = [ ];
-- 
GitLab


From bea0b3021c9337c4f4b518441db30167eef00074 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta <git@raphael.dasgupta.ch>
Date: Fri, 26 Oct 2018 00:29:27 +0200
Subject: [PATCH 0356/1065] nixpkgs docs: remove spurious ">"

---
 doc/stdenv.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index c3b155ab0e9..69604fcf99d 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -2100,7 +2100,7 @@ someVar=$(stripHash $name)
 
   <para>
    In order to alleviate this burden, the <firstterm>setup
-   hook></firstterm>mechanism was written, where any package can include a
+   hook</firstterm>mechanism was written, where any package can include a
    shell script that [by convention rather than enforcement by Nix], any
    downstream reverse-dependency will source as part of its build process. That
    allows the downstream dependency to merely specify its dependencies, and
-- 
GitLab


From 8b5a7597592550614b2de79c31abb090afcb3a5f Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 14 Oct 2018 12:47:04 -0400
Subject: [PATCH 0357/1065] jdk: give more detail when bootstrap jdks are
 missing

---
 pkgs/development/compilers/openjdk/bootstrap.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix
index 612f0db0582..1b20ca6cc60 100644
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ b/pkgs/development/compilers/openjdk/bootstrap.nix
@@ -16,12 +16,12 @@ let
   src = if stdenv.hostPlatform.system == "x86_64-linux" then
     (if version == "10"    then fetchboot "10" "x86_64" "08085fsxc1qhqiv3yi38w8lrg3vm7s0m2yvnwr1c92v019806yq2"
     else if version == "8" then fetchboot "8"  "x86_64" "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks"
-    else throw "No bootstrap for version")
+    else throw "No bootstrap jdk for version ${version}")
   else if stdenv.hostPlatform.system == "i686-linux" then
     (if version == "10"    then fetchboot "10" "i686" "1blb9gyzp8gfyggxvggqgpcgfcyi00ndnnskipwgdm031qva94p7"
     else if version == "8" then fetchboot "8"  "i686" "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9"
     else throw "No bootstrap for version")
-  else throw "No bootstrap for system";
+  else throw "No bootstrap jdk for system ${stdenv.hostPlatform.system}";
 
   bootstrap = runCommand "openjdk-bootstrap" {
     passthru.home = "${bootstrap}/lib/openjdk";
-- 
GitLab


From aa77e3aa4f726f204d897fd3f689e2c6e14b7a64 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta <git@raphael.dasgupta.ch>
Date: Fri, 26 Oct 2018 00:35:21 +0200
Subject: [PATCH 0358/1065] nixpkgs docs: add missing spaces between words

---
 doc/stdenv.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 69604fcf99d..4f121e328cb 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -372,7 +372,7 @@ let f(h, h + 1, i) = i + h
       They are programs/libraries used at build time that furthermore produce
       programs/libraries also used at build time. If the dependency doesn't
       care about the target platform (i.e. isn't a compiler or similar tool),
-      put it in <varname>nativeBuildInputs</varname>instead. The most common
+      put it in <varname>nativeBuildInputs</varname> instead. The most common
       use for this <literal>buildPackages.stdenv.cc</literal>, the default C
       compiler for this role. That example crops up more than one might think
       in old commonly used C libraries.
@@ -2100,7 +2100,7 @@ someVar=$(stripHash $name)
 
   <para>
    In order to alleviate this burden, the <firstterm>setup
-   hook</firstterm>mechanism was written, where any package can include a
+   hook</firstterm> mechanism was written, where any package can include a
    shell script that [by convention rather than enforcement by Nix], any
    downstream reverse-dependency will source as part of its build process. That
    allows the downstream dependency to merely specify its dependencies, and
-- 
GitLab


From 2337c7522af3b186d4d7ecefe9e19c33aafc6626 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 26 Oct 2018 01:17:55 +0200
Subject: [PATCH 0359/1065] openssh: 7.7p1 -> 7.9p1 (#48784)

added openssh_gssapi to make it easier to test the patched version

the HPN edition isn't available on top of 7.9p1 yet

fix-host-key-algorithms-plus.patch didn't apply anymore, assuming it's
fixed.

release notes: https://www.openssh.com/txt/release-7.9
---
 pkgs/tools/networking/openssh/default.nix     | 20 +++----
 .../fix-host-key-algorithms-plus.patch        | 52 -------------------
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 10 insertions(+), 66 deletions(-)
 delete mode 100644 pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 96bc2c56ece..7aeae3ca9d1 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -13,39 +13,31 @@ let
   gssapiPatch = fetchpatch {
     name = "openssh-gssapi.patch";
     url = "https://salsa.debian.org/ssh-team/openssh/raw/"
-      + "e395eed38096fcda74398424ea94de3ec44effd5"
+      + "d80ebbf028196b2478beebf5a290b97f35e1eed9"
       + "/debian/patches/gssapi.patch";
-    sha256 = "0x7xysgdahb4jaq0f28g2d7yzp0d3mh59i4xnffszvjndhvbk27x";
+    sha256 = "14j9cabb3gkhkjc641zbiv29mbvsmgsvis3fbj8ywsd21zc7m2wv";
   };
 
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "openssh-${version}";
-  version = if hpnSupport then "7.7p1" else "7.7p1";
+  version = if hpnSupport then "7.8p1" else "7.9p1";
 
   src = if hpnSupport then
       fetchurl {
-        url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_7_P1.tar.gz";
-        sha256 = "1l4k8mg3gnzxbz53cma8s6ak56waz03ijsr08p8vgpi0c2rc5ri5";
+        url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_8_P1.tar.gz";
+        sha256 = "05q5hxx7fzcgd8a5i0zk4fwvmnz4xqk04j489irnwm7cka7xdqxw";
       }
     else
       fetchurl {
         url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-        sha256 = "13vbbrvj3mmfhj83qyrg5c0ipr6bzw5s65dy4k8gr7p9hkkfffyp";
+        sha256 = "1b8sy6v0b8v4ggmknwcqx3y1rjcpsll0f1f8f4vyv11x4ni3njvb";
       };
 
   patches =
     [
-      # Remove on update!
-      (fetchpatch {
-        name = "fix-tunnel-forwarding.diff";
-        url = "https://github.com/openssh/openssh-portable/commit/cfb1d9bc767.diff";
-        sha256 = "1mszj7f1kj6bazr7asbi1bi4238lfpilpp98f6c1dn3py4fbsdg8";
-      })
-
       ./locale_archive.patch
-      ./fix-host-key-algorithms-plus.patch
 
       # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
       ./dont_create_privsep_path.patch
diff --git a/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch b/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch
deleted file mode 100644
index 02846e9bdad..00000000000
--- a/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Specifying "HostKeyAlgorithms +ssh-dds" does not work properly because
-setting any value for HostKeyAlgorithms causes the known host keys to
-be ignored for the purpose of determining the priority of algorithms.
-This was fixed upstream for HostKeyAlgorithms in sshd_config, but not
-in ssh_config. The fix is to apply order_hostkeyalgs() if the user
-specifies a HostKeyAlgorithms starting with "+".
-
-diff -ru -x '*~' openssh-7.2p2-orig/sshconnect2.c openssh-7.2p2/sshconnect2.c
---- openssh-7.2p2-orig/sshconnect2.c	2016-03-09 19:04:48.000000000 +0100
-+++ openssh-7.2p2/sshconnect2.c	2016-04-01 15:39:45.140945902 +0200
-@@ -100,7 +100,7 @@
- }
- 
- static char *
--order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port)
-+order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port, char *algs)
- {
- 	char *oavail, *avail, *first, *last, *alg, *hostname, *ret;
- 	size_t maxlen;
-@@ -116,7 +116,7 @@
- 	for (i = 0; i < options.num_system_hostfiles; i++)
- 		load_hostkeys(hostkeys, hostname, options.system_hostfiles[i]);
- 
--	oavail = avail = xstrdup(KEX_DEFAULT_PK_ALG);
-+	oavail = avail = xstrdup(algs);
- 	maxlen = strlen(avail) + 1;
- 	first = xmalloc(maxlen);
- 	last = xmalloc(maxlen);
-@@ -181,18 +181,21 @@
- 	myproposal[PROPOSAL_MAC_ALGS_CTOS] =
- 	    myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
- 	if (options.hostkeyalgorithms != NULL) {
-+		int append = options.hostkeyalgorithms[0] == '+';
- 		if (kex_assemble_names(KEX_DEFAULT_PK_ALG,
- 		    &options.hostkeyalgorithms) != 0)
- 			fatal("%s: kex_assemble_namelist", __func__);
- 		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
--		    compat_pkalg_proposal(options.hostkeyalgorithms);
-+		    compat_pkalg_proposal(append
-+			? order_hostkeyalgs(host, hostaddr, port, options.hostkeyalgorithms)
-+			: options.hostkeyalgorithms);
- 	} else {
- 		/* Enforce default */
- 		options.hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG);
- 		/* Prefer algorithms that we already have keys for */
- 		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
- 		    compat_pkalg_proposal(
--		    order_hostkeyalgs(host, hostaddr, port));
-+		    order_hostkeyalgs(host, hostaddr, port, KEX_DEFAULT_PK_ALG));
- 	}
- 
- 	if (options.rekey_limit || options.rekey_interval)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4293c40ba0..57f65c28deb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4515,6 +4515,10 @@ with pkgs;
 
   openssh_hpn = pkgs.appendToName "with-hpn" (openssh.override { hpnSupport = true; });
 
+  openssh_gssapi = pkgs.appendToName "with-gssapi" (openssh.override {
+    withGssapiPatches = true;
+  });
+
   opensp = callPackage ../tools/text/sgml/opensp { };
 
   opentracker = callPackage ../applications/networking/p2p/opentracker { };
-- 
GitLab


From 6ae3cb4d36079d4738c656c4bef6615ba3f064a1 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 25 Oct 2018 22:18:18 -0400
Subject: [PATCH 0360/1065] pythonPackages.pyarrow: fix running tests on hydra

This replaces standard checkPhase using setup.py that uses pytest-runner
with an explicit call to pytest. One reason to do that is because
setup.py triggers another rebuild when asked to do "test". Another
reason is that there seems to be a conflict between possible imports for
pyarrow: `pwd`/pyarrow vs $out/pyarrow. By some unknown reason this
triggers an import error on hydra and ofborg, but not on my machine. The
solution here is to remove `pwd`/pyarrow, keep the tests and use direct
call to pytest (setup.py needs `pwd`/pyarrow). The added benefit is that
we are now testing what is installed in $out.
---
 pkgs/development/python-modules/pyarrow/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index 8ebb88fa6a7..981576e13ed 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, pkgconfig, setuptools_scm, six }:
+{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }:
 
 let
   _arrow-cpp = arrow-cpp.override { inherit python; };
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
   propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ];
-  checkInputs = [ pandas pytest pytestrunner JPype1 ];
+  checkInputs = [ pandas pytest JPype1 ];
 
   PYARROW_BUILD_TYPE = "release";
   PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib";
@@ -43,6 +43,14 @@ buildPythonPackage rec {
 
   setupPyBuildFlags = ["--with-parquet" ];
 
+  checkPhase = ''
+    mv pyarrow/tests tests
+    rm -rf pyarrow
+    mkdir pyarrow
+    mv tests pyarrow/tests
+    pytest -v
+  '';
+
   meta = with lib; {
     description = "A cross-language development platform for in-memory data";
     homepage = https://arrow.apache.org/;
-- 
GitLab


From e76082a9412dad2ee6a5fa113950d539d95c9ca8 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 25 Oct 2018 23:14:27 -0400
Subject: [PATCH 0361/1065] pyarrow: disable jvm test

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

diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index 981576e13ed..d588ebb12e4 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }:
+{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }:
 
 let
   _arrow-cpp = arrow-cpp.override { inherit python; };
@@ -13,12 +13,13 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
   propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ];
-  checkInputs = [ pandas pytest JPype1 ];
+  checkInputs = [ pandas pytest ];
 
   PYARROW_BUILD_TYPE = "release";
   PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib";
 
   preCheck = ''
+    rm pyarrow/tests/test_jvm.py
     rm pyarrow/tests/test_hdfs.py
     rm pyarrow/tests/test_cuda.py
 
-- 
GitLab


From 92620012502fe01b332925286d35bdb0b390bd78 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 25 Oct 2018 22:26:14 -0700
Subject: [PATCH 0362/1065] wireless-regdb: 2018.09.07 -> 2018.10.24

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

diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index f0ad2c43a9c..b5293c6d341 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "wireless-regdb-${version}";
-  version = "2018.09.07";
+  version = "2018.10.24";
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz";
-    sha256 = "0nnn10pk94qnrdy55pwcr7506bxdsywa88a3shgqxsd3y53q2sx3";
+    sha256 = "05lixkdzy7f3wpan6svh1n9f70rs0kfw6hl6p34sl8bxqxd88ghd";
   };
 
   dontBuild = true;
-- 
GitLab


From ff4fdc8cb369f21776bbaf8686d3e132d8c6ae11 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 25 Oct 2018 23:54:28 -0700
Subject: [PATCH 0363/1065] trufflehog: 2.0.91 -> 2.0.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/trufflehog/versions
---
 pkgs/tools/security/trufflehog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index f805670a5d5..9492f2bb6ea 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -12,11 +12,11 @@ let
 in
   pythonPackages.buildPythonApplication rec {
     pname = "truffleHog";
-    version = "2.0.91";
+    version = "2.0.97";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0r4c9ihy6wjh5cwli7lb6cr2yfvxrh7r6cgznql1src5gzlnkymx";
+      sha256 = "034kpv1p4m90286slvc6d4mlrzaf0b5jbd4qaj87hj65wbpcpg8r";
     };
 
     # Relax overly restricted version constraint
-- 
GitLab


From c07b74e0b3446422b4d9e4557147e1160b297c65 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 00:43:00 -0700
Subject: [PATCH 0364/1065] urlwatch: 2.14 -> 2.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/urlwatch/versions
---
 pkgs/tools/networking/urlwatch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index 850a33db58c..c9de3f8ea57 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urlwatch-${version}";
-  version = "2.14";
+  version = "2.15";
 
   src = fetchFromGitHub {
     owner  = "thp";
     repo   = "urlwatch";
     rev    = version;
-    sha256 = "1m7qdh2lk5napncmfnk86dj4wqcahq8y24xnylxa4qlx2ivwkr6b";
+    sha256 = "1bkd0r5arzdvinpn1n23cw1gf7byxml95hl6qvvf6mnggb1ifcwg";
   };
 
   propagatedBuildInputs = with python3Packages; [
-- 
GitLab


From 6021a94062f9740591e858996984089317b51c13 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 26 Oct 2018 09:46:42 +0200
Subject: [PATCH 0365/1065] signal-desktop: 1.17.0 -> 1.17.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 29a65b5d9bc..f123770197f 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.17.0";
+  version = "1.17.1";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "0daxp8ychvvr4lqz8wni8lkalk3w409pzwnikvf92f1whxs76xj0";
+    sha256 = "1cvgjllnbdsr61pz6r4dkbbz58cf69k7p8wriyp1vpzkdi7k5bpl";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
-- 
GitLab


From e87534ed664563b116fedc9872833272a463edd7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 01:08:37 -0700
Subject: [PATCH 0366/1065] soapysdr: 0.6.1 -> 0.7.0

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

diff --git a/pkgs/applications/misc/soapysdr/default.nix b/pkgs/applications/misc/soapysdr/default.nix
index 6230f2f6f6a..90639fc5705 100644
--- a/pkgs/applications/misc/soapysdr/default.nix
+++ b/pkgs/applications/misc/soapysdr/default.nix
@@ -6,7 +6,7 @@
 } :
 
 let
-  version = "0.6.1";
+  version = "0.7.0";
 
 in stdenv.mkDerivation {
   name = "soapysdr-${version}";
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
     owner = "pothosware";
     repo = "SoapySDR";
     rev = "soapy-sdr-${version}";
-    sha256 = "1azbb2j6dv0b2dd5ks6yqd31j17sdhi9p82czwc8zy2isymax0l9";
+    sha256 = "14fjwnfj7jz9ixvim2gy4f52y6s7d4xggzxn2ck7g4q35d879x13";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
GitLab


From 5d88d542e3010cccc6dae47cd4021cb681f6f432 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 01:48:11 -0700
Subject: [PATCH 0367/1065] riot-web: 0.16.5 -> 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/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 70d27218783..fd9fe0bdfbf 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.16.5";
+  version = "0.17.0";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1b82d82pfv4kjdxghc8y78zwmnc89hi7arvql2bx0zyfhzxj6drl";
+    sha256 = "1ffbwz7wp1xhfv8a5nhrhw97nl5ybf0j97dkk2sy9cdlribzxs04";
   };
 
   installPhase = ''
-- 
GitLab


From f2c4ad23766d90a4d7e137795fbee483c25f61fa Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Fri, 26 Oct 2018 11:03:28 +0200
Subject: [PATCH 0368/1065] kustomize: 1.0.8 -> 1.0.9

---
 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 ce297df13c3..15ae07962c5 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.8";
+  version = "1.0.9";
   # rev is the 1.0.8 commit, mainly for kustomize version command output
-  rev = "58492e2d83c59ed63881311f46ad6251f77dabc3";
+  rev = "ec86b30d2b01a8fa62e645f024f26bfea5dcd30d";
 
   goPackagePath = "sigs.k8s.io/kustomize";
 
@@ -17,7 +17,7 @@ buildGoPackage rec {
   '';
 
   src = fetchFromGitHub {
-    sha256 = "0y6dqwhm7lczjy0zk2fnc1i43lvnjhcvihvm7qknky05z9f0v8bx";
+    sha256 = "06a0iic8sp745q71bh0k2zbcdhppp85bx9c3fwwr4wl77dlybz4f";
     rev = "v${version}";
     repo = "kustomize";
     owner = "kubernetes-sigs";
@@ -32,6 +32,6 @@ buildGoPackage rec {
     '';
     homepage = https://github.com/kubernetes-sigs/kustomize;
     license = licenses.asl20;
-    maintainers = [ maintainers.carlosdagos maintainers.vdemeester ];
+    maintainers = with maintainers; [ carlosdagos vdemeester periklis ];
   };
 }
-- 
GitLab


From 41b55b3508f3cec4736fb7f24c4aaa6b60fbd805 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 26 Oct 2018 11:15:10 +0200
Subject: [PATCH 0369/1065] idrisPackages.{categories,derive}: Use upstream
 instead of forks

These forks were introduced in https://github.com/NixOS/nixpkgs/pull/42861 to
make the builds succeed. The changes have since been incorporated
upstream.
---
 pkgs/development/idris-modules/categories.nix | 5 ++---
 pkgs/development/idris-modules/derive.nix     | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix
index 1e234b3f693..91ee174dadf 100644
--- a/pkgs/development/idris-modules/categories.nix
+++ b/pkgs/development/idris-modules/categories.nix
@@ -6,11 +6,10 @@ build-idris-package  {
   name = "categories";
   version = "2018-07-02";
 
-  # https://github.com/danilkolikov/categories/pull/5
   src = fetchFromGitHub {
-    owner = "infinisil";
+    owner = "danilkolikov";
     repo = "categories";
-    rev = "9722d62297e5025431e91b271ab09c5d14867236";
+    rev = "a1e0ac0f0da2e336a7d3900051892ff7ed504c35";
     sha256 = "1bbmm8zif5d5wckdaddw6q3c39w6ms1cxrlrmkdn7bik88dawff2";
   };
 
diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix
index 7b6cb64cfe3..7f3164f3160 100644
--- a/pkgs/development/idris-modules/derive.nix
+++ b/pkgs/development/idris-modules/derive.nix
@@ -10,12 +10,11 @@ build-idris-package  {
 
   idrisDeps = [ contrib pruviloj ];
 
-  # https://github.com/david-christiansen/derive-all-the-instances/pull/9
   src = fetchFromGitHub {
-    owner = "infinisil";
+    owner = "david-christiansen";
     repo = "derive-all-the-instances";
-    rev = "61c3e12e26f599379299fcbb9c40a81bfc3e0604";
-    sha256 = "0g2lb8nrwqwf3gm5fir43cxz6db84n19xiwkv8cmmqc1fgy6v0qn";
+    rev = "0a9a5082d4ab6f879a2c141d1a7b645fa73fd950";
+    sha256 = "06za15m1kv9mijzll5712crry4iwx3b0fjv76gy9vv1p10gy2g4m";
   };
 
   meta = {
-- 
GitLab


From ceae2c2d054d6e878ec8686e219a56a188137713 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 02:30:37 -0700
Subject: [PATCH 0370/1065] rspamd: 1.8.0 -> 1.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/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 02e14f3b5ac..b9dd07adde9 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -6,13 +6,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "rspamd-${version}";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rspamd";
     rev = version;
-    sha256 = "02q1id9kv5d6w1b1ifa2m6qrnbsja787dn0ywwi0yrsaqwk63wk7";
+    sha256 = "1cgnychv8yz7a6mjg3b12nzs4gl0xqg9agl7m6faihnh7gqx4xld";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
-- 
GitLab


From 1a984ccc4e3f89fdf21e12786b7e47c8c7aee878 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 23 Oct 2018 12:23:07 +0200
Subject: [PATCH 0371/1065] gitaly: 0.125.0 -> 0.125.1

---
 pkgs/applications/version-management/gitaly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index 9523059b42f..88bd0b9f10d 100644
--- a/pkgs/applications/version-management/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitaly/default.nix
@@ -7,14 +7,14 @@ let
     gemdir = ./.;
   };
 in buildGoPackage rec {
-  version = "0.125.0";
+  version = "0.125.1";
   name = "gitaly-${version}";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "14a4qgpnspzw9cjqh6gbw3771bxfm789ibvmvb8jc4pklvbyl4mi";
+    sha256 = "0vbxjqjs1r5c350r67812andasby5zk25xlaqp201lmlvamiv0ni";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitaly";
-- 
GitLab


From eb7f8e71ad8f4e9aa8a27789f2891e23d0402d61 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 23 Oct 2018 12:23:29 +0200
Subject: [PATCH 0372/1065] gitlab-workhorse: 6.1.1 -> 7.0.0

---
 .../version-management/gitlab-workhorse/default.nix          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index 16acf2a91d7..3fab965bf54 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchFromGitLab, git, go }:
+
 stdenv.mkDerivation rec {
   name = "gitlab-workhorse-${version}";
 
-  version = "6.1.1";
+  version = "7.0.0";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "1dwvk86bfsqgkp0mwz71yis3i7aypjf96r3hsjkgpd27hwbjgxbr";
+    sha256 = "1mmfb7h5sbva2kv9h9cxfg7dyksxrwwikq7jwggfawqaadzwm677";
   };
 
   buildInputs = [ git go ];
-- 
GitLab


From 02afda3fd856378571fefc101119ae88c7ea4158 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 23 Oct 2018 12:24:11 +0200
Subject: [PATCH 0373/1065] gitlab: 11.3.4 -> 11.4.0

---
 .../version-management/gitlab/default.nix     |  10 +-
 .../gitlab/rubyEnv-ce/Gemfile                 |  17 +--
 .../gitlab/rubyEnv-ce/Gemfile.lock            |  62 ++++------
 .../gitlab/rubyEnv-ce/gemset.nix              | 111 +++++++-----------
 .../gitlab/rubyEnv-ee/Gemfile                 |  17 +--
 .../gitlab/rubyEnv-ee/Gemfile.lock            |  62 ++++------
 .../gitlab/rubyEnv-ee/gemset.nix              | 111 +++++++-----------
 7 files changed, 151 insertions(+), 239 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index c1a4392ec0e..ba37091c433 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -11,29 +11,29 @@ let
     groups = [ "default" "unicorn" "ed25519" "metrics" ];
   };
 
-  version = "11.3.4";
+  version = "11.4.0";
 
   sources = if gitlabEnterprise then {
     gitlabDeb = fetchurl {
       url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb";
-      sha256 = "1cgwm6g1mij1958mdyds8f76qjw39nllsr23dvsqgf60h4vbsdfd";
+      sha256 = "1y2a8acgsgrgcjazijsflhxq4fwqvd9yhrjx5pcncb24vl0x6dg4";
     };
     gitlab = fetchFromGitLab {
       owner = "gitlab-org";
       repo = "gitlab-ee";
       rev = "v${version}-ee";
-      sha256 = "1ifaa879l85d4yfzrgszrgj04bfjxjh3n7v31zfb6lsqmh87xbm4";
+      sha256 = "1pyqk1c5bml7chs4pq1fcxkrhk5r327xx9my6zmp2cb503s5m590";
     };
   } else {
     gitlabDeb = fetchurl {
       url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb";
-      sha256 = "0hls81ns9n10xrzw0b9pn1916445irqrysbicsdl8kdn83ds35p7";
+      sha256 = "0wiizjihn1a6hg6a2wpwmnh5a34n102va4djac3sgx74mwx4bniq";
     };
     gitlab = fetchFromGitLab {
       owner = "gitlab-org";
       repo = "gitlab-ce";
       rev = "v${version}";
-      sha256 = "0dymr706yn917niybg2gj1pkgrzgiirbv4ib9pkgs140kbf3hn0c";
+      sha256 = "1a8pavqc9bblss5z9ikc9b0k0ra33vw73zy7rvn0v1wgvbqpc24k";
     };
   };
 
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
index f14e05d43e0..ecbfba0827d 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
@@ -80,16 +80,14 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
 gem 'net-ldap'
 
 # Git Wiki
-# Required manually in config/initializers/gollum.rb to control load order
+# Only used to compute wiki page slugs
 gem 'gitlab-gollum-lib', '~> 4.2', require: false
 
-gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
-
 # Language detection
 gem 'github-linguist', '~> 5.3.3', require: 'linguist'
 
 # API
-gem 'grape', '~> 1.0'
+gem 'grape', '~> 1.1'
 gem 'grape-entity', '~> 0.7.1'
 gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
 
@@ -112,9 +110,6 @@ gem 'hamlit', '~> 2.8.8'
 gem 'carrierwave', '= 1.2.3'
 gem 'mini_magick'
 
-# Drag and Drop UI
-gem 'dropzonejs-rails', '~> 0.7.1'
-
 # for backups
 gem 'fog-aws', '~> 2.0.1'
 gem 'fog-core', '~> 1.44'
@@ -137,6 +132,7 @@ gem 'seed-fu', '~> 2.3.7'
 gem 'html-pipeline', '~> 2.8'
 gem 'deckar01-task_list', '2.0.0'
 gem 'gitlab-markup', '~> 1.6.4'
+gem 'github-markup', '~> 1.7.0', require: 'github/markup'
 gem 'redcarpet', '~> 3.4'
 gem 'commonmarker', '~> 0.17'
 gem 'RedCloth', '~> 4.3.2'
@@ -170,10 +166,9 @@ gem 'state_machines-activerecord', '~> 0.5.1'
 gem 'acts-as-taggable-on', '~> 5.0'
 
 # Background jobs
-gem 'sidekiq', '~> 5.1'
+gem 'sidekiq', '~> 5.2.1'
 gem 'sidekiq-cron', '~> 0.6.0'
 gem 'redis-namespace', '~> 1.6.0'
-gem 'sidekiq-limit_fetch', '~> 3.4', require: false
 
 # Cron Parser
 gem 'rufus-scheduler', '~> 3.4'
@@ -300,7 +295,7 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql
 gem 'peek-pg', '~> 1.3.0', group: :postgres
 gem 'peek-rblineprof', '~> 0.2.0'
 gem 'peek-redis', '~> 1.2.0'
-gem 'peek-sidekiq', '~> 1.0.3'
+gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch'
 
 # Metrics
 group :metrics do
@@ -425,7 +420,7 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
 gem 'grpc', '~> 1.11.0'
 
 # Locked until https://github.com/google/protobuf/issues/4210 is closed
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
index e41719ec79d..9837a195d8c 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
@@ -86,7 +86,7 @@ GEM
     bindata (2.4.3)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.3.1)
+    bootsnap (1.3.2)
       msgpack (~> 1.0)
     bootstrap_form (2.7.0)
     brakeman (4.2.1)
@@ -133,14 +133,14 @@ GEM
     concurrent-ruby (1.0.5)
     concurrent-ruby-ext (1.0.5)
       concurrent-ruby (= 1.0.5)
-    connection_pool (2.2.1)
+    connection_pool (2.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
     creole (0.5.0)
     css_parser (1.5.0)
       addressable
-    daemons (1.2.3)
+    daemons (1.2.6)
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
     debugger-ruby_core_source (1.3.8)
@@ -175,8 +175,6 @@ GEM
     doorkeeper-openid_connect (1.5.0)
       doorkeeper (~> 4.3)
       json-jwt (~> 1.6)
-    dropzonejs-rails (0.7.2)
-      rails (> 3.1)
     ed25519 (1.2.4)
     email_reply_trimmer (0.1.6)
     email_spec (2.2.0)
@@ -189,7 +187,7 @@ GEM
     escape_utils (1.1.1)
     et-orbi (1.0.3)
       tzinfo
-    eventmachine (1.0.8)
+    eventmachine (1.2.7)
     excon (0.62.0)
     execjs (2.6.0)
     expression_parser (0.9.0)
@@ -276,7 +274,7 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gitaly-proto (0.117.0)
+    gitaly-proto (0.118.1)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
     github-linguist (5.3.3)
@@ -297,15 +295,14 @@ GEM
       rouge (~> 3.1)
       sanitize (~> 4.6.4)
       stringex (~> 2.6)
-    gitlab-gollum-rugged_adapter (0.4.4.1)
-      mime-types (>= 1.15)
-      rugged (~> 0.25)
     gitlab-grit (2.8.2)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
       mime-types (>= 1.16)
       posix-spawn (~> 0.3)
     gitlab-markup (1.6.4)
+    gitlab-sidekiq-fetcher (0.3.0)
+      sidekiq (~> 5)
     gitlab-styles (2.4.1)
       rubocop (~> 0.54.0)
       rubocop-gitlab-security (~> 0.1.0)
@@ -343,7 +340,7 @@ GEM
       signet (~> 0.7)
     gpgme (2.0.13)
       mini_portile2 (~> 2.1)
-    grape (1.0.3)
+    grape (1.1.0)
       activesupport
       builder
       mustermann-grape (~> 1.0.0)
@@ -493,7 +490,7 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.0)
     mini_magick (4.8.0)
-    mini_mime (1.0.0)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.7.0)
     mousetrap-rails (1.4.6)
@@ -501,7 +498,7 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mustermann (1.0.2)
+    mustermann (1.0.3)
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
     mysql2 (0.4.10)
@@ -605,10 +602,6 @@ GEM
       atomic (>= 1.0.0)
       peek
       redis
-    peek-sidekiq (1.0.3)
-      atomic (>= 1.0.0)
-      peek
-      sidekiq
     pg (0.18.4)
     po_to_json (1.0.1)
       json (>= 1.6.0)
@@ -633,9 +626,9 @@ GEM
     pry-byebug (3.4.3)
       byebug (>= 9.0, < 9.1)
       pry (~> 0.10)
-    pry-rails (0.3.5)
-      pry (>= 0.9.10)
-    public_suffix (3.0.2)
+    pry-rails (0.3.6)
+      pry (>= 0.10.4)
+    public_suffix (3.0.3)
     pyu-ruby-sasl (0.0.3.3)
     rack (1.6.10)
     rack-accept (0.4.5)
@@ -649,7 +642,7 @@ GEM
       httpclient (>= 2.4)
       multi_json (>= 1.3.6)
       rack (>= 1.1)
-    rack-protection (2.0.1)
+    rack-protection (2.0.3)
       rack
     rack-proxy (0.6.0)
       rack
@@ -735,7 +728,7 @@ GEM
     retriable (3.1.2)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (3.2.1)
+    rouge (3.3.0)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -843,16 +836,13 @@ GEM
       rack
     shoulda-matchers (3.1.2)
       activesupport (>= 4.0.0)
-    sidekiq (5.1.3)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
+    sidekiq (5.2.1)
+      connection_pool (~> 2.2, >= 2.2.2)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
     sidekiq-cron (0.6.0)
       rufus-scheduler (>= 3.3.0)
       sidekiq (>= 4.2.1)
-    sidekiq-limit_fetch (3.4.0)
-      sidekiq (>= 4)
     signet (0.8.1)
       addressable (~> 2.3)
       faraday (~> 0.9)
@@ -865,7 +855,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slack-notifier (1.5.1)
-    spring (2.0.1)
+    spring (2.0.2)
       activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -895,7 +885,7 @@ GEM
     test_after_commit (1.1.0)
       activerecord (>= 3.2)
     text (1.3.1)
-    thin (1.7.0)
+    thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
@@ -954,7 +944,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpack-rails (0.9.10)
+    webpack-rails (0.9.11)
       railties (>= 3.2.0)
     wikicloth (0.8.1)
       builder
@@ -1013,7 +1003,6 @@ DEPENDENCIES
   diffy (~> 3.1.0)
   doorkeeper (~> 4.3)
   doorkeeper-openid_connect (~> 1.5)
-  dropzonejs-rails (~> 0.7.1)
   ed25519 (~> 1.2)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
@@ -1038,19 +1027,20 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 0.117.0)
+  gitaly-proto (~> 0.118.1)
   github-linguist (~> 5.3.3)
+  github-markup (~> 1.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-gollum-lib (~> 4.2)
-  gitlab-gollum-rugged_adapter (~> 0.4.4)
   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)
   gpgme
-  grape (~> 1.0)
+  grape (~> 1.1)
   grape-entity (~> 0.7.1)
   grape-path-helpers (~> 1.0)
   grape_logging (~> 1.7)
@@ -1114,7 +1104,6 @@ DEPENDENCIES
   peek-pg (~> 1.3.0)
   peek-rblineprof (~> 0.2.0)
   peek-redis (~> 1.2.0)
-  peek-sidekiq (~> 1.0.3)
   pg (~> 0.18.2)
   premailer-rails (~> 1.9.7)
   prometheus-client-mmap (~> 0.9.4)
@@ -1166,9 +1155,8 @@ DEPENDENCIES
   settingslogic (~> 2.0.9)
   sham_rack (~> 1.3.6)
   shoulda-matchers (~> 3.1.2)
-  sidekiq (~> 5.1)
+  sidekiq (~> 5.2.1)
   sidekiq-cron (~> 0.6.0)
-  sidekiq-limit_fetch (~> 3.4)
   simple_po_parser (~> 1.1.2)
   simplecov (~> 0.14.0)
   slack-notifier (~> 1.5.1)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
index 65aac989103..ee262b6b5d9 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
@@ -301,10 +301,10 @@
     dependencies = ["msgpack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9";
+      sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.3.2";
   };
   bootstrap_form = {
     source = {
@@ -504,10 +504,10 @@
   connection_pool = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7";
+      sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.2";
   };
   crack = {
     dependencies = ["safe_yaml"];
@@ -546,10 +546,10 @@
   daemons = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg";
+      sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2";
       type = "gem";
     };
-    version = "1.2.3";
+    version = "1.2.6";
   };
   database_cleaner = {
     source = {
@@ -695,15 +695,6 @@
     };
     version = "1.5.0";
   };
-  dropzonejs-rails = {
-    dependencies = ["rails"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64";
-      type = "gem";
-    };
-    version = "0.7.2";
-  };
   ed25519 = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -773,10 +764,10 @@
   eventmachine = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp";
+      sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
       type = "gem";
     };
-    version = "1.0.8";
+    version = "1.2.7";
   };
   excon = {
     source = {
@@ -1078,10 +1069,10 @@
     dependencies = ["google-protobuf" "grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i";
+      sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki";
       type = "gem";
     };
-    version = "0.117.0";
+    version = "0.118.1";
   };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -1118,15 +1109,6 @@
     };
     version = "4.2.7.5";
   };
-  gitlab-gollum-rugged_adapter = {
-    dependencies = ["mime-types" "rugged"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi";
-      type = "gem";
-    };
-    version = "0.4.4.1";
-  };
   gitlab-grit = {
     dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
     source = {
@@ -1144,6 +1126,15 @@
     };
     version = "1.6.4";
   };
+  gitlab-sidekiq-fetcher = {
+    dependencies = ["sidekiq"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dvrp4iapwfaakc3qgf7mw05blxzfywpjfr7bhswwflih0pm67l7";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
   gitlab-styles = {
     dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
     source = {
@@ -1237,10 +1228,10 @@
     dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427";
+      sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.1.0";
   };
   grape-entity = {
     dependencies = ["activesupport" "multi_json"];
@@ -1779,10 +1770,10 @@
   mini_mime = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8";
+      sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.1";
   };
   mini_portile2 = {
     source = {
@@ -1843,10 +1834,10 @@
   mustermann = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g";
+      sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.0.3";
   };
   mustermann-grape = {
     dependencies = ["mustermann"];
@@ -2207,15 +2198,6 @@
     };
     version = "1.2.0";
   };
-  peek-sidekiq = {
-    dependencies = ["atomic" "peek" "sidekiq"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0y7s32p6cp66z1hpd1wcv4crmvvvcag5i39aazclckjsfpdfn24x";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
   pg = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2314,18 +2296,18 @@
     dependencies = ["pry"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0v8xlzzb535k7wcl0vrpday237xwc04rr9v3gviqzasl7ydw32x6";
+      sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy";
       type = "gem";
     };
-    version = "0.3.5";
+    version = "0.3.6";
   };
   public_suffix = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
+      sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
       type = "gem";
     };
-    version = "3.0.2";
+    version = "3.0.3";
   };
   pyu-ruby-sasl = {
     source = {
@@ -2382,10 +2364,10 @@
     dependencies = ["rack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7";
+      sha256 = "1z5598qipilmnf45428jnxi63ykrgvnyywa5ckpr52zv2vpd8jdp";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "2.0.3";
   };
   rack-proxy = {
     dependencies = ["rack"];
@@ -2699,10 +2681,10 @@
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
+      sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
       type = "gem";
     };
-    version = "3.2.1";
+    version = "3.3.0";
   };
   rqrcode = {
     dependencies = ["chunky_png"];
@@ -3072,13 +3054,13 @@
     version = "3.1.2";
   };
   sidekiq = {
-    dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"];
+    dependencies = ["connection_pool" "rack-protection" "redis"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh";
+      sha256 = "0s57vl2hwfaga73yiscak2rs7byg1q0z44wa9si9vl92qcmbik2j";
       type = "gem";
     };
-    version = "5.1.3";
+    version = "5.2.1";
   };
   sidekiq-cron = {
     dependencies = ["rufus-scheduler" "sidekiq"];
@@ -3089,15 +3071,6 @@
     };
     version = "0.6.0";
   };
-  sidekiq-limit_fetch = {
-    dependencies = ["sidekiq"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr";
-      type = "gem";
-    };
-    version = "3.4.0";
-  };
   signet = {
     dependencies = ["addressable" "faraday" "jwt" "multi_json"];
     source = {
@@ -3144,10 +3117,10 @@
     dependencies = ["activesupport"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wwbyg2nab2k4hdpd1i65qmnfixry29b4yqynrqfnmjghn0xvc7x";
+      sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "2.0.2";
   };
   spring-commands-rspec = {
     dependencies = ["spring"];
@@ -3288,10 +3261,10 @@
     dependencies = ["daemons" "eventmachine" "rack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q";
+      sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f";
       type = "gem";
     };
-    version = "1.7.0";
+    version = "1.7.2";
   };
   thor = {
     source = {
@@ -3518,10 +3491,10 @@
     dependencies = ["railties"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0l0jzw05yk1c19q874nhkanrn2ik7hjbr2vjcdnk1fqp2f3ypzvv";
+      sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr";
       type = "gem";
     };
-    version = "0.9.10";
+    version = "0.9.11";
   };
   wikicloth = {
     dependencies = ["builder" "expression_parser" "rinku"];
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
index 86502db9d26..ef14aace277 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
@@ -83,16 +83,14 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
 gem 'net-ldap'
 
 # Git Wiki
-# Required manually in config/initializers/gollum.rb to control load order
+# Only used to compute wiki page slugs
 gem 'gitlab-gollum-lib', '~> 4.2', require: false
 
-gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
-
 # Language detection
 gem 'github-linguist', '~> 5.3.3', require: 'linguist'
 
 # API
-gem 'grape', '~> 1.0'
+gem 'grape', '~> 1.1'
 gem 'grape-entity', '~> 0.7.1'
 gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
 
@@ -115,9 +113,6 @@ gem 'hamlit', '~> 2.8.8'
 gem 'carrierwave', '= 1.2.3'
 gem 'mini_magick'
 
-# Drag and Drop UI
-gem 'dropzonejs-rails', '~> 0.7.1'
-
 # for backups
 gem 'fog-aws', '~> 2.0.1'
 gem 'fog-core', '~> 1.44'
@@ -147,6 +142,7 @@ gem 'faraday_middleware-aws-signers-v4'
 gem 'html-pipeline', '~> 2.8'
 gem 'deckar01-task_list', '2.0.0'
 gem 'gitlab-markup', '~> 1.6.4'
+gem 'github-markup', '~> 1.7.0', require: 'github/markup'
 gem 'redcarpet', '~> 3.4'
 gem 'commonmarker', '~> 0.17'
 gem 'RedCloth', '~> 4.3.2'
@@ -180,10 +176,9 @@ gem 'state_machines-activerecord', '~> 0.5.1'
 gem 'acts-as-taggable-on', '~> 5.0'
 
 # Background jobs
-gem 'sidekiq', '~> 5.1'
+gem 'sidekiq', '~> 5.2.1'
 gem 'sidekiq-cron', '~> 0.6.0'
 gem 'redis-namespace', '~> 1.6.0'
-gem 'sidekiq-limit_fetch', '~> 3.4', require: false
 
 # Cron Parser
 gem 'rufus-scheduler', '~> 3.4'
@@ -312,7 +307,7 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql
 gem 'peek-pg', '~> 1.3.0', group: :postgres
 gem 'peek-rblineprof', '~> 0.2.0'
 gem 'peek-redis', '~> 1.2.0'
-gem 'peek-sidekiq', '~> 1.0.3'
+gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch'
 
 # Metrics
 group :metrics do
@@ -440,7 +435,7 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
 gem 'grpc', '~> 1.11.0'
 
 # Locked until https://github.com/google/protobuf/issues/4210 is closed
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
index d7c4f80efd1..4355b3ae271 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
@@ -94,7 +94,7 @@ GEM
     bindata (2.4.3)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.3.1)
+    bootsnap (1.3.2)
       msgpack (~> 1.0)
     bootstrap_form (2.7.0)
     brakeman (4.2.1)
@@ -141,14 +141,14 @@ GEM
     concurrent-ruby (1.0.5)
     concurrent-ruby-ext (1.0.5)
       concurrent-ruby (= 1.0.5)
-    connection_pool (2.2.1)
+    connection_pool (2.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
     creole (0.5.0)
     css_parser (1.5.0)
       addressable
-    daemons (1.2.3)
+    daemons (1.2.6)
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
     debugger-ruby_core_source (1.3.8)
@@ -183,8 +183,6 @@ GEM
     doorkeeper-openid_connect (1.5.0)
       doorkeeper (~> 4.3)
       json-jwt (~> 1.6)
-    dropzonejs-rails (0.7.2)
-      rails (> 3.1)
     ed25519 (1.2.4)
     elasticsearch (5.0.3)
       elasticsearch-api (= 5.0.3)
@@ -210,7 +208,7 @@ GEM
     escape_utils (1.1.1)
     et-orbi (1.0.3)
       tzinfo
-    eventmachine (1.0.8)
+    eventmachine (1.2.7)
     excon (0.62.0)
     execjs (2.6.0)
     expression_parser (0.9.0)
@@ -300,7 +298,7 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gitaly-proto (0.117.0)
+    gitaly-proto (0.118.1)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
     github-linguist (5.3.3)
@@ -321,9 +319,6 @@ GEM
       rouge (~> 3.1)
       sanitize (~> 4.6.4)
       stringex (~> 2.6)
-    gitlab-gollum-rugged_adapter (0.4.4.1)
-      mime-types (>= 1.15)
-      rugged (~> 0.25)
     gitlab-grit (2.8.2)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
@@ -331,6 +326,8 @@ GEM
       posix-spawn (~> 0.3)
     gitlab-license (1.0.0)
     gitlab-markup (1.6.4)
+    gitlab-sidekiq-fetcher (0.3.0)
+      sidekiq (~> 5)
     gitlab-styles (2.4.1)
       rubocop (~> 0.54.0)
       rubocop-gitlab-security (~> 0.1.0)
@@ -368,7 +365,7 @@ GEM
       signet (~> 0.7)
     gpgme (2.0.13)
       mini_portile2 (~> 2.1)
-    grape (1.0.3)
+    grape (1.1.0)
       activesupport
       builder
       mustermann-grape (~> 1.0.0)
@@ -521,7 +518,7 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.0)
     mini_magick (4.8.0)
-    mini_mime (1.0.0)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.7.0)
     mousetrap-rails (1.4.6)
@@ -529,7 +526,7 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mustermann (1.0.2)
+    mustermann (1.0.3)
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
     mysql2 (0.4.10)
@@ -634,10 +631,6 @@ GEM
       atomic (>= 1.0.0)
       peek
       redis
-    peek-sidekiq (1.0.3)
-      atomic (>= 1.0.0)
-      peek
-      sidekiq
     pg (0.18.4)
     po_to_json (1.0.1)
       json (>= 1.6.0)
@@ -662,9 +655,9 @@ GEM
     pry-byebug (3.4.3)
       byebug (>= 9.0, < 9.1)
       pry (~> 0.10)
-    pry-rails (0.3.5)
-      pry (>= 0.9.10)
-    public_suffix (3.0.2)
+    pry-rails (0.3.6)
+      pry (>= 0.10.4)
+    public_suffix (3.0.3)
     pyu-ruby-sasl (0.0.3.3)
     rack (1.6.10)
     rack-accept (0.4.5)
@@ -678,7 +671,7 @@ GEM
       httpclient (>= 2.4)
       multi_json (>= 1.3.6)
       rack (>= 1.1)
-    rack-protection (2.0.1)
+    rack-protection (2.0.3)
       rack
     rack-proxy (0.6.0)
       rack
@@ -764,7 +757,7 @@ GEM
     retriable (3.1.2)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (3.2.1)
+    rouge (3.3.0)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -872,16 +865,13 @@ GEM
       rack
     shoulda-matchers (3.1.2)
       activesupport (>= 4.0.0)
-    sidekiq (5.1.3)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
+    sidekiq (5.2.1)
+      connection_pool (~> 2.2, >= 2.2.2)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
     sidekiq-cron (0.6.0)
       rufus-scheduler (>= 3.3.0)
       sidekiq (>= 4.2.1)
-    sidekiq-limit_fetch (3.4.0)
-      sidekiq (>= 4)
     signet (0.8.1)
       addressable (~> 2.3)
       faraday (~> 0.9)
@@ -894,7 +884,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slack-notifier (1.5.1)
-    spring (2.0.1)
+    spring (2.0.2)
       activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -924,7 +914,7 @@ GEM
     test_after_commit (1.1.0)
       activerecord (>= 3.2)
     text (1.3.1)
-    thin (1.7.0)
+    thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
@@ -983,7 +973,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpack-rails (0.9.10)
+    webpack-rails (0.9.11)
       railties (>= 3.2.0)
     wikicloth (0.8.1)
       builder
@@ -1043,7 +1033,6 @@ DEPENDENCIES
   diffy (~> 3.1.0)
   doorkeeper (~> 4.3)
   doorkeeper-openid_connect (~> 1.5)
-  dropzonejs-rails (~> 0.7.1)
   ed25519 (~> 1.2)
   elasticsearch-api (= 5.0.3)
   elasticsearch-model (~> 0.1.9)
@@ -1072,20 +1061,21 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 0.117.0)
+  gitaly-proto (~> 0.118.1)
   github-linguist (~> 5.3.3)
+  github-markup (~> 1.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-gollum-lib (~> 4.2)
-  gitlab-gollum-rugged_adapter (~> 0.4.4)
   gitlab-license (~> 1.0)
   gitlab-markup (~> 1.6.4)
+  gitlab-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)
   gpgme
-  grape (~> 1.0)
+  grape (~> 1.1)
   grape-entity (~> 0.7.1)
   grape-path-helpers (~> 1.0)
   grape_logging (~> 1.7)
@@ -1151,7 +1141,6 @@ DEPENDENCIES
   peek-pg (~> 1.3.0)
   peek-rblineprof (~> 0.2.0)
   peek-redis (~> 1.2.0)
-  peek-sidekiq (~> 1.0.3)
   pg (~> 0.18.2)
   premailer-rails (~> 1.9.7)
   prometheus-client-mmap (~> 0.9.4)
@@ -1203,9 +1192,8 @@ DEPENDENCIES
   settingslogic (~> 2.0.9)
   sham_rack (~> 1.3.6)
   shoulda-matchers (~> 3.1.2)
-  sidekiq (~> 5.1)
+  sidekiq (~> 5.2.1)
   sidekiq-cron (~> 0.6.0)
-  sidekiq-limit_fetch (~> 3.4)
   simple_po_parser (~> 1.1.2)
   simplecov (~> 0.14.0)
   slack-notifier (~> 1.5.1)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
index a067d1e4272..03efc4e9600 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
@@ -336,10 +336,10 @@
     dependencies = ["msgpack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9";
+      sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.3.2";
   };
   bootstrap_form = {
     source = {
@@ -539,10 +539,10 @@
   connection_pool = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7";
+      sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.2";
   };
   crack = {
     dependencies = ["safe_yaml"];
@@ -581,10 +581,10 @@
   daemons = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg";
+      sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2";
       type = "gem";
     };
-    version = "1.2.3";
+    version = "1.2.6";
   };
   database_cleaner = {
     source = {
@@ -730,15 +730,6 @@
     };
     version = "1.5.0";
   };
-  dropzonejs-rails = {
-    dependencies = ["rails"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64";
-      type = "gem";
-    };
-    version = "0.7.2";
-  };
   ed25519 = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -852,10 +843,10 @@
   eventmachine = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp";
+      sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
       type = "gem";
     };
-    version = "1.0.8";
+    version = "1.2.7";
   };
   excon = {
     source = {
@@ -1166,10 +1157,10 @@
     dependencies = ["google-protobuf" "grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i";
+      sha256 = "19nyx75xnb3lsap6rr3p1avqsw1dcrm8d3ggmmihd58a9s762fki";
       type = "gem";
     };
-    version = "0.117.0";
+    version = "0.118.1";
   };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -1206,15 +1197,6 @@
     };
     version = "4.2.7.5";
   };
-  gitlab-gollum-rugged_adapter = {
-    dependencies = ["mime-types" "rugged"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi";
-      type = "gem";
-    };
-    version = "0.4.4.1";
-  };
   gitlab-grit = {
     dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
     source = {
@@ -1240,6 +1222,15 @@
     };
     version = "1.6.4";
   };
+  gitlab-sidekiq-fetcher = {
+    dependencies = ["sidekiq"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dvrp4iapwfaakc3qgf7mw05blxzfywpjfr7bhswwflih0pm67l7";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
   gitlab-styles = {
     dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
     source = {
@@ -1333,10 +1324,10 @@
     dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427";
+      sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.1.0";
   };
   grape-entity = {
     dependencies = ["activesupport" "multi_json"];
@@ -1892,10 +1883,10 @@
   mini_mime = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8";
+      sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.1";
   };
   mini_portile2 = {
     source = {
@@ -1956,10 +1947,10 @@
   mustermann = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g";
+      sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.0.3";
   };
   mustermann-grape = {
     dependencies = ["mustermann"];
@@ -2328,15 +2319,6 @@
     };
     version = "1.2.0";
   };
-  peek-sidekiq = {
-    dependencies = ["atomic" "peek" "sidekiq"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0y7s32p6cp66z1hpd1wcv4crmvvvcag5i39aazclckjsfpdfn24x";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
   pg = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2435,18 +2417,18 @@
     dependencies = ["pry"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0v8xlzzb535k7wcl0vrpday237xwc04rr9v3gviqzasl7ydw32x6";
+      sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy";
       type = "gem";
     };
-    version = "0.3.5";
+    version = "0.3.6";
   };
   public_suffix = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
+      sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
       type = "gem";
     };
-    version = "3.0.2";
+    version = "3.0.3";
   };
   pyu-ruby-sasl = {
     source = {
@@ -2503,10 +2485,10 @@
     dependencies = ["rack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7";
+      sha256 = "1z5598qipilmnf45428jnxi63ykrgvnyywa5ckpr52zv2vpd8jdp";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "2.0.3";
   };
   rack-proxy = {
     dependencies = ["rack"];
@@ -2820,10 +2802,10 @@
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
+      sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
       type = "gem";
     };
-    version = "3.2.1";
+    version = "3.3.0";
   };
   rqrcode = {
     dependencies = ["chunky_png"];
@@ -3193,13 +3175,13 @@
     version = "3.1.2";
   };
   sidekiq = {
-    dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"];
+    dependencies = ["connection_pool" "rack-protection" "redis"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh";
+      sha256 = "0s57vl2hwfaga73yiscak2rs7byg1q0z44wa9si9vl92qcmbik2j";
       type = "gem";
     };
-    version = "5.1.3";
+    version = "5.2.1";
   };
   sidekiq-cron = {
     dependencies = ["rufus-scheduler" "sidekiq"];
@@ -3210,15 +3192,6 @@
     };
     version = "0.6.0";
   };
-  sidekiq-limit_fetch = {
-    dependencies = ["sidekiq"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr";
-      type = "gem";
-    };
-    version = "3.4.0";
-  };
   signet = {
     dependencies = ["addressable" "faraday" "jwt" "multi_json"];
     source = {
@@ -3265,10 +3238,10 @@
     dependencies = ["activesupport"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wwbyg2nab2k4hdpd1i65qmnfixry29b4yqynrqfnmjghn0xvc7x";
+      sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "2.0.2";
   };
   spring-commands-rspec = {
     dependencies = ["spring"];
@@ -3409,10 +3382,10 @@
     dependencies = ["daemons" "eventmachine" "rack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q";
+      sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f";
       type = "gem";
     };
-    version = "1.7.0";
+    version = "1.7.2";
   };
   thor = {
     source = {
@@ -3639,10 +3612,10 @@
     dependencies = ["railties"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0l0jzw05yk1c19q874nhkanrn2ik7hjbr2vjcdnk1fqp2f3ypzvv";
+      sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr";
       type = "gem";
     };
-    version = "0.9.10";
+    version = "0.9.11";
   };
   wikicloth = {
     dependencies = ["builder" "expression_parser" "rinku"];
-- 
GitLab


From cafecf16afa57863f6981aa7a5adac6f1c29cda6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 26 Oct 2018 09:13:37 +0100
Subject: [PATCH 0374/1065] rust: 1.29.1 -> 1.30.0

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

diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 55348c5795a..e738dd7acae 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.28.0";
+  version = "1.29.2";
 
-  # fetch hashes by running `print-hashes.sh 1.24.1`
+  # fetch hashes by running `print-hashes.sh 1.29.2`
   hashes = {
-    i686-unknown-linux-gnu = "de7cdb4e665e897ea9b10bf6fd545f900683296456d6a11d8510397bb330455f";
-    x86_64-unknown-linux-gnu = "2a1390340db1d24a9498036884e6b2748e9b4b057fc5219694e298bdaa37b810";
-    armv7-unknown-linux-gnueabihf = "346558d14050853b87049e5e1fbfae0bf0360a2f7c57433c6985b1a879c349a2";
-    aarch64-unknown-linux-gnu = "9b6fbcee73070332c811c0ddff399fa31965bec62ef258656c0c90354f6231c1";
-    i686-apple-darwin = "752e2c9182e057c4a54152d1e0b3949482c225d02bb69d9d9a4127dc2a65fb68";
-    x86_64-apple-darwin = "5d7a70ed4701fe9410041c1eea025c95cad97e5b3d8acc46426f9ac4f9f02393";
+    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";
   };
 
   platform =
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 7d785093f9b..7e95f3c6cae 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -6,11 +6,11 @@
 
 let
   rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
-  version = "1.29.1";
-  cargoVersion = "1.29.1";
+  version = "1.30.0";
+  cargoVersion = "1.30.0";
   src = fetchurl {
     url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-    sha256 = "0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i";
+    sha256 = "1vh8q5i273xyjvpipqisny11iz0xfgz30cgjr7068nx5rhzsh2yd";
   };
 in rec {
   rustc = callPackage ./rustc.nix {
-- 
GitLab


From 7f80fb2db4a0a0d0fc6456fbb8c5d193e43f1348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 26 Oct 2018 10:53:21 +0100
Subject: [PATCH 0375/1065] doc: extend breakpointHook documentation

---
 doc/stdenv.xml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 4f121e328cb..7d86c0870b7 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -2451,16 +2451,19 @@ addEnvHooks "$hostOffset" myBashFunction
      </term>
      <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 allows the user to attach
-       to a build environemnt using the <varname>cntr</varname> command.
-       On build error it will print the instruction that are neccessary for cntr.
-       Note that <varname>cntr</varname> is not installed by default and
-       needs to be installed seperatly. <varname>cntr</varname> also needs to be executed
-       on the machine that is doing the build, which might be not the case
-       when remote builders are enabled. <varname>cntr</varname> is only supported
-       on linux based platforms.
+       This hook will make a build pause instead of stopping when a failure
+       happen. It prevents nix to cleanup 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
+       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
+       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.
+       <command>cntr</command> is only supported on linux based platforms.
       </para>
      </listitem>
     </varlistentry>
-- 
GitLab


From 764d165f43483b9f570a7b5bc267016120eafac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 26 Oct 2018 11:13:54 +0100
Subject: [PATCH 0376/1065] doc: apply `make format`

---
 doc/languages-frameworks/coq.xml |  4 ++--
 doc/stdenv.xml                   | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml
index 640b04c7da9..4314df5c9df 100644
--- a/doc/languages-frameworks/coq.xml
+++ b/doc/languages-frameworks/coq.xml
@@ -12,8 +12,8 @@
 
  <para>
   Some extensions (plugins) might require OCaml and sometimes other OCaml
-  packages. The <literal>coq.ocamlPackages</literal> attribute can be used
-  to depend on the same package set Coq was built against.
+  packages. The <literal>coq.ocamlPackages</literal> attribute can be used to
+  depend on the same package set Coq was built against.
  </para>
 
  <para>
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 7d86c0870b7..b2f30bf08db 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -2099,13 +2099,13 @@ someVar=$(stripHash $name)
   </para>
 
   <para>
-   In order to alleviate this burden, the <firstterm>setup
-   hook</firstterm> mechanism was written, where any package can include a
-   shell script that [by convention rather than enforcement by Nix], any
-   downstream reverse-dependency will source as part of its build process. That
-   allows the downstream dependency to merely specify its dependencies, and
-   lets those dependencies effectively initialize themselves. No boilerplate
-   mirroring the list of dependencies is needed.
+   In order to alleviate this burden, the <firstterm>setup hook</firstterm>
+   mechanism was written, where any package can include a shell script that [by
+   convention rather than enforcement by Nix], any downstream
+   reverse-dependency will source as part of its build process. That allows the
+   downstream dependency to merely specify its dependencies, and lets those
+   dependencies effectively initialize themselves. No boilerplate mirroring the
+   list of dependencies is needed.
   </para>
 
   <para>
-- 
GitLab


From 9843fdc532a75f34274fb781d69a2daa97a6a0d2 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 15 Oct 2018 22:57:08 +0200
Subject: [PATCH 0377/1065] ligcgroup: fix CVE-2018-14348

When using cgrulesengd it would create a logfile at /var/log/cgred with
the permission wide open (0666).
---
 pkgs/os-specific/linux/libcgroup/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix
index a70ab13db62..1e920247a75 100644
--- a/pkgs/os-specific/linux/libcgroup/default.nix
+++ b/pkgs/os-specific/linux/libcgroup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pam, yacc, flex }:
+{ stdenv, fetchurl, fetchpatch, pam, yacc, flex }:
 
 stdenv.mkDerivation rec {
   name    = "libcgroup-${version}";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pam yacc flex ];
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch?id=33e9f4c81de754bbf76b893ea1133ed023f2a0e5";
+      sha256 = "1x0x29ld0cgmfwq4qy13s6d5c8sym1frfh1j2q47d8gfw6qaxka5";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace src/tools/Makefile.in \
       --replace 'chmod u+s' 'chmod +x'
-- 
GitLab


From c994f40de8e5e632fc71948001a73aaf9d3319cb Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 15 Oct 2018 23:09:10 +0200
Subject: [PATCH 0378/1065] taglib: fix CVE-2018-11439

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

diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index 67db6e5097d..a2cb103a182 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
       url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch";
       sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90";
     })
+
+    (fetchpatch {
+      # https://github.com/taglib/taglib/pull/869
+      name = "CVE-2018-11439.patch";
+      url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch";
+      sha256 = "0p397qq4anvcm0p8xs68mxa8hg6dl07chg260lc6k2929m34xv72";
+    })
   ];
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 5f75f72497113001bbd464018db233fee13b0ed9 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 15 Oct 2018 23:27:45 +0200
Subject: [PATCH 0379/1065] yara: 3.7.1 -> 3.8.1

This fixes issues CVE-2018-12034 & CVE-2018-12035. They are OOB read &
write issues of the internal VM. Details can be retrieved at [1] & [2].

[1] https://github.com/VirusTotal/yara/issues/891
[2] https://bnbdr.github.io/posts/swisscheese/
---
 pkgs/tools/security/yara/default.nix | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix
index e273b2c1909..460474a7bb3 100644
--- a/pkgs/tools/security/yara/default.nix
+++ b/pkgs/tools/security/yara/default.nix
@@ -5,34 +5,16 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.7.1";
+  version = "3.8.1";
   name = "yara-${version}";
 
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "yara";
     rev = "v${version}";
-    sha256 = "05smkn4ii8irx6ccnzrhwa39pkmrjyxjmfrwh6mhdd8iz51v5cgz";
+    sha256 = "1ys2y5f2cif3g42daq646jcrn2na19zkx7fds2gnavj5c1rk7463";
   };
 
-  # FIXME: this is probably not the right way to make it work
-  # make[2]: *** No rule to make target 'libyara/.libs/libyara.a', needed by 'yara'.  Stop.
-  prePatch = ''
-    cat >staticlibrary.patch <<EOF
-    --- a/Makefile.am 2015-11-01 11:39:12.000000000 +0100
-    +++ b/Makefile.am 2015-11-01 11:45:32.000000000 +0100
-    @@ -12 +12 @@
-    -yara_LDADD = libyara/.libs/libyara.a
-    +yara_LDADD = libyara/.libs/libyara${stdenv.hostPlatform.extensions.sharedLibrary}
-    @@ -15 +15 @@
-    -yarac_LDADD = libyara/.libs/libyara.a
-    +yarac_LDADD = libyara/.libs/libyara${stdenv.hostPlatform.extensions.sharedLibrary}
-    EOF
-  '';
-  patches = [
-    "staticlibrary.patch"
-  ];
-
   buildInputs = [ autoconf automake libtool pcre]
     ++ stdenv.lib.optionals withCrypto [ openssl ]
     ++ stdenv.lib.optionals enableMagic [ file ]
-- 
GitLab


From 6ad3088b124504c873e239002b044e4b66607986 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 15 Oct 2018 23:55:47 +0200
Subject: [PATCH 0380/1065] libgxps: fix CVE-2018-10733

---
 pkgs/desktops/gnome-3/core/libgxps/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix
index c9312c22882..68193bad583 100644
--- a/pkgs/desktops/gnome-3/core/libgxps/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo
-, libarchive, freetype, libjpeg, libtiff, gnome3
+, libarchive, freetype, libjpeg, libtiff, gnome3, fetchpatch
 }:
 
 let
@@ -13,6 +13,19 @@ in stdenv.mkDerivation rec {
     sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2018-10733-1.patch";
+      url = https://gitlab.gnome.org/GNOME/libgxps/commit/b458226e162fe1ffe7acb4230c114a52ada5131b.patch;
+      sha256 = "0pqg9iwkg69qknj7vkgn26c32fndy55byxivd4km0vjfhfyx69hd";
+    })
+    (fetchpatch {
+      name = "CVE-2018-10733-2.patch";
+      url = https://gitlab.gnome.org/GNOME/libgxps/commit/133fe2a96e020d4ca65c6f64fb28a404050ebbfd.patch;
+      sha256 = "19n01x8zs05wf801mkz4mypvapph7h941md3hr3rj0ry6r88pkir";
+    })
+  ];
+
   nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
   buildInputs = [ glib cairo freetype libjpeg libtiff ];
   propagatedBuildInputs = [ libarchive ];
-- 
GitLab


From 1103b3fbe6e7349a1f95e7eb2f6f17af8210ab6e Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 16 Oct 2018 00:16:17 +0200
Subject: [PATCH 0381/1065] batik: mark as insecure

The package hasn't been updated in a long time. There have been several
issues with the package. There is no dependant  package in the
repository so marking it as insecure until someone maintains it sounds
reasonable.
---
 pkgs/applications/graphics/batik/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix
index 4032e2e3fee..51156dea4a1 100644
--- a/pkgs/applications/graphics/batik/default.nix
+++ b/pkgs/applications/graphics/batik/default.nix
@@ -15,5 +15,11 @@ stdenv.mkDerivation {
     homepage = https://xmlgraphics.apache.org/batik;
     license = licenses.asl20;
     platforms = platforms.unix;
+    knownVulnerabilities = [
+      # vulnerabilities as of 16th October 2018 from https://xmlgraphics.apache.org/security.html:
+      "CVE-2018-8013"
+      "CVE-2017-5662"
+      "CVE-2015-0250"
+    ];
   };
 }
-- 
GitLab


From 385e5ac8479f994dd4f2838a552341e009a99083 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 16 Oct 2018 00:23:02 +0200
Subject: [PATCH 0382/1065] sddm: 0.17.0 -> 0.18.0

Bumps to the latest stable version while fixing CVE-2018-14345 [1].

Changelog [2]:
 - Support theme supplied avatars
 - Compile against Qt 5.11
 - Fix platform detection for HighDPI
 - On close, switch VT to a running session if applicable
 - Better ConsoleKit support
 - Fix authentication when non-default hidden option ReuseSession=true is used (CVE-2018-14345)
 - Hide sessions with NoDisplay=true
 - Honor PAM's ambient supplemental groups
 - Cleanup socket destruction
 - Don't quit on SIGHUP
 - Updated translations

[1] https://nvd.nist.gov/vuln/detail/CVE-2018-14345
[2] https://github.com/sddm/sddm/releases/tag/v0.18.0
---
 .../display-managers/sddm/default.nix         |  5 ++--
 .../display-managers/sddm/qt511.patch         | 28 -------------------
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/applications/display-managers/sddm/qt511.patch

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index c9fd4f9c4ab..3de4067f55d 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "0.17.0";
+  version = "0.18.0";
 
 in mkDerivation rec {
   name = "sddm-${version}";
@@ -13,12 +13,11 @@ in mkDerivation rec {
     owner = "sddm";
     repo = "sddm";
     rev = "v${version}";
-    sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq";
+    sha256 = "16xnm02iqgy4hydzd6my0widq981glbazbhxnihhclgsaczh8mfq";
   };
 
   patches = [
     ./sddm-ignore-config-mtime.patch
-    ./qt511.patch
   ];
 
   postPatch =
diff --git a/pkgs/applications/display-managers/sddm/qt511.patch b/pkgs/applications/display-managers/sddm/qt511.patch
deleted file mode 100644
index 6430e60ed41..00000000000
--- a/pkgs/applications/display-managers/sddm/qt511.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 005c9ad..71b46d7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -93,7 +93,7 @@ find_package(XCB REQUIRED)
- find_package(XKB REQUIRED)
- 
- # Qt 5
--find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools)
-+find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools Test)
- 
- # find qt5 imports dir
- get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index c9d935a..bb85ddd 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -2,9 +2,8 @@ set(QT_USE_QTTEST TRUE)
- 
- include_directories(../src/common)
- 
--
- set(ConfigurationTest_SRCS ConfigurationTest.cpp ../src/common/ConfigReader.cpp)
- add_executable(ConfigurationTest ${ConfigurationTest_SRCS})
- add_test(NAME Configuration COMMAND ConfigurationTest)
- 
--qt5_use_modules(ConfigurationTest Test)
-+target_link_libraries(ConfigurationTest Qt5::Core Qt5::Test)
-- 
GitLab


From 289897237763ef6db49af8dc3d00c3568cc2f230 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 16 Oct 2018 00:35:52 +0200
Subject: [PATCH 0383/1065] kiwix: mark as insecure

There is at least one recorded issue against our kiwix version. Upstream
does no longer support this version of the project. They have moved to a
different repository & software architecture.
---
 pkgs/applications/misc/kiwix/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 8d095b78cdb..9ea8210e67e 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -103,5 +103,8 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ robbinch ];
+    knownVulnerabilities = [
+      "CVE-2015-1032"
+    ];
   };
 }
-- 
GitLab


From 0d64e81ce6166eb5920e01563b78b9cb6e2c2043 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 26 Oct 2018 12:14:24 +0100
Subject: [PATCH 0384/1065] rustc: fix moved tests and darwin build

---
 pkgs/development/compilers/rust/rustc.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index a054ed0eb55..decf14a3294 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -92,15 +92,15 @@ stdenv.mkDerivation {
     #[ -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/linker-output-non-utf8 || true
-    rm -vr src/test/run-make/issue-26092 || true
+    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/run-pass/issue-36023.rs || true
+    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/run-pass/issue-36474.rs || true
+    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
@@ -116,18 +116,18 @@ stdenv.mkDerivation {
     # Disable all lldb tests.
     # error: Can't run LLDB test because LLDB's python path is not set
     rm -vr src/test/debuginfo/*
-    rm -v src/test/run-pass/backtrace-debuginfo.rs
+    rm -v src/test/run-pass/backtrace-debuginfo.rs || true
 
     # error: No such file or directory
-    rm -v src/test/run-pass/issue-45731.rs
+    rm -v src/test/ui/run-pass/issues/issue-45731.rs || true
 
     # Disable tests that fail when sandboxing is enabled.
     substituteInPlace src/libstd/sys/unix/ext/net.rs \
         --replace '#[test]' '#[test] #[ignore]'
     substituteInPlace src/test/run-pass/env-home-dir.rs \
         --replace 'home_dir().is_some()' true
-    rm -v src/test/run-pass/fds-are-cloexec.rs  # FIXME: pipes?
-    rm -v src/test/run-pass/sync-send-in-std.rs  # FIXME: ???
+    rm -v src/test/run-pass/fds-are-cloexec.rs || true  # FIXME: pipes?
+    rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true  # FIXME: ???
   '';
 
   # rustc unfortunately need cmake for compiling llvm-rt but doesn't
-- 
GitLab


From 463a2d94bd3cd85e43666ea904a91f2947b80ef8 Mon Sep 17 00:00:00 2001
From: Nick Novitski <github@nicknovitski.com>
Date: Fri, 26 Oct 2018 04:18:10 -0700
Subject: [PATCH 0385/1065] cloud-sql-proxy: 1.11 -> 1.13 (#48920)

---
 pkgs/tools/misc/cloud-sql-proxy/default.nix |  6 +++---
 pkgs/tools/misc/cloud-sql-proxy/deps.nix    | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix
index 5059b395610..b9046bf19ca 100644
--- a/pkgs/tools/misc/cloud-sql-proxy/default.nix
+++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "cloud-sql-proxy-${version}";
-  version = "1.11";
+  version = "1.13";
 
   goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
   src = fetchgit {
     rev = version;
     url = "https://${goPackagePath}";
-    sha256 = "13g68i51f03xdh7a1qjmj8j5ljn4drd3n44fn348xfdxqclnx90l";
+    sha256 = "07n2hfhqa9hinabmx79aqqwxzzkky76x3jvpd89kch14fijbh532";
   };
 
   goDeps = ./deps.nix;
@@ -20,7 +20,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "An authenticating proxy for Second Generation Google Cloud SQL databases";
-    homepage = https://github.com/GoogleCloudPlatform/cloudsql-proxy;
+    homepage = "https://${goPackagePath}";
     license = licenses.asl20;
     maintainers = [ maintainers.nicknovitski ];
     platforms = platforms.all;
diff --git a/pkgs/tools/misc/cloud-sql-proxy/deps.nix b/pkgs/tools/misc/cloud-sql-proxy/deps.nix
index 7021b4b05b2..6898833b6f1 100644
--- a/pkgs/tools/misc/cloud-sql-proxy/deps.nix
+++ b/pkgs/tools/misc/cloud-sql-proxy/deps.nix
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://code.googlesource.com/gocloud";
-      rev = "e9284bade4f43071dac5ec56c73a03a3c9fa7772";
-      sha256 = "0qm0s97bj21m04a07yni09hdh0aycgmklm5mg6flx17lrp2av9j8";
+      rev = "dba8c2c195294739180b3e6865f8893eb808676e";
+      sha256 = "1l6aj26sd7byjcgi2b4k452fcg949v28lff2fkw5nq2qr2fjnqxy";
     };
   }
   {
@@ -23,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "3a7846fea0afe8cc88deb31d8cfb1fa15a3615ef";
-      sha256 = "1dxvliqc79bl0waczzy8ajm7jpbnn2bszwfcd71zjjxph8jz75kg";
+      rev = "9b4f9f5ad5197c79fd623a3638e70d8b26cef344";
+      sha256 = "06hvxy113h76f31gv1mq6vdr6xja1zv0fdig686l2b4y2b6swych";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/oauth2";
-      rev = "cdc340f7c179dbbfa4afd43b7614e8fcadde4269";
-      sha256 = "182is558nfvk4x1cm8sqzaym8kfcaaxaga9ggqhvzqrs8mncbj22";
+      rev = "9dcd33a902f40452422c2367fefcb95b54f9f8f8";
+      sha256 = "15lfa780h2ff50qvcdl7sfs9f9j13fa5kfj6fb292rk3fwxhnx4i";
     };
   }
   {
@@ -41,8 +41,8 @@
     fetch = {
       type = "git";
       url = "https://code.googlesource.com/google-api-go-client";
-      rev = "20530fd5d65ad2caee87891f9896d7547cb400c9";
-      sha256 = "06fsnml2kfzifxp2d5anb6vxjlgpkwl82xcddf0cg0v1bnx5mnrd";
+      rev = "39567f0042a03aeb2691599961ed4454e43d5063";
+      sha256 = "0c5gx156v1pk0gqvl9w43l06z0rh9g2sackpl9ghds0asnyqx04d";
     };
   }
 ]
-- 
GitLab


From a88e0ef9aa79ec3910898b056e087e9452c1964d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Hrnko?= <jan.hrnko@satoshilabs.com>
Date: Fri, 26 Oct 2018 14:53:31 +0200
Subject: [PATCH 0386/1065] nixos/trezord: revised and updated udev rules

---
 nixos/modules/services/hardware/trezord.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix
index dfefc1171e6..c06a0665d02 100644
--- a/nixos/modules/services/hardware/trezord.nix
+++ b/nixos/modules/services/hardware/trezord.nix
@@ -27,13 +27,13 @@ in {
       destination = "/etc/udev/rules.d/51-trezor.rules";
       text = ''
         # TREZOR v1 (One)
-        SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
-        KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001",  MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl"
+        SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n"
+        KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0660", GROUP="trezord", TAG+="uaccess"
 
         # TREZOR v2 (T)
-        SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0661", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
-        SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
-        KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl"
+        SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n"
+        SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n"
+        KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0660", GROUP="trezord", TAG+="uaccess"
       '';
     });
 
-- 
GitLab


From 2854322cb8891a9d9844f464c9d48b9ac8c8683d Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 10:48:10 -0400
Subject: [PATCH 0387/1065] pythonPackages.ifaddr: init at 0.1.4

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

diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix
new file mode 100644
index 00000000000..db0b8301f00
--- /dev/null
+++ b/pkgs/development/python-modules/ifaddr/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, ipaddress
+, python
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  version = "0.1.4";
+  pname = "ifaddr";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "cf2a8fbb578da2844d999a0a453825f660ed2d3fc47dcffc5f673dd8de4f0f8b";
+  };
+
+  # ipaddress is provided in python stdlib > 3.3
+  postPatch = if pythonOlder "3.4" then "" else ''
+    sed -i "s/'ipaddress'//" setup.py
+  '';
+
+  propagatedBuildInputs = [ ipaddress ];
+
+  checkPhase = ''
+   ${python.interpreter} ifaddr/test_ifaddr.py
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pydron/ifaddr;
+    description = "Enumerates all IP addresses on all network adapters of the system";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c5870b529c..dbabd011aa3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2462,6 +2462,8 @@ in {
 
   icalendar = callPackage ../development/python-modules/icalendar { };
 
+  ifaddr = callPackage ../development/python-modules/ifaddr { };
+
   imageio = callPackage ../development/python-modules/imageio { };
 
   imgaug = callPackage ../development/python-modules/imgaug { };
-- 
GitLab


From 8bca8527bd37d728f41aeab527bec5014e358f09 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 10:48:43 -0400
Subject: [PATCH 0388/1065] python3Packages.zeroconf: 0.20.0 -> 0.21.3 removes
 python3 support

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

diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index 06c5fe3a1be..b77215a2d24 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -1,16 +1,32 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, netifaces, six, enum-compat }:
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, ifaddr
+, typing
+, isPy27
+, pythonOlder
+, python
+}:
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.20.0";
+  version = "0.21.3";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6e3f1e7b5871e3d1410ac29b9fb85aafc1e2d661ed596b07a6f84559a475efcb";
+    sha256 = "5b52dfdf4e665d98a17bf9aa50dea7a8c98e25f972d9c1d7660e2b978a1f5713";
   };
 
-  propagatedBuildInputs = [ netifaces six enum-compat ];
+  propagatedBuildInputs = [ ifaddr ]
+    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
+
+  # tests not included with pypi release
+  doCheck = false;
+
+  checkPhase = ''
+    ${python.interpreter} test_zeroconf.py
+  '';
 
   meta = with stdenv.lib; {
     description = "A pure python implementation of multicast DNS service discovery";
-- 
GitLab


From 3446af99abb2ea1006490c70f6fda10c4b0ae091 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 10:54:03 -0400
Subject: [PATCH 0389/1065] pythonPackages.whichcraft: 0.4.1 -> 0.5.2 resolve
 libcLocales issue

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

diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix
index 89be87e1849..498c1c401f8 100644
--- a/pkgs/development/python-modules/whichcraft/default.nix
+++ b/pkgs/development/python-modules/whichcraft/default.nix
@@ -1,14 +1,17 @@
-{ lib, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "whichcraft";
-  version = "0.4.1";
+  version = "0.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9e0d51c9387cb7e9f28b7edb549e6a03da758f7784f991eb4397d7f7808c57fd";
+    sha256 = "fecddd531f237ffc5db8b215409afb18fa30300699064cca4817521b4fc81815";
   };
 
+  LC_ALL="en_US.utf-8";
+  buildInputs = [ glibcLocales ];
+
   checkInputs = [ pytest ];
 
   checkPhase = ''
-- 
GitLab


From 6ce6637219405b71f6e0cd013cb5e509626ed5c0 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 11:00:21 -0400
Subject: [PATCH 0390/1065] pythonPackages.selenium: 3.8.1 -> 3.14.1

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

diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix
index cd4a6389a35..b64b53fb2fb 100644
--- a/pkgs/development/python-modules/selenium/default.nix
+++ b/pkgs/development/python-modules/selenium/default.nix
@@ -4,6 +4,7 @@
 , fetchFromGitHub
 , buildPythonPackage
 , geckodriver
+, urllib3
 , xorg
 }:
 
@@ -22,17 +23,17 @@ in
 
 buildPythonPackage rec {
   pname = "selenium";
-  version = "3.8.1";
+  version = "3.14.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lqm2md84g11g7lqi94xqb5lydm93vgmlznfhf27g6sy9ayjvgcs";
+    sha256 = "ab192cd046164c40fabcf44b47c66c8b12495142f4a69dcc55ea6eeef096e614";
   };
 
   buildInputs = [xorg.libX11];
 
   propagatedBuildInputs = [
-    geckodriver
+    geckodriver urllib3
   ];
 
   patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
-- 
GitLab


From a19b12e7978ba7b4897d35fc2deaf18e304c67b5 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 11:25:48 -0400
Subject: [PATCH 0391/1065] pythonPackages.awkward: init at 0.3.0

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

diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
new file mode 100644
index 00000000000..6bbcd170382
--- /dev/null
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, numpy
+}:
+
+buildPythonPackage rec {
+  version = "0.3.0";
+  pname = "awkward";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "fc3080c66987f2a03aa9ba0809e51227eb7aa34198da4b1ee4deb95356409693";
+  };
+
+  propagatedBuildInputs = [ numpy ];
+
+  meta = with stdenv.lib; {
+    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 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dbabd011aa3..57fe0eea3f1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -204,6 +204,8 @@ in {
 
   automat = callPackage ../development/python-modules/automat { };
 
+  awkward = callPackage ../development/python-modules/awkward { };
+
   aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { };
 
   aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { };
-- 
GitLab


From 0a4f70663e5e4148fbd3bcce2196e6a02785e5aa Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 11:26:19 -0400
Subject: [PATCH 0392/1065] pythonPackages.uproot-methods: init at 0.2.5

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

diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix
new file mode 100644
index 00000000000..b3c2ce714ce
--- /dev/null
+++ b/pkgs/development/python-modules/uproot-methods/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, numpy
+, awkward
+}:
+
+buildPythonPackage rec {
+  version = "0.2.5";
+  pname = "uproot-methods";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "7d5563b3335af414a12caf5b350c952fdc7576abb17630382de5564a7c254ae6";
+  };
+
+  propagatedBuildInputs = [ numpy awkward ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/scikit-hep/uproot-methods;
+    description = "Pythonic mix-ins for ROOT classes";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 57fe0eea3f1..f8c635edb5b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7952,6 +7952,8 @@ in {
 
   uproot = callPackage ../development/python-modules/uproot {};
 
+  uproot-methods = callPackage ../development/python-modules/uproot-methods { };
+
   uptime = buildPythonPackage rec {
     name = "uptime-${version}";
     version = "3.0.1";
-- 
GitLab


From b89aa04c12e53a948d3cf0ef1b6dfba05b9a493e Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 11:26:45 -0400
Subject: [PATCH 0393/1065] pythonPackages.uproot: 2.9.11 -> 3.2.6

---
 .../python-modules/uproot/default.nix         | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index e2cc1105f09..120f728365d 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -1,17 +1,30 @@
-{lib, fetchPypi, buildPythonPackage, numpy}:
+{ lib
+, fetchPypi
+, buildPythonPackage
+, numpy
+, python-lz4
+, uproot-methods
+, awkward
+, cachetools
+, pythonOlder
+, pytestrunner
+, pytest
+, backports_lzma
+}:
 
 buildPythonPackage rec {
   pname = "uproot";
-  version = "2.9.11";
+  version = "3.2.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "da71e9e239129ec2ae7a62f9d35aebd46456f05e000ef14f32fe2c9fa8ec92c2";
+    sha256 = "af0a093f0788b8983d07b88fac3094b26c3e28358bc10cdb8d757cc07956f8d4";
   };
 
-  propagatedBuildInputs = [
-    numpy
-  ];
+  buildInputs = [ pytestrunner ];
+  checkInputs = [ pytest ]
+    ++ lib.optionals (pythonOlder "3.3") [ backports_lzma ];
+  propagatedBuildInputs = [ numpy python-lz4 cachetools uproot-methods awkward ];
 
   meta = with lib; {
     homepage = https://github.com/scikit-hep/uproot;
-- 
GitLab


From e3bf962bb8250ecab14c777a81ed72e9e29f691c Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 11:42:36 -0400
Subject: [PATCH 0394/1065] python3PAckages.python-rapidjson: init at 0.6.3

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

diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix
new file mode 100644
index 00000000000..d245d472a00
--- /dev/null
+++ b/pkgs/development/python-modules/python-rapidjson/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, pytest
+, pytz
+, glibcLocales
+}:
+
+buildPythonPackage rec {
+  version = "0.6.3";
+  pname = "python-rapidjson";
+  disabled = pythonOlder "3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0a7729c711d9be2b6c0638ce4851d398e181f2329814668aa7fda6421a5da085";
+  };
+
+  LC_ALL="en_US.utf-8";
+  buildInputs = [ glibcLocales ];
+
+  # buildInputs = [ ];
+  checkInputs = [ pytest pytz ];
+  # propagatedBuildInputs = [ ];
+
+  checkPhase = ''
+    pytest tests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/python-rapidjson/python-rapidjson;
+    description = "Python wrapper around rapidjson ";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f8c635edb5b..d5158c4fd80 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -596,6 +596,8 @@ in {
 
   python-prctl = callPackage ../development/python-modules/python-prctl { };
 
+  python-rapidjson = callPackage ../development/python-modules/python-rapidjson { };
+
   python-sql = callPackage ../development/python-modules/python-sql { };
 
   python-stdnum = callPackage ../development/python-modules/python-stdnum { };
-- 
GitLab


From 5aed95f8b4ecd1f6ec74eec2569dea2e309c87e7 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 11:43:07 -0400
Subject: [PATCH 0395/1065] pythonPackages.structlog: 17.2.0 -> 18.2.0

---
 .../python-modules/structlog/default.nix      | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix
index f667f17f77d..a4130502e4b 100644
--- a/pkgs/development/python-modules/structlog/default.nix
+++ b/pkgs/development/python-modules/structlog/default.nix
@@ -3,34 +3,30 @@
 , fetchPypi
 , fetchpatch
 , pytest
+, python-rapidjson
 , pretend
 , freezegun
+, twisted
 , simplejson
 , six
+, pythonAtLeast
 }:
 
 buildPythonPackage rec {
   pname = "structlog";
-  version = "17.2.0";
+  version = "18.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6980001045abd235fa12582222627c19b89109e58b85eb77d5a5abc778df6e20";
+    sha256 = "e361edb3b9aeaa85cd38a1bc9ddbb60cda8a991fc29de9db26832f6300e81eb4";
   };
 
-  patches = [
-    # Fix tests for pytest 3.3
-    (fetchpatch {
-      url = "https://github.com/hynek/structlog/commit/22f0ae50607a0cb024361599f84610ce290deb99.patch";
-      sha256 = "03622i13ammkpyrdk48kimbz94gbkpcmdpy0kj2z09m1kp6q2ljv";
-    })
-  ];
-
-  checkInputs = [ pytest pretend freezegun simplejson ];
+  checkInputs = [ pytest pretend freezegun simplejson twisted ]
+    ++ lib.optionals (pythonAtLeast "3.6") [ python-rapidjson ];
   propagatedBuildInputs = [ six ];
 
   checkPhase = ''
-    rm tests/test_twisted.py*
+    # rm tests/test_twisted.py*
     py.test
   '';
 
-- 
GitLab


From 4182bba9fedee636e39dcc5d33f6978d396d1f2c Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 14:03:50 -0400
Subject: [PATCH 0396/1065] pythonPackages.spark_parser: 1.4.0 -> 1.8.7

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

diff --git a/pkgs/development/python-modules/spark_parser/default.nix b/pkgs/development/python-modules/spark_parser/default.nix
new file mode 100644
index 00000000000..badc99f5e37
--- /dev/null
+++ b/pkgs/development/python-modules/spark_parser/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+, click
+}:
+
+buildPythonPackage rec {
+  pname = "spark_parser";
+  version = "1.8.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "4c5e6064afbb3c114749016d585b0e4f9222d4ffa97a1854c9ab70b25783ef48";
+  };
+
+  buildInputs = [ nose ];
+  propagatedBuildInputs = [ click ];
+
+  meta = with stdenv.lib; {
+    description = ''An Early-Algorithm Context-free grammar Parser'';
+    homepage = "https://github.com/rocky/python-spark";
+    license = licenses.mit;
+    maintainers = with maintainers; [raskin];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d5158c4fd80..9c4d00f7260 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6835,24 +6835,7 @@ in {
 
   subprocess32 = callPackage ../development/python-modules/subprocess32 { };
 
-  spark_parser = buildPythonPackage (rec {
-    name = "${pname}-${version}";
-    pname = "spark_parser";
-    version = "1.4.0";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/${pname}/${name}.tar.gz";
-      sha256 = "1r7d07kw4asgajvhq1gzln4g1qi2r13jw0s8c7d5z3g4kp8y0br8";
-    };
-    buildInputs = with self; [nose];
-    propagatedBuildInputs = [];
-    meta = {
-      description = ''An Early-Algorithm Context-free grammar Parser'';
-      homepage = "https://github.com/rocky/python-spark";
-      license = licenses.mit;
-      maintainers = with maintainers; [raskin];
-      platforms = platforms.all;
-    };
-  });
+  spark_parser = callPackage ../development/python-modules/spark_parser { };
 
   sphinx = callPackage ../development/python-modules/sphinx { };
 
-- 
GitLab


From 78885a63025304548f864d069cf09bdf084f9a8b Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 14:04:28 -0400
Subject: [PATCH 0397/1065] pythonPackages.xdis: 3.2.4 -> 3.8.8

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

diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
index 5973414f8dc..76e424cf011 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -1,20 +1,25 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, nose
+, pytest
 , six
+, click
 }:
 
 buildPythonPackage rec {
   pname = "xdis";
-  version = "3.2.4";
+  version = "3.8.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0g2lh70837vigcbc1i58349wp2xzrhlsg2ahc92sn8d3jwxja4dk";
+    sha256 = "4d212df8a85ab55a35f6ad71b2c29818d903c3e6a95e31eb26d5f3fc66a4e015";
   };
 
-  propagatedBuildInputs = [ nose six ];
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ six click ];
+
+  # newest release moves to pytest (tests not packaged with release)
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Python cross-version byte-code disassembler and marshal routines";
-- 
GitLab


From 1fa6e372b27d97726040c31729150cb2c246d60d Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 14:04:49 -0400
Subject: [PATCH 0398/1065] pythonPackages.uncompyle6: 2.8.3 -> 3.2.3

---
 .../python-modules/uncompyle6/default.nix         | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix
index 89edc8f184c..f0428f17603 100644
--- a/pkgs/development/python-modules/uncompyle6/default.nix
+++ b/pkgs/development/python-modules/uncompyle6/default.nix
@@ -3,19 +3,30 @@
 , fetchPypi
 , spark_parser
 , xdis
+, nose
+, pytest
+, hypothesis
+, six
 }:
 
 buildPythonPackage rec {
   pname = "uncompyle6";
-  version = "2.8.3";
+  version = "3.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0hx5sji6qjvnq1p0zhvyk5hgracpv2w6iar1j59qwllxv115ffi1";
+    sha256 = "bd882f3c979b49d28ba7accc5ce7380ced8cab12e782e9170769ca15f0b81f8a";
   };
 
+  checkInputs = [ nose pytest hypothesis six ];
   propagatedBuildInputs = [ spark_parser xdis ];
 
+  # six import errors (yet it is supplied...)
+  checkPhase = ''
+    pytest ./pytest --ignore=pytest/test_build_const_key_map.py \
+                    --ignore=pytest/test_grammar.py
+  '';
+
   meta = with stdenv.lib; {
     description = "Python cross-version byte-code deparser";
     homepage = https://github.com/rocky/python-uncompyle6/;
-- 
GitLab


From 9406b36e9dd2dca86f87e4b0a386b865cc20317b Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 14:13:59 -0400
Subject: [PATCH 0399/1065] pythonPackages.python-telegram-bot: 10.1.0 ->
 11.1.0

---
 .../python-telegram-bot/default.nix           | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index 5bb20ae8e77..5af4383d44b 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -1,12 +1,20 @@
-{ stdenv, fetchPypi, buildPythonPackage, certifi, future, urllib3 }:
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, certifi
+, future
+, urllib3
+, tornado
+, pytest
+}:
 
 buildPythonPackage rec {
   pname = "python-telegram-bot";
-  version = "10.1.0";
+  version = "11.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ca2f8a44ddef7271477e16f4986647fa90ef4df5b55a7953e53b9c9d2672f639";
+    sha256 = "cca4e32ebb8da7fdf35ab2fa2b3edd441211364819c5592fc253acdb7561ea5b";
   };
 
   prePatch = ''
@@ -16,10 +24,14 @@ buildPythonPackage rec {
       --replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \
       --replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \
       --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout"
+
+    touch LICENSE.dual
   '';
 
-  propagatedBuildInputs = [ certifi future urllib3 ];
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ certifi future urllib3 tornado ];
 
+  # tests not included with release
   doCheck = false;
 
   meta = with stdenv.lib; {
-- 
GitLab


From a501a0e1725204eb540b0048a22c374875359d79 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 14:16:20 -0400
Subject: [PATCH 0400/1065] pythonPackages.twine: 1.11.0 -> 1.12.1

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

diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix
index dfcce835e65..4c031c20aa1 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/pkgs/development/python-modules/twine/default.nix
@@ -6,18 +6,19 @@
 , requests_toolbelt
 , tqdm
 , pyblake2
+, readme_renderer
 }:
 
 buildPythonPackage rec {
   pname = "twine";
-  version = "1.11.0";
+  version = "1.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09cz9v63f8mrs4znbjapjj2z3wdfryq8q364zm0wzjhbzzcs9n9g";
+    sha256 = "7d89bc6acafb31d124e6e5b295ef26ac77030bf098960c2a4c4e058335827c5c";
   };
 
-  propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 ];
+  propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ];
 
   # Requires network
   doCheck = false;
-- 
GitLab


From 445340809fbc0e415626c78aa2360738815ecbeb Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 14:24:56 -0400
Subject: [PATCH 0401/1065] pythonPackages.trio: 0.7.0 -> 0.9.0

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

diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index ab816cde835..215f39da30b 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -9,22 +9,24 @@
 , pyopenssl
 , trustme
 , sniffio
+, jedi
+, pylint
 }:
 
 buildPythonPackage rec {
   pname = "trio";
-  version = "0.7.0";
+  version = "0.9.0";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0df152qnj4xgxrxzd8619f8h77mzry7z8sp4m76fi21gnrcr297n";
+    sha256 = "6d905d950dfa1db3fad6b5ef5637c221947123fd2b0e112033fecfc582318c3b";
   };
 
-  checkInputs = [ pytest pyopenssl trustme ];
+  checkInputs = [ pytest pyopenssl trustme jedi pylint ];
   # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it.
   checkPhase = ''
-    py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname'
+    HOME="$(mktemp -d)" py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname and not test_waitpid'
   '';
   propagatedBuildInputs = [
     attrs
-- 
GitLab


From f13d6d3e46d45e8ee00b1963faec73f3250c9dad Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 14:29:02 -0400
Subject: [PATCH 0402/1065] pythonPackages.rpmfluff: 0.5.3 -> 0.5.5

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

diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix
index c6cd2521292..a8997e279b2 100644
--- a/pkgs/development/python-modules/rpmfluff/default.nix
+++ b/pkgs/development/python-modules/rpmfluff/default.nix
@@ -1,15 +1,21 @@
-{ stdenv, buildPythonPackage, fetchurl }:
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, glibcLocales
+}:
 
 buildPythonPackage rec {
   pname = "rpmfluff";
-  version = "0.5.3";
-  name  = "${pname}-${version}";
+  version = "0.5.5";
 
   src = fetchurl {
-    url = "https://releases.pagure.org/${pname}/${name}.tar.xz";
-    sha256 = "1i45f012ngpxs83m3dpmaj3hs8z7r9sbf05vnvzgs3hpgsbhxa7r";
+  url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "0m92ihii8fgdyma9vn3s6fhq0px8n930c27zs554la0mm4548ss3";
   };
 
+  LC_ALL="en_US.utf-8";
+  buildInputs = [ glibcLocales ];
+
   meta = with stdenv.lib; {
     description = "lightweight way of building RPMs, and sabotaging them";
     homepage = https://pagure.io/rpmfluff;
-- 
GitLab


From 36eee63f36d187e4cb706161b5312cbbc472f4b2 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 15:20:55 -0400
Subject: [PATCH 0403/1065] pythonPAckages.dj-search-url: init at 0.1

---
 .../python-modules/dj-search-url/default.nix  | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/dj-search-url/default.nix

diff --git a/pkgs/development/python-modules/dj-search-url/default.nix b/pkgs/development/python-modules/dj-search-url/default.nix
new file mode 100644
index 00000000000..b66f6b8f73a
--- /dev/null
+++ b/pkgs/development/python-modules/dj-search-url/default.nix
@@ -0,0 +1,23 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, python
+}:
+
+buildPythonPackage rec {
+  version = "0.1";
+  pname = "dj-search-url";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "424d1a5852500b3c118abfdd0e30b3e0016fe68e7ed27b8553a67afa20d4fb40";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dstufft/dj-search-url;
+    description = "Use Search URLs in your Django Haystack Application";
+    license = licenses.bsd0;
+    maintainers = [ maintainers.costrouc ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9c4d00f7260..ce36cd90696 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2124,6 +2124,8 @@ in {
 
   dj-database-url = callPackage ../development/python-modules/dj-database-url { };
 
+  dj-search-url = callPackage ../development/python-modules/dj-search-url { };
+
   djmail = callPackage ../development/python-modules/djmail { };
 
   pillowfight = callPackage ../development/python-modules/pillowfight { };
-- 
GitLab


From f575ae13fa069dea8c2258e8bc5976c06fdd881e Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 15:21:21 -0400
Subject: [PATCH 0404/1065] pythonPackages.django-cache-url: init at 3.0.0

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

diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix
new file mode 100644
index 00000000000..4cff6f2a69b
--- /dev/null
+++ b/pkgs/development/python-modules/django-cache-url/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "3.0.0";
+  pname = "django-cache-url";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "235950e2d7cb16164082167c2974301e2f0fb2313d40bfacc9d24f5b09c3514b";
+  };
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest tests
+  '';
+
+  # tests not included with pypi release
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/ghickman/django-cache-url;
+    description = "Use Cache URLs in your Django application";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ce36cd90696..875c93fd3e3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2045,6 +2045,8 @@ in {
 
   django_colorful = callPackage ../development/python-modules/django_colorful { };
 
+  django-cache-url = callPackage ../development/python-modules/django-cache-url { };
+
   django_compressor = callPackage ../development/python-modules/django_compressor { };
 
   django_compat = callPackage ../development/python-modules/django-compat { };
-- 
GitLab


From 012404a8582b271366c697189422368ed1733e7d Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 15:21:45 -0400
Subject: [PATCH 0405/1065] pythonPackages.django-configurations: init at 2.1

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

diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix
new file mode 100644
index 00000000000..0ca6c400df2
--- /dev/null
+++ b/pkgs/development/python-modules/django-configurations/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, django-discover-runner
+, mock
+, dj-database-url
+, dj-email-url
+, dj-search-url
+, django-cache-url
+, six
+, django
+}:
+
+buildPythonPackage rec {
+  version = "2.1";
+  pname = "django-configurations";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "71d9acdff33aa034f0157b0b3d23629fe0cd499bf4d0b6d699b9ca0701d952e8";
+  };
+
+  checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url six ];
+
+  checkPhase = ''
+    export PYTHONPATH=.:$PYTHONPATH
+    export DJANGO_SETTINGS_MODULE="tests.settings.main"
+    export DJANGO_CONFIGURATION="Test"
+    ${django}/bin/django-admin.py test
+  '';
+
+  # django.core.exceptions.ImproperlyConfigured: django-configurations settings importer wasn't correctly installed
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://django-configurations.readthedocs.io/;
+    description = "A helper for organizing Django settings";
+    license = licenses.bsd0;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 875c93fd3e3..42773b4a9dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2047,6 +2047,8 @@ in {
 
   django-cache-url = callPackage ../development/python-modules/django-cache-url { };
 
+  django-configurations = callPackage ../development/python-modules/django-configurations { };
+
   django_compressor = callPackage ../development/python-modules/django_compressor { };
 
   django_compat = callPackage ../development/python-modules/django-compat { };
-- 
GitLab


From 758f4ce2b84264242073d10a3ce25f772d9922b9 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 15:22:12 -0400
Subject: [PATCH 0406/1065] pythonPackages.dj-email-url: init at 0.1.0

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

diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix
new file mode 100644
index 00000000000..c9e56017447
--- /dev/null
+++ b/pkgs/development/python-modules/dj-email-url/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, python
+}:
+
+buildPythonPackage rec {
+  version = "0.1.0";
+  pname = "dj-email-url";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "84f32673156f58d740a14cab09f04ca92a65b2c8881b60e31e09e67d7853e544";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} test_dj_email_url.py
+  '';
+
+  # tests not included with pypi release
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/migonzalvar/dj-email-url;
+    description = "Use an URL to configure email backend settings in your Django Application";
+    license = licenses.bsd0;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42773b4a9dd..11f5f74551c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2128,6 +2128,8 @@ in {
 
   dj-database-url = callPackage ../development/python-modules/dj-database-url { };
 
+  dj-email-url = callPackage ../development/python-modules/dj-email-url { };
+
   dj-search-url = callPackage ../development/python-modules/dj-search-url { };
 
   djmail = callPackage ../development/python-modules/djmail { };
-- 
GitLab


From 923acba10e47d2b05972fa7f4af1f390c3795ee3 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 15:22:48 -0400
Subject: [PATCH 0407/1065] pythonPackages.django-discover-runner: init at 1.0

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

diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix
new file mode 100644
index 00000000000..d25d9e79947
--- /dev/null
+++ b/pkgs/development/python-modules/django-discover-runner/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, django
+}:
+
+buildPythonPackage rec {
+  version = "1.0";
+  pname = "django-discover-runner";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ba91fe722c256bcbfdeb36fac7eac0f27e5bfda55d98c4c1cf9ab62b5b084fe";
+  };
+
+  propagatedBuildInputs = [ django ];
+
+  # tests not included with release
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/jezdez/django-discover-runner;
+    description = "A Django test runner based on unittest2's test discovery";
+    license = licenses.bsd0;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 11f5f74551c..5981a5ce05c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2055,6 +2055,8 @@ in {
 
   django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { };
 
+  django-discover-runner = callPackage ../development/python-modules/django-discover-runner { };
+
   django_environ = callPackage ../development/python-modules/django_environ { };
 
   django_evolution = callPackage ../development/python-modules/django_evolution { };
-- 
GitLab


From 2bb31202a27c5bd47a4e47b72badd820565f1d38 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 15:23:07 -0400
Subject: [PATCH 0408/1065] pythonPAckages.pytest-django: 3.1.2 -> 3.4.3

---
 .../python-modules/pytest-django/default.nix  | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
index db17d60b628..481e4154ddb 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -1,27 +1,26 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pytest, django, setuptools_scm
-, fetchpatch
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, django
+, setuptools_scm
+, django-configurations
+, pytest_xdist
+, six
 }:
 buildPythonPackage rec {
   pname = "pytest-django";
-  version = "3.1.2";
+  version = "3.4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02932m2sr8x22m4az8syr8g835g4ak77varrnw71n6xakmdcr303";
+    sha256 = "b379282feaf89069cb790775ab6bbbd2bd2038a68c7ef9b84a41898e0b551081";
   };
 
   buildInputs = [ pytest setuptools_scm ];
+  checkInputs = [ django-configurations pytest_xdist six ];
   propagatedBuildInputs = [ django ];
 
-  patches = [
-    # Unpin setuptools-scm
-    (fetchpatch {
-      url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch";
-      sha256 = "0mz3rcsv44pfzlxy3pv8mx87glmv34gy0d5aknvbzgb2a9niryws";
-    })
-  ];
-
   # Complicated. Requires Django setup.
   doCheck = false;
 
-- 
GitLab


From b40cec3b7a0436a0a76db296eafd438529559423 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 16:10:39 -0400
Subject: [PATCH 0409/1065] pythonPAckages.pympler: 0.4.3 -> 0.6

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

diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix
index 1a3eb047510..a331f5e1175 100644
--- a/pkgs/development/python-modules/pympler/default.nix
+++ b/pkgs/development/python-modules/pympler/default.nix
@@ -5,19 +5,15 @@
 
 buildPythonPackage rec {
   pname = "Pympler";
-  version = "0.4.3";
+  version = "0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0mhyxqlkha98y8mi5zqcjg23r30mgdjdzs05lghbmqfdyvzjh1a3";
+    sha256 = "c262ceca4dac67b8b523956833c52443420eabc3321a07185990b358b8ba13a7";
   };
 
- # Remove test asizeof.flatsize(), broken and can be missed as
- # test is only useful on python 2.5, see https://github.com/pympler/pympler/issues/22
- patchPhase = ''
-   substituteInPlace ./test/asizeof/test_asizeof.py --replace "n, e = test_flatsize" "#n, e = test_flatsize"
-   substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(n," "#self.assert_(n,"
-   substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(not e" "#self.assert_(not e"
+  postPatch = ''
+   rm test/asizeof/test_asizeof.py
   '';
 
   doCheck = stdenv.hostPlatform.isLinux;
-- 
GitLab


From fb8b2e901ec469d44be8a30f3d7c6f837caf3e63 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 16:14:07 -0400
Subject: [PATCH 0410/1065] pythonPAckages.nameparser: 0.3.4 -> 1.0.1

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

diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix
index a3e67fa7b98..b5150382b36 100644
--- a/pkgs/development/python-modules/nameparser/default.nix
+++ b/pkgs/development/python-modules/nameparser/default.nix
@@ -1,17 +1,21 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, glibcLocales
 }:
 
 buildPythonPackage rec {
   pname = "nameparser";
-  version = "0.3.4";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zi94m99ziwwd6kkip3w2xpnl05r2cfv9iq68inz7np81c3g8vag";
+    sha256 = "c7eeeffbf16e263452b17b5f4b544d366c3364e966721f39d490e6c7c8b44b7f";
   };
 
+  LC_ALL="en_US.UTF-8";
+  buildInputs = [ glibcLocales ];
+
   meta = with stdenv.lib; {
     description = "A simple Python module for parsing human names into their individual components";
     homepage = https://github.com/derek73/python-nameparser;
-- 
GitLab


From a85eb1035c29d4089321e6dfc481c8146d826f13 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 16:15:58 -0400
Subject: [PATCH 0411/1065] pythonPackages.pycontracts: 1.8.3 -> 1.8.6

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

diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix
index 23633ce248d..cd9c054ddca 100644
--- a/pkgs/development/python-modules/pycontracts/default.nix
+++ b/pkgs/development/python-modules/pycontracts/default.nix
@@ -1,17 +1,17 @@
 { stdenv, buildPythonPackage, fetchPypi
-, nose, pyparsing, decorator, six }:
+, nose, pyparsing, decorator, six, future }:
 
 buildPythonPackage rec {
   pname = "PyContracts";
-  version = "1.8.3";
+  version = "1.8.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8e52c4ddbc015b56cc672b7c005c11f3df4fe407b832964099836fa3cccb8b9d";
+    sha256 = "8b6ad8750bbb712b1c7b8f89772b42baeefd35b3c7085233e8027b92f277e073";
   };
 
   buildInputs = [ nose ];
-  propagatedBuildInputs = [ pyparsing decorator six ];
+  propagatedBuildInputs = [ pyparsing decorator six future ];
 
   meta = with stdenv.lib; {
     description = "Allows to declare constraints on function parameters and return values";
-- 
GitLab


From 2f99da4ec87506ffbae4ec0e952db0779466b378 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 16:21:22 -0400
Subject: [PATCH 0412/1065] pythonPackages.nose2: 0.5.0 -> 0.8.0

---
 pkgs/development/python-modules/nose2/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix
index 9d5c1675359..e708ff2ee3e 100644
--- a/pkgs/development/python-modules/nose2/default.nix
+++ b/pkgs/development/python-modules/nose2/default.nix
@@ -2,18 +2,23 @@
 , buildPythonPackage
 , fetchPypi
 , six
+, pythonOlder
+, mock
+, coverage
 }:
 
 buildPythonPackage rec {
   pname = "nose2";
-  version = "0.5.0";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0595rh6b6dncbj0jigsyrgrh6h8fsl6w1fr69h76mxv9nllv0rlr";
+    sha256 = "9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3";
   };
 
-  propagatedBuildInputs = [ six ];
+  propagatedBuildInputs = [ six coverage ]
+    ++ stdenv.lib.optionals (pythonOlder "3.4") [ mock ];
+
   # AttributeError: 'module' object has no attribute 'collector'
   doCheck = false;
 
-- 
GitLab


From ad439646277b777f3abdd886570a79cf6dd5281e Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 16:26:16 -0400
Subject: [PATCH 0413/1065] pythonPackages.memory_profiler: 0.41 -> 0.54.0

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

diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix
index 5f40ce0f1aa..7587e5f33c9 100644
--- a/pkgs/development/python-modules/memory_profiler/default.nix
+++ b/pkgs/development/python-modules/memory_profiler/default.nix
@@ -1,19 +1,27 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, psutil
+, python
 }:
 
 buildPythonPackage rec {
   pname = "memory_profiler";
-  version = "0.41";
+  version = "0.54.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dce6e931c281662a500b142595517d095267216472c2926e5ec8edab89898d10";
+    sha256 = "d64342a23f32e105f4929b408a8b89d9222c3ce8afbbb3359817555811448d1a";
   };
 
+  propagatedBuildInputs = [ psutil ];
+
+  checkPhase = ''
+    make test PYTHON=${python.interpreter}
+  '';
+
   # Tests don't import profile
-  doCheck = false;
+  # doCheck = false;
 
   meta = with stdenv.lib; {
     description = "A module for monitoring memory usage of a python program";
-- 
GitLab


From 550d80880d5b9dbc0838471336c0820b04ddc0ae Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 16:33:27 -0400
Subject: [PATCH 0414/1065] pythonPackages.ntfy: 1.2.0 -> 2.6.0

---
 pkgs/development/python-modules/ntfy/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/ntfy/default.nix b/pkgs/development/python-modules/ntfy/default.nix
index 5d54b0928b6..efbd1eec35a 100644
--- a/pkgs/development/python-modules/ntfy/default.nix
+++ b/pkgs/development/python-modules/ntfy/default.nix
@@ -2,26 +2,32 @@
 , buildPythonPackage
 , fetchFromGitHub
 , appdirs
-, pyyaml
+, ruamel_yaml
 , requests
-, dbus-python
 , emoji
 , sleekxmpp
 , mock
+, psutil
+, python
+# , dbus-python
 }:
 
 buildPythonPackage rec {
-  version = "1.2.0";
+  version = "2.6.0";
   pname = "ntfy";
 
   src = fetchFromGitHub {
     owner = "dschep";
     repo = "ntfy";
     rev = "v${version}";
-    sha256 = "0yjxwisxpxy3vpnqk9nw5k3db3xx6wyf6sk1px9m94s30glcq2cc";
+    sha256 = "0hnwrybbk0gw0c6kw2zpx0x1rh3jb9qyrprcphzkv0jlhzdfkrp1";
   };
 
-  propagatedBuildInputs = [ appdirs pyyaml requests dbus-python emoji sleekxmpp mock ];
+  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";
-- 
GitLab


From 1b47b95638cb8a10248baeaad3d5e91a3a39fdd3 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 26 Oct 2018 16:06:56 +0100
Subject: [PATCH 0415/1065] cargo: fix darwin build

It depends the Security framework now.
---
 pkgs/development/compilers/rust/cargo.nix   |  9 +++------
 pkgs/development/compilers/rust/default.nix |  4 ++--
 pkgs/top-level/all-packages.nix             | 11 ++++++-----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 25a71965e0b..02ea7ebbbfb 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,13 +1,10 @@
 { stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib
-, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin
+, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
+, CoreFoundation, Security
 , version
 , patches ? []
 , src }:
 
-let
-  inherit (darwin.apple_sdk.frameworks) CoreFoundation;
-in
-
 rustPlatform.buildRustPackage rec {
   name = "cargo-${version}";
   inherit version src patches;
@@ -24,7 +21,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ];
+    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
 
   LIBGIT2_SYS_USE_PKG_CONFIG=1;
 
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 7e95f3c6cae..a925127596d 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -1,4 +1,5 @@
 { stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl
+, CoreFoundation, Security
 , targets ? []
 , targetToolchains ? []
 , targetPatches ? []
@@ -44,8 +45,7 @@ in rec {
 
   cargo = callPackage ./cargo.nix rec {
     version = cargoVersion;
-    inherit src;
-    inherit stdenv;
+    inherit src stdenv CoreFoundation Security;
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57f65c28deb..cdb487c80ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7327,10 +7327,11 @@ with pkgs;
   };
 
   # For beta and nightly releases use the nixpkgs-mozilla overlay
-  rust = callPackage ../development/compilers/rust
-    (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-      stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
-    });
+  rust = callPackage ../development/compilers/rust ({
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+  } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
+    stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
+  });
   inherit (rust) cargo rustc;
 
   buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };
@@ -21152,7 +21153,7 @@ with pkgs;
   liblapackWithAtlas = liblapack;
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
-  
+
   lrs = callPackage ../development/libraries/science/math/lrs { };
 
   m4ri = callPackage ../development/libraries/science/math/m4ri { };
-- 
GitLab


From 80dd2faa5baabc4e437c2b65d40bbfdc4aeffc7d Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 26 Oct 2018 17:38:34 +0100
Subject: [PATCH 0416/1065] mono: Unbreak on aarch64 (#49164)

---
 pkgs/development/compilers/mono/generic-cmake.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix
index 9665f5006ed..12f833f5525 100644
--- a/pkgs/development/compilers/mono/generic-cmake.nix
+++ b/pkgs/development/compilers/mono/generic-cmake.nix
@@ -86,7 +86,5 @@ stdenv.mkDerivation rec {
     platforms = with platforms; darwin ++ linux;
     maintainers = with maintainers; [ thoughtpolice obadz vrthra ];
     license = licenses.free; # Combination of LGPL/X11/GPL ?
-    # 2018-08-21: mono 5.x is broken on aarch64 since at least 2017-07-06
-    broken = stdenv.isAarch64 && (versionAtLeast version "5");
   };
 }
-- 
GitLab


From 145627391b10d32496f2900b1b05146c0b303e95 Mon Sep 17 00:00:00 2001
From: qolii <qoli@protonmail.com>
Date: Fri, 26 Oct 2018 09:50:51 -0700
Subject: [PATCH 0417/1065] eternal-terminal: enable darwin build.

---
 pkgs/tools/networking/eternal-terminal/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index f9f67f59abf..36bc2a9bc28 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "Remote shell that automatically reconnects without interrupting the session";
     license = licenses.asl20;
     homepage = https://mistertea.github.io/EternalTCP/;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = [ maintainers.dezgeg ];
   };
 }
-- 
GitLab


From 8d49637658ee45ff56486d718ab4ccb1d98f1761 Mon Sep 17 00:00:00 2001
From: Tim <tim@datenknoten.me>
Date: Fri, 26 Oct 2018 19:16:44 +0200
Subject: [PATCH 0418/1065] apt-dater: init at 1.0.3 (#32175)

* apt-dater: init at 1.0.3

* apt-dater: use autoreconfHook
---
 .../package-management/apt-dater/default.nix  | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/tools/package-management/apt-dater/default.nix

diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix
new file mode 100644
index 00000000000..988147d7ab0
--- /dev/null
+++ b/pkgs/tools/package-management/apt-dater/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub
+, autoreconfHook, pkgconfig, gettext
+, vim, glib, libxml2, openssl, ncurses, popt, screen
+}:
+
+stdenv.mkDerivation rec {
+  name = "apt-dater-${version}";
+  version = "1.0.3";
+
+  src = fetchFromGitHub {
+    owner = "DE-IBH";
+    repo = "apt-dater";
+    rev = "v${version}";
+    sha256 = "1flr6cm72cywmwp5h7pbmmpq057xsi9shkczyplxqaqrb2gns5fl";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig autoreconfHook gettext
+  ];
+
+  buildInputs = [
+    libxml2 ncurses vim glib popt screen
+  ];
+
+  configureFlags = [ "--disable-history" ];
+
+  prePatch = ''
+    substituteInPlace etc/Makefile.am \
+      --replace 02770 0770
+  '';
+
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace "/usr/bin/screen" "${screen}/bin/screen"
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/DE-IBH/apt-dater;
+    description = "Terminal-based remote package update manager";
+    longDescription = ''
+      Provides an ncurses frontend for managing package updates on a large
+      number of remote hosts using SSH. It supports Debian-based managed hosts
+      as well as rug (e.g. openSUSE) and yum (e.g. CentOS) based systems.
+    '';
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ c0bw3b ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdb487c80ff..2e935c02e4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -635,6 +635,8 @@ with pkgs;
     stdenv = overrideCC stdenv gcc5;
   };
 
+  apt-dater = callPackage ../tools/package-management/apt-dater { };
+
   autorevision = callPackage ../tools/misc/autorevision { };
 
   bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { };
-- 
GitLab


From 21390ed5ec79c266227d069b550887536cea1cd7 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 24 Oct 2018 18:47:55 +0200
Subject: [PATCH 0419/1065] dmrconfig: init at 2018-10-20

---
 pkgs/applications/misc/dmrconfig/default.nix | 37 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/misc/dmrconfig/default.nix

diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix
new file mode 100644
index 00000000000..20c6ff57b24
--- /dev/null
+++ b/pkgs/applications/misc/dmrconfig/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub
+, libusb1, systemd }:
+
+stdenv.mkDerivation rec {
+  name = "dmrconfig-${version}";
+  version = "2018-10-20";
+
+  src = fetchFromGitHub {
+    owner = "sergev";
+    repo = "dmrconfig";
+    rev = "a4c5f893d2749727493427320c7f01768966ba51";
+    sha256 = "0h7hv6fv6v5g922nvgrb0w7hsqbhaw7xmdc6vydh2p3l7sp31vg2";
+  };
+
+  buildInputs = [
+    libusb1 systemd
+  ];
+
+  preConfigure = ''
+    substituteInPlace Makefile --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Configuration utility for DMR radios";
+    longDescription = ''
+      DMRconfig is a utility for programming digital radios via USB programming cable.
+    '';
+    homepage = https://github.com/sergev/dmrconfig;
+    license = licenses.asl20;
+    maintainers = [ maintainers.etu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45984c3e967..8a3c521f9b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16149,6 +16149,8 @@ with pkgs;
     inherit (python3Packages) buildPythonApplication requests;
   };
 
+  dmrconfig = callPackage ../applications/misc/dmrconfig { };
+
   dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) {
   };
 
-- 
GitLab


From 87d0fe0049985eecaf3adbbc643cc27cccec6d3b Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Mon, 1 Oct 2018 00:00:00 +0000
Subject: [PATCH 0420/1065] firefoxPackages.tor-browser: 8.0.2 -> 8.0.3

---
 .../networking/browsers/firefox/packages.nix  | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index bd42cf2d9d0..20c38a19446 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -14,12 +14,6 @@ let
     sha256 = "11acb0ms4jrswp7268nm2p8g8l4lv8zc666a5bqjbb09x9k6b78k";
   };
 
-  firefox60_triplet_patch = fetchpatch {
-    name = "triplet.patch";
-    url = https://hg.mozilla.org/releases/mozilla-release/raw-rev/bc651d3d910c;
-    sha256 = "0iybkadsgsf6a3pq3jh8z1p110vmpkih8i35jfj8micdkhxzi89g";
-  };
-
 in
 
 rec {
@@ -116,8 +110,7 @@ rec {
       find . -exec touch -d'2010-01-01 00:00' {} \;
     '';
 
-    patches = nixpkgsPatches
-      ++ lib.optional (args.tbversion == "8.0.2") firefox60_triplet_patch;
+    patches = nixpkgsPatches;
 
     meta = {
       description = "A web browser built from TorBrowser source tree";
@@ -173,16 +166,16 @@ in rec {
   };
 
   tor-browser-8-0 = tbcommon rec {
-    ffversion = "60.2.1esr";
-    tbversion = "8.0.2";
+    ffversion = "60.3.0esr";
+    tbversion = "8.0.3";
 
     # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
     src = fetchFromGitHub {
       owner = "SLNOS";
       repo  = "tor-browser";
-      # branch "tor-browser-60.2.1esr-8.0-1-slnos"
-      rev   = "4f71403a3e6203baa349a8f81d8664782c5ea548";
-      sha256 = "0zxdi162gpnfca7g77hc0rw4wkmxhfzp9hfmw6dpn97d5kn1zqq3";
+      # branch "tor-browser-60.3.0esr-8.0-1-slnos"
+      rev   = "bd512ad9c40069adfc983f4f03dbd9d220cdf2f9";
+      sha256 = "1j349aqiqrf58zrx8pkqvh292w41v1vwr7x7dmd74hq4pi2iwpn8";
     };
   };
 
-- 
GitLab


From 41b3c2137d73c5d13e719a61d66ec2f7952c9c85 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 26 Oct 2018 12:18:55 -0500
Subject: [PATCH 0421/1065] whois: 5.3.2 -> 5.4.0

https://github.com/rfc1036/whois/commit/4723a2cc4c7c49cd06a11dd07d5f7335e1608cea
---
 pkgs/tools/networking/whois/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index b11d149da88..f668998de7f 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:
 
 stdenv.mkDerivation rec {
-  version = "5.3.2";
+  version = "5.4.0";
   name = "whois-${version}";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "1sd6jl349kz3bjwm8rx9kihxyd3d35cac4swla843vwzdpczsk5f";
+    sha256 = "1n90qpy079x97a27zpckc0vnaqrdjsxgy0hsz0z8gbrc1sy30sdz";
   };
 
   nativeBuildInputs = [ perl gettext pkgconfig ];
-- 
GitLab


From 9d79d12e6f694fde7912b60eb2d967e3b6a27007 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 12:03:42 -0700
Subject: [PATCH 0422/1065] pulseeffects: 4.3.7 -> 4.3.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/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 f7463207045..a5dae1d0560 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -44,13 +44,13 @@ let
   ];
 in stdenv.mkDerivation rec {
   name = "pulseeffects-${version}";
-  version = "4.3.7";
+  version = "4.3.9";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "pulseeffects";
     rev = "v${version}";
-    sha256 = "1x1jnbpbc9snya9k2xq39gssf0k4lnd1hr4cjrnwscg5rqybxqsk";
+    sha256 = "1vir05hy2n0nk0gaqbn680bx53ixcyi2y0hq4grgm73bbb1jzqq6";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 26ee8d6479029d389a9f66f0101fd325d0c900cf Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Fri, 26 Oct 2018 21:08:42 +0200
Subject: [PATCH 0423/1065] brlaser: fix install dir

Fixes #49092
---
 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 46c38892bf8..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=$out/lib/cups" "-DCUPS_DATA_DIR=$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";
-- 
GitLab


From b26fc63e20115ced888b7c9f7cf623498b7d1a38 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 12:21:31 -0700
Subject: [PATCH 0424/1065] python36Packages.flask-babel: 0.11.2 -> 0.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/python3.6-flask-babel/versions
---
 pkgs/development/python-modules/flask-babel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix
index 1f4f914968f..caaf0a61152 100644
--- a/pkgs/development/python-modules/flask-babel/default.nix
+++ b/pkgs/development/python-modules/flask-babel/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "Flask-Babel";
-  version = "0.11.2";
+  version = "0.12.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ff9n165vhf1nhv6807ckhpp224jw7k7sd7jz5kfh3sbpl85gmy0";
+    sha256 = "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From eadd0868343fc0b97a3452b6c8e488ffeeaede16 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 26 Oct 2018 21:20:27 +0200
Subject: [PATCH 0425/1065] =?UTF-8?q?hwdata:=200.314=20=E2=86=92=200.316?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/libosinfo/default.nix | 4 ++--
 pkgs/os-specific/linux/hwdata/default.nix        | 8 ++++----
 pkgs/os-specific/linux/usbutils/default.nix      | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index ba267b79787..d4c324d4f23 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--with-usb-ids-path=${hwdata}/data/hwdata/usb.ids"
-    "--with-pci-ids-path=${hwdata}/data/hwdata/pci.ids"
+    "--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids"
+    "--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids"
     "--enable-gtk-doc"
   ];
 
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index 5943ced2f8f..dfca87e2716 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -2,24 +2,24 @@
 
 stdenv.mkDerivation rec {
   name = "hwdata-${version}";
-  version = "0.314";
+  version = "0.316";
 
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
     rev = "v${version}";
-    sha256 = "12k466ndg152fqld1w5v1zfdyv000yypazcwy75ywlxvlknv4y90";
+    sha256 = "0k3fypykbq9943cnxlmmpk0xp9nhhf46pfdhkgm99iaa27b8s1gb";
   };
 
   preConfigure = "patchShebangs ./configure";
 
-  configureFlags = [ "--datadir=$(prefix)/data" ];
+  configureFlags = [ "--datadir=${placeholder "out"}/share" ];
 
   doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus)
 
   outputHashMode = "recursive";
   outputHashAlgo = "sha256";
-  outputHash = "1w00y5kj8rd8slzydw1gw8cablxlkham4vq786kdd8zga286zabb";
+  outputHash = "0g2w4jr4p1hykracp2za7jb0rcr51kks1m43pzcaf7g99x8669ww";
 
   meta = {
     homepage = https://github.com/vcrhonek/hwdata;
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 657d6cc24a8..8d53756d510 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   postInstall =
     ''
       substituteInPlace $out/bin/lsusb.py \
-        --replace /usr/share/usb.ids ${hwdata}/data/hwdata/usb.ids
+        --replace /usr/share/usb.ids ${hwdata}/share/hwdata/usb.ids
     '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 6b5571b9e878052a488fda76629e3d825ac6c207 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 26 Oct 2018 20:54:43 +0200
Subject: [PATCH 0426/1065] =?UTF-8?q?gusb:=200.2.11=20=E2=86=92=200.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/gusb/default.nix | 40 ++++++++++++---------
 pkgs/top-level/all-packages.nix             |  4 +--
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index 4da9db3ef04..f445f90f308 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -1,30 +1,38 @@
-{stdenv, fetchurl
-, automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt
-, glib, systemd, libusb1, vala_0_38
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobjectIntrospection
+, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44
+, glib, systemd, libusb1, vala, hwdata
 }:
 stdenv.mkDerivation rec {
   name = "gusb-${version}";
-  version = "0.2.11";
-  enableParallelBuilding = true;
+  version = "0.3.0";
+
+  outputs = [ "bin" "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
-    sha256 = "1pppz17lw3khyz8by1dddxdqrv6qn4a23fpxs38c67db7x4l7ccw";
+    sha256 = "1p4f6jdjw6zl986f93gzdjg2hdcn5dlz6rcckcz4rbmnk47rbryq";
   };
 
-  preConfigure = "./autogen.sh";
-
-  nativeBuildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext
-                        gobjectIntrospection libxslt vala_0_38 ];
-  buildInputs = [ systemd  glib ];
+  nativeBuildInputs = [
+    meson ninja pkgconfig gettext
+    gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44
+    gobjectIntrospection vala
+  ];
+  buildInputs = [ systemd glib ];
 
   propagatedBuildInputs = [ libusb1 ];
 
-  meta = {
+  mesonFlags = [
+    "-Dusb_ids=${hwdata}/share/hwdata/usb.ids"
+  ];
+
+  doCheck = false; # tests try to access USB
+
+  meta = with stdenv.lib; {
     description = "GLib libusb wrapper";
-    homepage = https://people.freedesktop.org/~hughsient/releases/;
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://github.com/hughsie/libgusb;
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.marcweber ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1879dc063e..aa3a5ec38b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9801,9 +9801,7 @@ with pkgs;
 
   gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {};
 
-  gusb = callPackage ../development/libraries/gusb {
-    inherit (gnome2) gtkdoc;
-  };
+  gusb = callPackage ../development/libraries/gusb { };
 
   qt-mobility = callPackage ../development/libraries/qt-mobility {};
 
-- 
GitLab


From c93ab5eeb8f84bc57257c45434d943f52ec7ed4e Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles@dyfis.net>
Date: Fri, 26 Oct 2018 15:26:01 -0500
Subject: [PATCH 0427/1065] fakeroot: 1.22 -> 1.23

---
 pkgs/tools/system/fakeroot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix
index 8ffa85a5084..8796de4e9e0 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/pkgs/tools/system/fakeroot/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, fetchpatch, getopt, libcap }:
 
 stdenv.mkDerivation rec {
-  version = "1.22";
+  version = "1.23";
   name = "fakeroot-${version}";
 
   src = fetchurl {
-    url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.bz2";
-    sha256 = "1zn67sp066q63vx95r671v0ki878i40a2wa57pmh64k43r56m05x";
+    url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.xz";
+    sha256 = "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700";
   };
 
   patches = stdenv.lib.optional stdenv.isLinux ./einval.patch
-- 
GitLab


From 9203ba5ceacedfbafd23fd3ac888d904d8e4657e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 13:32:41 -0700
Subject: [PATCH 0428/1065] pyprof2calltree: 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/pyprof2calltree/versions
---
 pkgs/development/tools/profiling/pyprof2calltree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/pkgs/development/tools/profiling/pyprof2calltree/default.nix
index b2497633a68..a2d98bcf238 100644
--- a/pkgs/development/tools/profiling/pyprof2calltree/default.nix
+++ b/pkgs/development/tools/profiling/pyprof2calltree/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "pyprof2calltree";
-  version = "1.4.3";
+  version = "1.4.4";
 
   # Fetch from GitHub because the PyPi packaged version does not
   # include all test files.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
     owner = "pwaller";
     repo = "pyprof2calltree";
     rev = "v" + version;
-    sha256 = "0i0a895zal193cpvzbv68fch606g4ik27rvzbby3vxk61zlxfqy5";
+    sha256 = "1vrip41ib7nmkwa8rjny1na1wyp7nvvgvm0h9bd21i262kbm4nqx";
   };
 
   meta = with lib; {
-- 
GitLab


From 170797f234ed6ec59ff24cc9b15104fb812ceab5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 13:35:52 -0700
Subject: [PATCH 0429/1065] paperkey: 1.5 -> 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/paperkey/versions
---
 pkgs/tools/security/paperkey/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix
index 44cee21bc49..03af1b8a101 100644
--- a/pkgs/tools/security/paperkey/default.nix
+++ b/pkgs/tools/security/paperkey/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "paperkey-${version}";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchurl {
     url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz";
-    sha256 = "1prd2jaf4zjad3xhv160hmi5n408ssljfg7iz90jxs9w111pjwy4";
+    sha256 = "1xq5gni6gksjkd5avg0zpd73vsr97appksfx0gx2m38s4w9zsid2";
   };
 
   postPatch = ''
-- 
GitLab


From 6124447a544f26b2ec02eb6d8ed1640cda33a393 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 6 Oct 2018 13:43:21 +0200
Subject: [PATCH 0430/1065] kind: init at 2ae73f8e

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

diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix
new file mode 100644
index 00000000000..25bc7934000
--- /dev/null
+++ b/pkgs/development/tools/kind/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+with stdenv.lib;
+
+buildGoPackage rec {
+  name = "kind-${version}";
+  version = "2018-10-03-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "2ae73f8ef93609991b0e47a67825390ceec95b3f";
+
+  src = fetchFromGitHub {
+    rev = rev;
+    owner = "kubernetes-sigs";
+    repo = "kind";
+    sha256 = "0bg3y35sc1c73z4rfq11x1jz340786q91ywm165ri7vx280ffjgh";
+  };
+
+  goPackagePath = "sigs.k8s.io/kind";
+  excludedPackages = "images/base/entrypoint";
+
+  meta = {
+    description = "Kubernetes IN Docker - local clusters for testing Kubernetes";
+    homepage = https://github.com/kubernetes-sigs/kind;
+    maintainers = with maintainers; [ offline ];
+    license = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0f2356264a..43894603851 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8523,6 +8523,8 @@ with pkgs;
 
   kcov = callPackage ../development/tools/analysis/kcov { };
 
+  kind = callPackage ../development/tools/kind {  };
+
   kube-aws = callPackage ../development/tools/kube-aws { };
 
   kubectx = callPackage ../development/tools/kubectx { };
-- 
GitLab


From 7e825f5a7410b2ae2cf6e1bc873f84a790e75264 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 14:22:48 -0700
Subject: [PATCH 0431/1065] pipenv: 2018.10.9 -> 2018.10.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/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 1d23f5426a5..7d4a58d0e39 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.9";
+    version = "2018.10.13";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0b0safavjxq6malmv44acmgds21m2sp1wqa7gs0qz621v6gcgq4j";
+      sha256 = "0qwflq00rwk3pnldndb30f3avnbi4hvv6c8mm6l5xxnxy9dj71d7";
     };
 
     LC_ALL = "en_US.UTF-8";
-- 
GitLab


From 4552801c817f84f864ba3e27ba8695e5693c7373 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 06:51:24 -0700
Subject: [PATCH 0432/1065] vim: 8.1.0450 -> 8.1.0490

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 dcec9fdfef9..6d92c047157 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.0450";
+  version = "8.1.0490";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "1zhggpn4i704apfqn2kqr717kz9dvkjwnbmc3ydza621zjyrnxb2";
+    sha256 = "0gmlz2w066pcrn0jzpv3gk1qwx148f33gvgf5nkfy4nl1ljki81r";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From ca655e8b1489137773cb83162b55fdda21dd6d05 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Fri, 26 Oct 2018 23:46:02 +0200
Subject: [PATCH 0433/1065] strongswan-swanctl: adapt options to
 strongswan-5.7.1

The changes were found by executing the following in the strongswan
repo (https://github.com/strongswan/strongswan):

git diff 5.6.3..5.7.1 src/swanctl/swanctl.opt
---
 .../strongswan-swanctl/swanctl-params.nix     | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
index b16d299917f..d4f7e95f859 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
@@ -248,6 +248,14 @@ in {
       </itemizedlist>
     '';
 
+    ppk_id = mkOptionalStrParam ''
+       String identifying the Postquantum Preshared Key (PPK) to be used.
+    '';
+
+    ppk_required = mkYesNoParam no ''
+       Whether a Postquantum Preshared Key (PPK) is required for this connection.
+    '';
+
     keyingtries = mkIntParam 1 ''
       Number of retransmission sequences to perform during initial
       connect. Instead of giving up initiation after the first retransmission
@@ -922,6 +930,36 @@ in {
         <literal>0xffffffff</literal>.
       '';
 
+      set_mark_in = mkStrParam "0/0x00000000" ''
+        Netfilter mark applied to packets after the inbound IPsec SA processed
+        them. This way it's not necessary to mark packets via Netfilter before
+        decryption or right afterwards to match policies or process them
+        differently (e.g. via policy routing).
+
+        An additional mask may be appended to the mark, separated by
+        <literal>/</literal>. The default mask if omitted is 0xffffffff. The
+        special value <literal>%same</literal> uses the value (but not the mask)
+        from <option>mark_in</option> as mark value, which can be fixed,
+        <literal>%unique</literal> or <literal>%unique-dir</literal>.
+
+        Setting marks in XFRM input requires Linux 4.19 or higher.
+      '';
+
+      set_mark_out = mkStrParam "0/0x00000000" ''
+        Netfilter mark applied to packets after the outbound IPsec SA processed
+        them. This allows processing ESP packets differently than the original
+        traffic (e.g. via policy routing).
+
+        An additional mask may be appended to the mark, separated by
+        <literal>/</literal>. The default mask if omitted is 0xffffffff. The
+        special value <literal>%same</literal> uses the value (but not the mask)
+        from <option>mark_out</option> as mark value, which can be fixed,
+        <literal>%unique_</literal> or <literal>%unique-dir</literal>.
+
+        Setting marks in XFRM output is supported since Linux 4.14. Setting a
+        mask requires at least Linux 4.19.
+      '';
+
       tfc_padding = mkParamOfType (with lib.types; either int (enum ["mtu"])) 0 ''
         Pads ESP packets with additional data to have a consistent ESP packet
         size for improved Traffic Flow Confidentiality. The padding defines the
@@ -946,6 +984,33 @@ in {
         supported, but the installation does not fail otherwise.
       '';
 
+      copy_df = mkYesNoParam yes ''
+        Whether to copy the DF bit to the outer IPv4 header in tunnel mode. This
+        effectively disables Path MTU discovery (PMTUD). Controlling this
+        behavior is not supported by all kernel interfaces.
+      '';
+
+      copy_ecn = mkYesNoParam yes ''
+        Whether to copy the ECN (Explicit Congestion Notification) header field
+        to/from the outer IP header in tunnel mode. Controlling this behavior is
+        not supported by all kernel interfaces.
+      '';
+
+      copy_dscp = mkEnumParam [ "out" "in" "yes" "no" ] "out" ''
+        Whether to copy the DSCP (Differentiated Services Field Codepoint)
+        header field to/from the outer IP header in tunnel mode. The value
+        <literal>out</literal> only copies the field from the inner to the outer
+        header, the value <literal>in</literal> does the opposite and only
+        copies the field from the outer to the inner header when decapsulating,
+        the value <literal>yes</literal> copies the field in both directions,
+        and the value <literal>no</literal> disables copying the field
+        altogether. Setting this to <literal>yes</literal> or
+        <literal>in</literal> could allow an attacker to adversely affect other
+        traffic at the receiver, which is why the default is
+        <literal>out</literal>. Controlling this behavior is not supported by
+        all kernel interfaces.
+      '';
+
       start_action = mkEnumParam ["none" "trap" "start"] "none" ''
         Action to perform after loading the configuration.
         <itemizedlist>
@@ -1060,6 +1125,24 @@ in {
       defined in a unique section having the <literal>ike</literal> prefix.
     '';
 
+    ppk = mkPrefixedAttrsOfParams {
+      secret = mkOptionalStrParam ''
+	      Value of the PPK. It may either be an ASCII string, a hex encoded string
+	      if it has a <literal>0x</literal> prefix or a Base64 encoded string if
+	      it has a <literal>0s</literal> prefix in its value. Should have at least
+	      256 bits of entropy for 128-bit security.
+      '';
+
+      id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") ''
+	      PPK identity the PPK belongs to. Multiple unique identities may be
+	      specified, each having an <literal>id</literal> prefix, if a secret is
+	      shared between multiple peers.
+      '';
+    } ''
+	    Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is
+	    defined in a unique section having the <literal>ppk</literal> prefix.
+    '';
+
     private = mkPrefixedAttrsOfParams {
       file = mkOptionalStrParam ''
         File name in the private folder for which this passphrase should be used.
-- 
GitLab


From 41a579aa68a58bd496b852dd6380fa81f9cf0a7f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 01:06:07 +0200
Subject: [PATCH 0434/1065] scalapack: switch to openblas + add test

* change from blas,lapack to openblas
* add check phase
* enable parallel building
* fix license
---
 .../science/math/scalapack/default.nix        | 42 ++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index 83e177c66c1..3961374a9b1 100644
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -1,11 +1,7 @@
-{ stdenv
-, fetchurl
-, gfortran
-, cmake
-, blas
-, liblapack
-, mpi
-}:
+{ stdenv, fetchurl, cmake, openssh
+, gfortran, mpi, openblasCompat
+} :
+
 
 stdenv.mkDerivation rec {
   name = "scalapack-${version}";
@@ -16,12 +12,38 @@ stdenv.mkDerivation rec {
     sha256 = "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c";
   };
 
-  buildInputs = [ cmake mpi liblapack blas gfortran ];
+  nativeBuildInputs = [ cmake openssh ];
+  buildInputs = [ mpi gfortran openblasCompat ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  preConfigure = ''
+    cmakeFlagsArray+=(
+      -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
+      -DLAPACK_LIBRARIES="-lopenblas"
+      -DBLAS_LIBRARIES="-lopenblas"
+      )
+  '';
+
+  checkPhase = ''
+    # make sure the test starts even if we have less than 4 cores
+    export OMPI_MCA_rmaps_base_oversubscribe=1
+
+    # Run single threaded
+    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; {
     homepage = http://www.netlib.org/scalapack/;
     description = "Library of high-performance linear algebra routines for parallel distributed memory machines";
-    license = licenses.bsdOriginal;
+    license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = [ maintainers.costrouc ];
   };
-- 
GitLab


From 0caea008ea2b61d346b14f43a75c442f04fc4875 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 12:43:23 -0700
Subject: [PATCH 0435/1065] python36Packages.bokeh: 0.13.0 -> 1.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/python3.6-bokeh/versions
---
 pkgs/development/python-modules/bokeh/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index 4855a07a479..567ea4518f8 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 = "0.13.0";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d0cf59774d7c74b7173b82ce36bde35b8fe9da0f960364ba3c4df0d1fbd874d6";
+    sha256 = "1h1g3jw53srcvbgl1jb9p2rfi7kjz6c91hbqxfbr3s2wx1f67ahn";
   };
 
   disabled = isPyPy;
@@ -48,6 +48,7 @@ buildPythonPackage rec {
   checkInputs = [ mock pytest pillow selenium ];
 
   propagatedBuildInputs = [
+    pillow
     flask
     jinja2
     markupsafe
-- 
GitLab


From 45b93edc637cd9201dd27c29e005d1c08eafe7f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 09:31:53 -0700
Subject: [PATCH 0436/1065] python36Packages.colander: 1.4 -> 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/python3.6-colander/versions
---
 pkgs/development/python-modules/colander/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix
index ed27464d1fe..5cfa1862f48 100644
--- a/pkgs/development/python-modules/colander/default.nix
+++ b/pkgs/development/python-modules/colander/default.nix
@@ -1,16 +1,16 @@
 { lib, buildPythonPackage, fetchPypi
-, translationstring, iso8601 }:
+, translationstring, iso8601, enum34 }:
 
 buildPythonPackage rec {
   pname = "colander";
-  version = "1.4";
+  version = "1.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e20e9acf190e5711cf96aa65a5405dac04b6e841028fc361d953a9923dbc4e72";
+    sha256 = "18ah4cwwxnpm6qxi6x9ipy51dal4spd343h44s5wd01cnhgrwsyq";
   };
 
-  propagatedBuildInputs = [ translationstring iso8601 ];
+  propagatedBuildInputs = [ translationstring iso8601 enum34 ];
 
   meta = with lib; {
     description = "A simple schema-based serialization and deserialization library";
-- 
GitLab


From a4df2d4315bfe217eb2cb3f32ae3537920c25b5f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 01:59:07 +0200
Subject: [PATCH 0437/1065] snapper: 0.5.0 -> 0.7.2

---
 pkgs/tools/misc/snapper/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 563232dbe53..80b66026848 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -5,23 +5,15 @@
 
 stdenv.mkDerivation rec {
   name = "snapper-${version}";
-  version = "0.5.0";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "snapper";
     rev = "v${version}";
-    sha256 = "14hrv23film4iihyclcvc2r2dgxl8w3as50r81xjjc85iyp6yxkm";
+    sha256 = "1dm1kf4wrbcaaagxgbc8q0f5j9dq3bmp6ycl7zx8p70s4nv3xnbc";
   };
 
-  patches = [
-    # Fix build with new Boost
-    (fetchpatch {
-      url = "https://github.com/openSUSE/snapper/commit/2e3812d2c1d1f54861fb79f5c2b0197de96a00a3.patch";
-      sha256 = "0yrzss1v7lmcvkajmchz917yqsvlsdfz871szzw790v6pql1322s";
-    })
-  ];
-
   nativeBuildInputs = [
     autoreconfHook pkgconfig
     docbook_xsl libxslt docbook_xml_dtd_45
-- 
GitLab


From 7a711b5f544a919173725acf34c5cbe9db4db8c0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 19:56:11 -0700
Subject: [PATCH 0438/1065] ponyc: 0.24.4 -> 0.25.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/ponyc/versions
---
 pkgs/development/compilers/ponyc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 09677a47ab2..d90ddcaacfb 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.24.4";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "1p75h1ldi9iskqkwic5h426cwi45042p3agh9sdl6gld9s7lc9a6";
+    sha256 = "0ghmjp03q7k58yzfkvnl05xc2i2gmgnzpj3hs6g7ls4ny8n3i6hv";
   };
 
   buildInputs = [ llvm makeWrapper which ];
-- 
GitLab


From 58f701ab74568692a49a4230f37eb07b3b63740d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Wed, 24 Oct 2018 00:07:17 +0900
Subject: [PATCH 0439/1065] opensmtpd: 6.0.3p1 -> 6.4.0p1

---
 nixos/doc/manual/release-notes/rl-1903.xml |  8 ++++
 nixos/tests/opensmtpd.nix                  |  6 ++-
 pkgs/servers/mail/opensmtpd/default.nix    | 45 +++++++++-------------
 pkgs/servers/mail/opensmtpd/fix-build.diff | 12 ++++++
 4 files changed, 43 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/servers/mail/opensmtpd/fix-build.diff

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 839d75b53bd..64ccddb6c67 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -137,6 +137,14 @@
      make sure to update your configuration if you want to keep <literal>proglodyte-wasm</literal>
     </para>
    </listitem>
+   <listitem>
+    <para>
+     OpenSMTPD has been upgraded to version 6.4.0p1. This release makes
+     backwards-incompatible changes to the configuration file format. See
+     <command>man smtpd.conf</command> for more information on the new file
+     format.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix
index 4c0cbca2101..4d3479168f7 100644
--- a/nixos/tests/opensmtpd.nix
+++ b/nixos/tests/opensmtpd.nix
@@ -17,11 +17,12 @@ import ./make-test.nix {
         extraServerArgs = [ "-v" ];
         serverConfiguration = ''
           listen on 0.0.0.0
+          action do_relay relay
           # DO NOT DO THIS IN PRODUCTION!
           # Setting up authentication requires a certificate which is painful in
           # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A
           # WELL-CONTROLLED ENVIRONMENT!
-          accept from any for any relay
+          match from any for any action do_relay
         '';
       };
     };
@@ -41,8 +42,9 @@ import ./make-test.nix {
         extraServerArgs = [ "-v" ];
         serverConfiguration = ''
           listen on 0.0.0.0
-          accept from any for local deliver to mda \
+          action dovecot_deliver mda \
             "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}"
+          match from any for local action dovecot_deliver
         '';
       };
       services.dovecot2 = {
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 60c517230b4..d5580450444 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -1,43 +1,33 @@
 { stdenv, lib, fetchurl, fetchpatch, autoconf, automake, libtool, bison
-, libasr, libevent, zlib, openssl, db, pam
-
-# opensmtpd requires root for no reason to encrypt passwords, this patch fixes it
-# see also https://github.com/OpenSMTPD/OpenSMTPD/issues/678
-, unpriviledged_smtpctl_encrypt ? true
-
-# Deprecated: use the subaddressing-delimiter in the config file going forward
-, tag_char ? null
+, libasr, libevent, zlib, libressl, db, pam
 }:
 
-if (tag_char != null)
-then throw "opensmtpd: the tag_char argument is deprecated as it can now be specified at runtime via the 'subaddressing-delimiter' option of the configuration file"
-else stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "opensmtpd-${version}";
-  version = "6.0.3p1";
+  version = "6.4.0p1";
 
   nativeBuildInputs = [ autoconf automake libtool bison ];
-  buildInputs = [ libasr libevent zlib openssl db pam ];
+  buildInputs = [ libasr libevent zlib libressl db pam ];
 
   src = fetchurl {
     url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
-    sha256 = "291881862888655565e8bbe3cfb743310f5dc0edb6fd28a889a9a547ad767a81";
+    sha256 = "1qxxhnlsmpfh9v4azgl0634955r085gsic1c66jdll21bd5w2mq8";
   };
 
   patches = [
     ./proc_path.diff
-    (fetchpatch {
-      url = "https://github.com/OpenSMTPD/OpenSMTPD/commit/725ba4fa2ddf23bbcd1ff9ec92e86bbfaa6825c8.diff";
-      sha256 = "19rla0b2r53jpdiz25fcza29c2msz6j6paivxhp9jcy1xl457dqa";
-    })
+    ./fix-build.diff # See https://github.com/OpenSMTPD/OpenSMTPD/pull/884
   ];
 
-  postPatch = with builtins; with lib;
-    optionalString unpriviledged_smtpctl_encrypt ''
-      substituteInPlace smtpd/smtpctl.c --replace \
-        'if (geteuid())' \
-        'if (geteuid() != 0 && !(argc > 1 && !strcmp(argv[1], "encrypt")))'
-      substituteInPlace mk/smtpctl/Makefile.in --replace "chmod 2555" "chmod 0555"
-    '';
+  # See https://github.com/OpenSMTPD/OpenSMTPD/issues/885 for the `sh bootstrap`
+  # requirement
+  postPatch = ''
+    substituteInPlace smtpd/parse.y \
+      --replace "/usr/libexec/" "$out/libexec/opensmtpd/"
+    substituteInPlace mk/smtpctl/Makefile.am --replace "chgrp" "true"
+    substituteInPlace mk/smtpctl/Makefile.am --replace "chmod 2555" "chmod 0555"
+    sh bootstrap
+  '';
 
   configureFlags = [
     "--sysconfdir=/etc"
@@ -54,6 +44,9 @@ else stdenv.mkDerivation rec {
     "--with-table-db"
   ];
 
+  # See https://github.com/OpenSMTPD/OpenSMTPD/pull/884
+  makeFlags = [ "CFLAGS=-ffunction-sections" "LDFLAGS=-Wl,--gc-sections" ];
+
   installFlags = [
     "sysconfdir=\${out}/etc"
     "localstatedir=\${TMPDIR}"
@@ -67,6 +60,6 @@ else stdenv.mkDerivation rec {
     '';
     license = licenses.isc;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ rickynils obadz ];
+    maintainers = with maintainers; [ rickynils obadz ekleog ];
   };
 }
diff --git a/pkgs/servers/mail/opensmtpd/fix-build.diff b/pkgs/servers/mail/opensmtpd/fix-build.diff
new file mode 100644
index 00000000000..1f995fd4f62
--- /dev/null
+++ b/pkgs/servers/mail/opensmtpd/fix-build.diff
@@ -0,0 +1,12 @@
+diff --git a/mk/smtpctl/Makefile.am b/mk/smtpctl/Makefile.am
+index 5af0b713..f0fce735 100644
+--- a/mk/smtpctl/Makefile.am
++++ b/mk/smtpctl/Makefile.am
+@@ -4,6 +4,7 @@ sbin_PROGRAMS=          smtpctl
+ 
+ smtpctl_SOURCES=	$(smtpd_srcdir)/enqueue.c
+ smtpctl_SOURCES+=	$(smtpd_srcdir)/parser.c
++smtpctl_SOURCES+=	$(smtpd_srcdir)/config.c
+ smtpctl_SOURCES+=	$(smtpd_srcdir)/log.c
+ smtpctl_SOURCES+=	$(smtpd_srcdir)/envelope.c
+ smtpctl_SOURCES+=	$(smtpd_srcdir)/queue_backend.c
-- 
GitLab


From f5c2960a1136326a8d24720aca17683b28077ee2 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Wed, 24 Oct 2018 20:36:33 -0700
Subject: [PATCH 0440/1065] androidenv.buildTools: patch hard-coded /bin/ls
 paths

---
 pkgs/development/mobile/androidenv/build-tools.nix | 9 +++++++--
 pkgs/development/mobile/androidenv/default.nix     | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index a607ed31900..f0b9a77d3f1 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -1,4 +1,4 @@
-{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}:
+{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses, coreutils}:
 
 stdenv.mkDerivation rec {
   version = "28.0.3";
@@ -20,9 +20,14 @@ stdenv.mkDerivation rec {
     unzip $src
     mv android-* ${version}
 
+    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")
       ''
-        cd ${version}
 
         ln -s ${ncurses.out}/lib/libncurses.so.5 `pwd`/lib64/libtinfo.so.5
 
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index bd369200bd5..0291986b5a4 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -10,7 +10,7 @@ rec {
   };
 
   buildTools = import ./build-tools.nix {
-    inherit (pkgs) stdenv fetchurl unzip zlib file;
+    inherit (pkgs) stdenv fetchurl unzip zlib file coreutils;
     stdenv_32bit = pkgs_i686.stdenv;
     zlib_32bit = pkgs_i686.zlib;
     ncurses_32bit = pkgs_i686.ncurses5;
-- 
GitLab


From ec8f320797e37750fbf0eae2bd5cc9fac4542b78 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Tue, 23 Oct 2018 08:12:32 -0700
Subject: [PATCH 0441/1065] androidenv.androidndk: patch prebuilt 64bit
 binaries

---
 pkgs/development/mobile/androidenv/androidndk.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 072a6dc3168..23ae4378dc6 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -89,6 +89,16 @@ let
       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 \
-- 
GitLab


From 6e07691ed702bbaa6b5e18d51a9b055e122786c3 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Wed, 24 Oct 2018 15:38:52 -0700
Subject: [PATCH 0442/1065] androidenv: remove `android` command from fetch.sh

It's deprecated, and no longer prints the urls of any xml files for the script
to parse.
---
 pkgs/development/mobile/androidenv/fetch.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/fetch.sh b/pkgs/development/mobile/androidenv/fetch.sh
index 2edbe6bf489..102f6aafb89 100755
--- a/pkgs/development/mobile/androidenv/fetch.sh
+++ b/pkgs/development/mobile/androidenv/fetch.sh
@@ -1,8 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash --pure -p androidsdk curl libxslt
-
-# this shows a list of available xmls
-android list sdk | grep 'Parse XML:' | cut -f8- -d\  # | xargs -n 1 curl -O
+#! 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
-- 
GitLab


From a61f31cf23300dea260c95ea5d20e755d1b0914f Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Wed, 24 Oct 2018 14:50:11 -0700
Subject: [PATCH 0443/1065] androidenv: run ./fetch.sh

Manually corrected three problems:
- fetch.sh: android cli cannot find java executable
- addons.nix: google_apis_25 expression not added correctly
- addons.nix: android_support_extra expression deleted (replaced in android 9 with jetpack/androidx)
---
 pkgs/development/mobile/androidenv/addon.xml  | 132 ++-
 pkgs/development/mobile/androidenv/addons.nix |   9 +-
 .../mobile/androidenv/platforms-linux.nix     |  24 +
 .../mobile/androidenv/platforms-macosx.nix    |  24 +
 .../mobile/androidenv/repository-11.xml       | 852 ++++++++++++++----
 .../development/mobile/androidenv/sources.nix |  33 +
 .../development/mobile/androidenv/sys-img.xml | 239 +++--
 .../mobile/androidenv/sysimages.nix           |  73 +-
 8 files changed, 1043 insertions(+), 343 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index 1bc1d110db1..68792038d00 100644
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ b/pkgs/development/mobile/androidenv/addon.xml
@@ -1,6 +1,6 @@
 <?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 2017-09-08 08:19:28.153828 with ADRT.-->
+	<!--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
@@ -35,7 +35,7 @@ This is the Android Software Development Kit License Agreement
 
 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: (a) 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; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+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.
 
@@ -587,7 +587,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>3</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:49 2016.-->
+				<!--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>
@@ -614,7 +614,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:49 2016.-->
+				<!--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>
@@ -641,7 +641,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:51 2016.-->
+				<!--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>
@@ -668,7 +668,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:51 2016.-->
+				<!--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>
@@ -695,7 +695,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:52 2016.-->
+				<!--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>
@@ -722,7 +722,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:52 2016.-->
+				<!--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>
@@ -749,7 +749,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:50 2016.-->
+				<!--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>
@@ -776,7 +776,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:52 2016.-->
+				<!--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>
@@ -807,7 +807,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:54 2016.-->
+				<!--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>
@@ -834,7 +834,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:51 2016.-->
+				<!--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>
@@ -865,7 +865,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:54 2016.-->
+				<!--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>
@@ -896,7 +896,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:53 2016.-->
+				<!--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>
@@ -925,7 +925,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>3</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:54 2016.-->
+				<!--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>
@@ -958,7 +958,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:54 2016.-->
+				<!--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>
@@ -991,7 +991,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:55 2016.-->
+				<!--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>
@@ -1024,7 +1024,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:54 2016.-->
+				<!--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>
@@ -1057,7 +1057,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>20</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 04:16:31 2016.-->
+				<!--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>
@@ -1090,7 +1090,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Sep  8 15:11:39 2016.-->
+				<!--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>
@@ -1123,7 +1123,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Apr 25 23:37:40 2017.-->
+				<!--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>
@@ -1156,7 +1156,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:45 2016.-->
+				<!--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>
@@ -1189,7 +1189,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:45 2016.-->
+				<!--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>
@@ -1222,7 +1222,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:45 2016.-->
+				<!--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>
@@ -1256,7 +1256,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:54 2016.-->
+				<!--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>
@@ -1278,7 +1278,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 05:06:54 2016.-->
+				<!--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>
@@ -1303,7 +1303,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Mar 22 18:05:52 2017.-->
+				<!--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>
@@ -1323,7 +1323,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Sep  6 06:12:47 2017.-->
+				<!--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>
@@ -1343,7 +1343,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Apr  5 11:38:56 2016.-->
+				<!--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>
@@ -1364,7 +1364,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Apr  5 11:38:59 2016.-->
+				<!--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>
@@ -1386,7 +1386,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Apr  5 11:39:02 2016.-->
+				<!--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>
@@ -1401,16 +1401,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:path>google_play_services_froyo</sdk:path>
 	</sdk:extra>
 	<sdk:extra>
-		<!--Generated from bid:164902609, branch:perforce-->
+		<!--Generated from bid:189640690, branch:perforce-->
 		<sdk:revision>
-			<sdk:major>44</sdk:major>
+			<sdk:major>49</sdk:major>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Aug 10 14:27:42 2017.-->
-				<sdk:size>13796755</sdk:size>
-				<sdk:checksum type="sha1">d2bb583a3f62b068d448df10544c1852d910526f</sdk:checksum>
-				<sdk:url>google_play_services_v12_1_rc11.zip</sdk:url>
+				<!--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"/>
@@ -1428,7 +1428,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Apr  5 11:39:08 2016.-->
+				<!--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>
@@ -1443,28 +1443,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:name-display>Google USB Driver</sdk:name-display>
 		<sdk:path>usb_driver</sdk:path>
 	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:53928043, branch:perforce-->
-		<sdk:revision>
-			<sdk:major>5</sdk:major>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Apr  5 11:39:11 2016.-->
-				<sdk:size>436654</sdk:size>
-				<sdk:checksum type="sha1">bd2ac5ce7127070ac3229003eb69cfb806628ac9</sdk:checksum>
-				<sdk:url>play_billing_r05.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 Billing files and sample code</sdk:description>
-		<sdk:desc-url>http://developer.android.com/google/play/billing/index.html</sdk:desc-url>
-		<sdk:name-display>Google Play Billing Library</sdk:name-display>
-		<sdk:path>play_billing</sdk:path>
-		<sdk:old-paths>market_billing</sdk:old-paths>
-	</sdk:extra>
 	<sdk:extra>
 		<!--Generated from bid:45484492, branch:perforce-->
 		<sdk:obsolete/>
@@ -1473,7 +1451,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Apr  5 11:39:14 2016.-->
+				<!--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>
@@ -1495,7 +1473,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Apr  5 11:39:17 2016.-->
+				<!--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>
@@ -1516,7 +1494,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Apr  5 11:39:20 2016.-->
+				<!--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>
@@ -1538,7 +1516,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Apr  5 11:39:23 2016.-->
+				<!--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>
@@ -1559,7 +1537,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Apr  5 11:39:26 2016.-->
+				<!--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>
@@ -1581,21 +1559,21 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Apr  5 11:39:34 2016.-->
+				<!--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 Apr  5 11:39:35 2016.-->
+				<!--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 Apr  5 11:39:34 2016.-->
+				<!--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>
@@ -1611,26 +1589,26 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:path>auto</sdk:path>
 	</sdk:extra>
 	<sdk:extra>
-		<!--Generated from bid:155747253, branch:perforce-->
+		<!--Generated from bid:214678223, branch:perforce-->
 		<sdk:revision>
 			<sdk:major>1</sdk:major>
-			<sdk:minor>0</sdk:minor>
+			<sdk:minor>5</sdk:minor>
 			<sdk:micro>0</sdk:micro>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu May 11 08:10:37 2017.-->
-				<sdk:size>450468876</sdk:size>
-				<sdk:checksum type="sha1">50074a0f0312ee1d0d81d2cddc3d84a8a9e97a53</sdk:checksum>
-				<sdk:url>aiasdk-1.0.0.zip</sdk:url>
+				<!--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>Android Instant Apps Development SDK</sdk:description>
-		<sdk:desc-url>https://developer.android.com/topic/instant-apps/index.html</sdk:desc-url>
-		<sdk:name-display>Instant Apps Development SDK</sdk:name-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
index ab5d570a327..1a8e2d32a4b 100644
--- a/pkgs/development/mobile/androidenv/addons.nix
+++ b/pkgs/development/mobile/androidenv/addons.nix
@@ -296,8 +296,8 @@ in
   google_play_services = buildGoogleApis {
     name = "google_play_services";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/google_play_services_v12_1_rc11.zip;
-      sha1 = "d2bb583a3f62b068d448df10544c1852d910526f";
+      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";
@@ -308,8 +308,8 @@ in
   instant_apps = buildGoogleApis {
     name = "instant_apps_sdk";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/aiasdk-1.0.0.zip;
-      sha1 = "50074a0f0312ee1d0d81d2cddc3d84a8a9e97a53";
+      url = https://dl.google.com/android/repository/iasdk-1.5.0-1538000167.zip;
+      sha1 = "6c282b9c686e819fe7f5ac8f2249d2479acb63b4";
     };
     meta = {
       description = "Android Instant Apps Development SDK";
@@ -317,4 +317,5 @@ in
     };
   };
 
+
 }
diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
index e24a9c43160..dbb295f8cf5 100644
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -316,4 +316,28 @@ in
     };
   };
 
+  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
index 3775872514c..30ed94e516a 100644
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -316,4 +316,28 @@ in
     };
   };
 
+  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/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml
index 3924d6ddd3b..45ad16be57b 100644
--- a/pkgs/development/mobile/androidenv/repository-11.xml
+++ b/pkgs/development/mobile/androidenv/repository-11.xml
@@ -15,7 +15,7 @@
  * 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 2017-09-08 08:20:34.788412 with ADRT.-->
+	<!--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
@@ -50,7 +50,7 @@ This is the Android Software Development Kit License Agreement
 
 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: (a) 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; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+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.
 
@@ -296,45 +296,93 @@ This is the Android SDK Preview License Agreement (the &quot;License Agreement&q
 
 June 2014.</sdk:license>
 	<sdk:ndk>
-		<!--Generated from bid:4203891, branch:aosp-ndk-r15-release-->
+		<!--Generated from bid:5063045, branch:aosp-ndk-release-r18-->
 		<sdk:description>NDK</sdk:description>
-		<sdk:revision>15</sdk:revision>
+		<sdk:revision>18</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Jul 24 11:35:28 2017.-->
-				<sdk:size>960251267</sdk:size>
-				<sdk:checksum type="sha1">ea4b5d76475db84745aa8828000d009625fc1f98</sdk:checksum>
-				<sdk:url>android-ndk-r15c-darwin-x86_64.zip</sdk:url>
+				<!--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: Mon Jul 24 11:35:55 2017.-->
-				<sdk:size>974976754</sdk:size>
-				<sdk:checksum type="sha1">0bf02d4e8b85fd770fd7b9b2cdec57f9441f27a2</sdk:checksum>
-				<sdk:url>android-ndk-r15c-linux-x86_64.zip</sdk:url>
+				<!--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: Mon Jul 24 11:34:34 2017.-->
-				<sdk:size>784778144</sdk:size>
-				<sdk:checksum type="sha1">f2e47121feb73ec34ced5e947cbf1adc6b56246e</sdk:checksum>
-				<sdk:url>android-ndk-r15c-windows-x86.zip</sdk:url>
+				<!--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: Mon Jul 24 11:35:03 2017.-->
-				<sdk:size>849733996</sdk:size>
-				<sdk:checksum type="sha1">970bb2496de0eada74674bb1b06d79165f725696</sdk:checksum>
-				<sdk:url>android-ndk-r15c-windows-x86_64.zip</sdk:url>
+				<!--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>
@@ -343,7 +391,7 @@ June 2014.</sdk:license>
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Jul 18 10:38:38 2017.-->
+				<!--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>
@@ -367,7 +415,7 @@ June 2014.</sdk:license>
 		<sdk:revision>3</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Dec  5 10:12:38 2016.-->
+				<!--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>
@@ -391,7 +439,7 @@ June 2014.</sdk:license>
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 22 11:05:39 2016.-->
+				<!--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>
@@ -415,7 +463,7 @@ June 2014.</sdk:license>
 		<sdk:revision>3</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 22 14:26:20 2016.-->
+				<!--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>
@@ -439,7 +487,7 @@ June 2014.</sdk:license>
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:13 2016.-->
+				<!--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>
@@ -463,7 +511,7 @@ June 2014.</sdk:license>
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:12 2016.-->
+				<!--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>
@@ -487,7 +535,7 @@ June 2014.</sdk:license>
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:12 2016.-->
+				<!--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>
@@ -511,7 +559,7 @@ June 2014.</sdk:license>
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:11 2016.-->
+				<!--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>
@@ -535,7 +583,7 @@ June 2014.</sdk:license>
 		<sdk:revision>3</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:11 2016.-->
+				<!--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>
@@ -559,7 +607,7 @@ June 2014.</sdk:license>
 		<sdk:revision>3</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:11 2016.-->
+				<!--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>
@@ -583,7 +631,7 @@ June 2014.</sdk:license>
 		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:10 2016.-->
+				<!--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>
@@ -607,7 +655,7 @@ June 2014.</sdk:license>
 		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:10 2016.-->
+				<!--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>
@@ -631,7 +679,7 @@ June 2014.</sdk:license>
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:09 2016.-->
+				<!--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>
@@ -652,7 +700,7 @@ June 2014.</sdk:license>
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue May 24 11:44:04 2016.-->
+				<!--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>
@@ -675,7 +723,7 @@ June 2014.</sdk:license>
 		<sdk:revision>3</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue May 24 11:45:54 2016.-->
+				<!--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>
@@ -698,7 +746,7 @@ June 2014.</sdk:license>
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue May 24 11:45:33 2016.-->
+				<!--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>
@@ -721,7 +769,7 @@ June 2014.</sdk:license>
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue May 24 11:46:21 2016.-->
+				<!--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>
@@ -744,7 +792,7 @@ June 2014.</sdk:license>
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue May 24 11:47:02 2016.-->
+				<!--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>
@@ -767,7 +815,7 @@ June 2014.</sdk:license>
 		<sdk:revision>3</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:17 2016.-->
+				<!--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>
@@ -790,7 +838,7 @@ June 2014.</sdk:license>
 		<sdk:revision>3</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:17 2016.-->
+				<!--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>
@@ -814,21 +862,21 @@ June 2014.</sdk:license>
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:15 2016.-->
+				<!--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: Mon Mar 28 00:57:15 2016.-->
+				<!--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: Mon Mar 28 00:57:15 2016.-->
+				<!--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>
@@ -853,21 +901,21 @@ June 2014.</sdk:license>
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:13 2016.-->
+				<!--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: Mon Mar 28 00:57:13 2016.-->
+				<!--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: Mon Mar 28 00:57:13 2016.-->
+				<!--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>
@@ -892,21 +940,21 @@ June 2014.</sdk:license>
 		<sdk:revision>3</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:17 2016.-->
+				<!--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: Mon Mar 28 00:57:17 2016.-->
+				<!--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 Mar 28 00:57:17 2016.-->
+				<!--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>
@@ -931,21 +979,21 @@ June 2014.</sdk:license>
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:14 2016.-->
+				<!--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 Mar 28 00:57:14 2016.-->
+				<!--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: Mon Mar 28 00:57:14 2016.-->
+				<!--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>
@@ -970,21 +1018,21 @@ June 2014.</sdk:license>
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:08 2016.-->
+				<!--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: Mon Mar 28 00:57:08 2016.-->
+				<!--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: Mon Mar 28 00:57:08 2016.-->
+				<!--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>
@@ -1000,13 +1048,55 @@ June 2014.</sdk:license>
 			<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: Mon Dec  5 10:12:27 2016.-->
+				<!--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>
@@ -1020,7 +1110,7 @@ June 2014.</sdk:license>
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 22 11:05:30 2016.-->
+				<!--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>
@@ -1034,7 +1124,7 @@ June 2014.</sdk:license>
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:21 2016.-->
+				<!--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>
@@ -1048,7 +1138,7 @@ June 2014.</sdk:license>
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:21 2016.-->
+				<!--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>
@@ -1062,7 +1152,7 @@ June 2014.</sdk:license>
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:20 2016.-->
+				<!--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>
@@ -1076,7 +1166,7 @@ June 2014.</sdk:license>
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:20 2016.-->
+				<!--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>
@@ -1090,7 +1180,7 @@ June 2014.</sdk:license>
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:23 2016.-->
+				<!--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>
@@ -1104,7 +1194,7 @@ June 2014.</sdk:license>
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:23 2016.-->
+				<!--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>
@@ -1118,7 +1208,7 @@ June 2014.</sdk:license>
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:22 2016.-->
+				<!--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>
@@ -1132,7 +1222,7 @@ June 2014.</sdk:license>
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:22 2016.-->
+				<!--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>
@@ -1146,7 +1236,7 @@ June 2014.</sdk:license>
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:22 2016.-->
+				<!--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>
@@ -1161,7 +1251,7 @@ June 2014.</sdk:license>
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:21 2016.-->
+				<!--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>
@@ -1169,6 +1259,392 @@ June 2014.</sdk:license>
 		</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>
@@ -1178,21 +1654,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Jul 18 10:38:26 2017.-->
+				<!--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: Tue Jul 18 10:38:23 2017.-->
+				<!--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 Jul 18 10:38:21 2017.-->
+				<!--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>
@@ -1210,21 +1686,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Jun  2 13:22:18 2017.-->
+				<!--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: Fri Jun  2 13:22:15 2017.-->
+				<!--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: Fri Jun  2 13:22:13 2017.-->
+				<!--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>
@@ -1243,21 +1719,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri May 12 23:05:09 2017.-->
+				<!--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: Fri May 12 23:05:07 2017.-->
+				<!--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: Fri May 12 23:05:05 2017.-->
+				<!--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>
@@ -1276,21 +1752,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 21 10:10:45 2017.-->
+				<!--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 Mar 21 10:10:34 2017.-->
+				<!--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: Tue Mar 21 10:10:25 2017.-->
+				<!--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>
@@ -1308,21 +1784,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Apr 13 13:27:23 2017.-->
+				<!--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: Thu Apr 13 13:27:21 2017.-->
+				<!--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: Thu Apr 13 13:27:19 2017.-->
+				<!--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>
@@ -1340,21 +1816,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Dec  5 10:11:59 2016.-->
+				<!--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: Mon Dec  5 10:11:57 2016.-->
+				<!--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: Mon Dec  5 10:11:55 2016.-->
+				<!--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>
@@ -1372,21 +1848,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Nov 14 23:49:02 2016.-->
+				<!--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 Nov 14 23:49:00 2016.-->
+				<!--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: Mon Nov 14 23:48:57 2016.-->
+				<!--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>
@@ -1404,21 +1880,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Oct 17 14:57:00 2016.-->
+				<!--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: Mon Oct 17 14:56:58 2016.-->
+				<!--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: Mon Oct 17 14:56:56 2016.-->
+				<!--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>
@@ -1436,21 +1912,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Sep 27 10:00:17 2016.-->
+				<!--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 Sep 27 10:00:14 2016.-->
+				<!--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: Tue Sep 27 10:00:12 2016.-->
+				<!--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>
@@ -1468,21 +1944,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 22 11:05:10 2016.-->
+				<!--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: Mon Aug 22 11:05:08 2016.-->
+				<!--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: Mon Aug 22 11:05:05 2016.-->
+				<!--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>
@@ -1500,21 +1976,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Aug 23 11:42:33 2016.-->
+				<!--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: Tue Aug 23 11:42:31 2016.-->
+				<!--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 Aug 23 11:42:30 2016.-->
+				<!--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>
@@ -1532,21 +2008,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 04:18:09 2016.-->
+				<!--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: Mon Aug 15 04:18:36 2016.-->
+				<!--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: Mon Aug 15 04:19:02 2016.-->
+				<!--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>
@@ -1564,21 +2040,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 04:18:06 2016.-->
+				<!--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: Mon Aug 15 04:19:01 2016.-->
+				<!--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 Aug 15 04:19:55 2016.-->
+				<!--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>
@@ -1596,21 +2072,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 04:18:13 2016.-->
+				<!--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: Mon Aug 15 04:18:36 2016.-->
+				<!--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: Mon Aug 15 04:18:59 2016.-->
+				<!--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>
@@ -1628,21 +2104,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:56:55 2016.-->
+				<!--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: Mon Mar 28 00:56:55 2016.-->
+				<!--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: Mon Mar 28 00:56:55 2016.-->
+				<!--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>
@@ -1661,21 +2137,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 04:18:06 2016.-->
+				<!--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: Mon Aug 15 04:19:19 2016.-->
+				<!--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: Mon Aug 15 04:20:17 2016.-->
+				<!--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>
@@ -1693,21 +2169,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 04:18:01 2016.-->
+				<!--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 Aug 15 04:18:48 2016.-->
+				<!--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: Mon Aug 15 04:19:49 2016.-->
+				<!--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>
@@ -1726,21 +2202,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 04:17:57 2016.-->
+				<!--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: Mon Aug 15 04:18:14 2016.-->
+				<!--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: Mon Aug 15 04:19:09 2016.-->
+				<!--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>
@@ -1758,21 +2234,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 04:17:59 2016.-->
+				<!--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: Mon Aug 15 04:18:34 2016.-->
+				<!--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: Mon Aug 15 04:19:25 2016.-->
+				<!--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>
@@ -1791,21 +2267,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 04:17:59 2016.-->
+				<!--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 Aug 15 04:18:16 2016.-->
+				<!--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: Mon Aug 15 04:18:32 2016.-->
+				<!--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>
@@ -1824,21 +2300,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 04:17:58 2016.-->
+				<!--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: Mon Aug 15 04:18:34 2016.-->
+				<!--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: Mon Aug 15 04:19:31 2016.-->
+				<!--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>
@@ -1857,21 +2333,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 04:17:56 2016.-->
+				<!--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: Mon Aug 15 04:18:09 2016.-->
+				<!--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 Aug 15 04:19:02 2016.-->
+				<!--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>
@@ -1890,21 +2366,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Aug 15 04:17:55 2016.-->
+				<!--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: Mon Aug 15 04:18:08 2016.-->
+				<!--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 Aug 15 04:18:21 2016.-->
+				<!--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>
@@ -1923,21 +2399,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:56:49 2016.-->
+				<!--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 Mar 28 00:56:49 2016.-->
+				<!--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 Mar 28 00:56:49 2016.-->
+				<!--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>
@@ -1955,21 +2431,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:56:48 2016.-->
+				<!--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: Mon Mar 28 00:56:48 2016.-->
+				<!--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 Mar 28 00:56:48 2016.-->
+				<!--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>
@@ -1987,21 +2463,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:56:47 2016.-->
+				<!--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: Mon Mar 28 00:56:48 2016.-->
+				<!--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: Mon Mar 28 00:56:48 2016.-->
+				<!--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>
@@ -2020,21 +2496,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:56:47 2016.-->
+				<!--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: Mon Mar 28 00:56:47 2016.-->
+				<!--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: Mon Mar 28 00:56:47 2016.-->
+				<!--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>
@@ -2053,21 +2529,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:56:46 2016.-->
+				<!--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: Mon Mar 28 00:56:46 2016.-->
+				<!--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: Mon Mar 28 00:56:46 2016.-->
+				<!--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>
@@ -2086,21 +2562,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:03 2016.-->
+				<!--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: Mon Mar 28 00:57:03 2016.-->
+				<!--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: Mon Mar 28 00:57:03 2016.-->
+				<!--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>
@@ -2119,21 +2595,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:02 2016.-->
+				<!--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: Mon Mar 28 00:57:03 2016.-->
+				<!--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: Mon Mar 28 00:57:03 2016.-->
+				<!--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>
@@ -2152,21 +2628,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:02 2016.-->
+				<!--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: Mon Mar 28 00:57:02 2016.-->
+				<!--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: Mon Mar 28 00:57:02 2016.-->
+				<!--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>
@@ -2185,21 +2661,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:01 2016.-->
+				<!--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: Mon Mar 28 00:57:01 2016.-->
+				<!--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: Mon Mar 28 00:57:01 2016.-->
+				<!--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>
@@ -2218,21 +2694,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:57:00 2016.-->
+				<!--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 Mar 28 00:57:00 2016.-->
+				<!--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: Mon Mar 28 00:57:00 2016.-->
+				<!--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>
@@ -2251,21 +2727,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Mar 28 00:56:59 2016.-->
+				<!--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: Mon Mar 28 00:57:00 2016.-->
+				<!--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: Mon Mar 28 00:57:00 2016.-->
+				<!--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>
@@ -2275,32 +2751,32 @@ June 2014.</sdk:license>
 		<sdk:uses-license ref="android-sdk-license"/>
 	</sdk:build-tool>
 	<sdk:platform-tool>
-		<!--Generated from bid:4062713a, branch:git_oc-preview3-sdk-->
+		<!--Generated from bid:4986621, branch:aosp-sdk-release-->
 		<sdk:revision>
-			<sdk:major>26</sdk:major>
+			<sdk:major>28</sdk:major>
 			<sdk:minor>0</sdk:minor>
-			<sdk:micro>0</sdk:micro>
+			<sdk:micro>1</sdk:micro>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Jun  2 13:22:20 2017.-->
-				<sdk:size>7771750</sdk:size>
-				<sdk:checksum type="sha1">e75b6137dc444f777eb02f44a6d9819b3aabff82</sdk:checksum>
-				<sdk:url>platform-tools_r26.0.0-darwin.zip</sdk:url>
+				<!--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 Jun  2 13:22:19 2017.-->
-				<sdk:size>7859155</sdk:size>
-				<sdk:checksum type="sha1">00de8a6631405b617c10f68cd11ff2e1cd528e23</sdk:checksum>
-				<sdk:url>platform-tools_r26.0.0-linux.zip</sdk:url>
+				<!--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 Jun  2 13:22:20 2017.-->
-				<sdk:size>7511554</sdk:size>
-				<sdk:checksum type="sha1">a4128ebc3d1b6372d981810920e3fa01637f891a</sdk:checksum>
-				<sdk:url>platform-tools_r26.0.0-windows.zip</sdk:url>
+				<!--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>
@@ -2315,21 +2791,21 @@ June 2014.</sdk:license>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Dec 12 17:20:14 2016.-->
+				<!--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: Mon Dec 12 17:20:09 2016.-->
+				<!--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: Mon Dec 12 17:20:05 2016.-->
+				<!--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>
@@ -2347,7 +2823,7 @@ June 2014.</sdk:license>
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Sep  8 15:25:04 2016.-->
+				<!--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>
diff --git a/pkgs/development/mobile/androidenv/sources.nix b/pkgs/development/mobile/androidenv/sources.nix
index e4fe3cf0ff5..cca132e2774 100644
--- a/pkgs/development/mobile/androidenv/sources.nix
+++ b/pkgs/development/mobile/androidenv/sources.nix
@@ -148,4 +148,37 @@ in
     };
   };
 
+  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/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml
index 2a720918c23..d7c8dd9de9b 100644
--- a/pkgs/development/mobile/androidenv/sys-img.xml
+++ b/pkgs/development/mobile/androidenv/sys-img.xml
@@ -1,6 +1,6 @@
 <?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 2017-08-28 14:42:29.488243 with ADRT.-->
+	<!--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
@@ -35,7 +35,7 @@ This is the Android Software Development Kit License Agreement
 
 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: (a) 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; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+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.
 
@@ -411,7 +411,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:38:16 2016.-->
+				<!--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>
@@ -428,7 +428,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:25:05 2016.-->
+				<!--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>
@@ -445,7 +445,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Nov 10 17:19:27 2016.-->
+				<!--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>
@@ -462,7 +462,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:24:59 2016.-->
+				<!--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>
@@ -479,7 +479,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Nov 10 17:19:54 2016.-->
+				<!--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>
@@ -496,7 +496,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Nov 10 17:20:07 2016.-->
+				<!--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>
@@ -513,7 +513,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Nov 10 17:20:23 2016.-->
+				<!--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>
@@ -530,7 +530,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:35:34 2016.-->
+				<!--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>
@@ -547,7 +547,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>2</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:35:50 2016.-->
+				<!--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>
@@ -564,7 +564,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>6</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:41:26 2016.-->
+				<!--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>
@@ -582,7 +582,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>7</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Sep  6 08:28:18 2016.-->
+				<!--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>
@@ -599,7 +599,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>7</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Sep  6 08:28:58 2016.-->
+				<!--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>
@@ -609,23 +609,6 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:abi>arm64-v8a</sdk:abi>
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:1741834, branch:git_ics-mr1-->
-		<sdk:api-level>15</sdk:api-level>
-		<sdk:description>MIPS System Image</sdk:description>
-		<sdk:revision>1</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:24:59 2016.-->
-				<sdk:size>117503178</sdk:size>
-				<sdk:checksum type="sha1">a753bb4a6783124dad726c500ce9aec9d2c1b2d9</sdk:checksum>
-				<sdk:url>sysimg_mips-15_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:1741836, branch:git_jb-dev-->
 		<sdk:api-level>16</sdk:api-level>
@@ -633,7 +616,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:25:00 2016.-->
+				<!--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>
@@ -650,7 +633,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>1</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Tue Mar 29 18:25:00 2016.-->
+				<!--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>
@@ -667,7 +650,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Sep 16 16:10:43 2016.-->
+				<!--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>
@@ -684,7 +667,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Nov 10 17:20:36 2016.-->
+				<!--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>
@@ -695,16 +678,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3462064, branch:git_jb-emu-release-->
+		<!--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>5</sdk:revision>
+		<sdk:revision>6</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Nov 10 17:20:52 2016.-->
-				<sdk:size>134339698</sdk:size>
-				<sdk:checksum type="sha1">7ea16da3a8fdb880b1b290190fcc1bde2821c1e0</sdk:checksum>
-				<sdk:url>x86-16_r05.zip</sdk:url>
+				<!--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"/>
@@ -712,16 +695,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
 	<sdk:system-image>
-		<!--Generated from bid:3453820, branch:git_jb-mr1.1-emu-release-->
+		<!--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>3</sdk:revision>
+		<sdk:revision>4</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Nov 10 17:21:06 2016.-->
-				<sdk:size>142951842</sdk:size>
-				<sdk:checksum type="sha1">eb30274460ff0d61f3ed37862b567811bebd8270</sdk:checksum>
-				<sdk:url>x86-17_r03.zip</sdk:url>
+				<!--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"/>
@@ -735,7 +718,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>3</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Nov 10 17:21:19 2016.-->
+				<!--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>
@@ -752,7 +735,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>6</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Jul 13 12:41:20 2017.-->
+				<!--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>
@@ -769,7 +752,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Jul 13 12:42:18 2017.-->
+				<!--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>
@@ -786,7 +769,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>6</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Jul 13 12:43:18 2017.-->
+				<!--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>
@@ -803,7 +786,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>10</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Jul 13 12:44:25 2017.-->
+				<!--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>
@@ -820,7 +803,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>8</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Jul 13 12:45:47 2017.-->
+				<!--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>
@@ -830,6 +813,77 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<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>
@@ -837,7 +891,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>5</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Jul 13 12:46:57 2017.-->
+				<!--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>
@@ -854,7 +908,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>6</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Jul 13 12:48:15 2017.-->
+				<!--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>
@@ -871,7 +925,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>10</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Jul 13 12:49:37 2017.-->
+				<!--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>
@@ -888,7 +942,7 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:revision>8</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Thu Jul 13 12:51:15 2017.-->
+				<!--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>
@@ -898,4 +952,75 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<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
index c5d075d6307..0ad09a02556 100644
--- a/pkgs/development/mobile/androidenv/sysimages.nix
+++ b/pkgs/development/mobile/androidenv/sysimages.nix
@@ -47,14 +47,6 @@ in
     };
   };
 
-  sysimg_mips_15 = buildSystemImage {
-    name = "sysimg-mips-15";
-    src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-15_r01.zip;
-      sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9";
-    };
-  };
-
   sysimg_x86_15 = buildSystemImage {
     name = "sysimg-x86-15";
     src = fetchurl {
@@ -82,8 +74,8 @@ in
   sysimg_x86_16 = buildSystemImage {
     name = "sysimg-x86-16";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-16_r05.zip;
-      sha1 = "7ea16da3a8fdb880b1b290190fcc1bde2821c1e0";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip;
+      sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd";
     };
   };
 
@@ -106,8 +98,8 @@ in
   sysimg_x86_17 = buildSystemImage {
     name = "sysimg-x86-17";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-17_r03.zip;
-      sha1 = "eb30274460ff0d61f3ed37862b567811bebd8270";
+      url = https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip;
+      sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec";
     };
   };
 
@@ -250,17 +242,64 @@ in
   sysimg_x86_25 = buildSystemImage {
     name = "sysimg-x86-25";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/sys-img/android/x86-25_r03.zip;
-      sha1 = "7dd19cfee4e43a1f60e0f5f058404d92d9544b33";
+      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_r03.zip;
-      sha1 = "4593ee04811df21c339f3374fc5917843db06f8d";
+      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";
+    };
+  };
+}
-- 
GitLab


From 4a0ae5d7d69232ced9f47af783d1413c8bd991e5 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Fri, 26 Oct 2018 09:48:25 -0700
Subject: [PATCH 0444/1065] androidenv: add androidsdk_{8_1,9_0}{,_extras}

---
 .../development/mobile/androidenv/default.nix | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 0291986b5a4..25ccb6ee6ed 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -222,7 +222,37 @@ rec {
     useInstantApps = true;
   };
 
-  androidsdk_latest = androidsdk_8_0;
+  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)
-- 
GitLab


From 2bba06c4f081bb88a66d807633f51a988cfcbc09 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 21:17:27 -0700
Subject: [PATCH 0445/1065] openisns: 0.98 -> 0.99

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

diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix
index c8b404c6be7..21d32af3ba8 100644
--- a/pkgs/os-specific/linux/open-isns/default.nix
+++ b/pkgs/os-specific/linux/open-isns/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "open-isns-${version}";
-  version = "0.98";
+  version = "0.99";
 
   src = fetchFromGitHub {
     owner = "gonzoleeman";
     repo = "open-isns";
     rev = "v${version}";
-    sha256 = "055gjwz5hxaj5jk23bf7dy9wbxk9m8cfgl1msbzjc60gr2mmcbdg";
+    sha256 = "0m294aiv80rkihacw5094093pc0kd5bkbxqgs6i32jsglxy33hvf";
   };
 
   propagatedBuildInputs = [ openssl ];
-- 
GitLab


From ab7172a326b24e1715eb18afc8040a45b27c9ad2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 21:44:22 -0700
Subject: [PATCH 0446/1065] ocamlPackages.ocaml-migrate-parsetree: 1.0.11 ->
 1.1.0

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

diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
index 131f478d32e..e8074a51e52 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
@@ -6,13 +6,13 @@ else
 
 stdenv.mkDerivation rec {
    name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}";
-   version = "1.0.11";
+   version = "1.1.0";
 
    src = fetchFromGitHub {
      owner = "ocaml-ppx";
      repo = "ocaml-migrate-parsetree";
      rev = "v${version}";
-     sha256 = "05kbgs9n1x64fk6g3wbjnwjd17w10k3k8dzglnc45xg4hr7z651n";
+     sha256 = "1d2n349d1cqm3dr09mwy5m9rfd4bkkqvri5i94wknpsrr35vnrr1";
    };
 
    buildInputs = [ ocaml findlib ocamlbuild dune ];
-- 
GitLab


From 7c85639ed7be310957c6f4f9c93f0f1f31ff386f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 22:06:29 -0700
Subject: [PATCH 0447/1065] neo4j: 3.4.8 -> 3.4.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/neo4j/versions
---
 pkgs/servers/nosql/neo4j/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index 9365612c14e..0f20128678c 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "neo4j-${version}";
-  version = "3.4.8";
+  version = "3.4.9";
 
   src = fetchurl {
     url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
-    sha256 = "1mdxqfy5xzc6944lg87975i9bfpqqx28xl8h70m4wn79x0qgby2v";
+    sha256 = "0kg0dr42qi8cwg3i1hcgczd4psh97s54q5zd8z2wn1fqf4m2h597";
   };
 
   buildInputs = [ makeWrapper jre8 which gawk ];
-- 
GitLab


From d861da151f0799f6e12b96126cf8f7d1684ce4fc Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Fri, 26 Oct 2018 20:26:51 -0700
Subject: [PATCH 0448/1065] androidenv: version buildTools and add
 buildToolsVersions sdk argument

---
 .../mobile/androidenv/androidsdk.nix          |  12 +-
 .../androidenv/build-tools-srcs-linux.nix     | 376 ++++++++++++++++++
 .../androidenv/build-tools-srcs-macosx.nix    | 376 ++++++++++++++++++
 .../mobile/androidenv/build-tools.nix         | 104 +++--
 .../development/mobile/androidenv/default.nix |  13 +-
 pkgs/development/mobile/androidenv/fetch.sh   |   1 +
 .../mobile/androidenv/generate-tools.sh       |   4 +
 .../mobile/androidenv/generate-tools.xsl      |  43 ++
 pkgs/development/tools/apktool/default.nix    |   2 +-
 9 files changed, 871 insertions(+), 60 deletions(-)
 create mode 100644 pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix
 create mode 100644 pkgs/development/mobile/androidenv/build-tools-srcs-macosx.nix
 create mode 100755 pkgs/development/mobile/androidenv/generate-tools.sh
 create mode 100644 pkgs/development/mobile/androidenv/generate-tools.xsl

diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index feef5a787bf..a463adaf731 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -6,7 +6,7 @@
 , includeSources
 , licenseAccepted
 }:
-{ platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false
+{ platformVersions, abiVersions, useGoogleAPIs, buildToolsVersions ? [], useExtraSupportLibs ? false
 , useGooglePlayServices ? false, useInstantApps ? false }:
 
 if !licenseAccepted then throw ''
@@ -120,9 +120,17 @@ stdenv.mkDerivation rec {
 
     cd ..
     ln -s ${platformTools}/platform-tools
-    ln -s ${buildTools}/build-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
diff --git a/pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix b/pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix
new file mode 100644
index 00000000000..3c2960755e7
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/build-tools-srcs-linux.nix
@@ -0,0 +1,376 @@
+
+# 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
new file mode 100644
index 00000000000..1e15aa7c873
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/build-tools-srcs-macosx.nix
@@ -0,0 +1,376 @@
+
+# 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 f0b9a77d3f1..b362dc2dca5 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -1,61 +1,53 @@
-{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses, coreutils}:
-
-stdenv.mkDerivation rec {
-  version = "28.0.3";
-  name = "android-build-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/build-tools_r${version}-linux.zip";
-      sha256 = "16klhw9yk8znvbgvg967km4y5sb87z1cnf6njgv8hg3381m9am3r";
-    }
-    else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl {
-      url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip";
-      sha256 = "1src9g7058bl2z9y6v404gwqwpixb8b71awxhrb0w5iwnfabhymq";
-    }
-    else throw "System ${stdenv.hostPlatform.system} not supported!";
-
-  buildCommand = ''
-    mkdir -p $out/build-tools
-    cd $out/build-tools
-    unzip $src
-    mv android-* ${version}
-
-    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"
+{stdenv, lib, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses, coreutils, buildToolsSources}:
+
+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}
+
+      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
-              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"
+              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
-              patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 "$file"
+              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
-            patchelf --set-rpath ${stdenv_32bit.cc.cc.lib.out}/lib:${zlib_32bit.out}/lib:${ncurses_32bit.out}/lib "$file"
-          fi
-        done
-      ''}
+          done
+        ''}
 
-      patchShebangs .
-  '';
+        patchShebangs .
+    '';
 
-  buildInputs = [ unzip file ];
-}
+    buildInputs = [ unzip file ];
+  };
+in
+  lib.mapAttrs buildBuildTools buildToolsSources
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 25ccb6ee6ed..9058da1c50a 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -9,8 +9,19 @@ rec {
     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 fetchurl unzip zlib file coreutils;
+    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;
diff --git a/pkgs/development/mobile/androidenv/fetch.sh b/pkgs/development/mobile/androidenv/fetch.sh
index 102f6aafb89..ef15e8eaeda 100755
--- a/pkgs/development/mobile/androidenv/fetch.sh
+++ b/pkgs/development/mobile/androidenv/fetch.sh
@@ -11,3 +11,4 @@ curl -o sys-img.xml       https://dl.google.com/android/repository/sys-img/andro
 ./generate-platforms.sh
 ./generate-sysimages.sh
 ./generate-sources.sh
+./generate-tools.sh
diff --git a/pkgs/development/mobile/androidenv/generate-tools.sh b/pkgs/development/mobile/androidenv/generate-tools.sh
new file mode 100755
index 00000000000..5799894fd45
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generate-tools.sh
@@ -0,0 +1,4 @@
+#!/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
new file mode 100644
index 00000000000..814bad12988
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generate-tools.xsl
@@ -0,0 +1,43 @@
+<?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/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index 42deae45a25..17b0265fddd 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -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}/build-tools/25.0.1/"
+        --prefix PATH : "${buildTools.v25_0_1}/build-tools/25.0.1/"
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From de5d8a1e7087522931fd61bfbb208f8c708a4aa1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 22:20:27 -0700
Subject: [PATCH 0449/1065] nanomsg: 1.1.4 -> 1.1.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/nanomsg/versions
---
 pkgs/development/libraries/nanomsg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix
index f50b64fca3e..8f72b333aa4 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/pkgs/development/libraries/nanomsg/default.nix
@@ -1,14 +1,14 @@
 { stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.4";
+  version = "1.1.5";
   name = "nanomsg-${version}";
 
   src = fetchFromGitHub {
     owner = "nanomsg";
     repo = "nanomsg";
     rev = version;
-    sha256 = "11mxbhkxkzqwdmpl79mfiiqby7zawgkalips7zr0bbdfyhq7jyrl";
+    sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64";
   };
 
   buildInputs = [ cmake ];
-- 
GitLab


From d0db0bd3e93e9c7b60a1238f5f4b21762ca13b4a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 22:47:59 -0700
Subject: [PATCH 0450/1065] ocamlPackages.fmt: 0.8.4 -> 0.8.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/ocaml4.06.1-fmt/versions
---
 pkgs/development/ocaml-modules/fmt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix
index 2e7996f55d9..2aa560e5349 100644
--- a/pkgs/development/ocaml-modules/fmt/default.nix
+++ b/pkgs/development/ocaml-modules/fmt/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, result, uchar }:
 
 stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-fmt-0.8.4";
+  name = "ocaml${ocaml.version}-fmt-0.8.5";
 
   src = fetchurl {
-    url = http://erratique.ch/software/fmt/releases/fmt-0.8.4.tbz;
-    sha256 = "1qilsbisqqhmn8b1ar9lvjbgz8vf4gmqwqjnnjzgld2a3gmh8qvv";
+    url = http://erratique.ch/software/fmt/releases/fmt-0.8.5.tbz;
+    sha256 = "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060";
   };
 
   unpackCmd = "tar xjf $src";
-- 
GitLab


From a8020acb769d46ed1753fbe462e18243389f00ca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 22:53:59 -0700
Subject: [PATCH 0451/1065] nnn: 1.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/nnn/versions
---
 pkgs/applications/misc/nnn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index d97f2d2c048..051e7139a23 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "nnn-${version}";
-  version = "1.9";
+  version = "2.0";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "nnn";
     rev = "v${version}";
-    sha256 = "0z7mr9lql5hz0518wzkj8fdsdp8yh17fr418arjxjn66md4kwgpg";
+    sha256 = "16c6fimr1ayb2x3mvli70x2va3nz106jdfyqn53bhss7zjqvszxl";
   };
 
   configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);
-- 
GitLab


From 06e867291e39eb0c00c1462c6edd0ff796fb5a0b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 23:21:53 -0700
Subject: [PATCH 0452/1065] nullmailer: 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/nullmailer/versions
---
 pkgs/servers/mail/nullmailer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix
index ab632372b46..4b753bdf0cd 100644
--- a/pkgs/servers/mail/nullmailer/default.nix
+++ b/pkgs/servers/mail/nullmailer/default.nix
@@ -4,12 +4,12 @@ assert tls -> gnutls != null;
 
 stdenv.mkDerivation rec {
 
-  version = "2.1";
+  version = "2.2";
   name = "nullmailer-${version}";
 
   src = fetchurl {
     url = "https://untroubled.org/nullmailer/nullmailer-${version}.tar.gz";
-    sha256 = "0gykh0qc86rk0knfvp8ndqkryal3pvqdfdya94wvb6n1cc8p3ild";
+    sha256 = "0md8cf90fl2yf3zh9njjy42a673v4j4ygyq95xg7fzkygdigm1lq";
   };
 
   buildInputs = stdenv.lib.optional tls gnutls;
-- 
GitLab


From f565b95ca383574e32e843da811f939fe1d69baa Mon Sep 17 00:00:00 2001
From: Bart Bakker <bart@thesoftwarecraft.com>
Date: Thu, 25 Oct 2018 19:21:04 +0200
Subject: [PATCH 0453/1065] xorg.xf86videovmware: fix for GFX support

Fix the mesa dependency for `xorg.xf86videovmware`. Add `llvm_6` because
`mesa_noglu` has a runtime dependency on clang (see TODO in
`development/libraries/mesa`).
---
 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 58688590b84..4772ac7f7ee 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -2,10 +2,10 @@
   stdenv, makeWrapper, lib, fetchurl, fetchpatch,
 
   automake, autoconf, libtool, intltool, mtdev, libevdev, libinput,
-  python, freetype, apple_sdk, tradcpp, fontconfig, mesa_drivers,
+  python, freetype, apple_sdk, tradcpp, fontconfig,
   libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
   mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
-  mcpp, epoxy, openssl, pkgconfig }:
+  mcpp, epoxy, openssl, pkgconfig, llvm_6 }:
 
 let
   inherit (stdenv) lib isDarwin;
@@ -394,7 +394,7 @@ self: super:
   });
 
   xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: {
-    buildInputs =  attrs.buildInputs ++ [ mesa_drivers ]; # for libxatracker
+    buildInputs =  attrs.buildInputs ++ [ mesa_noglu llvm_6 ]; # for libxatracker
     meta = attrs.meta // {
       platforms = ["i686-linux" "x86_64-linux"];
     };
-- 
GitLab


From 561fb30ac62e39cea4d34916e807763e1bd95acf Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 27 Oct 2018 10:05:01 +0100
Subject: [PATCH 0454/1065] loc: enable darwin build

It works fine there and probably other unix platforms.
---
 pkgs/development/misc/loc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index b43deeceb86..4cb612523dc 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -15,12 +15,12 @@ buildRustPackage rec {
 
   cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/cgag/loc;
     description = "Count lines of code quickly";
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ ];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = platforms.unix;
   };
 }
 
-- 
GitLab


From fbea2cd77aa04558107f17d64549fbce692d18b7 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 27 Oct 2018 11:27:03 +0200
Subject: [PATCH 0455/1065] arb: 2.14.0 -> 2.15.1

---
 pkgs/applications/science/math/sage/sage-src.nix | 7 +++++++
 pkgs/development/libraries/arb/default.nix       | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index b86f9d1aa0d..f631fe38a5b 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -58,6 +58,13 @@ stdenv.mkDerivation rec {
       url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sagemath-lcalc-c++11.patch?h=packages/sagemath&id=0e31ae526ab7c6b5c0bfacb3f8b1c4fd490035aa";
       sha256 = "0p5wnvbx65i7cp0bjyaqgp4rly8xgnk12pqwaq3dqby0j2bk6ijb";
     })
+
+    # https://trac.sagemath.org/ticket/26360
+    (fetchpatch {
+      name = "arb-2.15.1.patch";
+      url = "https://git.sagemath.org/sage.git/patch/?id=30cc778d46579bd0c7537ed33e8d7a4f40fd5c31";
+      sha256 = "13vc2q799dh745sm59xjjabllfj0sfjzcacf8k59kwj04x755d30";
+    })
   ];
 
   patches = nixPatches ++ packageUpgradePatches ++ [
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index bca519c7628..f94e0a3ee78 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.14.0";
+  version = "2.15.1";
   src = fetchFromGitHub {
     owner = "fredrik-johansson";
     repo = "${pname}";
     rev = "${version}";
-    sha256 = "1ndxg7h4xvccjgp5l9z2f8b66dsff6fhf86bn5n7f75a1ksd7554";
+    sha256 = "148mn31xy4wgja2cainn2yaw1bjrppf1dxw2ngnvp7x5j7fms1am";
   };
   buildInputs = [mpir gmp mpfr flint];
   configureFlags = [
-- 
GitLab


From 50abe602b1ac61643b1fda36f7a6a6006108e748 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Sat, 27 Oct 2018 11:29:54 +0200
Subject: [PATCH 0456/1065] atlassian-jira: 7.12.1 -> 7.12.3

---
 pkgs/servers/atlassian/jira.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index 46a78e1c5bd..b9c5951b0b2 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-jira-${version}";
-  version = "7.12.1";
+  version = "7.12.3";
 
   src = fetchurl {
     url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "0qk72dq53kk40m8rz7i3r45cgrka2s1682b8d3kzdmmhclnzbaym";
+    sha256 = "0gna0pr8g78pahm4ci14742w40f0nwfn4hpm3iwbsiw2w6vziahv";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
-- 
GitLab


From 9a6e899d00cf4fd190c2eeb28baac2a497e1760f Mon Sep 17 00:00:00 2001
From: Alex Leferry 2 <alexherbo2@gmail.com>
Date: Sat, 27 Oct 2018 11:45:59 +0200
Subject: [PATCH 0457/1065] Fix higan typo

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

diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index 18db78d82ad..45b2f79146c 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An open-source, cycle-accurate Nintendo multi-system emulator";
     longDescription = ''
-      Higan (formerly bsnes) is a multi-system game console emulator.
+      higan (formerly bsnes) is a multi-system game console emulator.
       It currently supports the following systems:
         - Nintendo's Famicom, Super Famicom (with subsystems: 
           Super Game Boy, BS-X Satellaview, Sufami Turbo); 
-- 
GitLab


From 499df932d3e7300b60ed5a7636b2e867511ef687 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Sat, 27 Oct 2018 11:48:04 +0200
Subject: [PATCH 0458/1065] racket: 7.0 -> 7.1

---
 pkgs/development/interpreters/racket/default.nix | 4 ++--
 pkgs/development/interpreters/racket/minimal.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 1f2a28cb8fb..ee7d9dd6813 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -36,7 +36,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "racket-${version}";
-  version = "7.0"; # always change at once with ./minimal.nix
+  version = "7.1"; # always change at once with ./minimal.nix
 
   src = (stdenv.lib.makeOverridable ({ name, sha256 }:
     fetchurl rec {
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     }
   )) {
     inherit name;
-    sha256 = "1glv5amsp9xp480d4yr63hhm9kkyav06yl3a6p489nkr4cln0j9a";
+    sha256 = "180z0z6srzyipi9wfnbh61nbvzxr5d1cls7wxapv6fw92y52jwz9";
   };
 
   FONTCONFIG_FILE = fontsConf;
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix
index ba4e94cbf13..114023defcd 100644
--- a/pkgs/development/interpreters/racket/minimal.nix
+++ b/pkgs/development/interpreters/racket/minimal.nix
@@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
   name = "racket-minimal-${oldAttrs.version}";
   src = oldAttrs.src.override {
     inherit name;
-    sha256 = "0ivpr1a2w1ln1lx91q11rj9wp3rbfq33acrz2gxxvd80qqaq3zyh";
+    sha256 = "11vcqxdgyarv89ijd46wzrdl2wk7xjirg7ynlz7r0smdcqrcl711";
   };
 
   meta = oldAttrs.meta // {
-- 
GitLab


From 717206010fae20bcdb5ff2b523cfceb7f68f03bf Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 27 Oct 2018 13:16:30 +0300
Subject: [PATCH 0459/1065] nixos/installer: Drop extra copy of w3m

The nixos-manual service already uses w3m-nographics for a variant that
drops unnecessary junk like various image libraries.

iso_minimal closure (i.e. uncompressed) goes from 1884M -> 1837M.
---
 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 5aaffa4f1f2..3f2c420a2be 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -7,7 +7,7 @@
   # Include some utilities that are useful for installing or repairing
   # the system.
   environment.systemPackages = [
-    pkgs.w3m-nox # needed for the manual anyway
+    pkgs.w3m-nographics # needed for the manual anyway
     pkgs.testdisk # useful for repairing boot problems
     pkgs.ms-sys # for writing Microsoft boot sectors / MBRs
     pkgs.efibootmgr
-- 
GitLab


From e118a0fa1f003faa4606f90c9f463a8990360abd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 03:33:23 -0700
Subject: [PATCH 0460/1065] mysql-workbench: 8.0.12 -> 8.0.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/mysql-workbench/versions
---
 pkgs/applications/misc/mysql-workbench/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 7068d8aedd3..daeb8b159f7 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -13,12 +13,12 @@ let
   inherit (python2.pkgs) paramiko pycairo pyodbc;
 in stdenv.mkDerivation rec {
   pname = "mysql-workbench";
-  version = "8.0.12";
+  version = "8.0.13";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
-    sha256 = "0d6k1kw0bi3q5dlilzlgds1gcrlf7pis4asm3d6pssh2jmn5hh82";
+    sha256 = "1p4xy2a5cin1l06j4ixpgp1ynhjdj5gax4fjhznspch3c63jp9hj";
   };
 
   patches = [
-- 
GitLab


From 1795ca14c36575b16ae4de92b8443fdd145d44ff Mon Sep 17 00:00:00 2001
From: Michael Bishop <michael.bishop@iohk.io>
Date: Sat, 27 Oct 2018 08:15:31 -0300
Subject: [PATCH 0461/1065] wireshark: include headers in wireshark.dev, to
 support building wireshark plugins

---
 .../networking/sniffers/wireshark/default.nix         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 753defb0b4f..5d82b117486 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -17,6 +17,7 @@ let
 
 in stdenv.mkDerivation {
   name = "wireshark-${variant}-${version}";
+  outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
@@ -87,6 +88,16 @@ in stdenv.mkDerivation {
       --replace "Exec=wireshark" "Exec=$out/bin/wireshark"
 
     install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg
+    mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv
+
+    cp config.h $dev/include/
+    cp ../ws_*.h $dev/include
+    cp ../epan/*.h $dev/include/epan/
+    cp ../epan/wmem/*.h $dev/include/epan/wmem/
+    cp ../epan/ftypes/*.h $dev/include/epan/ftypes/
+    cp ../epan/dfilter/*.h $dev/include/epan/dfilter/
+    cp ../wsutil/*.h $dev/include/wsutil/
+    cp ../wiretap/*.h $dev/include/wiretap
   '';
 
   enableParallelBuilding = true;
-- 
GitLab


From 62c860efd7de7afd6cdcc479383570304d30a488 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 04:17:58 -0700
Subject: [PATCH 0462/1065] miller: 5.3.0 -> 5.4.0 (#49239)

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

diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix
index a17c348c4cc..3e0bee3b9b9 100644
--- a/pkgs/tools/text/miller/default.nix
+++ b/pkgs/tools/text/miller/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "miller-${version}";
 
-  version = "5.3.0";
+  version = "5.4.0";
 
   src = fetchFromGitHub {
     owner = "johnkerl";
     repo = "miller";
     rev = "${version}";
-    sha256 = "0abw2n6mi4wbgwihcv3y2xccqx4sj0gdgwvdrg2jkcgraa78sw8v";
+    sha256 = "0158by642frh9x6rrgqxwmk4766wb36kp0rrjg5swdbs9w3is3xg";
   };
 
   nativeBuildInputs = [ autoreconfHook flex libtool ];
-- 
GitLab


From 5bccc53a50cecbb01964d91355c929b690916994 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 04:21:11 -0700
Subject: [PATCH 0463/1065] lighttpd: 1.4.50 -> 1.4.51 (#49238)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lighttpd/versions
---
 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 65679e4ac86..9503fd14907 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.50";
+  name = "lighttpd-1.4.51";
 
   src = fetchurl {
     url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "1sr9avcnld22a5wl5s8vgrz8r86mybggm9z8zwabqz48v0986dr9";
+    sha256 = "10lw9vvivpvf4aw7ajayb2yyq4lp4dq3gq9llszjbw6icnrgvy9a";
   };
 
   postPatch = ''
-- 
GitLab


From d4029e79354c30a6f9a16142b9c32d037d6e689c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 04:29:13 -0700
Subject: [PATCH 0464/1065] matomo: 3.6.0 -> 3.6.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/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 1fb8f4b1221..474a5b65b30 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.0";
+  version = "3.6.1";
 
   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 = "1bkxa163s420w579ma7sbab1nm8c6ca6r6irn200j7p1r5zjklp8";
+    sha256 = "0hddj1gyyriwgsh1mghihck2i7rj6gvb1i0b2ripcdfjnxcs47hz";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 642943d584069aa7218f15729b76aa2b62580e10 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 04:30:07 -0700
Subject: [PATCH 0465/1065] minizinc: 2.2.0 -> 2.2.1 (#49241)

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

diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix
index 8c210cb9360..59f60d4046a 100644
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/pkgs/development/tools/minizinc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, flex, bison }:
 let
-  version = "2.2.0";
+  version = "2.2.1";
 in
 stdenv.mkDerivation {
   name = "minizinc-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     rev = "${version}";
     owner = "MiniZinc";
     repo = "libminizinc";
-    sha256 = "05is1r5y06jfqwvka90dn2ffxnvbgyswaxl00aqz6455hnggnxvm";
+    sha256 = "1i11lan7fqs3lg0s6jfr8sflzwn5nk1ln5j6afjrkrdb08291dr7";
   };
 
   # meta is all the information about the package..
-- 
GitLab


From d50e2c4fd0522c8ba436533167a7d855feeb9897 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Sat, 27 Oct 2018 13:31:15 +0200
Subject: [PATCH 0466/1065] alsaUtils: 1.1.6 -> 1.1.7 (#49237)

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

diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index 60e3b9750d7..c9cf1291267 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "alsa-utils-${version}";
-  version = "1.1.6";
+  version = "1.1.7";
 
   src = fetchurl {
     url = "mirror://alsa/utils/${name}.tar.bz2";
-    sha256 = "0vnkyymgwj9rfdb11nvab30dnfrylmakdfildxl0y8mj836awp0m";
+    sha256 = "02jlw6a22j2rr7inggfgk2hzx3w0fjhvhs0dn1afpzdp9aspzchx";
   };
 
   patchPhase = ''
-- 
GitLab


From a4ddc03160c008f3a050e1b267cb7638503d9019 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Sat, 27 Oct 2018 13:31:31 +0200
Subject: [PATCH 0467/1065] alsaTools: 1.1.6 -> 1.1.7 (#49236)

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

diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix
index 8faba250fb3..14b10e6752b 100644
--- a/pkgs/os-specific/linux/alsa-tools/default.nix
+++ b/pkgs/os-specific/linux/alsa-tools/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "alsa-tools-${version}";
-  version = "1.1.6";
+  version = "1.1.7";
 
   src = fetchurl {
     url = "mirror://alsa/tools/${name}.tar.bz2";
-    sha256 = "09rjb6hw1mn9y1jfdfj5djncgc2cr5wfps83k56rf6k4zg14v76n";
+    sha256 = "1xjfghr9s0j6n91kgs95cc4r6qrjsgc4yj2w0nir3xpnm0l36950";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 9f0381d4970acd24c22a6fac8d21b4d61345d38c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 05:11:57 -0700
Subject: [PATCH 0468/1065] sfml: 2.5.0 -> 2.5.1 (#48907)

* sfml: 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/sfml/versions

* sfml: cmake is only needed at build time

Moved cmake from buildInputs to nativeBuildInputs

* sfml: use fetchzip instead of fetchurl

Don't use fetchurl for changing GitHub archive tarballs
---
 pkgs/development/libraries/sfml/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 03a801a3240..37ef0ce7527 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -1,26 +1,31 @@
-{ stdenv, fetchurl, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
+{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
 , glew, libXrandr, libXrender, udev, xcbutilimage
 , IOKit, Foundation, AppKit, OpenAL
 }:
 
 let
-  version = "2.5.0";
+  version = "2.5.1";
 in
 
 stdenv.mkDerivation rec {
   name = "sfml-${version}";
-  src = fetchurl {
+
+  src = fetchzip {
     url = "https://github.com/SFML/SFML/archive/${version}.tar.gz";
-    sha256 = "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab";
+    sha256 = "0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay";
   };
-  buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew
                   libXrandr libXrender xcbutilimage
                 ] ++ stdenv.lib.optional stdenv.isLinux udev
                   ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
+
   cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
                  "-DSFML_MISC_INSTALL_PREFIX=share/SFML"
                  "-DSFML_BUILD_FRAMEWORKS=no"
                  "-DSFML_USE_SYSTEM_DEPS=yes" ];
+
   meta = with stdenv.lib; {
     homepage = http://www.sfml-dev.org/;
     description = "Simple and fast multimedia library";
-- 
GitLab


From cc92fc0a83690767d7dd397f2bba07872613e08d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 27 Oct 2018 13:42:03 +0300
Subject: [PATCH 0469/1065] nixos/installation-device: Move systemPackages
 additions to profiles/base

Other package additions are there as well.
---
 nixos/modules/profiles/base.nix                | 3 +++
 nixos/modules/profiles/installation-device.nix | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 3f2c420a2be..7e14b0e2114 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -19,6 +19,9 @@
     pkgs.cryptsetup # needed for dm-crypt volumes
     pkgs.mkpasswd # for generating password files
 
+    # Some text editors.
+    pkgs.vim
+
     # Some networking tools.
     pkgs.fuse
     pkgs.fuse3
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index d51ed195580..370db2b0845 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -87,9 +87,6 @@ with lib;
     # console less cumbersome if the machine has a public IP.
     networking.firewall.logRefusedConnections = mkDefault false;
 
-    environment.systemPackages = [ pkgs.vim ];
-
-
     # Allow the user to log in as root without a password.
     users.users.root.initialHashedPassword = "";
   };
-- 
GitLab


From ad7f2d120e49651f7d527bfb77a85fcae063ca4b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 27 Oct 2018 15:12:51 +0300
Subject: [PATCH 0470/1065] nixos/installation-cd-minimal: Drop fontconfig

Shouldn't be needed for anything.
---
 nixos/modules/installer/cd-dvd/installation-cd-minimal.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
index 3dc0f606bf6..bcdbffdc20b 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -7,4 +7,6 @@
   imports =
     [ ./installation-cd-base.nix
     ];
+
+  fonts.fontconfig.enable = false;
 }
-- 
GitLab


From e310622999946e940096e68031388fcf06fed924 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 27 Oct 2018 15:14:50 +0300
Subject: [PATCH 0471/1065] spidermonkey_52: Split into multiple outputs (and
 nuke static lib)

Saves 28M.
---
 pkgs/development/interpreters/spidermonkey/52.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index 7c6844fdec0..ea96e5ed334 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -10,6 +10,9 @@ in stdenv.mkDerivation rec {
     sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0";
   };
 
+  outputs = [ "out" "dev" ];
+  setOutputFlags = false; # Configure script only understands --includedir
+
   buildInputs = [ readline icu zlib nspr ];
   nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
 
@@ -32,6 +35,7 @@ in stdenv.mkDerivation rec {
     export CXXFLAGS="-fpermissive"
     export LIBXUL_DIST=$out
     export PYTHON="${python2.interpreter}"
+    configureFlagsArray+=("--includedir=$dev/include")
 
     cd js/src
 
@@ -49,6 +53,12 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    moveToOutput bin/js52-config "$dev"
+    # Nuke a static lib.
+    rm $out/lib/libjs_static.ajs
+  '';
+
   meta = with stdenv.lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
     homepage = https://developer.mozilla.org/en/SpiderMonkey;
-- 
GitLab


From 25137473565f7dd76d6b43fb275d7567fbd277fe Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 27 Oct 2018 13:27:25 +0200
Subject: [PATCH 0472/1065] sage: fix attrname

This is a minimal change mainly to make sure repology recognizes this
package as sage. I plan a bit more refactoring later, but this is
intentionally kept minimally invasive so that it won't break anything
and can be backported to 18.09.
---
 pkgs/applications/science/math/sage/sage-wrapper.nix | 2 +-
 pkgs/applications/science/math/sage/sage.nix         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-wrapper.nix b/pkgs/applications/science/math/sage/sage-wrapper.nix
index 06b667f426f..4b2f9c461c1 100644
--- a/pkgs/applications/science/math/sage/sage-wrapper.nix
+++ b/pkgs/applications/science/math/sage/sage-wrapper.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   version = sage.version;
-  name = "sage-wrapper-${version}";
+  name = "sage-${version}";
 
   buildInputs = [
     makeWrapper
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix
index b1e5d7278b0..ad9a32e0ca5 100644
--- a/pkgs/applications/science/math/sage/sage.nix
+++ b/pkgs/applications/science/math/sage/sage.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   version = sage-with-env.version;
-  name = "sage-${version}";
+  name = "sage-tests-${version}";
 
   buildInputs = [
     makeWrapper
-- 
GitLab


From 80833d13feb586a5799bad5aacfb106fd3fbf0f1 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 27 Oct 2018 14:08:35 +0200
Subject: [PATCH 0473/1065] sage: add sagemath alias

Sage is commonly referred to as sagemath (probably to improve
searchability). Many other distors call their package sagemath.
---
 pkgs/top-level/aliases.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4a8c4f1334d..444028d2db0 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -250,6 +250,7 @@ mapAliases ({
   s6Networking = s6-networking; # added 2018-07-23
   s6LinuxUtils = s6-linux-utils; # added 2018-07-23
   s6PortableUtils = s6-portable-utils; # added 2018-07-23
+  sagemath = sage; # added 2018-10-27
   sam = deadpixi-sam; # added 2018-04-25
   samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
   saneBackends = sane-backends; # added 2016-01-02
-- 
GitLab


From 473c890034e8d25278a52157ce230b77c82f3116 Mon Sep 17 00:00:00 2001
From: David Costa <david@zarel.net>
Date: Sat, 27 Oct 2018 13:25:16 +0100
Subject: [PATCH 0474/1065] crystal: fix "play" subcommand
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Merlin Göttlinger <megoettlinger@gmail.com>
---
 pkgs/development/compilers/crystal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 0648a245a4c..51cea9810bc 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
 , gmp, openssl, readline, tzdata, libxml2, libyaml
-, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which }:
+, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib }:
 
 let
   binaryVersion = "0.26.0";
@@ -57,7 +57,7 @@ let
 
     buildInputs = [
       boehmgc libatomic_ops pcre libevent
-      llvm
+      llvm zlib openssl
     ] ++ stdenv.lib.optionals stdenv.isDarwin [
       libiconv
     ];
-- 
GitLab


From 9bf79add1380b436d8cf7bb885095cd1a7bcfca0 Mon Sep 17 00:00:00 2001
From: royneary <christian@ulrich.earth>
Date: Sat, 27 Oct 2018 14:30:21 +0200
Subject: [PATCH 0475/1065]  nim: 0.18.0 -> 0.19.0

- remove sqlite as dependency (I don't see why it's needed)
- run checkPhase after installPhase (at least one test assumes the
standard library in ../lib relative to the nim binary)
- the broken tests pass now or don't exist anymore
- two of the tests requiring network access pass now without network access
- the tests in manyloc do not download dependencies and are passing now
---
 pkgs/development/compilers/nim/default.nix | 32 ++++++++--------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index a4b706d35aa..0d06f847ddf 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,14 +1,14 @@
 # based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml
 
-{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-8_x, openssl, pcre, readline, sqlite, boehmgc, sfml, tzdata, coreutils }:
+{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-8_x, openssl, pcre, readline, boehmgc, sfml, tzdata, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "nim-${version}";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchurl {
     url = "https://nim-lang.org/download/${name}.tar.xz";
-    sha256 = "45c74adb35f08dfa9add1112ae17330e5d902ebb4a36e7046caee8b79e6f3bd0";
+    sha256 = "0biwvw1gividp5lkf0daq1wp9v6ms4xy6dkf5zj0sn9w4m3n76d1";
   };
 
   doCheck = !stdenv.isDarwin;
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
     "-lcrypto"
     "-lpcre"
     "-lreadline"
-    "-lsqlite3"
     "-lgc"
   ];
 
@@ -30,10 +29,16 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     makeWrapper nodejs-slim-8_x tzdata coreutils
-    openssl pcre readline sqlite boehmgc sfml
+    openssl pcre readline boehmgc sfml
   ];
 
+  phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" "checkPhase" ];
+
   buildPhase = ''
+    # use gcc to trigger the linker since calling ld in build.sh causes an error 
+    LD=gcc
+    # build.sh wants to write to $HOME/.cache
+    HOME=$TMPDIR
     sh build.sh
     ./bin/nim c koch
     ./koch boot  -d:release \
@@ -51,7 +56,7 @@ stdenv.mkDerivation rec {
       --suffix PATH : ${lib.makeBinPath [ stdenv.cc ]}
   '';
 
-  postPatch =
+  patchPhase =
     let disableTest = ''sed -i '1i discard \"\"\"\n  disabled: true\n\"\"\"\n\n' '';
         disableCompile = ''sed -i -e 's/^/#/' '';
     in ''
@@ -59,25 +64,12 @@ stdenv.mkDerivation rec {
       substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin"
       substituteInPlace ./tests/stdlib/ttimes.nim --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
 
-      # disable supposedly broken tests
-      ${disableTest} ./tests/errmsgs/tproper_stacktrace2.nim
-      ${disableTest} ./tests/vm/trgba.nim
-
       # disable tests requiring network access (not available in the build container)
       ${disableTest} ./tests/stdlib/thttpclient.nim
-      ${disableTest} ./tests/cpp/tasync_cpp.nim
-      ${disableTest} ./tests/niminaction/Chapter7/Tweeter/src/tweeter.nim
-
-      # disable tests requiring un-downloadable dependencies (using nimble, which isn't available in the fetch phase)
-      ${disableCompile} ./tests/manyloc/keineschweine/keineschweine.nim
-      ${disableTest} ./tests/manyloc/keineschweine/keineschweine.nim
-      ${disableCompile} ./tests/manyloc/nake/nakefile.nim
-      ${disableTest} ./tests/manyloc/nake/nakefile.nim
-      ${disableCompile} ./tests/manyloc/named_argument_bug/main.nim
-      ${disableTest} ./tests/manyloc/named_argument_bug/main.nim
     '';
 
   checkPhase = ''
+    PATH=$PATH:$out/bin
     ./koch tests
   '';
 
-- 
GitLab


From c8f1b833073e4d9ad758dc620fbb660051f144b2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 05:31:32 -0700
Subject: [PATCH 0476/1065] python36Packages.aiohttp: 3.3.2 -> 3.4.4 (#49024)

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-aiohttp/versions
---
 pkgs/development/python-modules/aiohttp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index ec76d840a56..14fca8dfe82 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -18,11 +18,11 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.3.2";
+  version = "3.4.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12";
+    sha256 = "1ykm6kdjkrg556j0zd7dx2l1rsrbh0d9g27ivr6dmaahz9pyrbsi";
   };
 
   disabled = pythonOlder "3.5";
-- 
GitLab


From ad24d00e5f08d6137df2b41c07873f207d7dd3b1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 05:33:42 -0700
Subject: [PATCH 0477/1065] python36Packages.aniso8601: 3.0.2 -> 4.0.1 (#49181)

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-aniso8601/versions
---
 pkgs/development/python-modules/aniso8601/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix
index b8ee673e66b..163e2c9b209 100644
--- a/pkgs/development/python-modules/aniso8601/default.nix
+++ b/pkgs/development/python-modules/aniso8601/default.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "aniso8601";
-  version = "3.0.2";
+  version = "4.0.1";
 
   meta = with stdenv.lib; {
     description = "Parses ISO 8601 strings.";
@@ -15,6 +15,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7849749cf00ae0680ad2bdfe4419c7a662bef19c03691a19e008c8b9a5267802";
+    sha256 = "15cwnadw2xdczdi13k9grrgqq67hxgys4l155dqsl2zh3glhsmp7";
   };
 }
-- 
GitLab


From 6540ec6e75c6e51236acd5198df1e7b5d830b247 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 05:45:36 -0700
Subject: [PATCH 0478/1065] python36Packages.djangorestframework: 3.8.2 ->
 3.9.0 (#49172)

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-djangorestframework/versions
---
 .../python-modules/djangorestframework/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index 18372fc113a..d75fc90eda7 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi, django }:
 buildPythonPackage rec {
-  version = "3.8.2";
+  version = "3.9.0";
   pname = "djangorestframework";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b6714c3e4b0f8d524f193c91ecf5f5450092c2145439ac2769711f7eba89a9d9";
+    sha256 = "0dk1r2qiifws4bb2pq8xk5dbsrhli0fi14iqg59v360mpfq6ay30";
   };
 
   # Test settings are missing
-- 
GitLab


From 50c4d94fc5c87532f704d7e70ef347410a67254a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 05:47:50 -0700
Subject: [PATCH 0479/1065] python36Packages.praw: 5.4.0 -> 6.0.0 (#49166)

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-praw/versions
---
 pkgs/development/python-modules/praw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix
index 8f43cbfb4a8..f8f3d5458a0 100644
--- a/pkgs/development/python-modules/praw/default.nix
+++ b/pkgs/development/python-modules/praw/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "praw";
-  version = "5.4.0";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "praw-dev";
     repo = "praw";
     rev = "v${version}";
-    sha256 = "13vbh2r952ai2m6sc79psfwaj5fc8cssdg2pqpizg2mwd0l1s6lb";
+    sha256 = "0y6nyz8vf98gl1qfmnznv3dbvlbzdl6mz99vk673nyfn3hbs451i";
   };
 
   postPatch = ''
-- 
GitLab


From 2da483c2395520ddb336842051faab1a194b05a6 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Sat, 27 Oct 2018 15:01:30 +0200
Subject: [PATCH 0480/1065] pythonPackages.phonenumbers: 8.9.15 -> 8.9.16
 (#49159)

---
 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 01c387928f5..915c48f069a 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.9.15";
+  version = "8.9.16";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8e9664ce0a838c81f4fb3e4d271c76859d26bde57242d64fe1632ab636f5319f";
+    sha256 = "1camfcbvbl0xljxmd4h8smcfg3ris19jjznjv5zcbrxr28fafq74";
   };
 
   meta = {
-- 
GitLab


From c77a322edb995bd6cff3bf4c41b779f4ccb7931d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 06:08:45 -0700
Subject: [PATCH 0481/1065] python36Packages.grip: 4.4.0 -> 4.5.2 (#49050)

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-grip/versions
---
 pkgs/development/python-modules/grip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix
index c11bcaa5baa..d812d58b74c 100644
--- a/pkgs/development/python-modules/grip/default.nix
+++ b/pkgs/development/python-modules/grip/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "grip";
-  version = "4.4.0";
+  version = "4.5.2";
 
   src = fetchFromGitHub {
     owner = "joeyespo";
     repo = "grip";
     rev = "v${version}";
-    sha256 = "1768n3w40qg1njkzqjyl5gkva0h31k8h250821v69imj1zimymag";
+    sha256 = "0hphplnyi903jx7ghfxplg1qlj2kpcav1frr2js7p45pbh5ib9rm";
   };
 
   patches = [
-- 
GitLab


From 4b60f4c55f801dfac70a48106a79a4b21b418cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Sat, 27 Oct 2018 15:11:53 +0200
Subject: [PATCH 0482/1065] home-assistant: 0.80.3 -> 0.81.0 (#49251)

* python3.pkgs.async-timeout: 3.0.0 -> 3.0.1

* home-assistant: 0.80.3 -> 0.81.0
---
 .../python-modules/async_timeout/default.nix  |  4 +-
 .../home-assistant/component-packages.nix     | 60 +++++++++++++++----
 pkgs/servers/home-assistant/default.nix       |  6 +-
 pkgs/servers/home-assistant/frontend.nix      |  4 +-
 4 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix
index ee15be95418..aabf30183d5 100644
--- a/pkgs/development/python-modules/async_timeout/default.nix
+++ b/pkgs/development/python-modules/async_timeout/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "async-timeout";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b3c0ddc416736619bd4a95ca31de8da6920c3b9a140c64dbef2b2fa7bf521287";
+    sha256 = "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f";
   };
 
   # Circular dependency on aiohttp
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index f1ee1eda95d..6ad3facc071 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.80.3";
+  version = "0.81.0";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
@@ -16,6 +16,7 @@
     "alarm_control_panel.concord232" = ps: with ps; [  ];
     "alarm_control_panel.demo" = ps: with ps; [  ];
     "alarm_control_panel.egardia" = ps: with ps; [  ];
+    "alarm_control_panel.elkm1" = ps: with ps; [  ];
     "alarm_control_panel.envisalink" = ps: with ps; [  ];
     "alarm_control_panel.homematicip_cloud" = ps: with ps; [  ];
     "alarm_control_panel.ialarm" = ps: with ps; [  ];
@@ -54,6 +55,7 @@
     "auth.mfa_setup_flow" = ps: with ps; [  ];
     "automation" = ps: with ps; [  ];
     "automation.event" = ps: with ps; [  ];
+    "automation.geo_location" = ps: with ps; [  ];
     "automation.homeassistant" = ps: with ps; [  ];
     "automation.litejet" = ps: with ps; [  ];
     "automation.mqtt" = ps: with ps; [ paho-mqtt ];
@@ -118,6 +120,7 @@
     "binary_sensor.netatmo" = ps: with ps; [  ];
     "binary_sensor.nx584" = ps: with ps; [  ];
     "binary_sensor.octoprint" = ps: with ps; [  ];
+    "binary_sensor.opentherm_gw" = ps: with ps; [  ];
     "binary_sensor.openuv" = ps: with ps; [  ];
     "binary_sensor.pilight" = ps: with ps; [  ];
     "binary_sensor.ping" = ps: with ps; [  ];
@@ -128,6 +131,7 @@
     "binary_sensor.random" = ps: with ps; [  ];
     "binary_sensor.raspihats" = ps: with ps; [  ];
     "binary_sensor.rest" = ps: with ps; [  ];
+    "binary_sensor.rflink" = ps: with ps; [  ];
     "binary_sensor.rfxtrx" = ps: with ps; [  ];
     "binary_sensor.ring" = ps: with ps; [  ];
     "binary_sensor.rpi_gpio" = ps: with ps; [  ];
@@ -209,8 +213,9 @@
     "climate" = ps: with ps; [  ];
     "climate.daikin" = ps: with ps; [  ];
     "climate.demo" = ps: with ps; [  ];
+    "climate.dyson" = ps: with ps; [  ];
     "climate.ecobee" = ps: with ps; [  ];
-    "climate.econet" = ps: with ps; [  ];
+    "climate.elkm1" = ps: with ps; [  ];
     "climate.ephember" = ps: with ps; [  ];
     "climate.eq3btsmart" = ps: with ps; [ construct ];
     "climate.evohome" = ps: with ps; [  ];
@@ -226,6 +231,7 @@
     "climate.knx" = ps: with ps; [  ];
     "climate.maxcube" = ps: with ps; [  ];
     "climate.melissa" = ps: with ps; [  ];
+    "climate.mill" = ps: with ps; [  ];
     "climate.modbus" = ps: with ps; [  ];
     "climate.mqtt" = ps: with ps; [ paho-mqtt ];
     "climate.mysensors" = ps: with ps; [  ];
@@ -295,7 +301,6 @@
     "cover.rflink" = ps: with ps; [  ];
     "cover.rfxtrx" = ps: with ps; [  ];
     "cover.rpi_gpio" = ps: with ps; [  ];
-    "cover.ryobi_gdo" = ps: with ps; [  ];
     "cover.scsgate" = ps: with ps; [  ];
     "cover.tahoma" = ps: with ps; [  ];
     "cover.tellduslive" = ps: with ps; [  ];
@@ -351,6 +356,7 @@
     "device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ];
     "device_tracker.owntracks_http" = 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; [  ];
     "device_tracker.sky_hub" = ps: with ps; [  ];
     "device_tracker.snmp" = ps: with ps; [ pysnmp ];
@@ -383,6 +389,7 @@
     "edp_redy" = ps: with ps; [  ];
     "egardia" = ps: with ps; [  ];
     "eight_sleep" = ps: with ps; [  ];
+    "elkm1" = ps: with ps; [  ];
     "emoncms_history" = ps: with ps; [  ];
     "emulated_hue" = ps: with ps; [ aiohttp-cors ];
     "emulated_hue.hue_api" = ps: with ps; [  ];
@@ -410,11 +417,12 @@
     "foursquare" = ps: with ps; [ aiohttp-cors ];
     "freedns" = ps: with ps; [  ];
     "fritzbox" = ps: with ps; [  ];
-    "frontend" = ps: with ps; [ aiohttp-cors ];
+    "frontend" = ps: with ps; [ aiohttp-cors ruamel_yaml ];
     "gc100" = ps: with ps; [  ];
     "geo_location" = ps: with ps; [  ];
     "geo_location.demo" = ps: with ps; [  ];
     "geo_location.geo_json_events" = ps: with ps; [  ];
+    "geo_location.nsw_rural_fire_service_feed" = ps: with ps; [  ];
     "goalfeed" = ps: with ps; [  ];
     "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
     "google_assistant" = ps: with ps; [ aiohttp-cors ];
@@ -506,6 +514,7 @@
     "knx" = ps: with ps; [  ];
     "konnected" = ps: with ps; [ aiohttp-cors netdisco ];
     "lametric" = ps: with ps; [  ];
+    "lifx" = ps: with ps; [  ];
     "light" = ps: with ps; [  ];
     "light.abode" = ps: with ps; [  ];
     "light.ads" = ps: with ps; [  ];
@@ -516,6 +525,7 @@
     "light.decora" = ps: with ps; [  ];
     "light.decora_wifi" = ps: with ps; [  ];
     "light.demo" = ps: with ps; [  ];
+    "light.elkm1" = ps: with ps; [  ];
     "light.enocean" = ps: with ps; [  ];
     "light.eufy" = ps: with ps; [  ];
     "light.flux_led" = ps: with ps; [  ];
@@ -593,6 +603,7 @@
     "lock.nello" = ps: with ps; [  ];
     "lock.nuki" = ps: with ps; [  ];
     "lock.sesame" = ps: with ps; [  ];
+    "lock.template" = ps: with ps; [  ];
     "lock.tesla" = ps: with ps; [  ];
     "lock.vera" = ps: with ps; [  ];
     "lock.verisure" = ps: with ps; [  ];
@@ -600,11 +611,11 @@
     "lock.wink" = ps: with ps; [  ];
     "lock.xiaomi_aqara" = ps: with ps; [  ];
     "lock.zwave" = ps: with ps; [  ];
-    "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ];
+    "logbook" = ps: with ps; [ aiohttp-cors ruamel_yaml sqlalchemy ];
     "logentries" = ps: with ps; [  ];
     "logger" = ps: with ps; [  ];
     "logi_circle" = ps: with ps; [  ];
-    "lovelace" = ps: with ps; [  ];
+    "lovelace" = ps: with ps; [ ruamel_yaml ];
     "lutron" = ps: with ps; [  ];
     "lutron_caseta" = ps: with ps; [  ];
     "mailbox" = ps: with ps; [ aiohttp-cors ];
@@ -644,6 +655,7 @@
     "media_player.itunes" = ps: with ps; [  ];
     "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ];
     "media_player.lg_netcast" = ps: with ps; [  ];
+    "media_player.lg_soundbar" = ps: with ps; [  ];
     "media_player.liveboxplaytv" = ps: with ps; [  ];
     "media_player.mediaroom" = ps: with ps; [  ];
     "media_player.monoprice" = ps: with ps; [  ];
@@ -727,7 +739,8 @@
     "notify.group" = ps: with ps; [  ];
     "notify.hangouts" = ps: with ps; [  ];
     "notify.hipchat" = ps: with ps; [  ];
-    "notify.html5" = ps: with ps; [ aiohttp-cors ];
+    "notify.homematic" = ps: with ps; [ pyhomematic ];
+    "notify.html5" = ps: with ps; [ aiohttp-cors ruamel_yaml ];
     "notify.instapush" = ps: with ps; [  ];
     "notify.ios" = ps: with ps; [ aiohttp-cors zeroconf ];
     "notify.joaoapps_join" = ps: with ps; [  ];
@@ -764,7 +777,7 @@
     "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];
     "notify.twitter" = ps: with ps; [  ];
     "notify.webostv" = ps: with ps; [  ];
-    "notify.xmpp" = ps: with ps; [ pyasn1-modules pyasn1 sleekxmpp ];
+    "notify.xmpp" = ps: with ps; [ slixmpp ];
     "notify.yessssms" = ps: with ps; [  ];
     "nuheat" = ps: with ps; [  ];
     "nuimo_controller" = ps: with ps; [  ];
@@ -772,11 +785,12 @@
     "onboarding" = ps: with ps; [ aiohttp-cors ];
     "onboarding.const" = ps: with ps; [  ];
     "onboarding.views" = ps: with ps; [  ];
+    "opentherm_gw" = ps: with ps; [  ];
     "openuv" = ps: with ps; [  ];
     "openuv.config_flow" = ps: with ps; [  ];
     "openuv.const" = ps: with ps; [  ];
-    "panel_custom" = ps: with ps; [ aiohttp-cors ];
-    "panel_iframe" = ps: with ps; [ aiohttp-cors ];
+    "panel_custom" = ps: with ps; [ aiohttp-cors ruamel_yaml ];
+    "panel_iframe" = ps: with ps; [ aiohttp-cors ruamel_yaml ];
     "persistent_notification" = ps: with ps; [  ];
     "pilight" = ps: with ps; [  ];
     "plant" = ps: with ps; [  ];
@@ -806,6 +820,7 @@
     "rflink" = ps: with ps; [  ];
     "rfxtrx" = ps: with ps; [  ];
     "ring" = ps: with ps; [  ];
+    "route53" = ps: with ps; [ boto3 ];
     "rpi_gpio" = ps: with ps; [  ];
     "rpi_pfio" = ps: with ps; [  ];
     "rss_feed_template" = ps: with ps; [ aiohttp-cors ];
@@ -813,6 +828,7 @@
     "satel_integra" = ps: with ps; [  ];
     "scene" = ps: with ps; [  ];
     "scene.deconz" = ps: with ps; [  ];
+    "scene.elkm1" = ps: with ps; [  ];
     "scene.homeassistant" = ps: with ps; [  ];
     "scene.hunterdouglas_powerview" = ps: with ps; [  ];
     "scene.knx" = ps: with ps; [  ];
@@ -889,6 +905,7 @@
     "sensor.efergy" = ps: with ps; [  ];
     "sensor.eight_sleep" = ps: with ps; [  ];
     "sensor.eliqonline" = ps: with ps; [  ];
+    "sensor.elkm1" = ps: with ps; [  ];
     "sensor.emoncms" = ps: with ps; [  ];
     "sensor.enocean" = ps: with ps; [  ];
     "sensor.enphase_envoy" = ps: with ps; [  ];
@@ -992,6 +1009,7 @@
     "sensor.openexchangerates" = ps: with ps; [  ];
     "sensor.openhardwaremonitor" = ps: with ps; [  ];
     "sensor.opensky" = ps: with ps; [  ];
+    "sensor.opentherm_gw" = ps: with ps; [  ];
     "sensor.openuv" = ps: with ps; [  ];
     "sensor.openweathermap" = ps: with ps; [ pyowm ];
     "sensor.otp" = ps: with ps; [ pyotp ];
@@ -1017,6 +1035,7 @@
     "sensor.ring" = ps: with ps; [  ];
     "sensor.ripple" = ps: with ps; [  ];
     "sensor.rmvtransport" = ps: with ps; [  ];
+    "sensor.rtorrent" = ps: with ps; [  ];
     "sensor.sabnzbd" = ps: with ps; [  ];
     "sensor.scrape" = ps: with ps; [ beautifulsoup4 ];
     "sensor.season" = ps: with ps; [ ephem ];
@@ -1062,6 +1081,7 @@
     "sensor.temper" = ps: with ps; [  ];
     "sensor.template" = ps: with ps; [  ];
     "sensor.tesla" = ps: with ps; [  ];
+    "sensor.thermoworks_smoke" = ps: with ps; [  ];
     "sensor.thethingsnetwork" = ps: with ps; [  ];
     "sensor.thinkingcleaner" = ps: with ps; [  ];
     "sensor.tibber" = ps: with ps; [  ];
@@ -1071,6 +1091,7 @@
     "sensor.tradfri" = ps: with ps; [  ];
     "sensor.trafikverket_weatherstation" = ps: with ps; [  ];
     "sensor.transmission" = ps: with ps; [ transmissionrpc ];
+    "sensor.transport_nsw" = ps: with ps; [  ];
     "sensor.travisci" = ps: with ps; [  ];
     "sensor.twitch" = ps: with ps; [  ];
     "sensor.uber" = ps: with ps; [  ];
@@ -1116,10 +1137,16 @@
     "shell_command" = ps: with ps; [  ];
     "shiftr" = ps: with ps; [ paho-mqtt ];
     "shopping_list" = ps: with ps; [ aiohttp-cors ];
+    "simplisafe" = ps: with ps; [  ];
+    "simplisafe.config_flow" = ps: with ps; [  ];
+    "simplisafe.const" = ps: with ps; [  ];
     "sisyphus" = ps: with ps; [  ];
     "skybell" = ps: with ps; [  ];
     "sleepiq" = ps: with ps; [  ];
     "smappee" = ps: with ps; [  ];
+    "smhi" = ps: with ps; [  ];
+    "smhi.config_flow" = ps: with ps; [  ];
+    "smhi.const" = ps: with ps; [  ];
     "snips" = ps: with ps; [ paho-mqtt ];
     "sonos" = ps: with ps; [  ];
     "spaceapi" = ps: with ps; [ aiohttp-cors ];
@@ -1150,6 +1177,7 @@
     "switch.doorbird" = ps: with ps; [  ];
     "switch.edimax" = ps: with ps; [  ];
     "switch.edp_redy" = ps: with ps; [  ];
+    "switch.elkm1" = ps: with ps; [  ];
     "switch.enocean" = ps: with ps; [  ];
     "switch.eufy" = ps: with ps; [  ];
     "switch.flux" = ps: with ps; [  ];
@@ -1190,6 +1218,7 @@
     "switch.raincloud" = ps: with ps; [  ];
     "switch.rainmachine" = ps: with ps; [  ];
     "switch.raspihats" = ps: with ps; [  ];
+    "switch.recswitch" = ps: with ps; [  ];
     "switch.rest" = ps: with ps; [  ];
     "switch.rflink" = ps: with ps; [  ];
     "switch.rfxtrx" = ps: with ps; [  ];
@@ -1215,6 +1244,7 @@
     "switch.tradfri" = ps: with ps; [  ];
     "switch.transmission" = ps: with ps; [ transmissionrpc ];
     "switch.tuya" = ps: with ps; [  ];
+    "switch.unifi" = ps: with ps; [  ];
     "switch.upcloud" = ps: with ps; [  ];
     "switch.velbus" = ps: with ps; [  ];
     "switch.vera" = ps: with ps; [  ];
@@ -1262,6 +1292,10 @@
     "tts.yandextts" = ps: with ps; [  ];
     "tuya" = ps: with ps; [  ];
     "twilio" = ps: with ps; [ aiohttp-cors twilio ];
+    "unifi" = ps: with ps; [  ];
+    "unifi.const" = ps: with ps; [  ];
+    "unifi.controller" = ps: with ps; [  ];
+    "unifi.errors" = ps: with ps; [  ];
     "upcloud" = ps: with ps; [  ];
     "updater" = ps: with ps; [ distro ];
     "upnp" = ps: with ps; [ aiohttp-cors ];
@@ -1284,6 +1318,10 @@
     "volvooncall" = ps: with ps; [  ];
     "vultr" = ps: with ps; [ vultr ];
     "wake_on_lan" = ps: with ps; [ wakeonlan ];
+    "water_heater" = ps: with ps; [  ];
+    "water_heater.demo" = ps: with ps; [  ];
+    "water_heater.econet" = ps: with ps; [  ];
+    "water_heater.wink" = ps: with ps; [  ];
     "waterfurnace" = ps: with ps; [  ];
     "watson_iot" = ps: with ps; [  ];
     "weather" = ps: with ps; [  ];
@@ -1296,6 +1334,7 @@
     "weather.met" = ps: with ps; [  ];
     "weather.metoffice" = ps: with ps; [  ];
     "weather.openweathermap" = ps: with ps; [ pyowm ];
+    "weather.smhi" = ps: with ps; [  ];
     "weather.yweather" = ps: with ps; [ yahooweather ];
     "weather.zamg" = ps: with ps; [  ];
     "webhook" = ps: with ps; [ aiohttp-cors ];
@@ -1324,6 +1363,7 @@
     "zone.zone" = ps: with ps; [  ];
     "zoneminder" = ps: with ps; [  ];
     "zwave" = ps: with ps; [ pydispatcher python_openzwave ];
+    "zwave.config_flow" = ps: with ps; [  ];
     "zwave.const" = ps: with ps; [  ];
     "zwave.discovery_schemas" = ps: with ps; [  ];
     "zwave.node_entity" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 8503b53033c..48ad27c9619 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -22,6 +22,8 @@ let
       "51afec6ffa50a9da4cdef188971a802beb1ca8e8edb40fa429e5e529db3475fa")
     (mkOverride "astral" "1.6.1"
       "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d")
+    (mkOverride "async-timeout" "3.0.1"
+      "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f")
     (mkOverride "attrs" "18.2.0"
       "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69")
     (mkOverride "bcrypt" "3.1.4"
@@ -77,7 +79,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.80.3";
+  hassVersion = "0.81.0";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -92,7 +94,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "0fjkw8kg0vsyrkcrx9jhqrh5nzxx5wphj6zglqgai2d635m8j2dg";
+    sha256 = "05cdx2pax7vx0v7arnciqrq38k2xyiv7iagxd3qs5m6gra72qlqw";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 25a63ef71a9..7bf1e687141 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 = "20181018.0";
+  version = "20181026.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "83f52421056acda8297f174a7c4e3c540109673c2f2c25720638d171c6bc2653";
+    sha256 = "fa877803ec7201a9b2129e96d6c19822cbcb28fa8ad5d422974bd3c872da1531";
   };
 
   propagatedBuildInputs = [ user-agents ];
-- 
GitLab


From 244f27b4becbd281366537f6ad37a2f748f5a355 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 06:15:24 -0700
Subject: [PATCH 0483/1065] altcoins.litecoin: 0.16.2 -> 0.16.3 (#49247)

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

diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index b23f3ad4243..33ac2be1832 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -11,13 +11,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.16.2";
+  version = "0.16.3";
 
   src = fetchFromGitHub {
     owner = "litecoin-project";
     repo = "litecoin";
     rev = "v${version}";
-    sha256 = "0xfwh7cxxz6w8kgr4kl48w3zm81n1hv8fxb5l9zx3460im1ffgy6";
+    sha256 = "0vc184qfdkjky1qffa7309k6973k4197bkzwcmffc9r5sdfhrhkp";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
-- 
GitLab


From baa4483a656a475f144abdfe0c49e278505d3b0d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 06:24:22 -0700
Subject: [PATCH 0484/1065] ocamlPackages.merlin: 3.2.1 -> 3.2.2

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

diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index d74b480c9c5..c15970d3f3e 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -3,7 +3,7 @@
 assert stdenv.lib.versionAtLeast ocaml.version "4.02";
 
 let
-  version = "3.2.1";
+  version = "3.2.2";
 in
 
 stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz";
-    sha256 = "1szv2b7d12ll5n6pvnhlv3a6vnlyrkpya4l9fiyyiwyvgd4xzxwf";
+    sha256 = "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb";
   };
 
   buildInputs = [ ocaml findlib dune yojson ];
-- 
GitLab


From 4b6958173722075ec5c294936e1ab9e1376cb443 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 06:24:37 -0700
Subject: [PATCH 0485/1065] libversion: 2.6.0 -> 2.7.0 (#49244)

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

diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix
index 6e7005195bf..6ca7b11321b 100644
--- a/pkgs/development/libraries/libversion/default.nix
+++ b/pkgs/development/libraries/libversion/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 let
-  version = "2.6.0";
+  version = "2.7.0";
 in
 stdenv.mkDerivation {
   name = "libversion-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     owner = "repology";
     repo = "libversion";
     rev = version;
-    sha256 = "0krhfycva3l4rhac5kx6x1a6fad594i9i77vy52rwn37j62bm601";
+    sha256 = "0brk2mbazc7yz0h4zsvbybbaymf497dgxnc74qihnvbi4z4rlqpj";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 219c77bf9b2578c6dd9849841e1d3604ac1143b9 Mon Sep 17 00:00:00 2001
From: Henry <cryptix@riseup.net>
Date: Sat, 13 Oct 2018 14:46:39 +0200
Subject: [PATCH 0486/1065] go-junit-report: init at 2018-06-14 (385fac0ce9a)

---
 .../tools/go-junit-report/default.nix         | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/tools/go-junit-report/default.nix

diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix
new file mode 100644
index 00000000000..5e1a69a1692
--- /dev/null
+++ b/pkgs/development/tools/go-junit-report/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "go-junit-report-unstable-${version}";
+  version = "2018-06-14";
+  rev = "385fac0ced9acaae6dc5b39144194008ded00697";
+
+  goPackagePath = "github.com/jstemmer/go-junit-report";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "jstemmer";
+    repo = "go-junit-report";
+    sha256 = "109zs8wpdmc2ijc2khyqija8imay88ka6v50xvrpnnwnd3ywckxi";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Converts go test output to an xml report, suitable for applications that expect junit xml reports (e.g. Jenkins)";
+    homepage    = "https://${goPackagePath}";
+    maintainers = with maintainers; [ cryptix ];
+    license     = licenses.mit;
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16f1b80eef7..5db4b204a2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6918,6 +6918,8 @@ with pkgs;
 
   go-repo-root = callPackage ../development/tools/go-repo-root { };
 
+  go-junit-report = callPackage ../development/tools/go-junit-report { };
+
   gox = callPackage ../development/tools/gox { };
 
   gprolog = callPackage ../development/compilers/gprolog { };
-- 
GitLab


From 8284f09dcda1cb7b6e70ae34b9fbfd341a96b3a7 Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Sat, 27 Oct 2018 15:18:53 +0200
Subject: [PATCH 0487/1065] bats: add missing grep dependency

---
 pkgs/development/interpreters/bats/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
index 081f1a547d6..85794b09ae0 100644
--- a/pkgs/development/interpreters/bats/default.nix
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ stdenv, fetchzip, gnugrep }:
 
 stdenv.mkDerivation rec {
   name = "bats-${version}";
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz";
   };
 
-  patchPhase = "patchShebangs ./install.sh";
+  patchPhase = ''
+    patchShebangs ./install.sh
+    substituteInPlace ./libexec/bats-core/bats-format-tap-stream --replace grep ${gnugrep}/bin/grep
+  '';
 
   installPhase = "./install.sh $out";
 
-- 
GitLab


From d9423ee4464e02fd90eb2ca6192017a00a0805bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 06:50:57 -0700
Subject: [PATCH 0488/1065] mysql57: 5.7.23 -> 5.7.24 (#49221)

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

diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
index 723b4e4d8d3..b5912dd9ab9 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -7,11 +7,11 @@
 let
 self = stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.7.23";
+  version = "5.7.24";
 
   src = fetchurl {
     url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
-    sha256 = "0rbc3xsc11lq2dm0ip6gxa16c06hi74scb97x5cw7yhbabaz4c07";
+    sha256 = "11qz8cc4zyi7sxs66c5zlap6fd3vra1srwgzcxdzhz59qs90rgq5";
   };
 
   preConfigure = stdenv.lib.optional stdenv.isDarwin ''
-- 
GitLab


From 363c9930d70f61f12d145c060419a6f517753b9a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 14:54:53 +0200
Subject: [PATCH 0489/1065] qjson: add meta data

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

diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index 29202396c05..a7077c69dd8 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -13,8 +13,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake qt4 ];
 
-  meta = {
-    maintainers = [ ];
+  meta = with stdenv.lib; {
+    description = "Lightweight data-interchange format";
+    homepage = http://qjson.sourceforge.net/;
+    license = licenses.lgpl21;
     inherit (qt4.meta) platforms;
   };
 }
-- 
GitLab


From 4dc8e779f6ed204f1dfcd8f4eba3d73591fc8f0f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 14:56:07 +0200
Subject: [PATCH 0490/1065] qoauth: add licenes

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

diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix
index d09c0d9a6ce..0d9ae21e87e 100644
--- a/pkgs/development/libraries/qoauth/default.nix
+++ b/pkgs/development/libraries/qoauth/default.nix
@@ -21,9 +21,9 @@ stdenv.mkDerivation {
   NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ];
   NIX_LDFLAGS = [ "-lqca-qt5" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Qt library for OAuth authentication";
     inherit (qt5.qtbase.meta) platforms;
-    maintainers = [ ];
+    license = licenses.lgpl21;
   };
 }
-- 
GitLab


From ef5a7d4eb3e4d5f5dd994ef7437a3050d07f58f2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 14:59:39 +0200
Subject: [PATCH 0491/1065] qrupdate: add meta data

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

diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index c8b01c46080..85e45d3fad0 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -34,7 +34,10 @@ stdenv.mkDerivation {
 
   buildInputs = [ gfortran openblas ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Library for fast updating of qr and cholesky decompositions";
+    homepage = https://sourceforge.net/projects/qrupdate/;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From b8fd2f234c4cb824423a16121b707494d75fbdbb Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:02:30 +0200
Subject: [PATCH 0492/1065] qt-3: add licenses

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

diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 0691f26b471..95b82f8f3cf 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -84,7 +84,8 @@ stdenv.mkDerivation {
 
   passthru = {inherit mysqlSupport;};
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    license = with licenses; [ gpl2 qpl ];
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From e91b5eead6413c831a18bc9849d11b2b38a5e228 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:06:47 +0200
Subject: [PATCH 0493/1065] qt-mobility: add license

---
 pkgs/development/libraries/qt-mobility/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix
index 5cf49450422..ae99035d226 100644
--- a/pkgs/development/libraries/qt-mobility/default.nix
+++ b/pkgs/development/libraries/qt-mobility/default.nix
@@ -42,11 +42,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qt4 libX11 bluez perl ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Qt Mobility";
     homepage = http://qt.nokia.com/products/qt-addons/mobility;
-    maintainers = with stdenv.lib.maintainers; [qknight];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = [ maintainers.qknight ];
+    platforms = platforms.linux;
+    license = with licenses; [ bsd3 fdl13 gpl3 lgpl21 ];
   };
 }
 
-- 
GitLab


From b3a1eb18d3b0ab5ec5f952cbf571bac6ea3fd3db Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:23:35 +0200
Subject: [PATCH 0494/1065] qtscriptgenerator: add license

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

diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix
index 040072cb463..88591e880de 100644
--- a/pkgs/development/libraries/qtscriptgenerator/default.nix
+++ b/pkgs/development/libraries/qtscriptgenerator/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation {
     description = "QtScript bindings generator";
     homepage = https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/;
     inherit (qt4.meta) platforms;
-    maintainers = [ ];
+    license = stdenv.lib.licenses.lgpl21;
   };
 }
-- 
GitLab


From a515ac69aef392cbba422c21cd3616d046d76233 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:25:36 +0200
Subject: [PATCH 0495/1065] readline-5: add license

---
 pkgs/development/libraries/readline/5.x.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix
index 9e7c5c1d4e3..84062408d45 100644
--- a/pkgs/development/libraries/readline/5.x.nix
+++ b/pkgs/development/libraries/readline/5.x.nix
@@ -11,8 +11,10 @@ stdenv.mkDerivation {
   propagatedBuildInputs = [ncurses];
 
   patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
-  meta = {
+
+  meta = with stdenv.lib; {
     branch = "5";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.gpl2;
   };
 }
-- 
GitLab


From 070891ce4359003344c6cc33b302c57dea340242 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:27:09 +0200
Subject: [PATCH 0496/1065] graphite2: add license

---
 pkgs/development/libraries/silgraphite/graphite2.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index dc3f4a118f6..f795dfef9e4 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -18,9 +18,10 @@ stdenv.mkDerivation rec {
   checkInputs = [ python ];
   doCheck = false; # fails, probably missing something
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An advanced font engine";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.unix;
+    license = licenses.lgpl21;
   };
 }
-- 
GitLab


From f32543dbbca15cb5d4493bf33894ec2471bdc6c5 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:29:37 +0200
Subject: [PATCH 0497/1065] sofia-sip: add meta data

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

diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix
index 9fe88b771be..ca2ff666b7a 100644
--- a/pkgs/development/libraries/sofia-sip/default.nix
+++ b/pkgs/development/libraries/sofia-sip/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ glib openssl ];
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
+    homepage = http://sofia-sip.sourceforge.net/;
+    platforms = platforms.linux;
+    license = licenses.lgpl2;
   };
 }
-- 
GitLab


From 6ab64b3db8f41c7d90c30929289a414441fe386f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:33:08 +0200
Subject: [PATCH 0498/1065] t1lib: add meta data

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

diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix
index 8a76e886b4f..b8e7518cd33 100644
--- a/pkgs/development/libraries/t1lib/default.nix
+++ b/pkgs/development/libraries/t1lib/default.nix
@@ -30,7 +30,10 @@ stdenv.mkDerivation {
 
   postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ??
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "A type 1 font rasterizer library for UNIX/X11";
+    homepage = http://www.t1lib.org/;
+    license = with licenses; [ gpl2 lgpl2 ];
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From 0f2d7e51f1a150e8d258752c70c1a0089fa43f86 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:37:35 +0200
Subject: [PATCH 0499/1065] taglib-extras: add license + description

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

diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix
index 0059243890d..b667e604740 100644
--- a/pkgs/development/libraries/taglib-extras/default.nix
+++ b/pkgs/development/libraries/taglib-extras/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
     sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake
   '';
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Additional taglib plugins";
+    platforms = platforms.unix;
+    license = licenses.lgpl2;
   };
 }
-- 
GitLab


From c2a744b9af3bdd5c66b24eec493607948fc0e227 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sat, 27 Oct 2018 16:40:04 +0200
Subject: [PATCH 0500/1065] lib/trivial: Update function comments for doc
 generation

Expands on some of the function comments and add some of the
special syntaxes recognised by nixdoc.
---
 lib/trivial.nix | 117 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 87 insertions(+), 30 deletions(-)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index 938df6ced47..e31cf73d27c 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -9,23 +9,37 @@ rec {
 
      Type: id :: a -> a
   */
-  id = x: x;
+  id =
+    # The value to return
+    x: x;
 
   /* The constant function
-     Ignores the second argument.
-     Or: Construct a function that always returns a static value.
+
+     Ignores the second argument. If called with only one argument,
+     constructs a function that always returns a static value.
 
      Type: const :: a -> b -> a
      Example:
        let f = const 5; in f 10
        => 5
   */
-  const = x: y: x;
+  const =
+    # Value to return
+    x:
+    # Value to ignore
+    y: x;
 
 
   ## Named versions corresponding to some builtin operators.
 
-  /* Concatenate two lists */
+  /* Concatenate two lists
+
+     Type: concat :: [a] -> [a] -> [a]
+
+     Example:
+       concat [ 1 2 ] [ 3 4 ]
+       => [ 1 2 3 4 ]
+  */
   concat = x: y: x ++ y;
 
   /* boolean “or” */
@@ -53,27 +67,40 @@ rec {
   bitNot = builtins.sub (-1);
 
   /* Convert a boolean to a string.
-     Note that toString on a bool returns "1" and "".
+
+     This function uses the strings "true" and "false" to represent
+     boolean values. Calling `toString` on a bool instead returns "1"
+     and "" (sic!).
+
+     Type: boolToString :: bool -> string
   */
   boolToString = b: if b then "true" else "false";
 
   /* Merge two attribute sets shallowly, right side trumps left
 
+     mergeAttrs :: attrs -> attrs -> attrs
+
      Example:
        mergeAttrs { a = 1; b = 2; } { b = 3; c = 4; }
        => { a = 1; b = 3; c = 4; }
   */
-  mergeAttrs = x: y: x // y;
+  mergeAttrs =
+    # Left attribute set
+    x:
+    # Right attribute set (higher precedence for equal keys)
+    y: x // y;
 
   /* Flip the order of the arguments of a binary function.
 
+     Type: flip :: (a -> b -> c) -> (b -> a -> c)
+
      Example:
        flip concat [1] [2]
        => [ 2 1 ]
   */
   flip = f: a: b: f b a;
 
-  /* Apply function if argument is non-null.
+  /* Apply function if the supplied argument is non-null.
 
      Example:
        mapNullable (x: x+1) null
@@ -81,7 +108,11 @@ rec {
        mapNullable (x: x+1) 22
        => 23
   */
-  mapNullable = f: a: if isNull a then a else f a;
+  mapNullable =
+    # Function to call
+    f:
+    # Argument to check for null before passing it to `f`
+    a: if isNull a then a else f a;
 
   # Pull in some builtins not included elsewhere.
   inherit (builtins)
@@ -92,21 +123,27 @@ rec {
 
   ## nixpks version strings
 
-  # The current full nixpkgs version number.
+  /* Returns the current full nixpkgs version number. */
   version = release + versionSuffix;
 
-  # The current nixpkgs version number as string.
+  /* Returns the current nixpkgs release number as string. */
   release = lib.strings.fileContents ../.version;
 
-  # The current nixpkgs version suffix as string.
+  /* Returns the current nixpkgs version suffix as string. */
   versionSuffix =
     let suffixFile = ../.version-suffix;
     in if pathExists suffixFile
     then lib.strings.fileContents suffixFile
     else "pre-git";
 
-  # Attempt to get the revision nixpkgs is from
-  revisionWithDefault = default:
+  /* Attempts to return the the current revision of nixpkgs and
+     returns the supplied default value otherwise.
+
+     Type: revisionWithDefault :: string -> string
+  */
+  revisionWithDefault =
+    # Default value to return if revision can not be determined
+    default:
     let
       revisionFile = "${toString ./..}/.git-revision";
       gitRepo      = "${toString ./..}/.git";
@@ -117,14 +154,20 @@ rec {
 
   nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version;
 
-  # Whether we're being called by nix-shell.
+  /* Determine whether the function is being called from inside a Nix
+     shell.
+
+     Type: inNixShell :: bool
+  */
   inNixShell = builtins.getEnv "IN_NIX_SHELL" != "";
 
 
   ## Integer operations
 
-  # Return minimum/maximum of two numbers.
+  /* Return minimum of two numbers. */
   min = x: y: if x < y then x else y;
+
+  /* Return maximum of two numbers. */
   max = x: y: if x > y then x else y;
 
   /* Integer modulus
@@ -158,8 +201,9 @@ rec {
      second subtype, compare elements of a single subtype with `yes`
      and `no` respectively.
 
-     Example:
+     Type: (a -> bool) -> (a -> a -> int) -> (a -> a -> int) -> (a -> a -> int)
 
+     Example:
        let cmp = splitByAndCompare (hasPrefix "foo") compare compare; in
 
        cmp "a" "z" => -1
@@ -170,31 +214,44 @@ rec {
        # while
        compare "fooa" "a" => 1
   */
-  splitByAndCompare = p: yes: no: a: b:
+  splitByAndCompare =
+    # Predicate
+    p:
+    # Comparison function if predicate holds for both values
+    yes:
+    # Comparison function if predicate holds for neither value
+    no:
+    # First value to compare
+    a:
+    # Second value to compare
+    b:
     if p a
     then if p b then yes a b else -1
     else if p b then 1 else no a b;
 
 
-  /* Reads a JSON file. */
+  /* Reads a JSON file.
+
+     Type :: path -> any
+  */
   importJSON = path:
     builtins.fromJSON (builtins.readFile path);
 
 
   ## Warnings
 
-  /* See https://github.com/NixOS/nix/issues/749. Eventually we'd like these
-     to expand to Nix builtins that carry metadata so that Nix can filter out
-     the INFO messages without parsing the message string.
+  # See https://github.com/NixOS/nix/issues/749. Eventually we'd like these
+  # to expand to Nix builtins that carry metadata so that Nix can filter out
+  # the INFO messages without parsing the message string.
+  #
+  # Usage:
+  # {
+  #   foo = lib.warn "foo is deprecated" oldFoo;
+  # }
+  #
+  # TODO: figure out a clever way to integrate location information from
+  # something like __unsafeGetAttrPos.
 
-     Usage:
-     {
-       foo = lib.warn "foo is deprecated" oldFoo;
-     }
-
-     TODO: figure out a clever way to integrate location information from
-     something like __unsafeGetAttrPos.
-  */
   warn = msg: builtins.trace "WARNING: ${msg}";
   info = msg: builtins.trace "INFO: ${msg}";
 
-- 
GitLab


From 89d71c5279196f593152b52f92f1a8580a41c87d Mon Sep 17 00:00:00 2001
From: royneary <christian@ulrich.earth>
Date: Sat, 27 Oct 2018 16:58:44 +0200
Subject: [PATCH 0501/1065] nim: don't hardcode gcc

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

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 0d06f847ddf..28017006273 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
   phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" "checkPhase" ];
 
   buildPhase = ''
-    # use gcc to trigger the linker since calling ld in build.sh causes an error 
-    LD=gcc
+    # use $CC to trigger the linker since calling ld in build.sh causes an error
+    LD=$CC
     # build.sh wants to write to $HOME/.cache
     HOME=$TMPDIR
     sh build.sh
-- 
GitLab


From f3fb56d6339723eb0350bebf7d8be1d7753bd654 Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Sat, 27 Oct 2018 11:06:41 +0300
Subject: [PATCH 0502/1065] avocode: 3.4.0 -> 3.6.2

---
 .../applications/graphics/avocode/default.nix | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index e0aea87c90c..7777be91897 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -1,23 +1,24 @@
 { stdenv, makeDesktopItem, fetchurl, unzip
-, gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2
-, xorg, mozjpeg
+, gdk_pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
+, xorg, mozjpeg, makeWrapper, gsettings-desktop-schemas
 }:
 
 stdenv.mkDerivation rec {
   name = "avocode-${version}";
-  version = "3.4.0";
+  version = "3.6.2";
 
   src = fetchurl {
     url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
-    sha256 = "1dk4vgam9r5nl8dvpfwrn52gq6r4zxs4zz63p3c4gk73d8qnh4dl";
+    sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2";
   };
 
-  libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [
+  libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [
     stdenv.cc.cc.lib
     gdk_pixbuf
     glib
-    gtk2
+    gtk3
     atk
+    at-spi2-atk
     pango
     cairo
     freetype
@@ -29,7 +30,6 @@ stdenv.mkDerivation rec {
     cups
     expat
     udev
-    GConf
     libX11
     libxcb
     libXi
@@ -54,7 +54,8 @@ stdenv.mkDerivation rec {
     comment = "The bridge between designers and developers";
   };
 
-  buildInputs = [ unzip ];
+  nativeBuildInputs = [makeWrapper];
+  buildInputs = [ unzip gtk3 gsettings-desktop-schemas];
 
   # src is producing multiple folder on unzip so we must
   # override unpackCmd to extract it into newly created folder
@@ -85,6 +86,10 @@ stdenv.mkDerivation rec {
     for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
       patchelf --set-rpath ${libPath}:$out/ $file
     done
+    for file in $out/bin/*; do
+      wrapProgram $file \
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+    done
   '';
 
   enableParallelBuilding = true;
-- 
GitLab


From dd9e60f75ed2dcb392b18b8f60cddd19bb357178 Mon Sep 17 00:00:00 2001
From: Nikita Voloboev <nikita.voloboev@gmail.com>
Date: Sat, 27 Oct 2018 16:15:36 +0100
Subject: [PATCH 0503/1065] goku: init 0.1.11

---
 maintainers/maintainer-list.nix          |  5 +++++
 pkgs/os-specific/darwin/goku/default.nix | 27 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/goku/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 22ea07b9f11..08425d40b3d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2967,6 +2967,11 @@
     github = "nequissimus";
     name = "Tim Steinbach";
   };
+  nikitavoloboev = {
+    email = "nikita.voloboev@gmail.com";
+    github = "nikitavoloboev";
+    name = "Nikita Voloboev";
+  };
   nfjinjing = {
     email = "nfjinjing@gmail.com";
     github = "nfjinjing";
diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix
new file mode 100644
index 00000000000..190c0ae2213
--- /dev/null
+++ b/pkgs/os-specific/darwin/goku/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "goku-${version}";
+  version = "0.1.11";
+
+  src = fetchurl {
+    url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.tar.gz";
+    sha256 = "49562342be114c2656726c5c697131acd286965ab3903a1a1e157cc689e20b15";
+  };
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp goku $out/bin
+    cp gokuw $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Karabiner configurator";
+    homepage = https://github.com/yqrashawn/GokuRakuJoudo;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.nikitavoloboev ];
+    platforms = platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95ce949d8d7..12665aa1754 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -732,6 +732,8 @@ with pkgs;
 
   oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { };
 
+  goku = callPackage ../os-specific/darwin/goku { };
+
   kwakd = callPackage ../servers/kwakd { };
 
   kwm = callPackage ../os-specific/darwin/kwm { };
-- 
GitLab


From 1d5b938eb5dc2614890881b436aa4d2e6e0c2bf9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 08:52:30 -0700
Subject: [PATCH 0504/1065] matio: 1.5.12 -> 1.5.13 (#49263)

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

diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix
index 57321522736..f28ff1b0a21 100644
--- a/pkgs/development/libraries/matio/default.nix
+++ b/pkgs/development/libraries/matio/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "matio-1.5.12";
+  name = "matio-1.5.13";
   src = fetchurl {
     url = "mirror://sourceforge/matio/${name}.tar.gz";
-    sha256 = "1afqjhc1wbm7g1vry3w30c7dbrxg6n4i482ybgx6l1b5wj0f75c6";
+    sha256 = "1jz5760jn1cifr479znhmzksi8fp07j99jd8xdnxpjd79gsv5bgy";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 7eedac5fc5ad3355042a10b69101c862bdfdf9cf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 08:53:00 -0700
Subject: [PATCH 0505/1065] libcouchbase: 2.9.5 -> 2.10.0 (#49271)

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 e3d5c7d6424..516702e2afe 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libcouchbase-${version}";
-  version = "2.9.5";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "libcouchbase";
     rev = version;
-    sha256 = "18l3579b47l8d6nhv0xls8pybkqdmdkw8jg4inalnx3g7ydqfn00";
+    sha256 = "08bvnd0m18qs5akbblf80l54khm1523fdiiajp7fj88vrs86nbi2";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";
-- 
GitLab


From 154d026917ee8a0b5771900c80f11b40db8f3099 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 08:53:16 -0700
Subject: [PATCH 0506/1065] libupnp: 1.8.3 -> 1.8.4 (#49268)

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

diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index 018a57ad057..192659824d2 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libupnp-${version}";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "mrjimenez";
     repo = "pupnp";
     rev = "release-${version}";
-    sha256 = "1w0kfq1pg3y2wl6gwkm1w872g0qz29w1z9wj08xxmwnk5mkpvsrl";
+    sha256 = "1daml02z4rs9cxls95p2v24jvwcsp43a0gqv06s84ay5yn6r47wx";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
GitLab


From 1f9f8075491ba5e167275973832d1a3cecf2e133 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 08:54:35 -0700
Subject: [PATCH 0507/1065] libsolv: 0.6.35 -> 0.7.0 (#49259)

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 ad8120d3591..51b6cbd4ed5 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 {
-  rev  = "0.6.35";
+  rev  = "0.7.0";
   name = "libsolv-${rev}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner  = "openSUSE";
     repo   = "libsolv";
-    sha256 = "0jx1bmwwhjwfidwa0hrarwpcrf4ic068kapd4vb9m5y7xd4l55nq";
+    sha256 = "02vz1yp516nh4vv0jdckll37mc373ddd363ip005xfbrbb2jr1xh";
   };
 
   cmakeFlags = [
-- 
GitLab


From 6c8760f07cfb51317a177a2f06523dd5c8e87d9e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 09:02:13 -0700
Subject: [PATCH 0508/1065] krita: 4.1.3 -> 4.1.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/krita/versions
---
 pkgs/applications/graphics/krita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 9aa80fc789c..ce2bdcbd298 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -10,11 +10,11 @@
 
 mkDerivation rec {
   name = "krita-${version}";
-  version = "4.1.3";
+  version = "4.1.5";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "0d546dxs552z0pxnaka1jm7ksravw17f777wf593z0pl4ds8dgdx";
+    sha256 = "1by8p8ifdp03f05bhg8ygdd1j036anfpjjnzbx63l2fbmy9k6q10";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];
-- 
GitLab


From 4b2a4a387ebf273d9ad577de8f41cfb40d209e97 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 09:03:09 -0700
Subject: [PATCH 0509/1065] openorienteering-mapper: 0.8.2 -> 0.8.3 (#49217)

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

diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix
index 6ed6326f16e..3517351090d 100644
--- a/pkgs/applications/gis/openorienteering-mapper/default.nix
+++ b/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "OpenOrienteering-Mapper-${version}";
-  version = "0.8.2";
+  version = "0.8.3";
 
   buildInputs = [ gdal qtbase qttools qtlocation qtimageformats
                   qtsensors clipper zlib proj doxygen cups];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "OpenOrienteering";
     repo = "mapper";
     rev = "v${version}";
-    sha256 = "02lga6nlal4c7898zc3lv1pcwyv1wpkn7v2xji2kgq68r6aw6j59";
+    sha256 = "0pnqwvmg97mgc2ci3abmx07l0njxcrbljh75w8ym31g0jq76pgr9";
   };
 
   cmakeFlags =
-- 
GitLab


From d6a15b09c788a1acf4b39ef6aecdb8b2757e3f1b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 09:58:27 -0700
Subject: [PATCH 0510/1065] mkvtoolnix: 27.0.0 -> 28.2.0 (#49253)

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

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 7d9ce1ac453..3464b7aaeaa 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "27.0.0";
+  version = "28.2.0";
 
   src = fetchFromGitLab {
     owner  = "mbunkus";
     repo   = "mkvtoolnix";
     rev    = "release-${version}";
-    sha256 = "0pcf0bzs588p0a4j01jzcy5y9c4hiblz3kwfznn1sjcyxm552z6n";
+    sha256 = "162qj5z9wzm63im6jnd0n95ggzdk6fzq5bxgrr0l3y82ahfb7qwa";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 1381019e49b8403aaf10c9b3ecb80e138d7e304d Mon Sep 17 00:00:00 2001
From: aanderse <aaron@fosslib.net>
Date: Sat, 27 Oct 2018 13:01:30 -0400
Subject: [PATCH 0511/1065] nixos/rsyslogd & nixos/syslog-ng: fix broken module
 (#47306)

* journald: forward message to syslog by default if a syslog implementation is installed

* added a test to ensure rsyslog is receiving messages when expected

* added rsyslogd tests to release.nix
---
 nixos/modules/system/boot/systemd.nix | 12 +++++++++
 nixos/release.nix                     |  1 +
 nixos/tests/rsyslogd.nix              | 37 +++++++++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 nixos/tests/rsyslogd.nix

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index a1412bc3290..3d9fa53ce52 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -587,6 +587,15 @@ in
       '';
     };
 
+    services.journald.forwardToSyslog = mkOption {
+      default = config.services.rsyslogd.enable || config.services.syslog-ng.enable;
+      defaultText = "config.services.rsyslogd.enable || config.services.syslog-ng.enable";
+      type = types.bool;
+      description = ''
+        Whether to forward log messages to syslog.
+      '';
+    };
+
     services.logind.extraConfig = mkOption {
       default = "";
       type = types.lines;
@@ -754,6 +763,9 @@ in
           ForwardToConsole=yes
           TTYPath=${config.services.journald.console}
         ''}
+        ${optionalString (config.services.journald.forwardToSyslog) ''
+          ForwardToSyslog=yes
+        ''}
         ${config.services.journald.extraConfig}
       '';
 
diff --git a/nixos/release.nix b/nixos/release.nix
index 5412080cca1..46dbe4aa77b 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -399,6 +399,7 @@ in rec {
   tests.radicale = callTest tests/radicale.nix {};
   tests.redmine = callTest tests/redmine.nix {};
   tests.rspamd = callSubTests tests/rspamd.nix {};
+  tests.rsyslogd = callSubTests tests/rsyslogd.nix {};
   tests.runInMachine = callTest tests/run-in-machine.nix {};
   tests.rxe = callTest tests/rxe.nix {};
   tests.samba = callTest tests/samba.nix {};
diff --git a/nixos/tests/rsyslogd.nix b/nixos/tests/rsyslogd.nix
new file mode 100644
index 00000000000..4836419f0c2
--- /dev/null
+++ b/nixos/tests/rsyslogd.nix
@@ -0,0 +1,37 @@
+{ system ? builtins.currentSystem }:
+
+with import ../lib/testing.nix { inherit system; };
+{
+  test1 = makeTest {
+    name = "rsyslogd-test1";
+    meta.maintainers = [ lib.maintainers.aanderse ];
+
+    machine =
+      { config, pkgs, ... }:
+      { services.rsyslogd.enable = true;
+        services.journald.forwardToSyslog = false;
+      };
+
+    # ensure rsyslogd isn't receiving messages from journald if explicitly disabled
+    testScript = ''
+      $machine->waitForUnit("default.target");
+      $machine->fail("test -f /var/log/messages");
+    '';
+  };
+
+  test2 = makeTest {
+    name = "rsyslogd-test2";
+    meta.maintainers = [ lib.maintainers.aanderse ];
+
+    machine =
+      { config, pkgs, ... }:
+      { services.rsyslogd.enable = true;
+      };
+
+    # ensure rsyslogd is receiving messages from journald
+    testScript = ''
+      $machine->waitForUnit("default.target");
+      $machine->succeed("test -f /var/log/messages");
+    '';
+  };
+}
-- 
GitLab


From 112758e39d46f44b253bd43e337b1afcb9e9ea2a Mon Sep 17 00:00:00 2001
From: Michael Bishop <michael.bishop@iohk.io>
Date: Sat, 27 Oct 2018 14:08:28 -0300
Subject: [PATCH 0512/1065] libupnp: enable split outputs

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

diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index 192659824d2..b5a01698e5e 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
     rev = "release-${version}";
     sha256 = "1daml02z4rs9cxls95p2v24jvwcsp43a0gqv06s84ay5yn6r47wx";
   };
+  outputs = [ "dev" "out" ];
 
   nativeBuildInputs = [ autoreconfHook ];
 
-- 
GitLab


From 42f17d8f14773d045d95ad1ea8819293033ae7fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 27 Oct 2018 18:07:24 +0100
Subject: [PATCH 0513/1065] nix-review: 0.5.3 -> 0.6.0

---
 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 126673ad9cc..f761c69e026 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.5.3";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-review";
     rev = version;
-    sha256 = "14ak0qfc5faamnp4fmrqmb1ikpv656nr830rja89yzc96s73337z";
+    sha256 = "1391fs33jlg1pnfxpfhvry4sb4p4hy8gjpipnnxm8483f12b49km";
   };
 
   makeWrapperArgs = [
-- 
GitLab


From f4927a34e764be81fbf76ec54f5d656f3c64dff1 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 27 Oct 2018 18:21:15 +0100
Subject: [PATCH 0514/1065] rust-cbindgen: fix darwin build

---
 pkgs/development/tools/rust/cbindgen/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index fe80d0d9dd1..970ace229e2 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform, Security }:
 
 rustPlatform.buildRustPackage rec {
   name = "rust-cbindgen-${version}";
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1m1chwmfgj74xrmn4gb9yz5kx8c408a1hlqmpcq780kqj0k927i9";
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+
   meta = with stdenv.lib; {
     description = "A project for generating C bindings from Rust code";
     homepage = https://github.com/eqrion/cbindgen;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12665aa1754..d17b11c0b07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7386,7 +7386,9 @@ with pkgs;
   rustracer = callPackage ../development/tools/rust/racer { };
   rustracerd = callPackage ../development/tools/rust/racerd { };
   rust-bindgen = callPackage ../development/tools/rust/bindgen { };
-  rust-cbindgen = callPackage ../development/tools/rust/cbindgen { };
+  rust-cbindgen = callPackage ../development/tools/rust/cbindgen {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
   rustup = callPackage ../development/tools/rust/rustup {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-- 
GitLab


From 12bbb99e12fd4d4e4ddf4c78f8419bc800e07d9b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 10:27:19 -0700
Subject: [PATCH 0515/1065] hwinfo: 21.58 -> 21.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/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 59ece285676..4b2ad1f7ef9 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.58";
+  version = "21.60";
 
   src = fetchFromGitHub {
     owner = "opensuse";
     repo = "hwinfo";
     rev = "${version}";
-    sha256 = "15gfgb711cs42nynmql2dyi8hs7f5wj3pcm75snnbz5arp8lx3j2";
+    sha256 = "1agjc14m1814x897wkx484qb8llr395xlzn428f86sxgshicwfy3";
   };
 
   patchPhase = ''
-- 
GitLab


From 269b690aecfdb086d5a40b685ece70acba235e43 Mon Sep 17 00:00:00 2001
From: aki-ks <aki@kaysubs.de>
Date: Sat, 27 Oct 2018 20:13:01 +0200
Subject: [PATCH 0516/1065] jetbrains.idea-community: 2018.2.4 -> 2018.2.5

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 23ecfb0c19d..e0a808ce000 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -289,12 +289,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2018.2.4"; /* updated by script */
+    version = "2018.2.5"; /* 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 = "1syrxkp4pk95bvx02g2hg0mvn36w098h82k0qv0j6aqv0sidfzjy"; /* updated by script */
+      sha256 = "0jnnmhn1gba670q2yprlh3ypa6k21pbg91pshz9aqkdhhmzk4759"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IntelliJ IDEA Release";
-- 
GitLab


From e49377208a61b64c182ce0f431903c0033c2aa12 Mon Sep 17 00:00:00 2001
From: aki-ks <aki@kaysubs.de>
Date: Sat, 27 Oct 2018 20:15:06 +0200
Subject: [PATCH 0517/1065] jetbrains.idea-ultimate: 2018.2.4 -> 2018.2.5

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index e0a808ce000..f5fbf1b5f03 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -302,12 +302,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2018.2.4"; /* updated by script */
+    version = "2018.2.5"; /* 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 = "0z1ga6lzmkn7y7y24984vmp3ilrfc1ak1ddcgsdkwkiq5bx67ck8"; /* updated by script */
+      sha256 = "105mzbqm3bx05bmkwyfykz76bzgzzgb9hb6wcagb9fv7dvqyggg6"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IntelliJ IDEA Release";
-- 
GitLab


From 2cb9858b34bad75d7e9ed1786a207235b0b9d685 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 11:26:07 -0700
Subject: [PATCH 0518/1065] icdiff: 1.9.3 -> 1.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/icdiff/versions
---
 pkgs/tools/text/icdiff/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix
index 949a9c89e9a..aec238cb4cc 100644
--- a/pkgs/tools/text/icdiff/default.nix
+++ b/pkgs/tools/text/icdiff/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "icdiff-${version}";
-  version = "1.9.3";
+  version = "1.9.4";
 
   src = fetchFromGitHub {
     owner = "jeffkaufman";
     repo = "icdiff";
     rev = "release-${version}";
-    sha256 = "10hv09sg7m8gzjf1v785kvim9ps81akzyx7ws6ypylyxc0l2fdcl";
+    sha256 = "1micpm7kq9swfscmp4mg37fnzgzpsg7704yi33c5sd6cmgbdabxm";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 651c1784a943488b16dad56af7a382091f2e45e8 Mon Sep 17 00:00:00 2001
From: royneary <christian@ulrich.earth>
Date: Sat, 27 Oct 2018 20:39:02 +0200
Subject: [PATCH 0519/1065] nim: disable test supposedly broken on Aarch64

---
 pkgs/development/compilers/nim/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 28017006273..3596c17b407 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
 
   patchPhase =
     let disableTest = ''sed -i '1i discard \"\"\"\n  disabled: true\n\"\"\"\n\n' '';
+        disableStdLibTest = ''sed -i -e '/^when isMainModule/,/^END$/{s/^/#/}' '';
         disableCompile = ''sed -i -e 's/^/#/' '';
     in ''
       substituteInPlace ./tests/async/tioselectors.nim --replace "/bin/sleep" "sleep"
@@ -66,6 +67,9 @@ stdenv.mkDerivation rec {
 
       # disable tests requiring network access (not available in the build container)
       ${disableTest} ./tests/stdlib/thttpclient.nim
+    '' + lib.optionalString stdenv.isAarch64 ''
+      # disable test supposedly broken on aarch64
+      ${disableStdLibTest} ./lib/pure/stats.nim
     '';
 
   checkPhase = ''
-- 
GitLab


From 7b2906449daa214d9ecb01def9a52b36f2420f60 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sat, 27 Oct 2018 21:06:43 +0200
Subject: [PATCH 0520/1065] thonny: 3.0.1 -> 3.0.5

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

diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix
index cccf59f3e7b..ba68a5420a8 100644
--- a/pkgs/applications/editors/thonny/default.nix
+++ b/pkgs/applications/editors/thonny/default.nix
@@ -4,13 +4,13 @@ with python3.pkgs;
 
 buildPythonApplication rec {
   pname = "thonny";
-  version = "3.0.1";
+  version = "3.0.5";
 
   src = fetchFromBitbucket {
     owner = "plas";
     repo = pname;
-    rev = "f66bd266deda11534561a01ede53cf1b71d2c3c0";
-    sha256 = "0mjskb0gyddybvlbhm10ch1rwzvmci95b018x67bh67bybdl4hm7";
+    rev = "e5a1ad4ae9d24066a769489b1e168b4bd6e00b03";
+    sha256 = "1lrl5pj9dpw9i5ij863hd47gfd15nmvglqkl2ldwgfn7kgpsdkz5";
   };
 
   propagatedBuildInputs = with python3.pkgs; [
-- 
GitLab


From 49ca9324afd32aac6689ba955de6156cd3fe124a Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sat, 27 Oct 2018 18:04:07 +0200
Subject: [PATCH 0521/1065] todoman: 3.4.0 -> 3.4.1

---
 pkgs/applications/office/todoman/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index a7d93c3b0cb..740224b15b3 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, python3, glibcLocales }:
+{ stdenv, python3, glibcLocales, fetchpatch }:
 
 let
   inherit (python3.pkgs) buildPythonApplication fetchPypi;
 in
 buildPythonApplication rec {
   pname = "todoman";
-  version = "3.4.0";
+  version = "3.4.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09441fdrwz2irsbrxnpwys51372z6rn6gnxn87p95r3fv9gmh0fw";
+    sha256 = "1rvid1rklvgvsf6xmxd91j2fi46v4fzn5z6zbs5yn0wpb0k605r5";
   };
 
     LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
@@ -29,9 +29,17 @@ 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
+    rm tests/test_cli.py
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From bba31d192dd8978bcdf619aadbcdabff84f6eb92 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 22:54:07 +0200
Subject: [PATCH 0522/1065] slurm: 18.08.1.1 -> 18.08.3.1

---
 pkgs/servers/computing/slurm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index 44ae3b894d5..053fadc8af5 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.1.1";
+  version = "18.08.3.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 = "1yndxi11vj0di3yf6ky78zcnffk6d3676gf5y7jn7vwxxmzm4h5k";
+    sha256 = "1dz5hgnlsld8b8vrbckk3mj7cqrv662wsp0s9z4x8wafygz3zx07";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 220aa36deb049c2d03739873ce9e7f78fc9cc63d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 22:16:07 +0200
Subject: [PATCH 0523/1065] pyslurm: 20180908 -> 18.08.3

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

diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index f004ab1054d..7d592c7b450 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pyslurm";
-  version = "20180908";
+  version = "18-08-3";
 
   src = fetchFromGitHub {
     repo = "pyslurm";
     owner = "PySlurm";
-    rev = "50dc113e99d82e70e84fc2e812333733708be4ed";
-    sha256 = "1j2i4rvhmk2ihhcvsjdlqlxqb5a05jg8k9bqkv3zrvdj71yn4z9k";
+    rev = version;
+    sha256 = "1rymx106xa99wd4n44s7jw0w41spg39y1ji4fgn01yk7wjfrdrwg";
   };
 
   buildInputs = [ cython slurm ];
-- 
GitLab


From 2783ca5de461c3307b020056be7a97d43731547d Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Sat, 27 Oct 2018 21:42:49 +0200
Subject: [PATCH 0524/1065] uriparser:  0.8.6 -> 0.9.0

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

diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index c716ae7f8db..03f8e20b38d 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, cpptest, pkgconfig, doxygen, graphviz }:
+{ stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }:
 
 stdenv.mkDerivation rec {
   name = "uriparser-${version}";
-  version = "0.8.6";
+  version = "0.9.0";
 
   # Release tarball differs from source tarball
   src = fetchurl {
     url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2";
-    sha256 = "0m2a5bf5b00ybagxmsa8mdj9mhc62vcm0qimy1ivfza1fbjsf287";
+    sha256 = "0b2yagxzhq9ghpszci6a9xlqg0yl7vq9j5r8dwbar3nszqsfnrzc";
   };
 
-  nativeBuildInputs = [ pkgconfig cpptest doxygen graphviz ];
+  nativeBuildInputs = [ pkgconfig gtest doxygen graphviz ];
 
   doCheck = true;
 
-- 
GitLab


From 69fb8a811aed14d0bb8e19fc5709a2a55de48426 Mon Sep 17 00:00:00 2001
From: Yurii Izorkin <Izorkin@gmail.com>
Date: Sat, 27 Oct 2018 23:50:06 +0300
Subject: [PATCH 0525/1065] znc: add configure options (#48683)

* znc: add option to disable IPv6

* znc: add option to enable debugging

* znc: add option to enable zlib support

* zncModules: match znc build inputs

znc-buildmod expects modules to be aware of the same libs znc itself is linked to.
Before this: znc-buildmod was passing -lz but zlib was not in the include path
---
 pkgs/applications/networking/znc/default.nix | 9 +++++++--
 pkgs/applications/networking/znc/modules.nix | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 861e7d24275..2f736dd5856 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -4,6 +4,9 @@
 , withTcl ? false, tcl
 , withCyrus ? true, cyrus_sasl
 , withUnicode ? true, icu
+, withZlib ? true, zlib
+, withIPv6 ? true
+, withDebug ? false
 }:
 
 with stdenv.lib;
@@ -24,7 +27,8 @@ stdenv.mkDerivation rec {
     ++ optional withPython python3
     ++ optional withTcl tcl
     ++ optional withCyrus cyrus_sasl
-    ++ optional withUnicode icu;
+    ++ optional withUnicode icu
+    ++ optional withZlib zlib;
 
   configureFlags = [
     (stdenv.lib.enableFeature withPerl "perl")
@@ -32,7 +36,8 @@ stdenv.mkDerivation rec {
     (stdenv.lib.enableFeature withTcl "tcl")
     (stdenv.lib.withFeatureAs withTcl "tcl" "${tcl}/lib")
     (stdenv.lib.enableFeature withCyrus "cyrus")
-  ];
+  ] ++ optional (!withIPv6) [ "--disable-ipv6" ]
+    ++ optional withDebug [ "--enable-debug" ];
 
   meta = with stdenv.lib; {
     description = "Advanced IRC bouncer";
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index a799df2d1ed..42d2093ee3a 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -9,6 +9,8 @@ let
     inherit buildPhase;
     inherit installPhase;
 
+    buildInputs = znc.buildInputs;
+
     meta = a.meta // { platforms = stdenv.lib.platforms.unix; };
     passthru.module_name = module_name;
   });
-- 
GitLab


From 233dad81ebc164520fb763cbb47a16c88655888d Mon Sep 17 00:00:00 2001
From: Demyan Rogozhin <demyan.rogozhin@gmail.com>
Date: Sat, 27 Oct 2018 23:50:40 +0200
Subject: [PATCH 0526/1065] particl-core: Eabled tests and parallel build.

Build now dependent on Python3 and current version of Boost
---
 pkgs/applications/altcoins/default.nix           |  2 +-
 .../altcoins/particl/particl-core.nix            | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 87f5d0be68a..b24dbb8f90a 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -90,5 +90,5 @@ rec {
   parity-beta = callPackage ./parity/beta.nix { };
   parity-ui = callPackage ./parity-ui { };
 
-  particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; };
+  particl-core = callPackage ./particl/particl-core.nix { miniupnpc = miniupnpc_2; };
 }
diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix
index 3be2d296d39..d3b20ef2ea3 100644
--- a/pkgs/applications/altcoins/particl/particl-core.nix
+++ b/pkgs/applications/altcoins/particl/particl-core.nix
@@ -10,13 +10,14 @@
 , zeromq
 , zlib
 , unixtools
+, python3
 }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "particl-core-${version}";
-  version     = "0.17.0.2";
+  version = "0.17.0.2";
 
   src = fetchurl {
     url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz";
@@ -24,17 +25,20 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  buildInputs = [
-    openssl db48 boost zlib miniupnpc libevent zeromq
-    unixtools.hexdump
-  ];
+  buildInputs = [ openssl db48 boost zlib miniupnpc libevent zeromq unixtools.hexdump python3 ];
 
   configureFlags = [
     "--disable-bench"
-    "--enable-tests=no"
     "--with-boost-libdir=${boost.out}/lib"
+  ] ++ optionals (!doCheck) [
+    "--enable-tests=no"
   ];
 
+  # Always check during Hydra builds
+  doCheck = true;
+  preCheck = "patchShebangs test";
+  enableParallelBuilding = true;
+
   meta = {
     description = "Privacy-Focused Marketplace & Decentralized Application Platform";
     longDescription= ''
-- 
GitLab


From 34a5a4389092f7f96248062abd40876894f956a8 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Sat, 27 Oct 2018 18:41:54 +0200
Subject: [PATCH 0527/1065] rstudio: 1.1.456 -> 1.1.463

---
 pkgs/applications/editors/rstudio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 1a5c9d65583..9d8c430630e 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -6,7 +6,7 @@
 let
   verMajor = "1";
   verMinor = "1";
-  verPatch = "456";
+  verPatch = "463";
   version = "${verMajor}.${verMinor}.${verPatch}";
   ginVer = "1.5";
   gwtVer = "2.7.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     owner = "rstudio";
     repo = "rstudio";
     rev = "v${version}";
-    sha256 = "0hv07qrbjwapbjrkddasglsgk0x5j7qal468i5rv77krsp09s4fz";
+    sha256 = "014g984znsczzy1fyn9y1ly3rbsngryfs674lfgciz60mqnl8im6";
   };
 
   # Hack RStudio to only use the input R.
-- 
GitLab


From 79d46f0a28e0a5fc2068f76f68e06a4d86ad6c93 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Sat, 27 Oct 2018 15:11:35 -0700
Subject: [PATCH 0528/1065] vlc: shrink runtime closure size by removing
 CONFIGURE_LINE

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

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index b08ff812ace..06a53ead3ba 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -72,6 +72,11 @@ stdenv.mkDerivation rec {
     "--with-kde-solid=$out/share/apps/solid/actions"
   ] ++ optional onlyLibVLC "--disable-vlc";
 
+  # Remove runtime dependencies on libraries
+  postConfigure = ''
+    sed -i 's|^#define CONFIGURE_LINE.*$|#define CONFIGURE_LINE "<removed>"|g' config.h
+  '';
+
   meta = with stdenv.lib; {
     description = "Cross-platform media player and streaming server";
     homepage = http://www.videolan.org/vlc/;
-- 
GitLab


From 873b4ed6264ec5c470e36052d8c0a8300cd7e859 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:39:17 +0200
Subject: [PATCH 0529/1065] taglib-sharp: add license + homepage

---
 pkgs/development/libraries/taglib-sharp/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix
index 6da524c2339..86006806baa 100644
--- a/pkgs/development/libraries/taglib-sharp/default.nix
+++ b/pkgs/development/libraries/taglib-sharp/default.nix
@@ -7,7 +7,6 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mono";
     repo = "taglib-sharp";
-
     rev = "taglib-sharp-${version}";
     sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp";
   };
@@ -21,6 +20,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library for reading and writing metadata in media files";
+    homepage = https://github.com/mono/taglib-sharp;
     platforms = platforms.linux;
+    license = licenses.lgpl21;
   };
 }
-- 
GitLab


From ab6cf6c57dcfa565206786896e47e4ef38a5eaf0 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:41:45 +0200
Subject: [PATCH 0530/1065] taglib: add licenses

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

diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix
index 1caa8a376fb..99892a41fa4 100644
--- a/pkgs/development/libraries/taglib/1.9.nix
+++ b/pkgs/development/libraries/taglib/1.9.nix
@@ -15,9 +15,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://developer.kde.org/~wheeler/taglib.html;
     repositories.git = git://github.com/taglib/taglib.git;
-
     description = "A library for reading and editing the meta-data of several popular audio formats";
     inherit (cmake.meta) platforms;
-    maintainers = [ ];
+    license = with stdenv.lib.licenses; [ lgpl21 mpl11 ];
   };
 }
-- 
GitLab


From 0a2ebb03f4766e051a16c43d435bdbe938a685ac Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:43:09 +0200
Subject: [PATCH 0531/1065] tclap: add license

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

diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix
index a92c7b74ebf..293baa492c5 100644
--- a/pkgs/development/libraries/tclap/default.nix
+++ b/pkgs/development/libraries/tclap/default.nix
@@ -8,9 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://tclap.sourceforge.net/;
     description = "Templatized C++ Command Line Parser Library";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.mit;
   };
 }
-- 
GitLab


From 500ea2661feafc4b20843d14e37df223bb26b820 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:45:24 +0200
Subject: [PATCH 0532/1065] telepathy-farstream: add meta data

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

diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix
index fae51aea477..1247d9ffa84 100644
--- a/pkgs/development/libraries/telepathy/farstream/default.nix
+++ b/pkgs/development/libraries/telepathy/farstream/default.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ];
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call";
+    homepage = https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/;
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
   };
 }
-- 
GitLab


From 154d5d993be3ddb518517406bc541d60ddba5cf8 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:47:40 +0200
Subject: [PATCH 0533/1065] telepathy-glib: add licenses

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

diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index 9ca2481c3b0..ca6a4997abf 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -22,8 +22,9 @@ stdenv.mkDerivation rec {
 
   passthru.python = python2;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://telepathy.freedesktop.org;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = with licenses; [ bsd2 bsd3 lgpl21Plus ];
   };
 }
-- 
GitLab


From d513d6115fa6cbe257ba0600dc3601abc5b27b33 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:50:00 +0200
Subject: [PATCH 0534/1065] tidyp: add license

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

diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix
index ba95da77b72..51dabbd2beb 100644
--- a/pkgs/development/libraries/tidyp/default.nix
+++ b/pkgs/development/libraries/tidyp/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
     homepage = http://tidyp.com/;
     platforms = platforms.linux;
     maintainers = with maintainers; [ pSub ];
+    license = licenses.bsd3;
   };
 }
-- 
GitLab


From 9aa4a78b9618561e8b7e5dde3be4b125e84d5e2d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:51:47 +0200
Subject: [PATCH 0535/1065] xbase: add license

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

diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix
index 79f75abfd91..3dd2cb5b874 100644
--- a/pkgs/development/libraries/xbase/default.nix
+++ b/pkgs/development/libraries/xbase/default.nix
@@ -25,10 +25,10 @@ stdenv.mkDerivation {
     })
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://linux.techass.com/projects/xdb/;
     description = "C++ class library formerly known as XDB";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ ];
+    platforms = platforms.linux;
+    license = licenses.lgpl2;
   };
 }
-- 
GitLab


From f59a7904589f6ee46cedb46e18a3e31af58d06d0 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 27 Oct 2018 15:53:47 +0200
Subject: [PATCH 0536/1065] xine-lib: add licenses

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

diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 69b5b95e761..d86dac05073 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -26,9 +26,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.xine-project.org/;
     description = "A high-performance, portable and reusable multimedia playback engine";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = with licenses; [ gpl2 lgpl2 ];
   };
 }
-- 
GitLab


From 7ab76cc5e82b461de4af96dfdbafa3eb9ea7265d Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Sun, 28 Oct 2018 00:53:54 +0200
Subject: [PATCH 0537/1065] nixos/virtualbox-image: increase disk to 50G

100GB breaks cptofs but 50GB is fine and benchmarks shows it takes the same time as building the demo VBox VM with a 10GB disk

+ enabled VM sound output by default
+ set USB controller in USB2.0 mode
+ add manifest file in the OVA as it allows integrity checking on imports
---
 nixos/modules/virtualisation/virtualbox-image.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 60048911658..037c0d2f0d8 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -12,7 +12,7 @@ in {
     virtualbox = {
       baseImageSize = mkOption {
         type = types.int;
-        default = 10 * 1024;
+        default = 50 * 1024;
         description = ''
           The size of the VirtualBox base image in MiB.
         '';
@@ -61,7 +61,7 @@ in {
           export HOME=$PWD
           export PATH=${pkgs.virtualbox}/bin:$PATH
 
-          echo "creating VirtualBox pass-through disk wrapper (no copying invovled)..."
+          echo "creating VirtualBox pass-through disk wrapper (no copying involved)..."
           VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage
 
           echo "creating VirtualBox VM..."
@@ -72,9 +72,9 @@ in {
             --memory ${toString cfg.memorySize} --acpi on --vram 32 \
             ${optionalString (pkgs.stdenv.hostPlatform.system == "i686-linux") "--pae on"} \
             --nictype1 virtio --nic1 nat \
-            --audiocontroller ac97 --audio alsa \
+            --audiocontroller ac97 --audio alsa --audioout on \
             --rtcuseutc on \
-            --usb on --mouse usbtablet
+            --usb on --usbehci on --mouse usbtablet
           VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on
           VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \
             --medium disk.vmdk
@@ -82,7 +82,7 @@ in {
           echo "exporting VirtualBox VM..."
           mkdir -p $out
           fn="$out/${cfg.vmFileName}"
-          VBoxManage export "$vmName" --output "$fn"
+          VBoxManage export "$vmName" --output "$fn" --options manifest
 
           rm -v $diskImage
 
-- 
GitLab


From ae3b4655a4a7d8692dab3ba46a40b7daabcb1208 Mon Sep 17 00:00:00 2001
From: Pierre-Etienne Meunier <pierre-etienne.meunier@inria.fr>
Date: Sun, 28 Oct 2018 00:06:29 +0100
Subject: [PATCH 0538/1065] Carnix: 0.7.2 -> 0.8.10 (#40587)

Carnix: splits input into two parts: creates from creates.io and local ones
---
 .../rust/build-rust-crate/build-crate.nix     |   29 +-
 .../rust/build-rust-crate/default.nix         |   16 +-
 .../rust/build-rust-crate/helpers.nix         |   24 +
 pkgs/build-support/rust/carnix.nix            | 1685 ++------------
 pkgs/build-support/rust/crates-io.nix         | 2050 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |    3 +-
 6 files changed, 2353 insertions(+), 1454 deletions(-)
 create mode 100644 pkgs/build-support/rust/build-rust-crate/helpers.nix
 create mode 100644 pkgs/build-support/rust/crates-io.nix

diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index f65118ba4a6..252a0ff521f 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -2,7 +2,7 @@
 { crateName,
   dependencies,
   crateFeatures, libName, release, libPath,
-  crateType, metadata, crateBin,
+  crateType, metadata, crateBin, hasCrateBin,
   extraRustcOpts, verbose, colors }:
 
   let
@@ -13,6 +13,17 @@
             (if release then "-C opt-level=3" else "-C debuginfo=2")
             (["-C codegen-units=1"] ++ extraRustcOpts);
         rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
+
+    # Some platforms have different names for rustc.
+    rustPlatform =
+      with stdenv.hostPlatform.parsed;
+      let cpu_ = if cpu.name == "armv7a" then "armv7"
+                 else cpu.name;
+          vendor_ = vendor.name;
+          kernel_ = kernel.name;
+          abi_ = abi.name;
+      in
+      "${cpu_}-${vendor_}-${kernel_}-${abi_}";
   in ''
     runHook preBuild
     norm=""
@@ -32,7 +43,8 @@
        lib_src=$1
        echo_build_heading $lib_src ${libName}
 
-       noisily rustc --crate-name $CRATE_NAME $lib_src --crate-type ${crateType} \
+       noisily rustc --crate-name $CRATE_NAME $lib_src \
+         ${lib.strings.concatStrings (map (x: " --crate-type ${x}") crateType)}  \
          ${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \
          --emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \
          $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
@@ -54,7 +66,8 @@
       noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\
         ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \
         $LINK ${deps}$EXTRA_LIB --cap-lints allow \
-        $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
+        $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} \
+        ${if stdenv.hostPlatform != stdenv.buildPlatform then "--target ${rustPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" else ""}
       if [ "$crate_name_" != "$crate_name" ]; then
         mv target/bin/$crate_name_ target/bin/$crate_name
       fi
@@ -103,9 +116,9 @@
        tr '\n' ' ' < target/link > target/link_
        LINK=$(cat target/link_)
     fi
-
-    mkdir -p target/bin
+    ${lib.optionalString (crateBin != "") ''
     printf "%s\n" "${crateBin}" | head -n1 | tr -s ',' '\n' | while read -r BIN_NAME BIN_PATH; do
+      mkdir -p target/bin
       # filter empty entries / empty "lines"
       if [[ -z "$BIN_NAME" ]]; then
            continue
@@ -141,13 +154,15 @@
       fi
       build_bin "$BIN_NAME" "$BIN_PATH"
     done
+    ''}
 
-
-    ${lib.optionalString (crateBin == "") ''
+    ${lib.optionalString (crateBin == "" && !hasCrateBin) ''
       if [[ -e src/main.rs ]]; then
+        mkdir -p target/bin
         build_bin ${crateName} src/main.rs
       fi
       for i in src/bin/*.rs; do #*/
+        mkdir -p target/bin
         build_bin "$(basename $i .rs)" "$i"
       done
     ''}
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index a11cef9f1f4..ec11472bbae 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -4,7 +4,7 @@
 # This can be useful for deploying packages with NixOps, and to share
 # binary dependencies between projects.
 
-{ lib, stdenv, defaultCrateOverrides, fetchCrate, ncurses, rustc  }:
+{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc }:
 
 let
     # This doesn't appear to be officially documented anywhere yet.
@@ -16,7 +16,7 @@ let
     makeDeps = dependencies:
       (lib.concatMapStringsSep " " (dep:
         let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in
-        (if dep.crateType == "lib" then
+        (if lib.lists.any (x: x == "lib") dep.crateType then
            " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib"
          else
            " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")
@@ -86,7 +86,8 @@ stdenv.mkDerivation (rec {
       else
         fetchCrate { inherit (crate) crateName version sha256; };
     name = "rust_${crate.crateName}-${crate.version}";
-    buildInputs = [ rust ncurses ] ++ (crate.buildInputs or []) ++ buildInputs_;
+    depsBuildBuild = [ rust stdenv.cc ];
+    buildInputs = (crate.buildInputs or []) ++ buildInputs_;
     dependencies =
       builtins.map
         (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })
@@ -122,15 +123,16 @@ stdenv.mkDerivation (rec {
 
        ) "" crate.crateBin
     else "";
+    hasCrateBin = crate ? crateBin;
 
     build = crate.build or "";
     workspace_member = crate.workspace_member or ".";
     crateVersion = crate.version;
     crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [];
     crateType =
-      if lib.attrByPath ["procMacro"] false crate then "proc-macro" else
-      if lib.attrByPath ["plugin"] false crate then "dylib" else
-      (crate.type or "lib");
+      if lib.attrByPath ["procMacro"] false crate then ["proc-macro"] else
+      if lib.attrByPath ["plugin"] false crate then ["dylib"] else
+        (crate.type or ["lib"]);
     colors = lib.attrByPath [ "colors" ] "always" crate;
     extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []);
     configurePhase = configureCrate {
@@ -143,7 +145,7 @@ stdenv.mkDerivation (rec {
     buildPhase = buildCrate {
       inherit crateName dependencies
               crateFeatures libName release libPath crateType
-              metadata crateBin verbose colors
+              metadata crateBin hasCrateBin verbose colors
               extraRustcOpts;
     };
     installPhase = installCrate crateName metadata;
diff --git a/pkgs/build-support/rust/build-rust-crate/helpers.nix b/pkgs/build-support/rust/build-rust-crate/helpers.nix
new file mode 100644
index 00000000000..e04324684e5
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/helpers.nix
@@ -0,0 +1,24 @@
+{stdenv, lib}:
+{
+  kernel = stdenv.hostPlatform.parsed.kernel.name;
+  abi = stdenv.hostPlatform.parsed.abi.name;
+   updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
+   mapFeatures = features: map (fun: fun { features = features; });
+   mkFeatures = feat: lib.lists.foldl (features: featureName:
+     if feat.${featureName} or false then
+       [ featureName ] ++ features
+     else
+       features
+   ) [] (builtins.attrNames feat);
+  include = includedFiles: src: builtins.filterSource (path: type:
+    lib.lists.any (f:
+      let p = toString (src + ("/" + f)); in
+      (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
+    ) includedFiles
+  ) src;
+  exclude = excludedFiles: src: builtins.filterSource (path: type:
+    lib.lists.all (f:
+       !lib.strings.hasPrefix (toString (src + ("/" + f))) path
+    ) excludedFiles
+  ) src;
+}
diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix
index 0b8b3d60b6c..7a0d92f81b4 100644
--- a/pkgs/build-support/rust/carnix.nix
+++ b/pkgs/build-support/rust/carnix.nix
@@ -1,1444 +1,251 @@
-# Generated by carnix 0.7.2: carnix nix
-{ lib, stdenv, buildRustCrate, fetchgit }:
-let kernel = stdenv.hostPlatform.parsed.kernel.name;
-    abi = stdenv.hostPlatform.parsed.abi.name;
-    updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
-    mapFeatures = features: map (fun: fun { features = features; });
-    mkFeatures = feat: lib.lists.foldl (features: featureName:
-      if feat.${featureName} or false then
-        [ featureName ] ++ features
-      else
-        features
-    ) [] (builtins.attrNames feat);
+# Generated by carnix 0.8.11: carnix generate-nix
+{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }:
+with buildRustCrateHelpers;
+let inherit (lib.lists) fold;
+    inherit (lib.attrsets) recursiveUpdate;
 in
+let crates = cratesIO; in
 rec {
-  carnix = f: carnix_0_7_2 { features = carnix_0_7_2_features { carnix_0_7_2 = f; }; };
+  carnix = crates.crates.carnix."0.8.11" deps;
   __all = [ (carnix {}) ];
-  aho_corasick_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "aho-corasick";
-    version = "0.6.4";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "189v919mp6rzzgjp1khpn4zlq8ls81gh43x1lmc8kbkagdlpq888";
-    libName = "aho_corasick";
-    crateBin = [ {  name = "aho-corasick-dot"; } ];
-    inherit dependencies buildDependencies features;
+  deps.aho_corasick."0.6.8" = {
+    memchr = "2.1.0";
+  };
+  deps.ansi_term."0.11.0" = {
+    winapi = "0.3.6";
+  };
+  deps.argon2rs."0.2.5" = {
+    blake2_rfc = "0.2.18";
+    scoped_threadpool = "0.1.9";
+  };
+  deps.arrayvec."0.4.7" = {
+    nodrop = "0.1.12";
+  };
+  deps.atty."0.2.11" = {
+    termion = "1.5.1";
+    libc = "0.2.43";
+    winapi = "0.3.6";
+  };
+  deps.backtrace."0.3.9" = {
+    cfg_if = "0.1.6";
+    rustc_demangle = "0.1.9";
+    backtrace_sys = "0.1.24";
+    libc = "0.2.43";
+    winapi = "0.3.6";
+  };
+  deps.backtrace_sys."0.1.24" = {
+    libc = "0.2.43";
+    cc = "1.0.25";
+  };
+  deps.bitflags."1.0.4" = {};
+  deps.blake2_rfc."0.2.18" = {
+    arrayvec = "0.4.7";
+    constant_time_eq = "0.1.3";
+  };
+  deps.carnix."0.8.11" = {
+    clap = "2.32.0";
+    dirs = "1.0.4";
+    env_logger = "0.5.13";
+    error_chain = "0.12.0";
+    itertools = "0.7.8";
+    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";
+    tempdir = "0.3.7";
+    toml = "0.4.8";
+  };
+  deps.cc."1.0.25" = {};
+  deps.cfg_if."0.1.6" = {};
+  deps.clap."2.32.0" = {
+    atty = "0.2.11";
+    bitflags = "1.0.4";
+    strsim = "0.7.0";
+    textwrap = "0.10.0";
+    unicode_width = "0.1.5";
+    vec_map = "0.8.1";
+    ansi_term = "0.11.0";
+  };
+  deps.constant_time_eq."0.1.3" = {};
+  deps.dirs."1.0.4" = {
+    redox_users = "0.2.0";
+    libc = "0.2.43";
+    winapi = "0.3.6";
+  };
+  deps.either."1.5.0" = {};
+  deps.env_logger."0.5.13" = {
+    atty = "0.2.11";
+    humantime = "1.1.1";
+    log = "0.4.5";
+    regex = "1.0.5";
+    termcolor = "1.0.4";
+  };
+  deps.error_chain."0.12.0" = {
+    backtrace = "0.3.9";
+  };
+  deps.failure."0.1.3" = {
+    backtrace = "0.3.9";
+    failure_derive = "0.1.3";
+  };
+  deps.failure_derive."0.1.3" = {
+    proc_macro2 = "0.4.20";
+    quote = "0.6.8";
+    syn = "0.15.13";
+    synstructure = "0.10.0";
+  };
+  deps.fuchsia_zircon."0.3.3" = {
+    bitflags = "1.0.4";
+    fuchsia_zircon_sys = "0.3.3";
+  };
+  deps.fuchsia_zircon_sys."0.3.3" = {};
+  deps.humantime."1.1.1" = {
+    quick_error = "1.2.2";
+  };
+  deps.itertools."0.7.8" = {
+    either = "1.5.0";
+  };
+  deps.itoa."0.4.3" = {};
+  deps.lazy_static."1.1.0" = {
+    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";
+  };
+  deps.memchr."2.1.0" = {
+    cfg_if = "0.1.6";
+    libc = "0.2.43";
+    version_check = "0.1.5";
+  };
+  deps.nodrop."0.1.12" = {};
+  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";
+  };
+  deps.quick_error."1.2.2" = {};
+  deps.quote."0.6.8" = {
+    proc_macro2 = "0.4.20";
+  };
+  deps.rand."0.4.3" = {
+    fuchsia_zircon = "0.3.3";
+    libc = "0.2.43";
+    winapi = "0.3.6";
+  };
+  deps.redox_syscall."0.1.40" = {};
+  deps.redox_termios."0.1.1" = {
+    redox_syscall = "0.1.40";
+  };
+  deps.redox_users."0.2.0" = {
+    argon2rs = "0.2.5";
+    failure = "0.1.3";
+    rand = "0.4.3";
+    redox_syscall = "0.1.40";
+  };
+  deps.regex."1.0.5" = {
+    aho_corasick = "0.6.8";
+    memchr = "2.1.0";
+    regex_syntax = "0.6.2";
+    thread_local = "0.3.6";
+    utf8_ranges = "1.0.1";
+  };
+  deps.regex_syntax."0.6.2" = {
+    ucd_util = "0.1.1";
+  };
+  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" = {};
+  deps.serde."1.0.80" = {};
+  deps.serde_derive."1.0.80" = {
+    proc_macro2 = "0.4.20";
+    quote = "0.6.8";
+    syn = "0.15.13";
+  };
+  deps.serde_json."1.0.32" = {
+    itoa = "0.4.3";
+    ryu = "0.2.6";
+    serde = "1.0.80";
+  };
+  deps.strsim."0.7.0" = {};
+  deps.syn."0.15.13" = {
+    proc_macro2 = "0.4.20";
+    quote = "0.6.8";
+    unicode_xid = "0.1.0";
+  };
+  deps.synstructure."0.10.0" = {
+    proc_macro2 = "0.4.20";
+    quote = "0.6.8";
+    syn = "0.15.13";
+    unicode_xid = "0.1.0";
+  };
+  deps.tempdir."0.3.7" = {
+    rand = "0.4.3";
+    remove_dir_all = "0.5.1";
+  };
+  deps.termcolor."1.0.4" = {
+    wincolor = "1.0.1";
+  };
+  deps.termion."1.5.1" = {
+    libc = "0.2.43";
+    redox_syscall = "0.1.40";
+    redox_termios = "0.1.1";
+  };
+  deps.textwrap."0.10.0" = {
+    unicode_width = "0.1.5";
+  };
+  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";
+  };
+  deps.ucd_util."0.1.1" = {};
+  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" = {
+    winapi_i686_pc_windows_gnu = "0.4.0";
+    winapi_x86_64_pc_windows_gnu = "0.4.0";
+  };
+  deps.winapi_i686_pc_windows_gnu."0.4.0" = {};
+  deps.winapi_util."0.1.1" = {
+    winapi = "0.3.6";
+  };
+  deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {};
+  deps.wincolor."1.0.1" = {
+    winapi = "0.3.6";
+    winapi_util = "0.1.1";
   };
-  ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "ansi_term";
-    version = "0.11.0";
-    authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" "Josh Triplett <josh@joshtriplett.org>" ];
-    sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v";
-    inherit dependencies buildDependencies features;
-  };
-  atty_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "atty";
-    version = "0.2.8";
-    authors = [ "softprops <d.tangren@gmail.com>" ];
-    sha256 = "03w1q3h4w7vhcdxdwa9cirjkzdjz3ja636fj3g64659z6yax6p6d";
-    inherit dependencies buildDependencies features;
-  };
-  backtrace_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "backtrace";
-    version = "0.3.6";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" "The Rust Project Developers" ];
-    sha256 = "00p77iqrv2p47m4y5lq1clb8fi1xfmnz2520frqx88497ff4zhrx";
-    inherit dependencies buildDependencies features;
-  };
-  backtrace_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "backtrace-sys";
-    version = "0.1.16";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1cn2c8q3dn06crmnk0p62czkngam4l8nf57wy33nz1y5g25pszwy";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  bitflags_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "bitflags";
-    version = "1.0.1";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1";
-    inherit dependencies buildDependencies features;
-  };
-  carnix_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "carnix";
-    version = "0.7.2";
-    authors = [ "pe@pijul.org <pe@pijul.org>" ];
-    sha256 = "0zsmc4wiz7vill676mcdh6ibyzmr9rn030j555ncqgavs7k5yhq5";
-    crateBin = [ {  name = "cargo-generate-nixfile";  path = "src/cargo-generate-nixfile.rs"; } {  name = "carnix";  path = "src/main.rs"; } ];
-    inherit dependencies buildDependencies features;
-  };
-  cc_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "cc";
-    version = "1.0.10";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0fqchrxcrd2j2b9x7cqs49ck7b3ilsap8s9xhs75gzgl6c1ylpdn";
-    inherit dependencies buildDependencies features;
-  };
-  cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "cfg-if";
-    version = "0.1.2";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi";
-    inherit dependencies buildDependencies features;
-  };
-  clap_2_31_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "clap";
-    version = "2.31.2";
-    authors = [ "Kevin K. <kbknapp@gmail.com>" ];
-    sha256 = "0r24ziw85a8y1sf2l21y4mvv5qan3rjafcshpyfsjfadqfxsij72";
-    inherit dependencies buildDependencies features;
-  };
-  dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "dtoa";
-    version = "0.4.2";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw";
-    inherit dependencies buildDependencies features;
-  };
-  either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "either";
-    version = "1.5.0";
-    authors = [ "bluss" ];
-    sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz";
-    inherit dependencies buildDependencies features;
-  };
-  env_logger_0_5_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "env_logger";
-    version = "0.5.7";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0wgd9fashmwbx5ssrxx69naam6hlb5c7qmh1nln645q4gms35i2l";
-    inherit dependencies buildDependencies features;
-  };
-  error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "error-chain";
-    version = "0.11.0";
-    authors = [ "Brian Anderson <banderson@mozilla.com>" "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" "Yamakaky <yamakaky@yamaworld.fr>" ];
-    sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7";
-    inherit dependencies buildDependencies features;
-  };
-  fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "fuchsia-zircon";
-    version = "0.3.3";
-    authors = [ "Raph Levien <raph@google.com>" ];
-    sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk";
-    inherit dependencies buildDependencies features;
-  };
-  fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "fuchsia-zircon-sys";
-    version = "0.3.3";
-    authors = [ "Raph Levien <raph@google.com>" ];
-    sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
-    inherit dependencies buildDependencies features;
-  };
-  humantime_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "humantime";
-    version = "1.1.1";
-    authors = [ "Paul Colomiets <paul@colomiets.name>" ];
-    sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn";
-    libPath = "src/lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  itertools_0_7_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "itertools";
-    version = "0.7.8";
-    authors = [ "bluss" ];
-    sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357";
-    inherit dependencies buildDependencies features;
-  };
-  itoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "itoa";
-    version = "0.4.1";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1jyrsmrm5q4r2ipmq5hvvkqg0mgnlbk44lm7gr0v9ymvbrh2gbij";
-    inherit dependencies buildDependencies features;
-  };
-  lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "lazy_static";
-    version = "1.0.0";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh";
-    inherit dependencies buildDependencies features;
-  };
-  libc_0_2_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libc";
-    version = "0.2.40";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1xfc39237ldzgr8x8wcflgdr8zssi3wif7g2zxc02d94gzkjsw83";
-    inherit dependencies buildDependencies features;
-  };
-  libsqlite3_sys_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libsqlite3-sys";
-    version = "0.9.1";
-    authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ];
-    sha256 = "1j599xygsh564xmx29942w0sq7w05c1jipk6dsyrxj6b33kw3fw7";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  linked_hash_map_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "linked-hash-map";
-    version = "0.4.2";
-    authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" "Andrew Paseltiner <apaseltiner@gmail.com>" ];
-    sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl";
-    inherit dependencies buildDependencies features;
-  };
-  log_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "log";
-    version = "0.4.1";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "01vm8yy3wngvyj6qp1x3xpcb4xq7v67yn9l7fsma8kz28mliz90d";
-    inherit dependencies buildDependencies features;
-  };
-  lru_cache_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "lru-cache";
-    version = "0.1.1";
-    authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" ];
-    sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw";
-    inherit dependencies buildDependencies features;
-  };
-  memchr_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "memchr";
-    version = "1.0.2";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ];
-    sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7";
-    inherit dependencies buildDependencies features;
-  };
-  memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "memchr";
-    version = "2.0.1";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ];
-    sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr";
-    inherit dependencies buildDependencies features;
-  };
-  nom_3_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "nom";
-    version = "3.2.1";
-    authors = [ "contact@geoffroycouprie.com" ];
-    sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07";
-    inherit dependencies buildDependencies features;
-  };
-  num_traits_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-traits";
-    version = "0.2.2";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1gcqhcd27gi72al5salxlp3m374qr3xnc3zh249f7dsrxc9rmgh0";
-    inherit dependencies buildDependencies features;
-  };
-  pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "pkg-config";
-    version = "0.3.9";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146";
-    inherit dependencies buildDependencies features;
-  };
-  proc_macro2_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "proc-macro2";
-    version = "0.3.6";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1viqlvsknzvgc2j0bcz53n94zxv7c816py7hv2r27y0bv1dq4iqp";
-    inherit dependencies buildDependencies features;
-  };
-  quick_error_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "quick-error";
-    version = "1.2.1";
-    authors = [ "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" ];
-    sha256 = "0vq41csw68ynaq2fy5dvldh4lx7pnbw6pr332kv5rvrz4pz0jnq6";
-    inherit dependencies buildDependencies features;
-  };
-  quote_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "quote";
-    version = "0.5.1";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "0jppgddqp6vp67ns4hpyf644n5678fligp711isp0xkvfv19la3r";
-    inherit dependencies buildDependencies features;
-  };
-  rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rand";
-    version = "0.4.2";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm";
-    inherit dependencies buildDependencies features;
-  };
-  redox_syscall_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "redox_syscall";
-    version = "0.1.37";
-    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
-    sha256 = "0qa0jl9cr3qp80an8vshp2mcn8rzvwiavs1398hq1vsjw7pc3h2v";
-    libName = "syscall";
-    inherit dependencies buildDependencies features;
-  };
-  redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "redox_termios";
-    version = "0.1.1";
-    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
-    sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh";
-    libPath = "src/lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  regex_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "regex";
-    version = "0.2.10";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0cwdmcllssm984b5nnpr55rgla1yzw31kmp2imxdpgk6hvlhf1ca";
-    inherit dependencies buildDependencies features;
-  };
-  regex_syntax_0_5_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "regex-syntax";
-    version = "0.5.5";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1m5v66r6xxglgkdl1ci23qq0bl0k2wqplm6li4pmg1k7szvgxcbp";
-    inherit dependencies buildDependencies features;
-  };
-  remove_dir_all_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "remove_dir_all";
-    version = "0.5.0";
-    authors = [ "Aaronepower <theaaronepower@gmail.com>" ];
-    sha256 = "0cgmlm9xvf19z84zcb7d62c2lfv60g6gd58c9717giq7c9ib284y";
-    inherit dependencies buildDependencies features;
-  };
-  rusqlite_0_13_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rusqlite";
-    version = "0.13.0";
-    authors = [ "John Gallagher <jgallagher@bignerdranch.com>" ];
-    sha256 = "1hj2464ar2y4324sk3jx7m9byhkcp60krrrs1v1i8dlhhlnkb9hc";
-    inherit dependencies buildDependencies features;
-  };
-  rustc_demangle_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rustc-demangle";
-    version = "0.1.7";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0wrln6jvwmqrhyvqlw5vq9a2s4r04ja8mrybxjj9aaaar1fyvns6";
-    inherit dependencies buildDependencies features;
-  };
-  serde_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde";
-    version = "1.0.38";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "0dri7vmzjsfmak1qq5wdinykqqvd5shpms504p8acpgyx7817jgk";
-    inherit dependencies buildDependencies features;
-  };
-  serde_derive_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde_derive";
-    version = "1.0.38";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "027c13sbnqkfzc8vxx0m6wnkr68im8kdbkbnix07dgw1l616yw0m";
-    procMacro = true;
-    inherit dependencies buildDependencies features;
-  };
-  serde_derive_internals_0_23_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde_derive_internals";
-    version = "0.23.1";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "0bjgcn2irh6sd34q3j3xkbn5ghfgiv3cfdlffb31lh0bikwpk1b4";
-    inherit dependencies buildDependencies features;
-  };
-  serde_json_1_0_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde_json";
-    version = "1.0.14";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "053n2vbcx32f28pr8fxi0fxq7m3g0gm94kz9i1fmi1kiwq9j5lsj";
-    inherit dependencies buildDependencies features;
-  };
-  strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "strsim";
-    version = "0.7.0";
-    authors = [ "Danny Guo <dannyguo91@gmail.com>" ];
-    sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv";
-    inherit dependencies buildDependencies features;
-  };
-  syn_0_13_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "syn";
-    version = "0.13.1";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1pimp7fpvillhz06xz0k6450h9nis3ab6h1j2hzrzykrpxs2qnyg";
-    inherit dependencies buildDependencies features;
-  };
-  tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tempdir";
-    version = "0.3.7";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy";
-    inherit dependencies buildDependencies features;
-  };
-  termcolor_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "termcolor";
-    version = "0.3.6";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "0w609sa1apl1kii67ln2g82r4rrycw45zgjq7mxxjrx1fa21v05z";
-    inherit dependencies buildDependencies features;
-  };
-  termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "termion";
-    version = "1.5.1";
-    authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ];
-    sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1";
-    inherit dependencies buildDependencies features;
-  };
-  textwrap_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "textwrap";
-    version = "0.9.0";
-    authors = [ "Martin Geisler <martin@geisler.net>" ];
-    sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb";
-    inherit dependencies buildDependencies features;
-  };
-  thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "thread_local";
-    version = "0.3.5";
-    authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ];
-    sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6";
-    inherit dependencies buildDependencies features;
-  };
-  time_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "time";
-    version = "0.1.39";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1ryy3bwhvyzj6fym123il38mk9ranm4vradj2a47l5ij8jd7w5if";
-    inherit dependencies buildDependencies features;
-  };
-  toml_0_4_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "toml";
-    version = "0.4.6";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0rfl7lyb5f67spk69s604nw87f97g7fvv36hj9v88qlr2bwyrn8v";
-    inherit dependencies buildDependencies features;
-  };
-  ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "ucd-util";
-    version = "0.1.1";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-width";
-    version = "0.1.4";
-    authors = [ "kwantam <kwantam@gmail.com>" ];
-    sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-xid";
-    version = "0.1.0";
-    authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ];
-    sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj";
-    inherit dependencies buildDependencies features;
-  };
-  unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unreachable";
-    version = "1.0.0";
-    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
-    sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf";
-    inherit dependencies buildDependencies features;
-  };
-  utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "utf8-ranges";
-    version = "1.0.0";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0";
-    inherit dependencies buildDependencies features;
-  };
-  vcpkg_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "vcpkg";
-    version = "0.2.3";
-    authors = [ "Jim McGrath <jimmc2@gmail.com>" ];
-    sha256 = "0achi8sfy0wm4q04gj7nwpq9xfx8ynk6vv4r12a3ijg26hispq0c";
-    inherit dependencies buildDependencies features;
-  };
-  vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "vec_map";
-    version = "0.8.0";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Jorge Aparicio <japaricious@gmail.com>" "Alexis Beingessner <a.beingessner@gmail.com>" "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon <aturon@mozilla.com>" "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood <csouth3@illinois.edu>" "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens <markus@m-siemens.de>" "Josh Branchaud <jbranchaud@gmail.com>" "Huon Wilson <dbau.pp@gmail.com>" "Corey Farwell <coref@rwell.org>" "Aaron Liblong <>" "Nick Cameron <nrc@ncameron.org>" "Patrick Walton <pcwalton@mimiga.net>" "Felix S Klock II <>" "Andrew Paseltiner <apaseltiner@gmail.com>" "Sean McArthur <sean.monstar@gmail.com>" "Vadim Petrochenkov <>" ];
-    sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay";
-    inherit dependencies buildDependencies features;
-  };
-  void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "void";
-    version = "1.0.2";
-    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
-    sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi";
-    version = "0.3.4";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1qbrf5dcnd8j36cawby5d9r5vx07r0l4ryf672pfncnp8895k9lx";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi-i686-pc-windows-gnu";
-    version = "0.4.0";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi-x86_64-pc-windows-gnu";
-    version = "0.4.0";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  wincolor_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "wincolor";
-    version = "0.1.6";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "0f8m3l86pw6qi31jidqj78pgd15xj914850lyvsxkbln4f1drv47";
-    inherit dependencies buildDependencies features;
-  };
-  aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ {
-    dependencies = mapFeatures features ([ memchr_2_0_1 ]);
-  };
-  aho_corasick_0_6_4_features = f: updateFeatures f (rec {
-    aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true);
-    memchr_2_0_1.default = true;
-  }) [ memchr_2_0_1_features ];
-  ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ {
-    dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
-  };
-  ansi_term_0_11_0_features = f: updateFeatures f (rec {
-    ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true);
-    winapi_0_3_4.consoleapi = true;
-    winapi_0_3_4.default = true;
-    winapi_0_3_4.errhandlingapi = true;
-    winapi_0_3_4.processenv = true;
-  }) [ winapi_0_3_4_features ];
-  atty_0_2_8 = { features?(atty_0_2_8_features {}) }: atty_0_2_8_ {
-    dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else [])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
-  };
-  atty_0_2_8_features = f: updateFeatures f (rec {
-    atty_0_2_8.default = (f.atty_0_2_8.default or true);
-    libc_0_2_40.default = (f.libc_0_2_40.default or false);
-    termion_1_5_1.default = true;
-    winapi_0_3_4.consoleapi = true;
-    winapi_0_3_4.default = true;
-    winapi_0_3_4.minwinbase = true;
-    winapi_0_3_4.minwindef = true;
-    winapi_0_3_4.processenv = true;
-    winapi_0_3_4.winbase = true;
-  }) [ termion_1_5_1_features libc_0_2_40_features winapi_0_3_4_features ];
-  backtrace_0_3_6 = { features?(backtrace_0_3_6_features {}) }: backtrace_0_3_6_ {
-    dependencies = mapFeatures features ([ cfg_if_0_1_2 rustc_demangle_0_1_7 ])
-      ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ]
-      ++ (if features.backtrace_0_3_6.backtrace-sys or false then [ backtrace_sys_0_1_16 ] else [])) else [])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ ]
-      ++ (if features.backtrace_0_3_6.winapi or false then [ winapi_0_3_4 ] else [])) else []);
-    features = mkFeatures (features.backtrace_0_3_6 or {});
-  };
-  backtrace_0_3_6_features = f: updateFeatures f (rec {
-    backtrace_0_3_6.addr2line =
-      (f.backtrace_0_3_6.addr2line or false) ||
-      (f.backtrace_0_3_6.gimli-symbolize or false) ||
-      (backtrace_0_3_6.gimli-symbolize or false);
-    backtrace_0_3_6.backtrace-sys =
-      (f.backtrace_0_3_6.backtrace-sys or false) ||
-      (f.backtrace_0_3_6.libbacktrace or false) ||
-      (backtrace_0_3_6.libbacktrace or false);
-    backtrace_0_3_6.coresymbolication =
-      (f.backtrace_0_3_6.coresymbolication or false) ||
-      (f.backtrace_0_3_6.default or false) ||
-      (backtrace_0_3_6.default or false);
-    backtrace_0_3_6.dbghelp =
-      (f.backtrace_0_3_6.dbghelp or false) ||
-      (f.backtrace_0_3_6.default or false) ||
-      (backtrace_0_3_6.default or false);
-    backtrace_0_3_6.default = (f.backtrace_0_3_6.default or true);
-    backtrace_0_3_6.dladdr =
-      (f.backtrace_0_3_6.dladdr or false) ||
-      (f.backtrace_0_3_6.default or false) ||
-      (backtrace_0_3_6.default or false);
-    backtrace_0_3_6.findshlibs =
-      (f.backtrace_0_3_6.findshlibs or false) ||
-      (f.backtrace_0_3_6.gimli-symbolize or false) ||
-      (backtrace_0_3_6.gimli-symbolize or false);
-    backtrace_0_3_6.gimli =
-      (f.backtrace_0_3_6.gimli or false) ||
-      (f.backtrace_0_3_6.gimli-symbolize or false) ||
-      (backtrace_0_3_6.gimli-symbolize or false);
-    backtrace_0_3_6.libbacktrace =
-      (f.backtrace_0_3_6.libbacktrace or false) ||
-      (f.backtrace_0_3_6.default or false) ||
-      (backtrace_0_3_6.default or false);
-    backtrace_0_3_6.libunwind =
-      (f.backtrace_0_3_6.libunwind or false) ||
-      (f.backtrace_0_3_6.default or false) ||
-      (backtrace_0_3_6.default or false);
-    backtrace_0_3_6.memmap =
-      (f.backtrace_0_3_6.memmap or false) ||
-      (f.backtrace_0_3_6.gimli-symbolize or false) ||
-      (backtrace_0_3_6.gimli-symbolize or false);
-    backtrace_0_3_6.object =
-      (f.backtrace_0_3_6.object or false) ||
-      (f.backtrace_0_3_6.gimli-symbolize or false) ||
-      (backtrace_0_3_6.gimli-symbolize or false);
-    backtrace_0_3_6.rustc-serialize =
-      (f.backtrace_0_3_6.rustc-serialize or false) ||
-      (f.backtrace_0_3_6.serialize-rustc or false) ||
-      (backtrace_0_3_6.serialize-rustc or false);
-    backtrace_0_3_6.serde =
-      (f.backtrace_0_3_6.serde or false) ||
-      (f.backtrace_0_3_6.serialize-serde or false) ||
-      (backtrace_0_3_6.serialize-serde or false);
-    backtrace_0_3_6.serde_derive =
-      (f.backtrace_0_3_6.serde_derive or false) ||
-      (f.backtrace_0_3_6.serialize-serde or false) ||
-      (backtrace_0_3_6.serialize-serde or false);
-    backtrace_0_3_6.winapi =
-      (f.backtrace_0_3_6.winapi or false) ||
-      (f.backtrace_0_3_6.dbghelp or false) ||
-      (backtrace_0_3_6.dbghelp or false);
-    backtrace_sys_0_1_16.default = true;
-    cfg_if_0_1_2.default = true;
-    libc_0_2_40.default = true;
-    rustc_demangle_0_1_7.default = true;
-    winapi_0_3_4.dbghelp = true;
-    winapi_0_3_4.default = true;
-    winapi_0_3_4.minwindef = true;
-    winapi_0_3_4.processthreadsapi = true;
-    winapi_0_3_4.std = true;
-    winapi_0_3_4.winnt = true;
-  }) [ cfg_if_0_1_2_features rustc_demangle_0_1_7_features backtrace_sys_0_1_16_features libc_0_2_40_features winapi_0_3_4_features ];
-  backtrace_sys_0_1_16 = { features?(backtrace_sys_0_1_16_features {}) }: backtrace_sys_0_1_16_ {
-    dependencies = mapFeatures features ([ libc_0_2_40 ]);
-    buildDependencies = mapFeatures features ([ cc_1_0_10 ]);
-  };
-  backtrace_sys_0_1_16_features = f: updateFeatures f (rec {
-    backtrace_sys_0_1_16.default = (f.backtrace_sys_0_1_16.default or true);
-    cc_1_0_10.default = true;
-    libc_0_2_40.default = true;
-  }) [ libc_0_2_40_features cc_1_0_10_features ];
-  bitflags_1_0_1 = { features?(bitflags_1_0_1_features {}) }: bitflags_1_0_1_ {
-    features = mkFeatures (features.bitflags_1_0_1 or {});
-  };
-  bitflags_1_0_1_features = f: updateFeatures f (rec {
-    bitflags_1_0_1.default = (f.bitflags_1_0_1.default or true);
-    bitflags_1_0_1.example_generated =
-      (f.bitflags_1_0_1.example_generated or false) ||
-      (f.bitflags_1_0_1.default or false) ||
-      (bitflags_1_0_1.default or false);
-  }) [];
-  carnix_0_7_2 = { features?(carnix_0_7_2_features {}) }: carnix_0_7_2_ {
-    dependencies = mapFeatures features ([ clap_2_31_2 env_logger_0_5_7 error_chain_0_11_0 itertools_0_7_8 log_0_4_1 nom_3_2_1 regex_0_2_10 rusqlite_0_13_0 serde_1_0_38 serde_derive_1_0_38 serde_json_1_0_14 tempdir_0_3_7 toml_0_4_6 ]);
-  };
-  carnix_0_7_2_features = f: updateFeatures f (rec {
-    carnix_0_7_2.default = (f.carnix_0_7_2.default or true);
-    clap_2_31_2.default = true;
-    env_logger_0_5_7.default = true;
-    error_chain_0_11_0.default = true;
-    itertools_0_7_8.default = true;
-    log_0_4_1.default = true;
-    nom_3_2_1.default = true;
-    regex_0_2_10.default = true;
-    rusqlite_0_13_0.default = true;
-    serde_1_0_38.default = true;
-    serde_derive_1_0_38.default = true;
-    serde_json_1_0_14.default = true;
-    tempdir_0_3_7.default = true;
-    toml_0_4_6.default = true;
-  }) [ clap_2_31_2_features env_logger_0_5_7_features error_chain_0_11_0_features itertools_0_7_8_features log_0_4_1_features nom_3_2_1_features regex_0_2_10_features rusqlite_0_13_0_features serde_1_0_38_features serde_derive_1_0_38_features serde_json_1_0_14_features tempdir_0_3_7_features toml_0_4_6_features ];
-  cc_1_0_10 = { features?(cc_1_0_10_features {}) }: cc_1_0_10_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.cc_1_0_10 or {});
-  };
-  cc_1_0_10_features = f: updateFeatures f (rec {
-    cc_1_0_10.default = (f.cc_1_0_10.default or true);
-    cc_1_0_10.rayon =
-      (f.cc_1_0_10.rayon or false) ||
-      (f.cc_1_0_10.parallel or false) ||
-      (cc_1_0_10.parallel or false);
-  }) [];
-  cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {};
-  cfg_if_0_1_2_features = f: updateFeatures f (rec {
-    cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true);
-  }) [];
-  clap_2_31_2 = { features?(clap_2_31_2_features {}) }: clap_2_31_2_ {
-    dependencies = mapFeatures features ([ bitflags_1_0_1 textwrap_0_9_0 unicode_width_0_1_4 ]
-      ++ (if features.clap_2_31_2.atty or false then [ atty_0_2_8 ] else [])
-      ++ (if features.clap_2_31_2.strsim or false then [ strsim_0_7_0 ] else [])
-      ++ (if features.clap_2_31_2.vec_map or false then [ vec_map_0_8_0 ] else []))
-      ++ (if !(kernel == "windows") then mapFeatures features ([ ]
-      ++ (if features.clap_2_31_2.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []);
-    features = mkFeatures (features.clap_2_31_2 or {});
-  };
-  clap_2_31_2_features = f: updateFeatures f (rec {
-    ansi_term_0_11_0.default = true;
-    atty_0_2_8.default = true;
-    bitflags_1_0_1.default = true;
-    clap_2_31_2.ansi_term =
-      (f.clap_2_31_2.ansi_term or false) ||
-      (f.clap_2_31_2.color or false) ||
-      (clap_2_31_2.color or false);
-    clap_2_31_2.atty =
-      (f.clap_2_31_2.atty or false) ||
-      (f.clap_2_31_2.color or false) ||
-      (clap_2_31_2.color or false);
-    clap_2_31_2.clippy =
-      (f.clap_2_31_2.clippy or false) ||
-      (f.clap_2_31_2.lints or false) ||
-      (clap_2_31_2.lints or false);
-    clap_2_31_2.color =
-      (f.clap_2_31_2.color or false) ||
-      (f.clap_2_31_2.default or false) ||
-      (clap_2_31_2.default or false);
-    clap_2_31_2.default = (f.clap_2_31_2.default or true);
-    clap_2_31_2.strsim =
-      (f.clap_2_31_2.strsim or false) ||
-      (f.clap_2_31_2.suggestions or false) ||
-      (clap_2_31_2.suggestions or false);
-    clap_2_31_2.suggestions =
-      (f.clap_2_31_2.suggestions or false) ||
-      (f.clap_2_31_2.default or false) ||
-      (clap_2_31_2.default or false);
-    clap_2_31_2.term_size =
-      (f.clap_2_31_2.term_size or false) ||
-      (f.clap_2_31_2.wrap_help or false) ||
-      (clap_2_31_2.wrap_help or false);
-    clap_2_31_2.vec_map =
-      (f.clap_2_31_2.vec_map or false) ||
-      (f.clap_2_31_2.default or false) ||
-      (clap_2_31_2.default or false);
-    clap_2_31_2.yaml =
-      (f.clap_2_31_2.yaml or false) ||
-      (f.clap_2_31_2.doc or false) ||
-      (clap_2_31_2.doc or false);
-    clap_2_31_2.yaml-rust =
-      (f.clap_2_31_2.yaml-rust or false) ||
-      (f.clap_2_31_2.yaml or false) ||
-      (clap_2_31_2.yaml or false);
-    strsim_0_7_0.default = true;
-    textwrap_0_9_0.default = true;
-    textwrap_0_9_0.term_size =
-      (f.textwrap_0_9_0.term_size or false) ||
-      (clap_2_31_2.wrap_help or false) ||
-      (f.clap_2_31_2.wrap_help or false);
-    unicode_width_0_1_4.default = true;
-    vec_map_0_8_0.default = true;
-  }) [ atty_0_2_8_features bitflags_1_0_1_features strsim_0_7_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ansi_term_0_11_0_features ];
-  dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {};
-  dtoa_0_4_2_features = f: updateFeatures f (rec {
-    dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true);
-  }) [];
-  either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.either_1_5_0 or {});
-  };
-  either_1_5_0_features = f: updateFeatures f (rec {
-    either_1_5_0.default = (f.either_1_5_0.default or true);
-    either_1_5_0.use_std =
-      (f.either_1_5_0.use_std or false) ||
-      (f.either_1_5_0.default or false) ||
-      (either_1_5_0.default or false);
-  }) [];
-  env_logger_0_5_7 = { features?(env_logger_0_5_7_features {}) }: env_logger_0_5_7_ {
-    dependencies = mapFeatures features ([ atty_0_2_8 humantime_1_1_1 log_0_4_1 termcolor_0_3_6 ]
-      ++ (if features.env_logger_0_5_7.regex or false then [ regex_0_2_10 ] else []));
-    features = mkFeatures (features.env_logger_0_5_7 or {});
-  };
-  env_logger_0_5_7_features = f: updateFeatures f (rec {
-    atty_0_2_8.default = true;
-    env_logger_0_5_7.default = (f.env_logger_0_5_7.default or true);
-    env_logger_0_5_7.regex =
-      (f.env_logger_0_5_7.regex or false) ||
-      (f.env_logger_0_5_7.default or false) ||
-      (env_logger_0_5_7.default or false);
-    humantime_1_1_1.default = true;
-    log_0_4_1.default = true;
-    log_0_4_1.std = true;
-    regex_0_2_10.default = true;
-    termcolor_0_3_6.default = true;
-  }) [ atty_0_2_8_features humantime_1_1_1_features log_0_4_1_features regex_0_2_10_features termcolor_0_3_6_features ];
-  error_chain_0_11_0 = { features?(error_chain_0_11_0_features {}) }: error_chain_0_11_0_ {
-    dependencies = mapFeatures features ([ ]
-      ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_6 ] else []));
-    features = mkFeatures (features.error_chain_0_11_0 or {});
-  };
-  error_chain_0_11_0_features = f: updateFeatures f (rec {
-    backtrace_0_3_6.default = true;
-    error_chain_0_11_0.backtrace =
-      (f.error_chain_0_11_0.backtrace or false) ||
-      (f.error_chain_0_11_0.default or false) ||
-      (error_chain_0_11_0.default or false);
-    error_chain_0_11_0.default = (f.error_chain_0_11_0.default or true);
-    error_chain_0_11_0.example_generated =
-      (f.error_chain_0_11_0.example_generated or false) ||
-      (f.error_chain_0_11_0.default or false) ||
-      (error_chain_0_11_0.default or false);
-  }) [ backtrace_0_3_6_features ];
-  fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ {
-    dependencies = mapFeatures features ([ bitflags_1_0_1 fuchsia_zircon_sys_0_3_3 ]);
-  };
-  fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec {
-    bitflags_1_0_1.default = true;
-    fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true);
-    fuchsia_zircon_sys_0_3_3.default = true;
-  }) [ bitflags_1_0_1_features fuchsia_zircon_sys_0_3_3_features ];
-  fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {};
-  fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec {
-    fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true);
-  }) [];
-  humantime_1_1_1 = { features?(humantime_1_1_1_features {}) }: humantime_1_1_1_ {
-    dependencies = mapFeatures features ([ quick_error_1_2_1 ]);
-  };
-  humantime_1_1_1_features = f: updateFeatures f (rec {
-    humantime_1_1_1.default = (f.humantime_1_1_1.default or true);
-    quick_error_1_2_1.default = true;
-  }) [ quick_error_1_2_1_features ];
-  itertools_0_7_8 = { features?(itertools_0_7_8_features {}) }: itertools_0_7_8_ {
-    dependencies = mapFeatures features ([ either_1_5_0 ]);
-    features = mkFeatures (features.itertools_0_7_8 or {});
-  };
-  itertools_0_7_8_features = f: updateFeatures f (rec {
-    either_1_5_0.default = (f.either_1_5_0.default or false);
-    itertools_0_7_8.default = (f.itertools_0_7_8.default or true);
-    itertools_0_7_8.use_std =
-      (f.itertools_0_7_8.use_std or false) ||
-      (f.itertools_0_7_8.default or false) ||
-      (itertools_0_7_8.default or false);
-  }) [ either_1_5_0_features ];
-  itoa_0_4_1 = { features?(itoa_0_4_1_features {}) }: itoa_0_4_1_ {
-    features = mkFeatures (features.itoa_0_4_1 or {});
-  };
-  itoa_0_4_1_features = f: updateFeatures f (rec {
-    itoa_0_4_1.default = (f.itoa_0_4_1.default or true);
-    itoa_0_4_1.std =
-      (f.itoa_0_4_1.std or false) ||
-      (f.itoa_0_4_1.default or false) ||
-      (itoa_0_4_1.default or false);
-  }) [];
-  lazy_static_1_0_0 = { features?(lazy_static_1_0_0_features {}) }: lazy_static_1_0_0_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.lazy_static_1_0_0 or {});
-  };
-  lazy_static_1_0_0_features = f: updateFeatures f (rec {
-    lazy_static_1_0_0.compiletest_rs =
-      (f.lazy_static_1_0_0.compiletest_rs or false) ||
-      (f.lazy_static_1_0_0.compiletest or false) ||
-      (lazy_static_1_0_0.compiletest or false);
-    lazy_static_1_0_0.default = (f.lazy_static_1_0_0.default or true);
-    lazy_static_1_0_0.nightly =
-      (f.lazy_static_1_0_0.nightly or false) ||
-      (f.lazy_static_1_0_0.spin_no_std or false) ||
-      (lazy_static_1_0_0.spin_no_std or false);
-    lazy_static_1_0_0.spin =
-      (f.lazy_static_1_0_0.spin or false) ||
-      (f.lazy_static_1_0_0.spin_no_std or false) ||
-      (lazy_static_1_0_0.spin_no_std or false);
-  }) [];
-  libc_0_2_40 = { features?(libc_0_2_40_features {}) }: libc_0_2_40_ {
-    features = mkFeatures (features.libc_0_2_40 or {});
-  };
-  libc_0_2_40_features = f: updateFeatures f (rec {
-    libc_0_2_40.default = (f.libc_0_2_40.default or true);
-    libc_0_2_40.use_std =
-      (f.libc_0_2_40.use_std or false) ||
-      (f.libc_0_2_40.default or false) ||
-      (libc_0_2_40.default or false);
-  }) [];
-  libsqlite3_sys_0_9_1 = { features?(libsqlite3_sys_0_9_1_features {}) }: libsqlite3_sys_0_9_1_ {
-    dependencies = (if abi == "msvc" then mapFeatures features ([]) else []);
-    buildDependencies = mapFeatures features ([ ]
-      ++ (if features.libsqlite3_sys_0_9_1.pkg-config or false then [ pkg_config_0_3_9 ] else []));
-    features = mkFeatures (features.libsqlite3_sys_0_9_1 or {});
-  };
-  libsqlite3_sys_0_9_1_features = f: updateFeatures f (rec {
-    libsqlite3_sys_0_9_1.bindgen =
-      (f.libsqlite3_sys_0_9_1.bindgen or false) ||
-      (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
-      (libsqlite3_sys_0_9_1.buildtime_bindgen or false);
-    libsqlite3_sys_0_9_1.cc =
-      (f.libsqlite3_sys_0_9_1.cc or false) ||
-      (f.libsqlite3_sys_0_9_1.bundled or false) ||
-      (libsqlite3_sys_0_9_1.bundled or false);
-    libsqlite3_sys_0_9_1.default = (f.libsqlite3_sys_0_9_1.default or true);
-    libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 =
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
-      (f.libsqlite3_sys_0_9_1.default or false) ||
-      (libsqlite3_sys_0_9_1.default or false);
-    libsqlite3_sys_0_9_1.pkg-config =
-      (f.libsqlite3_sys_0_9_1.pkg-config or false) ||
-      (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
-      (libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
-      (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
-      (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
-      (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) ||
-      (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) ||
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
-      (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) ||
-      (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false);
-    libsqlite3_sys_0_9_1.vcpkg =
-      (f.libsqlite3_sys_0_9_1.vcpkg or false) ||
-      (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
-      (libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
-      (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
-      (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
-      (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) ||
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) ||
-      (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) ||
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
-      (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) ||
-      (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false);
-    pkg_config_0_3_9.default = true;
-  }) [ pkg_config_0_3_9_features ];
-  linked_hash_map_0_4_2 = { features?(linked_hash_map_0_4_2_features {}) }: linked_hash_map_0_4_2_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.linked_hash_map_0_4_2 or {});
-  };
-  linked_hash_map_0_4_2_features = f: updateFeatures f (rec {
-    linked_hash_map_0_4_2.default = (f.linked_hash_map_0_4_2.default or true);
-    linked_hash_map_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);
-    linked_hash_map_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);
-    linked_hash_map_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);
-  }) [];
-  log_0_4_1 = { features?(log_0_4_1_features {}) }: log_0_4_1_ {
-    dependencies = mapFeatures features ([ cfg_if_0_1_2 ]);
-    features = mkFeatures (features.log_0_4_1 or {});
-  };
-  log_0_4_1_features = f: updateFeatures f (rec {
-    cfg_if_0_1_2.default = true;
-    log_0_4_1.default = (f.log_0_4_1.default or true);
-  }) [ cfg_if_0_1_2_features ];
-  lru_cache_0_1_1 = { features?(lru_cache_0_1_1_features {}) }: lru_cache_0_1_1_ {
-    dependencies = mapFeatures features ([ linked_hash_map_0_4_2 ]);
-    features = mkFeatures (features.lru_cache_0_1_1 or {});
-  };
-  lru_cache_0_1_1_features = f: updateFeatures f (rec {
-    linked_hash_map_0_4_2.default = true;
-    linked_hash_map_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_0_1_1.default = (f.lru_cache_0_1_1.default or true);
-    lru_cache_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);
-  }) [ linked_hash_map_0_4_2_features ];
-  memchr_1_0_2 = { features?(memchr_1_0_2_features {}) }: memchr_1_0_2_ {
-    dependencies = mapFeatures features ([ ]
-      ++ (if features.memchr_1_0_2.libc or false then [ libc_0_2_40 ] else []));
-    features = mkFeatures (features.memchr_1_0_2 or {});
-  };
-  memchr_1_0_2_features = f: updateFeatures f (rec {
-    libc_0_2_40.default = (f.libc_0_2_40.default or false);
-    libc_0_2_40.use_std =
-      (f.libc_0_2_40.use_std or false) ||
-      (memchr_1_0_2.use_std or false) ||
-      (f.memchr_1_0_2.use_std or false);
-    memchr_1_0_2.default = (f.memchr_1_0_2.default or true);
-    memchr_1_0_2.libc =
-      (f.memchr_1_0_2.libc or false) ||
-      (f.memchr_1_0_2.default or false) ||
-      (memchr_1_0_2.default or false) ||
-      (f.memchr_1_0_2.use_std or false) ||
-      (memchr_1_0_2.use_std or false);
-    memchr_1_0_2.use_std =
-      (f.memchr_1_0_2.use_std or false) ||
-      (f.memchr_1_0_2.default or false) ||
-      (memchr_1_0_2.default or false);
-  }) [ libc_0_2_40_features ];
-  memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ {
-    dependencies = mapFeatures features ([ ]
-      ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_40 ] else []));
-    features = mkFeatures (features.memchr_2_0_1 or {});
-  };
-  memchr_2_0_1_features = f: updateFeatures f (rec {
-    libc_0_2_40.default = (f.libc_0_2_40.default or false);
-    libc_0_2_40.use_std =
-      (f.libc_0_2_40.use_std or false) ||
-      (memchr_2_0_1.use_std or false) ||
-      (f.memchr_2_0_1.use_std or false);
-    memchr_2_0_1.default = (f.memchr_2_0_1.default or true);
-    memchr_2_0_1.libc =
-      (f.memchr_2_0_1.libc or false) ||
-      (f.memchr_2_0_1.default or false) ||
-      (memchr_2_0_1.default or false) ||
-      (f.memchr_2_0_1.use_std or false) ||
-      (memchr_2_0_1.use_std or false);
-    memchr_2_0_1.use_std =
-      (f.memchr_2_0_1.use_std or false) ||
-      (f.memchr_2_0_1.default or false) ||
-      (memchr_2_0_1.default or false);
-  }) [ libc_0_2_40_features ];
-  nom_3_2_1 = { features?(nom_3_2_1_features {}) }: nom_3_2_1_ {
-    dependencies = mapFeatures features ([ memchr_1_0_2 ]);
-    features = mkFeatures (features.nom_3_2_1 or {});
-  };
-  nom_3_2_1_features = f: updateFeatures f (rec {
-    memchr_1_0_2.default = (f.memchr_1_0_2.default or false);
-    memchr_1_0_2.use_std =
-      (f.memchr_1_0_2.use_std or false) ||
-      (nom_3_2_1.std or false) ||
-      (f.nom_3_2_1.std or false);
-    nom_3_2_1.compiler_error =
-      (f.nom_3_2_1.compiler_error or false) ||
-      (f.nom_3_2_1.nightly or false) ||
-      (nom_3_2_1.nightly or false);
-    nom_3_2_1.default = (f.nom_3_2_1.default or true);
-    nom_3_2_1.lazy_static =
-      (f.nom_3_2_1.lazy_static or false) ||
-      (f.nom_3_2_1.regexp_macros or false) ||
-      (nom_3_2_1.regexp_macros or false);
-    nom_3_2_1.regex =
-      (f.nom_3_2_1.regex or false) ||
-      (f.nom_3_2_1.regexp or false) ||
-      (nom_3_2_1.regexp or false);
-    nom_3_2_1.regexp =
-      (f.nom_3_2_1.regexp or false) ||
-      (f.nom_3_2_1.regexp_macros or false) ||
-      (nom_3_2_1.regexp_macros or false);
-    nom_3_2_1.std =
-      (f.nom_3_2_1.std or false) ||
-      (f.nom_3_2_1.default or false) ||
-      (nom_3_2_1.default or false);
-    nom_3_2_1.stream =
-      (f.nom_3_2_1.stream or false) ||
-      (f.nom_3_2_1.default or false) ||
-      (nom_3_2_1.default or false);
-  }) [ memchr_1_0_2_features ];
-  num_traits_0_2_2 = { features?(num_traits_0_2_2_features {}) }: num_traits_0_2_2_ {
-    features = mkFeatures (features.num_traits_0_2_2 or {});
-  };
-  num_traits_0_2_2_features = f: updateFeatures f (rec {
-    num_traits_0_2_2.default = (f.num_traits_0_2_2.default or true);
-    num_traits_0_2_2.std =
-      (f.num_traits_0_2_2.std or false) ||
-      (f.num_traits_0_2_2.default or false) ||
-      (num_traits_0_2_2.default or false);
-  }) [];
-  pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {};
-  pkg_config_0_3_9_features = f: updateFeatures f (rec {
-    pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true);
-  }) [];
-  proc_macro2_0_3_6 = { features?(proc_macro2_0_3_6_features {}) }: proc_macro2_0_3_6_ {
-    dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]);
-    features = mkFeatures (features.proc_macro2_0_3_6 or {});
-  };
-  proc_macro2_0_3_6_features = f: updateFeatures f (rec {
-    proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or true);
-    proc_macro2_0_3_6.proc-macro =
-      (f.proc_macro2_0_3_6.proc-macro or false) ||
-      (f.proc_macro2_0_3_6.default or false) ||
-      (proc_macro2_0_3_6.default or false) ||
-      (f.proc_macro2_0_3_6.nightly or false) ||
-      (proc_macro2_0_3_6.nightly or false);
-    unicode_xid_0_1_0.default = true;
-  }) [ unicode_xid_0_1_0_features ];
-  quick_error_1_2_1 = { features?(quick_error_1_2_1_features {}) }: quick_error_1_2_1_ {};
-  quick_error_1_2_1_features = f: updateFeatures f (rec {
-    quick_error_1_2_1.default = (f.quick_error_1_2_1.default or true);
-  }) [];
-  quote_0_5_1 = { features?(quote_0_5_1_features {}) }: quote_0_5_1_ {
-    dependencies = mapFeatures features ([ proc_macro2_0_3_6 ]);
-    features = mkFeatures (features.quote_0_5_1 or {});
-  };
-  quote_0_5_1_features = f: updateFeatures f (rec {
-    proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false);
-    proc_macro2_0_3_6.proc-macro =
-      (f.proc_macro2_0_3_6.proc-macro or false) ||
-      (quote_0_5_1.proc-macro or false) ||
-      (f.quote_0_5_1.proc-macro or false);
-    quote_0_5_1.default = (f.quote_0_5_1.default or true);
-    quote_0_5_1.proc-macro =
-      (f.quote_0_5_1.proc-macro or false) ||
-      (f.quote_0_5_1.default or false) ||
-      (quote_0_5_1.default or false);
-  }) [ proc_macro2_0_3_6_features ];
-  rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ {
-    dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else [])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ]
-      ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_40 ] else [])) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
-    features = mkFeatures (features.rand_0_4_2 or {});
-  };
-  rand_0_4_2_features = f: updateFeatures f (rec {
-    fuchsia_zircon_0_3_3.default = true;
-    libc_0_2_40.default = true;
-    rand_0_4_2.default = (f.rand_0_4_2.default or true);
-    rand_0_4_2.i128_support =
-      (f.rand_0_4_2.i128_support or false) ||
-      (f.rand_0_4_2.nightly or false) ||
-      (rand_0_4_2.nightly or false);
-    rand_0_4_2.libc =
-      (f.rand_0_4_2.libc or false) ||
-      (f.rand_0_4_2.std or false) ||
-      (rand_0_4_2.std or false);
-    rand_0_4_2.std =
-      (f.rand_0_4_2.std or false) ||
-      (f.rand_0_4_2.default or false) ||
-      (rand_0_4_2.default or false);
-    winapi_0_3_4.default = true;
-    winapi_0_3_4.minwindef = true;
-    winapi_0_3_4.ntsecapi = true;
-    winapi_0_3_4.profileapi = true;
-    winapi_0_3_4.winnt = true;
-  }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ];
-  redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {};
-  redox_syscall_0_1_37_features = f: updateFeatures f (rec {
-    redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true);
-  }) [];
-  redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ {
-    dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]);
-  };
-  redox_termios_0_1_1_features = f: updateFeatures f (rec {
-    redox_syscall_0_1_37.default = true;
-    redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true);
-  }) [ redox_syscall_0_1_37_features ];
-  regex_0_2_10 = { features?(regex_0_2_10_features {}) }: regex_0_2_10_ {
-    dependencies = mapFeatures features ([ aho_corasick_0_6_4 memchr_2_0_1 regex_syntax_0_5_5 thread_local_0_3_5 utf8_ranges_1_0_0 ]);
-    features = mkFeatures (features.regex_0_2_10 or {});
-  };
-  regex_0_2_10_features = f: updateFeatures f (rec {
-    aho_corasick_0_6_4.default = true;
-    memchr_2_0_1.default = true;
-    regex_0_2_10.default = (f.regex_0_2_10.default or true);
-    regex_0_2_10.pattern =
-      (f.regex_0_2_10.pattern or false) ||
-      (f.regex_0_2_10.unstable or false) ||
-      (regex_0_2_10.unstable or false);
-    regex_syntax_0_5_5.default = true;
-    thread_local_0_3_5.default = true;
-    utf8_ranges_1_0_0.default = true;
-  }) [ aho_corasick_0_6_4_features memchr_2_0_1_features regex_syntax_0_5_5_features thread_local_0_3_5_features utf8_ranges_1_0_0_features ];
-  regex_syntax_0_5_5 = { features?(regex_syntax_0_5_5_features {}) }: regex_syntax_0_5_5_ {
-    dependencies = mapFeatures features ([ ucd_util_0_1_1 ]);
-  };
-  regex_syntax_0_5_5_features = f: updateFeatures f (rec {
-    regex_syntax_0_5_5.default = (f.regex_syntax_0_5_5.default or true);
-    ucd_util_0_1_1.default = true;
-  }) [ ucd_util_0_1_1_features ];
-  remove_dir_all_0_5_0 = { features?(remove_dir_all_0_5_0_features {}) }: remove_dir_all_0_5_0_ {
-    dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
-  };
-  remove_dir_all_0_5_0_features = f: updateFeatures f (rec {
-    remove_dir_all_0_5_0.default = (f.remove_dir_all_0_5_0.default or true);
-    winapi_0_3_4.default = true;
-    winapi_0_3_4.errhandlingapi = true;
-    winapi_0_3_4.fileapi = true;
-    winapi_0_3_4.std = true;
-    winapi_0_3_4.winbase = true;
-    winapi_0_3_4.winerror = true;
-  }) [ winapi_0_3_4_features ];
-  rusqlite_0_13_0 = { features?(rusqlite_0_13_0_features {}) }: rusqlite_0_13_0_ {
-    dependencies = mapFeatures features ([ bitflags_1_0_1 libsqlite3_sys_0_9_1 lru_cache_0_1_1 time_0_1_39 ]);
-    features = mkFeatures (features.rusqlite_0_13_0 or {});
-  };
-  rusqlite_0_13_0_features = f: updateFeatures f (rec {
-    bitflags_1_0_1.default = true;
-    libsqlite3_sys_0_9_1.buildtime_bindgen =
-      (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) ||
-      (rusqlite_0_13_0.buildtime_bindgen or false) ||
-      (f.rusqlite_0_13_0.buildtime_bindgen or false);
-    libsqlite3_sys_0_9_1.bundled =
-      (f.libsqlite3_sys_0_9_1.bundled or false) ||
-      (rusqlite_0_13_0.bundled or false) ||
-      (f.rusqlite_0_13_0.bundled or false);
-    libsqlite3_sys_0_9_1.default = true;
-    libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 =
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) ||
-      (rusqlite_0_13_0.backup or false) ||
-      (f.rusqlite_0_13_0.backup or false);
-    libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 =
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) ||
-      (rusqlite_0_13_0.trace or false) ||
-      (f.rusqlite_0_13_0.trace or false);
-    libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 =
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) ||
-      (rusqlite_0_13_0.functions or false) ||
-      (f.rusqlite_0_13_0.functions or false);
-    libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 =
-      (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) ||
-      (rusqlite_0_13_0.blob or false) ||
-      (f.rusqlite_0_13_0.blob or false);
-    libsqlite3_sys_0_9_1.sqlcipher =
-      (f.libsqlite3_sys_0_9_1.sqlcipher or false) ||
-      (rusqlite_0_13_0.sqlcipher or false) ||
-      (f.rusqlite_0_13_0.sqlcipher or false);
-    lru_cache_0_1_1.default = true;
-    rusqlite_0_13_0.default = (f.rusqlite_0_13_0.default or true);
-    time_0_1_39.default = true;
-  }) [ bitflags_1_0_1_features libsqlite3_sys_0_9_1_features lru_cache_0_1_1_features time_0_1_39_features ];
-  rustc_demangle_0_1_7 = { features?(rustc_demangle_0_1_7_features {}) }: rustc_demangle_0_1_7_ {};
-  rustc_demangle_0_1_7_features = f: updateFeatures f (rec {
-    rustc_demangle_0_1_7.default = (f.rustc_demangle_0_1_7.default or true);
-  }) [];
-  serde_1_0_38 = { features?(serde_1_0_38_features {}) }: serde_1_0_38_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.serde_1_0_38 or {});
-  };
-  serde_1_0_38_features = f: updateFeatures f (rec {
-    serde_1_0_38.default = (f.serde_1_0_38.default or true);
-    serde_1_0_38.serde_derive =
-      (f.serde_1_0_38.serde_derive or false) ||
-      (f.serde_1_0_38.derive or false) ||
-      (serde_1_0_38.derive or false) ||
-      (f.serde_1_0_38.playground or false) ||
-      (serde_1_0_38.playground or false);
-    serde_1_0_38.std =
-      (f.serde_1_0_38.std or false) ||
-      (f.serde_1_0_38.default or false) ||
-      (serde_1_0_38.default or false);
-    serde_1_0_38.unstable =
-      (f.serde_1_0_38.unstable or false) ||
-      (f.serde_1_0_38.alloc or false) ||
-      (serde_1_0_38.alloc or false);
-  }) [];
-  serde_derive_1_0_38 = { features?(serde_derive_1_0_38_features {}) }: serde_derive_1_0_38_ {
-    dependencies = mapFeatures features ([ proc_macro2_0_3_6 quote_0_5_1 serde_derive_internals_0_23_1 syn_0_13_1 ]);
-    features = mkFeatures (features.serde_derive_1_0_38 or {});
-  };
-  serde_derive_1_0_38_features = f: updateFeatures f (rec {
-    proc_macro2_0_3_6.default = true;
-    quote_0_5_1.default = true;
-    serde_derive_1_0_38.default = (f.serde_derive_1_0_38.default or true);
-    serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or false);
-    syn_0_13_1.default = true;
-    syn_0_13_1.visit = true;
-  }) [ proc_macro2_0_3_6_features quote_0_5_1_features serde_derive_internals_0_23_1_features syn_0_13_1_features ];
-  serde_derive_internals_0_23_1 = { features?(serde_derive_internals_0_23_1_features {}) }: serde_derive_internals_0_23_1_ {
-    dependencies = mapFeatures features ([ proc_macro2_0_3_6 syn_0_13_1 ]);
-  };
-  serde_derive_internals_0_23_1_features = f: updateFeatures f (rec {
-    proc_macro2_0_3_6.default = true;
-    serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or true);
-    syn_0_13_1.clone-impls = true;
-    syn_0_13_1.default = (f.syn_0_13_1.default or false);
-    syn_0_13_1.derive = true;
-    syn_0_13_1.parsing = true;
-  }) [ proc_macro2_0_3_6_features syn_0_13_1_features ];
-  serde_json_1_0_14 = { features?(serde_json_1_0_14_features {}) }: serde_json_1_0_14_ {
-    dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_4_1 num_traits_0_2_2 serde_1_0_38 ]);
-    features = mkFeatures (features.serde_json_1_0_14 or {});
-  };
-  serde_json_1_0_14_features = f: updateFeatures f (rec {
-    dtoa_0_4_2.default = true;
-    itoa_0_4_1.default = true;
-    num_traits_0_2_2.default = (f.num_traits_0_2_2.default or false);
-    serde_1_0_38.default = true;
-    serde_json_1_0_14.default = (f.serde_json_1_0_14.default or true);
-    serde_json_1_0_14.linked-hash-map =
-      (f.serde_json_1_0_14.linked-hash-map or false) ||
-      (f.serde_json_1_0_14.preserve_order or false) ||
-      (serde_json_1_0_14.preserve_order or false);
-  }) [ dtoa_0_4_2_features itoa_0_4_1_features num_traits_0_2_2_features serde_1_0_38_features ];
-  strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {};
-  strsim_0_7_0_features = f: updateFeatures f (rec {
-    strsim_0_7_0.default = (f.strsim_0_7_0.default or true);
-  }) [];
-  syn_0_13_1 = { features?(syn_0_13_1_features {}) }: syn_0_13_1_ {
-    dependencies = mapFeatures features ([ proc_macro2_0_3_6 unicode_xid_0_1_0 ]
-      ++ (if features.syn_0_13_1.quote or false then [ quote_0_5_1 ] else []));
-    features = mkFeatures (features.syn_0_13_1 or {});
-  };
-  syn_0_13_1_features = f: updateFeatures f (rec {
-    proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false);
-    proc_macro2_0_3_6.proc-macro =
-      (f.proc_macro2_0_3_6.proc-macro or false) ||
-      (syn_0_13_1.proc-macro or false) ||
-      (f.syn_0_13_1.proc-macro or false);
-    quote_0_5_1.default = (f.quote_0_5_1.default or false);
-    quote_0_5_1.proc-macro =
-      (f.quote_0_5_1.proc-macro or false) ||
-      (syn_0_13_1.proc-macro or false) ||
-      (f.syn_0_13_1.proc-macro or false);
-    syn_0_13_1.clone-impls =
-      (f.syn_0_13_1.clone-impls or false) ||
-      (f.syn_0_13_1.default or false) ||
-      (syn_0_13_1.default or false);
-    syn_0_13_1.default = (f.syn_0_13_1.default or true);
-    syn_0_13_1.derive =
-      (f.syn_0_13_1.derive or false) ||
-      (f.syn_0_13_1.default or false) ||
-      (syn_0_13_1.default or false);
-    syn_0_13_1.parsing =
-      (f.syn_0_13_1.parsing or false) ||
-      (f.syn_0_13_1.default or false) ||
-      (syn_0_13_1.default or false);
-    syn_0_13_1.printing =
-      (f.syn_0_13_1.printing or false) ||
-      (f.syn_0_13_1.default or false) ||
-      (syn_0_13_1.default or false);
-    syn_0_13_1.proc-macro =
-      (f.syn_0_13_1.proc-macro or false) ||
-      (f.syn_0_13_1.default or false) ||
-      (syn_0_13_1.default or false);
-    syn_0_13_1.quote =
-      (f.syn_0_13_1.quote or false) ||
-      (f.syn_0_13_1.printing or false) ||
-      (syn_0_13_1.printing or false);
-    unicode_xid_0_1_0.default = true;
-  }) [ proc_macro2_0_3_6_features quote_0_5_1_features unicode_xid_0_1_0_features ];
-  tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ {
-    dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_0 ]);
-  };
-  tempdir_0_3_7_features = f: updateFeatures f (rec {
-    rand_0_4_2.default = true;
-    remove_dir_all_0_5_0.default = true;
-    tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true);
-  }) [ rand_0_4_2_features remove_dir_all_0_5_0_features ];
-  termcolor_0_3_6 = { features?(termcolor_0_3_6_features {}) }: termcolor_0_3_6_ {
-    dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_6 ]) else []);
-  };
-  termcolor_0_3_6_features = f: updateFeatures f (rec {
-    termcolor_0_3_6.default = (f.termcolor_0_3_6.default or true);
-    wincolor_0_1_6.default = true;
-  }) [ wincolor_0_1_6_features ];
-  termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ {
-    dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else [])
-      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []);
-  };
-  termion_1_5_1_features = f: updateFeatures f (rec {
-    libc_0_2_40.default = true;
-    redox_syscall_0_1_37.default = true;
-    redox_termios_0_1_1.default = true;
-    termion_1_5_1.default = (f.termion_1_5_1.default or true);
-  }) [ libc_0_2_40_features redox_syscall_0_1_37_features redox_termios_0_1_1_features ];
-  textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ {
-    dependencies = mapFeatures features ([ unicode_width_0_1_4 ]);
-  };
-  textwrap_0_9_0_features = f: updateFeatures f (rec {
-    textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true);
-    unicode_width_0_1_4.default = true;
-  }) [ unicode_width_0_1_4_features ];
-  thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ {
-    dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]);
-  };
-  thread_local_0_3_5_features = f: updateFeatures f (rec {
-    lazy_static_1_0_0.default = true;
-    thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true);
-    unreachable_1_0_0.default = true;
-  }) [ lazy_static_1_0_0_features unreachable_1_0_0_features ];
-  time_0_1_39 = { features?(time_0_1_39_features {}) }: time_0_1_39_ {
-    dependencies = mapFeatures features ([ libc_0_2_40 ])
-      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
-  };
-  time_0_1_39_features = f: updateFeatures f (rec {
-    libc_0_2_40.default = true;
-    redox_syscall_0_1_37.default = true;
-    time_0_1_39.default = (f.time_0_1_39.default or true);
-    winapi_0_3_4.default = true;
-    winapi_0_3_4.minwinbase = true;
-    winapi_0_3_4.minwindef = true;
-    winapi_0_3_4.ntdef = true;
-    winapi_0_3_4.profileapi = true;
-    winapi_0_3_4.std = true;
-    winapi_0_3_4.sysinfoapi = true;
-    winapi_0_3_4.timezoneapi = true;
-  }) [ libc_0_2_40_features redox_syscall_0_1_37_features winapi_0_3_4_features ];
-  toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ {
-    dependencies = mapFeatures features ([ serde_1_0_38 ]);
-  };
-  toml_0_4_6_features = f: updateFeatures f (rec {
-    serde_1_0_38.default = true;
-    toml_0_4_6.default = (f.toml_0_4_6.default or true);
-  }) [ serde_1_0_38_features ];
-  ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {};
-  ucd_util_0_1_1_features = f: updateFeatures f (rec {
-    ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true);
-  }) [];
-  unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
-    features = mkFeatures (features.unicode_width_0_1_4 or {});
-  };
-  unicode_width_0_1_4_features = f: updateFeatures f (rec {
-    unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
-  }) [];
-  unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ {
-    features = mkFeatures (features.unicode_xid_0_1_0 or {});
-  };
-  unicode_xid_0_1_0_features = f: updateFeatures f (rec {
-    unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true);
-  }) [];
-  unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ {
-    dependencies = mapFeatures features ([ void_1_0_2 ]);
-  };
-  unreachable_1_0_0_features = f: updateFeatures f (rec {
-    unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true);
-    void_1_0_2.default = (f.void_1_0_2.default or false);
-  }) [ void_1_0_2_features ];
-  utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {};
-  utf8_ranges_1_0_0_features = f: updateFeatures f (rec {
-    utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true);
-  }) [];
-  vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {};
-  vcpkg_0_2_3_features = f: updateFeatures f (rec {
-    vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true);
-  }) [];
-  vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.vec_map_0_8_0 or {});
-  };
-  vec_map_0_8_0_features = f: updateFeatures f (rec {
-    vec_map_0_8_0.default = (f.vec_map_0_8_0.default or true);
-    vec_map_0_8_0.serde =
-      (f.vec_map_0_8_0.serde or false) ||
-      (f.vec_map_0_8_0.eders or false) ||
-      (vec_map_0_8_0.eders or false);
-    vec_map_0_8_0.serde_derive =
-      (f.vec_map_0_8_0.serde_derive or false) ||
-      (f.vec_map_0_8_0.eders or false) ||
-      (vec_map_0_8_0.eders or false);
-  }) [];
-  void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ {
-    features = mkFeatures (features.void_1_0_2 or {});
-  };
-  void_1_0_2_features = f: updateFeatures f (rec {
-    void_1_0_2.default = (f.void_1_0_2.default or true);
-    void_1_0_2.std =
-      (f.void_1_0_2.std or false) ||
-      (f.void_1_0_2.default or false) ||
-      (void_1_0_2.default or false);
-  }) [];
-  winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ {
-    dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else [])
-      ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []);
-    features = mkFeatures (features.winapi_0_3_4 or {});
-  };
-  winapi_0_3_4_features = f: updateFeatures f (rec {
-    winapi_0_3_4.default = (f.winapi_0_3_4.default or true);
-    winapi_i686_pc_windows_gnu_0_4_0.default = true;
-    winapi_x86_64_pc_windows_gnu_0_4_0.default = true;
-  }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ];
-  winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {};
-  winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
-    winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true);
-  }) [];
-  winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {};
-  winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
-    winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true);
-  }) [];
-  wincolor_0_1_6 = { features?(wincolor_0_1_6_features {}) }: wincolor_0_1_6_ {
-    dependencies = mapFeatures features ([ winapi_0_3_4 ]);
-  };
-  wincolor_0_1_6_features = f: updateFeatures f (rec {
-    winapi_0_3_4.consoleapi = true;
-    winapi_0_3_4.default = true;
-    winapi_0_3_4.minwindef = true;
-    winapi_0_3_4.processenv = true;
-    winapi_0_3_4.winbase = true;
-    winapi_0_3_4.wincon = true;
-    wincolor_0_1_6.default = (f.wincolor_0_1_6.default or true);
-  }) [ winapi_0_3_4_features ];
 }
diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix
new file mode 100644
index 00000000000..9d9cafe4cbf
--- /dev/null
+++ b/pkgs/build-support/rust/crates-io.nix
@@ -0,0 +1,2050 @@
+{ lib, buildRustCrate, buildRustCrateHelpers }:
+with buildRustCrateHelpers;
+let inherit (lib.lists) fold;
+    inherit (lib.attrsets) recursiveUpdate;
+in
+rec {
+
+  crates.aho_corasick."0.6.8" = deps: { features?(features_.aho_corasick."0.6.8" deps {}) }: buildRustCrate {
+    crateName = "aho-corasick";
+    version = "0.6.8";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "04bz5m32ykyn946iwxgbrl8nwca7ssxsqma140hgmkchaay80nfr";
+    libName = "aho_corasick";
+    crateBin =
+      [{  name = "aho-corasick-dot";  path = "src/main.rs"; }];
+    dependencies = mapFeatures features ([
+      (crates."memchr"."${deps."aho_corasick"."0.6.8"."memchr"}" deps)
+    ]);
+  };
+  features_.aho_corasick."0.6.8" = deps: f: updateFeatures f (rec {
+    aho_corasick."0.6.8".default = (f.aho_corasick."0.6.8".default or true);
+    memchr."${deps.aho_corasick."0.6.8".memchr}".default = true;
+  }) [
+    (features_.memchr."${deps."aho_corasick"."0.6.8"."memchr"}" deps)
+  ];
+
+
+  crates.ansi_term."0.11.0" = deps: { features?(features_.ansi_term."0.11.0" deps {}) }: buildRustCrate {
+    crateName = "ansi_term";
+    version = "0.11.0";
+    authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" "Josh Triplett <josh@joshtriplett.org>" ];
+    sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v";
+    dependencies = (if kernel == "windows" then mapFeatures features ([
+      (crates."winapi"."${deps."ansi_term"."0.11.0"."winapi"}" deps)
+    ]) else []);
+  };
+  features_.ansi_term."0.11.0" = deps: f: updateFeatures f (rec {
+    ansi_term."0.11.0".default = (f.ansi_term."0.11.0".default or true);
+    winapi = fold recursiveUpdate {} [
+      { "${deps.ansi_term."0.11.0".winapi}"."consoleapi" = true; }
+      { "${deps.ansi_term."0.11.0".winapi}"."errhandlingapi" = true; }
+      { "${deps.ansi_term."0.11.0".winapi}"."processenv" = true; }
+      { "${deps.ansi_term."0.11.0".winapi}".default = true; }
+    ];
+  }) [
+    (features_.winapi."${deps."ansi_term"."0.11.0"."winapi"}" deps)
+  ];
+
+
+  crates.argon2rs."0.2.5" = deps: { features?(features_.argon2rs."0.2.5" deps {}) }: buildRustCrate {
+    crateName = "argon2rs";
+    version = "0.2.5";
+    authors = [ "bryant <bryant@defrag.in>" ];
+    sha256 = "1byl9b3wwyrarn8qack21v5fi2qsnn3y5clvikk2apskhmnih1rw";
+    dependencies = mapFeatures features ([
+      (crates."blake2_rfc"."${deps."argon2rs"."0.2.5"."blake2_rfc"}" deps)
+      (crates."scoped_threadpool"."${deps."argon2rs"."0.2.5"."scoped_threadpool"}" deps)
+    ]);
+    features = mkFeatures (features."argon2rs"."0.2.5" or {});
+  };
+  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) ||
+        (argon2rs."0.2.5"."simd" or false) ||
+        (f."argon2rs"."0.2.5"."simd" or false); }
+    ];
+    scoped_threadpool."${deps.argon2rs."0.2.5".scoped_threadpool}".default = true;
+  }) [
+    (features_.blake2_rfc."${deps."argon2rs"."0.2.5"."blake2_rfc"}" deps)
+    (features_.scoped_threadpool."${deps."argon2rs"."0.2.5"."scoped_threadpool"}" deps)
+  ];
+
+
+  crates.arrayvec."0.4.7" = deps: { features?(features_.arrayvec."0.4.7" deps {}) }: buildRustCrate {
+    crateName = "arrayvec";
+    version = "0.4.7";
+    authors = [ "bluss" ];
+    sha256 = "0fzgv7z1x1qnyd7j32vdcadk4k9wfx897y06mr3bw1yi52iqf4z4";
+    dependencies = mapFeatures features ([
+      (crates."nodrop"."${deps."arrayvec"."0.4.7"."nodrop"}" deps)
+    ]);
+    features = mkFeatures (features."arrayvec"."0.4.7" or {});
+  };
+  features_.arrayvec."0.4.7" = deps: f: updateFeatures f (rec {
+    arrayvec = fold recursiveUpdate {} [
+      { "0.4.7".default = (f.arrayvec."0.4.7".default or true); }
+      { "0.4.7".serde =
+        (f.arrayvec."0.4.7".serde or false) ||
+        (f.arrayvec."0.4.7".serde-1 or false) ||
+        (arrayvec."0.4.7"."serde-1" or false); }
+      { "0.4.7".std =
+        (f.arrayvec."0.4.7".std or false) ||
+        (f.arrayvec."0.4.7".default or false) ||
+        (arrayvec."0.4.7"."default" or false); }
+    ];
+    nodrop."${deps.arrayvec."0.4.7".nodrop}".default = (f.nodrop."${deps.arrayvec."0.4.7".nodrop}".default or false);
+  }) [
+    (features_.nodrop."${deps."arrayvec"."0.4.7"."nodrop"}" deps)
+  ];
+
+
+  crates.atty."0.2.11" = deps: { features?(features_.atty."0.2.11" deps {}) }: buildRustCrate {
+    crateName = "atty";
+    version = "0.2.11";
+    authors = [ "softprops <d.tangren@gmail.com>" ];
+    sha256 = "0by1bj2km9jxi4i4g76zzi76fc2rcm9934jpnyrqd95zw344pb20";
+    dependencies = (if kernel == "redox" then mapFeatures features ([
+      (crates."termion"."${deps."atty"."0.2.11"."termion"}" deps)
+    ]) else [])
+      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([
+      (crates."libc"."${deps."atty"."0.2.11"."libc"}" deps)
+    ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([
+      (crates."winapi"."${deps."atty"."0.2.11"."winapi"}" deps)
+    ]) else []);
+  };
+  features_.atty."0.2.11" = deps: f: updateFeatures f (rec {
+    atty."0.2.11".default = (f.atty."0.2.11".default or true);
+    libc."${deps.atty."0.2.11".libc}".default = (f.libc."${deps.atty."0.2.11".libc}".default or false);
+    termion."${deps.atty."0.2.11".termion}".default = true;
+    winapi = fold recursiveUpdate {} [
+      { "${deps.atty."0.2.11".winapi}"."consoleapi" = true; }
+      { "${deps.atty."0.2.11".winapi}"."minwinbase" = true; }
+      { "${deps.atty."0.2.11".winapi}"."minwindef" = true; }
+      { "${deps.atty."0.2.11".winapi}"."processenv" = true; }
+      { "${deps.atty."0.2.11".winapi}"."winbase" = true; }
+      { "${deps.atty."0.2.11".winapi}".default = true; }
+    ];
+  }) [
+    (features_.termion."${deps."atty"."0.2.11"."termion"}" deps)
+    (features_.libc."${deps."atty"."0.2.11"."libc"}" deps)
+    (features_.winapi."${deps."atty"."0.2.11"."winapi"}" deps)
+  ];
+
+
+  crates.backtrace."0.3.9" = deps: { features?(features_.backtrace."0.3.9" deps {}) }: buildRustCrate {
+    crateName = "backtrace";
+    version = "0.3.9";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" "The Rust Project Developers" ];
+    sha256 = "137pjkcn89b7fqk78w65ggj92pynmf1hkr1sjz53aga4b50lkmwm";
+    dependencies = mapFeatures features ([
+      (crates."cfg_if"."${deps."backtrace"."0.3.9"."cfg_if"}" deps)
+      (crates."rustc_demangle"."${deps."backtrace"."0.3.9"."rustc_demangle"}" deps)
+    ])
+      ++ (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 (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 []);
+    features = mkFeatures (features."backtrace"."0.3.9" or {});
+  };
+  features_.backtrace."0.3.9" = deps: f: updateFeatures f (rec {
+    backtrace = fold recursiveUpdate {} [
+      { "0.3.9".addr2line =
+        (f.backtrace."0.3.9".addr2line or false) ||
+        (f.backtrace."0.3.9".gimli-symbolize or false) ||
+        (backtrace."0.3.9"."gimli-symbolize" or false); }
+      { "0.3.9".backtrace-sys =
+        (f.backtrace."0.3.9".backtrace-sys or false) ||
+        (f.backtrace."0.3.9".libbacktrace or false) ||
+        (backtrace."0.3.9"."libbacktrace" or false); }
+      { "0.3.9".coresymbolication =
+        (f.backtrace."0.3.9".coresymbolication or false) ||
+        (f.backtrace."0.3.9".default or false) ||
+        (backtrace."0.3.9"."default" or false); }
+      { "0.3.9".dbghelp =
+        (f.backtrace."0.3.9".dbghelp or false) ||
+        (f.backtrace."0.3.9".default or false) ||
+        (backtrace."0.3.9"."default" or false); }
+      { "0.3.9".default = (f.backtrace."0.3.9".default or true); }
+      { "0.3.9".dladdr =
+        (f.backtrace."0.3.9".dladdr or false) ||
+        (f.backtrace."0.3.9".default or false) ||
+        (backtrace."0.3.9"."default" or false); }
+      { "0.3.9".findshlibs =
+        (f.backtrace."0.3.9".findshlibs or false) ||
+        (f.backtrace."0.3.9".gimli-symbolize or false) ||
+        (backtrace."0.3.9"."gimli-symbolize" or false); }
+      { "0.3.9".gimli =
+        (f.backtrace."0.3.9".gimli or false) ||
+        (f.backtrace."0.3.9".gimli-symbolize or false) ||
+        (backtrace."0.3.9"."gimli-symbolize" or false); }
+      { "0.3.9".libbacktrace =
+        (f.backtrace."0.3.9".libbacktrace or false) ||
+        (f.backtrace."0.3.9".default or false) ||
+        (backtrace."0.3.9"."default" or false); }
+      { "0.3.9".libunwind =
+        (f.backtrace."0.3.9".libunwind or false) ||
+        (f.backtrace."0.3.9".default or false) ||
+        (backtrace."0.3.9"."default" or false); }
+      { "0.3.9".memmap =
+        (f.backtrace."0.3.9".memmap or false) ||
+        (f.backtrace."0.3.9".gimli-symbolize or false) ||
+        (backtrace."0.3.9"."gimli-symbolize" or false); }
+      { "0.3.9".object =
+        (f.backtrace."0.3.9".object or false) ||
+        (f.backtrace."0.3.9".gimli-symbolize or false) ||
+        (backtrace."0.3.9"."gimli-symbolize" or false); }
+      { "0.3.9".rustc-serialize =
+        (f.backtrace."0.3.9".rustc-serialize or false) ||
+        (f.backtrace."0.3.9".serialize-rustc or false) ||
+        (backtrace."0.3.9"."serialize-rustc" or false); }
+      { "0.3.9".serde =
+        (f.backtrace."0.3.9".serde or false) ||
+        (f.backtrace."0.3.9".serialize-serde or false) ||
+        (backtrace."0.3.9"."serialize-serde" or false); }
+      { "0.3.9".serde_derive =
+        (f.backtrace."0.3.9".serde_derive or false) ||
+        (f.backtrace."0.3.9".serialize-serde or false) ||
+        (backtrace."0.3.9"."serialize-serde" or false); }
+      { "0.3.9".winapi =
+        (f.backtrace."0.3.9".winapi or false) ||
+        (f.backtrace."0.3.9".dbghelp or false) ||
+        (backtrace."0.3.9"."dbghelp" or false); }
+    ];
+    backtrace_sys."${deps.backtrace."0.3.9".backtrace_sys}".default = true;
+    cfg_if."${deps.backtrace."0.3.9".cfg_if}".default = true;
+    libc."${deps.backtrace."0.3.9".libc}".default = true;
+    rustc_demangle."${deps.backtrace."0.3.9".rustc_demangle}".default = true;
+    winapi = fold recursiveUpdate {} [
+      { "${deps.backtrace."0.3.9".winapi}"."dbghelp" = true; }
+      { "${deps.backtrace."0.3.9".winapi}"."minwindef" = true; }
+      { "${deps.backtrace."0.3.9".winapi}"."processthreadsapi" = true; }
+      { "${deps.backtrace."0.3.9".winapi}"."std" = true; }
+      { "${deps.backtrace."0.3.9".winapi}"."winnt" = true; }
+      { "${deps.backtrace."0.3.9".winapi}".default = true; }
+    ];
+  }) [
+    (features_.cfg_if."${deps."backtrace"."0.3.9"."cfg_if"}" deps)
+    (features_.rustc_demangle."${deps."backtrace"."0.3.9"."rustc_demangle"}" deps)
+    (features_.backtrace_sys."${deps."backtrace"."0.3.9"."backtrace_sys"}" deps)
+    (features_.libc."${deps."backtrace"."0.3.9"."libc"}" deps)
+    (features_.winapi."${deps."backtrace"."0.3.9"."winapi"}" deps)
+  ];
+
+
+  crates.backtrace_sys."0.1.24" = deps: { features?(features_.backtrace_sys."0.1.24" deps {}) }: buildRustCrate {
+    crateName = "backtrace-sys";
+    version = "0.1.24";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "15d6jlknykiijcin3vqbx33760w24ss5qw3l1xd3hms5k4vc8305";
+    build = "build.rs";
+    dependencies = mapFeatures features ([
+      (crates."libc"."${deps."backtrace_sys"."0.1.24"."libc"}" deps)
+    ]);
+
+    buildDependencies = mapFeatures features ([
+      (crates."cc"."${deps."backtrace_sys"."0.1.24"."cc"}" deps)
+    ]);
+  };
+  features_.backtrace_sys."0.1.24" = deps: f: updateFeatures f (rec {
+    backtrace_sys."0.1.24".default = (f.backtrace_sys."0.1.24".default or true);
+    cc."${deps.backtrace_sys."0.1.24".cc}".default = true;
+    libc."${deps.backtrace_sys."0.1.24".libc}".default = true;
+  }) [
+    (features_.libc."${deps."backtrace_sys"."0.1.24"."libc"}" deps)
+    (features_.cc."${deps."backtrace_sys"."0.1.24"."cc"}" deps)
+  ];
+
+
+  crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate {
+    crateName = "bitflags";
+    version = "1.0.4";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08";
+    features = mkFeatures (features."bitflags"."1.0.4" or {});
+  };
+  features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec {
+    bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true);
+  }) [];
+
+
+  crates.blake2_rfc."0.2.18" = deps: { features?(features_.blake2_rfc."0.2.18" deps {}) }: buildRustCrate {
+    crateName = "blake2-rfc";
+    version = "0.2.18";
+    authors = [ "Cesar Eduardo Barros <cesarb@cesarb.eti.br>" ];
+    sha256 = "0pyqrik4471ljk16prs0iwb2sam39z0z6axyyjxlqxdmf4wprf0l";
+    dependencies = mapFeatures features ([
+      (crates."arrayvec"."${deps."blake2_rfc"."0.2.18"."arrayvec"}" deps)
+      (crates."constant_time_eq"."${deps."blake2_rfc"."0.2.18"."constant_time_eq"}" deps)
+    ]);
+    features = mkFeatures (features."blake2_rfc"."0.2.18" or {});
+  };
+  features_.blake2_rfc."0.2.18" = deps: f: updateFeatures f (rec {
+    arrayvec."${deps.blake2_rfc."0.2.18".arrayvec}".default = (f.arrayvec."${deps.blake2_rfc."0.2.18".arrayvec}".default or false);
+    blake2_rfc = fold recursiveUpdate {} [
+      { "0.2.18".default = (f.blake2_rfc."0.2.18".default or true); }
+      { "0.2.18".simd =
+        (f.blake2_rfc."0.2.18".simd or false) ||
+        (f.blake2_rfc."0.2.18".simd_opt or false) ||
+        (blake2_rfc."0.2.18"."simd_opt" or false); }
+      { "0.2.18".simd_opt =
+        (f.blake2_rfc."0.2.18".simd_opt or false) ||
+        (f.blake2_rfc."0.2.18".simd_asm or false) ||
+        (blake2_rfc."0.2.18"."simd_asm" or false); }
+      { "0.2.18".std =
+        (f.blake2_rfc."0.2.18".std or false) ||
+        (f.blake2_rfc."0.2.18".default or false) ||
+        (blake2_rfc."0.2.18"."default" or false); }
+    ];
+    constant_time_eq."${deps.blake2_rfc."0.2.18".constant_time_eq}".default = true;
+  }) [
+    (features_.arrayvec."${deps."blake2_rfc"."0.2.18"."arrayvec"}" deps)
+    (features_.constant_time_eq."${deps."blake2_rfc"."0.2.18"."constant_time_eq"}" deps)
+  ];
+
+
+  crates.carnix."0.8.11" = deps: { features?(features_.carnix."0.8.11" deps {}) }: buildRustCrate {
+    crateName = "carnix";
+    version = "0.8.11";
+    authors = [ "pe@pijul.org <pe@pijul.org>" ];
+    sha256 = "1i5iz51mradd3vishc19cd0nfh9r2clbmiq94f83npny65dnp6ch";
+    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)
+    ]);
+  };
+  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_.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)
+  ];
+
+
+  crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate {
+    crateName = "cc";
+    version = "1.0.25";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0pd8fhjlpr5qan984frkf1c8nxrqp6827wmmfzhm2840229z2hq0";
+    dependencies = mapFeatures features ([
+]);
+    features = mkFeatures (features."cc"."1.0.25" or {});
+  };
+  features_.cc."1.0.25" = deps: f: updateFeatures f (rec {
+    cc = fold recursiveUpdate {} [
+      { "1.0.25".default = (f.cc."1.0.25".default or true); }
+      { "1.0.25".rayon =
+        (f.cc."1.0.25".rayon or false) ||
+        (f.cc."1.0.25".parallel or false) ||
+        (cc."1.0.25"."parallel" or false); }
+    ];
+  }) [];
+
+
+  crates.cfg_if."0.1.6" = deps: { features?(features_.cfg_if."0.1.6" deps {}) }: buildRustCrate {
+    crateName = "cfg-if";
+    version = "0.1.6";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n";
+  };
+  features_.cfg_if."0.1.6" = deps: f: updateFeatures f (rec {
+    cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true);
+  }) [];
+
+
+  crates.clap."2.32.0" = deps: { features?(features_.clap."2.32.0" deps {}) }: buildRustCrate {
+    crateName = "clap";
+    version = "2.32.0";
+    authors = [ "Kevin K. <kbknapp@gmail.com>" ];
+    sha256 = "1hdjf0janvpjkwrjdjx1mm2aayzr54k72w6mriyr0n5anjkcj1lx";
+    dependencies = mapFeatures features ([
+      (crates."bitflags"."${deps."clap"."2.32.0"."bitflags"}" deps)
+      (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 !(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 []);
+    features = mkFeatures (features."clap"."2.32.0" or {});
+  };
+  features_.clap."2.32.0" = deps: f: updateFeatures f (rec {
+    ansi_term."${deps.clap."2.32.0".ansi_term}".default = true;
+    atty."${deps.clap."2.32.0".atty}".default = true;
+    bitflags."${deps.clap."2.32.0".bitflags}".default = true;
+    clap = fold recursiveUpdate {} [
+      { "2.32.0".ansi_term =
+        (f.clap."2.32.0".ansi_term or false) ||
+        (f.clap."2.32.0".color or false) ||
+        (clap."2.32.0"."color" or false); }
+      { "2.32.0".atty =
+        (f.clap."2.32.0".atty or false) ||
+        (f.clap."2.32.0".color or false) ||
+        (clap."2.32.0"."color" or false); }
+      { "2.32.0".clippy =
+        (f.clap."2.32.0".clippy or false) ||
+        (f.clap."2.32.0".lints or false) ||
+        (clap."2.32.0"."lints" or false); }
+      { "2.32.0".color =
+        (f.clap."2.32.0".color or false) ||
+        (f.clap."2.32.0".default or false) ||
+        (clap."2.32.0"."default" or false); }
+      { "2.32.0".default = (f.clap."2.32.0".default or true); }
+      { "2.32.0".strsim =
+        (f.clap."2.32.0".strsim or false) ||
+        (f.clap."2.32.0".suggestions or false) ||
+        (clap."2.32.0"."suggestions" or false); }
+      { "2.32.0".suggestions =
+        (f.clap."2.32.0".suggestions or false) ||
+        (f.clap."2.32.0".default or false) ||
+        (clap."2.32.0"."default" or false); }
+      { "2.32.0".term_size =
+        (f.clap."2.32.0".term_size or false) ||
+        (f.clap."2.32.0".wrap_help or false) ||
+        (clap."2.32.0"."wrap_help" or false); }
+      { "2.32.0".vec_map =
+        (f.clap."2.32.0".vec_map or false) ||
+        (f.clap."2.32.0".default or false) ||
+        (clap."2.32.0"."default" or false); }
+      { "2.32.0".yaml =
+        (f.clap."2.32.0".yaml or false) ||
+        (f.clap."2.32.0".doc or false) ||
+        (clap."2.32.0"."doc" or false); }
+      { "2.32.0".yaml-rust =
+        (f.clap."2.32.0".yaml-rust or false) ||
+        (f.clap."2.32.0".yaml or false) ||
+        (clap."2.32.0"."yaml" or false); }
+    ];
+    strsim."${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) ||
+        (clap."2.32.0"."wrap_help" or false) ||
+        (f."clap"."2.32.0"."wrap_help" or false); }
+    ];
+    unicode_width."${deps.clap."2.32.0".unicode_width}".default = true;
+    vec_map."${deps.clap."2.32.0".vec_map}".default = true;
+  }) [
+    (features_.atty."${deps."clap"."2.32.0"."atty"}" deps)
+    (features_.bitflags."${deps."clap"."2.32.0"."bitflags"}" deps)
+    (features_.strsim."${deps."clap"."2.32.0"."strsim"}" deps)
+    (features_.textwrap."${deps."clap"."2.32.0"."textwrap"}" deps)
+    (features_.unicode_width."${deps."clap"."2.32.0"."unicode_width"}" deps)
+    (features_.vec_map."${deps."clap"."2.32.0"."vec_map"}" deps)
+    (features_.ansi_term."${deps."clap"."2.32.0"."ansi_term"}" deps)
+  ];
+
+
+  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";
+    authors = [ "Cesar Eduardo Barros <cesarb@cesarb.eti.br>" ];
+    sha256 = "03qri9hjf049gwqg9q527lybpg918q6y5q4g9a5lma753nff49wd";
+  };
+  features_.constant_time_eq."0.1.3" = deps: f: updateFeatures f (rec {
+    constant_time_eq."0.1.3".default = (f.constant_time_eq."0.1.3".default or true);
+  }) [];
+
+
+  crates.dirs."1.0.4" = deps: { features?(features_.dirs."1.0.4" deps {}) }: buildRustCrate {
+    crateName = "dirs";
+    version = "1.0.4";
+    authors = [ "Simon Ochsenreither <simon@ochsenreither.de>" ];
+    sha256 = "1hp3nz0350b0gpavb3w5ajqc9l1k59cfrcsr3hcavwlkizdnpv1y";
+    dependencies = (if kernel == "redox" then mapFeatures features ([
+      (crates."redox_users"."${deps."dirs"."1.0.4"."redox_users"}" deps)
+    ]) else [])
+      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([
+      (crates."libc"."${deps."dirs"."1.0.4"."libc"}" deps)
+    ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([
+      (crates."winapi"."${deps."dirs"."1.0.4"."winapi"}" deps)
+    ]) else []);
+  };
+  features_.dirs."1.0.4" = deps: f: updateFeatures f (rec {
+    dirs."1.0.4".default = (f.dirs."1.0.4".default or true);
+    libc."${deps.dirs."1.0.4".libc}".default = true;
+    redox_users."${deps.dirs."1.0.4".redox_users}".default = true;
+    winapi = fold recursiveUpdate {} [
+      { "${deps.dirs."1.0.4".winapi}"."knownfolders" = true; }
+      { "${deps.dirs."1.0.4".winapi}"."objbase" = true; }
+      { "${deps.dirs."1.0.4".winapi}"."shlobj" = true; }
+      { "${deps.dirs."1.0.4".winapi}"."winbase" = true; }
+      { "${deps.dirs."1.0.4".winapi}"."winerror" = true; }
+      { "${deps.dirs."1.0.4".winapi}".default = true; }
+    ];
+  }) [
+    (features_.redox_users."${deps."dirs"."1.0.4"."redox_users"}" deps)
+    (features_.libc."${deps."dirs"."1.0.4"."libc"}" deps)
+    (features_.winapi."${deps."dirs"."1.0.4"."winapi"}" deps)
+  ];
+
+
+  crates.either."1.5.0" = deps: { features?(features_.either."1.5.0" deps {}) }: buildRustCrate {
+    crateName = "either";
+    version = "1.5.0";
+    authors = [ "bluss" ];
+    sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz";
+    dependencies = mapFeatures features ([
+]);
+    features = mkFeatures (features."either"."1.5.0" or {});
+  };
+  features_.either."1.5.0" = deps: f: updateFeatures f (rec {
+    either = fold recursiveUpdate {} [
+      { "1.5.0".default = (f.either."1.5.0".default or true); }
+      { "1.5.0".use_std =
+        (f.either."1.5.0".use_std or false) ||
+        (f.either."1.5.0".default or false) ||
+        (either."1.5.0"."default" or false); }
+    ];
+  }) [];
+
+
+  crates.env_logger."0.5.13" = deps: { features?(features_.env_logger."0.5.13" deps {}) }: buildRustCrate {
+    crateName = "env_logger";
+    version = "0.5.13";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1q6vylngcz4bn088b4hvsl879l8yz1k2bma75waljb5p4h4kbb72";
+    dependencies = mapFeatures features ([
+      (crates."atty"."${deps."env_logger"."0.5.13"."atty"}" deps)
+      (crates."humantime"."${deps."env_logger"."0.5.13"."humantime"}" deps)
+      (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 []));
+    features = mkFeatures (features."env_logger"."0.5.13" or {});
+  };
+  features_.env_logger."0.5.13" = deps: f: updateFeatures f (rec {
+    atty."${deps.env_logger."0.5.13".atty}".default = true;
+    env_logger = fold recursiveUpdate {} [
+      { "0.5.13".default = (f.env_logger."0.5.13".default or true); }
+      { "0.5.13".regex =
+        (f.env_logger."0.5.13".regex or false) ||
+        (f.env_logger."0.5.13".default or false) ||
+        (env_logger."0.5.13"."default" or false); }
+    ];
+    humantime."${deps.env_logger."0.5.13".humantime}".default = true;
+    log = fold recursiveUpdate {} [
+      { "${deps.env_logger."0.5.13".log}"."std" = true; }
+      { "${deps.env_logger."0.5.13".log}".default = true; }
+    ];
+    regex."${deps.env_logger."0.5.13".regex}".default = true;
+    termcolor."${deps.env_logger."0.5.13".termcolor}".default = true;
+  }) [
+    (features_.atty."${deps."env_logger"."0.5.13"."atty"}" deps)
+    (features_.humantime."${deps."env_logger"."0.5.13"."humantime"}" deps)
+    (features_.log."${deps."env_logger"."0.5.13"."log"}" deps)
+    (features_.regex."${deps."env_logger"."0.5.13"."regex"}" deps)
+    (features_.termcolor."${deps."env_logger"."0.5.13"."termcolor"}" deps)
+  ];
+
+
+  crates.error_chain."0.12.0" = deps: { features?(features_.error_chain."0.12.0" deps {}) }: buildRustCrate {
+    crateName = "error-chain";
+    version = "0.12.0";
+    authors = [ "Brian Anderson <banderson@mozilla.com>" "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" "Yamakaky <yamakaky@yamaworld.fr>" ];
+    sha256 = "1m6wk1r6wqg1mn69bxxvk5k081cb4xy6bfhsxb99rv408x9wjcnl";
+    dependencies = mapFeatures features ([
+    ]
+      ++ (if features.error_chain."0.12.0".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else []));
+    features = mkFeatures (features."error_chain"."0.12.0" or {});
+  };
+  features_.error_chain."0.12.0" = deps: f: updateFeatures f (rec {
+    backtrace."${deps.error_chain."0.12.0".backtrace}".default = true;
+    error_chain = fold recursiveUpdate {} [
+      { "0.12.0".backtrace =
+        (f.error_chain."0.12.0".backtrace or false) ||
+        (f.error_chain."0.12.0".default or false) ||
+        (error_chain."0.12.0"."default" or false); }
+      { "0.12.0".default = (f.error_chain."0.12.0".default or true); }
+      { "0.12.0".example_generated =
+        (f.error_chain."0.12.0".example_generated or false) ||
+        (f.error_chain."0.12.0".default or false) ||
+        (error_chain."0.12.0"."default" or false); }
+    ];
+  }) [
+    (features_.backtrace."${deps."error_chain"."0.12.0"."backtrace"}" deps)
+  ];
+
+
+  crates.failure."0.1.3" = deps: { features?(features_.failure."0.1.3" deps {}) }: buildRustCrate {
+    crateName = "failure";
+    version = "0.1.3";
+    authors = [ "Without Boats <boats@mozilla.com>" ];
+    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 []));
+    features = mkFeatures (features."failure"."0.1.3" or {});
+  };
+  features_.failure."0.1.3" = deps: f: updateFeatures f (rec {
+    backtrace."${deps.failure."0.1.3".backtrace}".default = true;
+    failure = fold recursiveUpdate {} [
+      { "0.1.3".backtrace =
+        (f.failure."0.1.3".backtrace or false) ||
+        (f.failure."0.1.3".std or false) ||
+        (failure."0.1.3"."std" or false); }
+      { "0.1.3".default = (f.failure."0.1.3".default or true); }
+      { "0.1.3".derive =
+        (f.failure."0.1.3".derive or false) ||
+        (f.failure."0.1.3".default or false) ||
+        (failure."0.1.3"."default" or false); }
+      { "0.1.3".failure_derive =
+        (f.failure."0.1.3".failure_derive or false) ||
+        (f.failure."0.1.3".derive or false) ||
+        (failure."0.1.3"."derive" or false); }
+      { "0.1.3".std =
+        (f.failure."0.1.3".std or false) ||
+        (f.failure."0.1.3".default or false) ||
+        (failure."0.1.3"."default" or false); }
+    ];
+    failure_derive."${deps.failure."0.1.3".failure_derive}".default = true;
+  }) [
+    (features_.backtrace."${deps."failure"."0.1.3"."backtrace"}" deps)
+    (features_.failure_derive."${deps."failure"."0.1.3"."failure_derive"}" deps)
+  ];
+
+
+  crates.failure_derive."0.1.3" = deps: { features?(features_.failure_derive."0.1.3" deps {}) }: buildRustCrate {
+    crateName = "failure_derive";
+    version = "0.1.3";
+    authors = [ "Without Boats <woboats@gmail.com>" ];
+    sha256 = "1mh7ad2d17f13g0k29bskp0f9faws0w1q4a5yfzlzi75bw9kidgm";
+    procMacro = true;
+    build = "build.rs";
+    dependencies = mapFeatures features ([
+      (crates."proc_macro2"."${deps."failure_derive"."0.1.3"."proc_macro2"}" deps)
+      (crates."quote"."${deps."failure_derive"."0.1.3"."quote"}" deps)
+      (crates."syn"."${deps."failure_derive"."0.1.3"."syn"}" deps)
+      (crates."synstructure"."${deps."failure_derive"."0.1.3"."synstructure"}" deps)
+    ]);
+    features = mkFeatures (features."failure_derive"."0.1.3" or {});
+  };
+  features_.failure_derive."0.1.3" = deps: f: updateFeatures f (rec {
+    failure_derive."0.1.3".default = (f.failure_derive."0.1.3".default or true);
+    proc_macro2."${deps.failure_derive."0.1.3".proc_macro2}".default = true;
+    quote."${deps.failure_derive."0.1.3".quote}".default = true;
+    syn."${deps.failure_derive."0.1.3".syn}".default = true;
+    synstructure."${deps.failure_derive."0.1.3".synstructure}".default = true;
+  }) [
+    (features_.proc_macro2."${deps."failure_derive"."0.1.3"."proc_macro2"}" deps)
+    (features_.quote."${deps."failure_derive"."0.1.3"."quote"}" deps)
+    (features_.syn."${deps."failure_derive"."0.1.3"."syn"}" deps)
+    (features_.synstructure."${deps."failure_derive"."0.1.3"."synstructure"}" deps)
+  ];
+
+
+  crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate {
+    crateName = "fuchsia-zircon";
+    version = "0.3.3";
+    authors = [ "Raph Levien <raph@google.com>" ];
+    sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk";
+    dependencies = mapFeatures features ([
+      (crates."bitflags"."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps)
+      (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps)
+    ]);
+  };
+  features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec {
+    bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true;
+    fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true);
+    fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true;
+  }) [
+    (features_.bitflags."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps)
+    (features_.fuchsia_zircon_sys."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps)
+  ];
+
+
+  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";
+    authors = [ "Raph Levien <raph@google.com>" ];
+    sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
+  };
+  features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec {
+    fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true);
+  }) [];
+
+
+  crates.humantime."1.1.1" = deps: { features?(features_.humantime."1.1.1" deps {}) }: buildRustCrate {
+    crateName = "humantime";
+    version = "1.1.1";
+    authors = [ "Paul Colomiets <paul@colomiets.name>" ];
+    sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn";
+    libPath = "src/lib.rs";
+    dependencies = mapFeatures features ([
+      (crates."quick_error"."${deps."humantime"."1.1.1"."quick_error"}" deps)
+    ]);
+  };
+  features_.humantime."1.1.1" = deps: f: updateFeatures f (rec {
+    humantime."1.1.1".default = (f.humantime."1.1.1".default or true);
+    quick_error."${deps.humantime."1.1.1".quick_error}".default = true;
+  }) [
+    (features_.quick_error."${deps."humantime"."1.1.1"."quick_error"}" deps)
+  ];
+
+
+  crates.itertools."0.7.8" = deps: { features?(features_.itertools."0.7.8" deps {}) }: buildRustCrate {
+    crateName = "itertools";
+    version = "0.7.8";
+    authors = [ "bluss" ];
+    sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357";
+    dependencies = mapFeatures features ([
+      (crates."either"."${deps."itertools"."0.7.8"."either"}" deps)
+    ]);
+    features = mkFeatures (features."itertools"."0.7.8" or {});
+  };
+  features_.itertools."0.7.8" = deps: f: updateFeatures f (rec {
+    either."${deps.itertools."0.7.8".either}".default = (f.either."${deps.itertools."0.7.8".either}".default or false);
+    itertools = fold recursiveUpdate {} [
+      { "0.7.8".default = (f.itertools."0.7.8".default or true); }
+      { "0.7.8".use_std =
+        (f.itertools."0.7.8".use_std or false) ||
+        (f.itertools."0.7.8".default or false) ||
+        (itertools."0.7.8"."default" or false); }
+    ];
+  }) [
+    (features_.either."${deps."itertools"."0.7.8"."either"}" deps)
+  ];
+
+
+  crates.itoa."0.4.3" = deps: { features?(features_.itoa."0.4.3" deps {}) }: buildRustCrate {
+    crateName = "itoa";
+    version = "0.4.3";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "0zadimmdgvili3gdwxqg7ljv3r4wcdg1kkdfp9nl15vnm23vrhy1";
+    features = mkFeatures (features."itoa"."0.4.3" or {});
+  };
+  features_.itoa."0.4.3" = deps: f: updateFeatures f (rec {
+    itoa = fold recursiveUpdate {} [
+      { "0.4.3".default = (f.itoa."0.4.3".default or true); }
+      { "0.4.3".std =
+        (f.itoa."0.4.3".std or false) ||
+        (f.itoa."0.4.3".default or false) ||
+        (itoa."0.4.3"."default" or false); }
+    ];
+  }) [];
+
+
+  crates.lazy_static."1.1.0" = deps: { features?(features_.lazy_static."1.1.0" deps {}) }: buildRustCrate {
+    crateName = "lazy_static";
+    version = "1.1.0";
+    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
+    sha256 = "1da2b6nxfc2l547qgl9kd1pn9sh1af96a6qx6xw8xdnv6hh5fag0";
+    build = "build.rs";
+    dependencies = mapFeatures features ([
+]);
+
+    buildDependencies = mapFeatures features ([
+      (crates."version_check"."${deps."lazy_static"."1.1.0"."version_check"}" deps)
+    ]);
+    features = mkFeatures (features."lazy_static"."1.1.0" or {});
+  };
+  features_.lazy_static."1.1.0" = deps: f: updateFeatures f (rec {
+    lazy_static = fold recursiveUpdate {} [
+      { "1.1.0".default = (f.lazy_static."1.1.0".default or true); }
+      { "1.1.0".nightly =
+        (f.lazy_static."1.1.0".nightly or false) ||
+        (f.lazy_static."1.1.0".spin_no_std or false) ||
+        (lazy_static."1.1.0"."spin_no_std" or false); }
+      { "1.1.0".spin =
+        (f.lazy_static."1.1.0".spin or false) ||
+        (f.lazy_static."1.1.0".spin_no_std or false) ||
+        (lazy_static."1.1.0"."spin_no_std" or false); }
+    ];
+    version_check."${deps.lazy_static."1.1.0".version_check}".default = true;
+  }) [
+    (features_.version_check."${deps."lazy_static"."1.1.0"."version_check"}" deps)
+  ];
+
+
+  crates.libc."0.2.43" = deps: { features?(features_.libc."0.2.43" deps {}) }: buildRustCrate {
+    crateName = "libc";
+    version = "0.2.43";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0pshydmsq71kl9276zc2928ld50sp524ixcqkcqsgq410dx6c50b";
+    features = mkFeatures (features."libc"."0.2.43" or {});
+  };
+  features_.libc."0.2.43" = deps: f: updateFeatures f (rec {
+    libc = fold recursiveUpdate {} [
+      { "0.2.43".default = (f.libc."0.2.43".default or true); }
+      { "0.2.43".use_std =
+        (f.libc."0.2.43".use_std or false) ||
+        (f.libc."0.2.43".default or false) ||
+        (libc."0.2.43"."default" or false); }
+    ];
+  }) [];
+
+
+  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); }
+    ];
+  }) [];
+
+
+  crates.log."0.4.5" = deps: { features?(features_.log."0.4.5" deps {}) }: buildRustCrate {
+    crateName = "log";
+    version = "0.4.5";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1hdcj17al94ga90q7jx2y1rmxi68n3akra1awv3hr3s9b9zipgq6";
+    dependencies = mapFeatures features ([
+      (crates."cfg_if"."${deps."log"."0.4.5"."cfg_if"}" deps)
+    ]);
+    features = mkFeatures (features."log"."0.4.5" or {});
+  };
+  features_.log."0.4.5" = deps: f: updateFeatures f (rec {
+    cfg_if."${deps.log."0.4.5".cfg_if}".default = true;
+    log."0.4.5".default = (f.log."0.4.5".default or true);
+  }) [
+    (features_.cfg_if."${deps."log"."0.4.5"."cfg_if"}" deps)
+  ];
+
+
+  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)
+  ];
+
+
+  crates.memchr."1.0.2" = deps: { features?(features_.memchr."1.0.2" deps {}) }: buildRustCrate {
+    crateName = "memchr";
+    version = "1.0.2";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ];
+    sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7";
+    dependencies = mapFeatures features ([
+    ]
+      ++ (if features.memchr."1.0.2".libc or false then [ (crates.libc."0.2.43" 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) ||
+        (memchr."1.0.2"."use_std" or false) ||
+        (f."memchr"."1.0.2"."use_std" or false); }
+    ];
+    memchr = fold recursiveUpdate {} [
+      { "1.0.2".default = (f.memchr."1.0.2".default or true); }
+      { "1.0.2".libc =
+        (f.memchr."1.0.2".libc or false) ||
+        (f.memchr."1.0.2".default or false) ||
+        (memchr."1.0.2"."default" or false) ||
+        (f.memchr."1.0.2".use_std or false) ||
+        (memchr."1.0.2"."use_std" or false); }
+      { "1.0.2".use_std =
+        (f.memchr."1.0.2".use_std or false) ||
+        (f.memchr."1.0.2".default or false) ||
+        (memchr."1.0.2"."default" or false); }
+    ];
+  }) [
+    (features_.libc."${deps."memchr"."1.0.2"."libc"}" deps)
+  ];
+
+
+  crates.memchr."2.1.0" = deps: { features?(features_.memchr."2.1.0" deps {}) }: buildRustCrate {
+    crateName = "memchr";
+    version = "2.1.0";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ];
+    sha256 = "02w1fc5z1ccx8fbzgcr0mpk0xf2i9g4vbx9q5c2g8pjddbaqvjjq";
+    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 []));
+
+    buildDependencies = mapFeatures features ([
+      (crates."version_check"."${deps."memchr"."2.1.0"."version_check"}" deps)
+    ]);
+    features = mkFeatures (features."memchr"."2.1.0" or {});
+  };
+  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) ||
+        (memchr."2.1.0"."use_std" or false) ||
+        (f."memchr"."2.1.0"."use_std" or false); }
+    ];
+    memchr = fold recursiveUpdate {} [
+      { "2.1.0".default = (f.memchr."2.1.0".default or true); }
+      { "2.1.0".libc =
+        (f.memchr."2.1.0".libc or false) ||
+        (f.memchr."2.1.0".default or false) ||
+        (memchr."2.1.0"."default" or false) ||
+        (f.memchr."2.1.0".use_std or false) ||
+        (memchr."2.1.0"."use_std" or false); }
+      { "2.1.0".use_std =
+        (f.memchr."2.1.0".use_std or false) ||
+        (f.memchr."2.1.0".default or false) ||
+        (memchr."2.1.0"."default" or false); }
+    ];
+    version_check."${deps.memchr."2.1.0".version_check}".default = true;
+  }) [
+    (features_.cfg_if."${deps."memchr"."2.1.0"."cfg_if"}" deps)
+    (features_.libc."${deps."memchr"."2.1.0"."libc"}" deps)
+    (features_.version_check."${deps."memchr"."2.1.0"."version_check"}" deps)
+  ];
+
+
+  crates.nodrop."0.1.12" = deps: { features?(features_.nodrop."0.1.12" deps {}) }: buildRustCrate {
+    crateName = "nodrop";
+    version = "0.1.12";
+    authors = [ "bluss" ];
+    sha256 = "1b9rxvdg8061gxjc239l9slndf0ds3m6fy2sf3gs8f9kknqgl49d";
+    dependencies = mapFeatures features ([
+]);
+    features = mkFeatures (features."nodrop"."0.1.12" or {});
+  };
+  features_.nodrop."0.1.12" = deps: f: updateFeatures f (rec {
+    nodrop = fold recursiveUpdate {} [
+      { "0.1.12".default = (f.nodrop."0.1.12".default or true); }
+      { "0.1.12".nodrop-union =
+        (f.nodrop."0.1.12".nodrop-union or false) ||
+        (f.nodrop."0.1.12".use_union or false) ||
+        (nodrop."0.1.12"."use_union" or false); }
+      { "0.1.12".std =
+        (f.nodrop."0.1.12".std or false) ||
+        (f.nodrop."0.1.12".default or false) ||
+        (nodrop."0.1.12"."default" or false); }
+    ];
+  }) [];
+
+
+  crates.nom."3.2.1" = deps: { features?(features_.nom."3.2.1" deps {}) }: buildRustCrate {
+    crateName = "nom";
+    version = "3.2.1";
+    authors = [ "contact@geoffroycouprie.com" ];
+    sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07";
+    dependencies = mapFeatures features ([
+      (crates."memchr"."${deps."nom"."3.2.1"."memchr"}" deps)
+    ]);
+    features = mkFeatures (features."nom"."3.2.1" or {});
+  };
+  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) ||
+        (nom."3.2.1"."std" or false) ||
+        (f."nom"."3.2.1"."std" or false); }
+    ];
+    nom = fold recursiveUpdate {} [
+      { "3.2.1".compiler_error =
+        (f.nom."3.2.1".compiler_error or false) ||
+        (f.nom."3.2.1".nightly or false) ||
+        (nom."3.2.1"."nightly" or false); }
+      { "3.2.1".default = (f.nom."3.2.1".default or true); }
+      { "3.2.1".lazy_static =
+        (f.nom."3.2.1".lazy_static or false) ||
+        (f.nom."3.2.1".regexp_macros or false) ||
+        (nom."3.2.1"."regexp_macros" or false); }
+      { "3.2.1".regex =
+        (f.nom."3.2.1".regex or false) ||
+        (f.nom."3.2.1".regexp or false) ||
+        (nom."3.2.1"."regexp" or false); }
+      { "3.2.1".regexp =
+        (f.nom."3.2.1".regexp or false) ||
+        (f.nom."3.2.1".regexp_macros or false) ||
+        (nom."3.2.1"."regexp_macros" or false); }
+      { "3.2.1".std =
+        (f.nom."3.2.1".std or false) ||
+        (f.nom."3.2.1".default or false) ||
+        (nom."3.2.1"."default" or false); }
+      { "3.2.1".stream =
+        (f.nom."3.2.1".stream or false) ||
+        (f.nom."3.2.1".default or false) ||
+        (nom."3.2.1"."default" or false); }
+    ];
+  }) [
+    (features_.memchr."${deps."nom"."3.2.1"."memchr"}" deps)
+  ];
+
+
+  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);
+  }) [];
+
+
+  crates.proc_macro2."0.4.20" = deps: { features?(features_.proc_macro2."0.4.20" deps {}) }: buildRustCrate {
+    crateName = "proc-macro2";
+    version = "0.4.20";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0yr74b00d3wzg21kjvfln7vzzvf9aghbaff4c747i3grbd997ys2";
+    build = "build.rs";
+    dependencies = mapFeatures features ([
+      (crates."unicode_xid"."${deps."proc_macro2"."0.4.20"."unicode_xid"}" deps)
+    ]);
+    features = mkFeatures (features."proc_macro2"."0.4.20" or {});
+  };
+  features_.proc_macro2."0.4.20" = deps: f: updateFeatures f (rec {
+    proc_macro2 = fold recursiveUpdate {} [
+      { "0.4.20".default = (f.proc_macro2."0.4.20".default or true); }
+      { "0.4.20".proc-macro =
+        (f.proc_macro2."0.4.20".proc-macro or false) ||
+        (f.proc_macro2."0.4.20".default or false) ||
+        (proc_macro2."0.4.20"."default" or false) ||
+        (f.proc_macro2."0.4.20".nightly or false) ||
+        (proc_macro2."0.4.20"."nightly" or false); }
+    ];
+    unicode_xid."${deps.proc_macro2."0.4.20".unicode_xid}".default = true;
+  }) [
+    (features_.unicode_xid."${deps."proc_macro2"."0.4.20"."unicode_xid"}" deps)
+  ];
+
+
+  crates.quick_error."1.2.2" = deps: { features?(features_.quick_error."1.2.2" deps {}) }: buildRustCrate {
+    crateName = "quick-error";
+    version = "1.2.2";
+    authors = [ "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" ];
+    sha256 = "192a3adc5phgpibgqblsdx1b421l5yg9bjbmv552qqq9f37h60k5";
+  };
+  features_.quick_error."1.2.2" = deps: f: updateFeatures f (rec {
+    quick_error."1.2.2".default = (f.quick_error."1.2.2".default or true);
+  }) [];
+
+
+  crates.quote."0.6.8" = deps: { features?(features_.quote."0.6.8" deps {}) }: buildRustCrate {
+    crateName = "quote";
+    version = "0.6.8";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "0dq6j23w6pmc4l6v490arixdwypy0b82z76nrzaingqhqri4p3mh";
+    dependencies = mapFeatures features ([
+      (crates."proc_macro2"."${deps."quote"."0.6.8"."proc_macro2"}" deps)
+    ]);
+    features = mkFeatures (features."quote"."0.6.8" or {});
+  };
+  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) ||
+        (quote."0.6.8"."proc-macro" or false) ||
+        (f."quote"."0.6.8"."proc-macro" or false); }
+    ];
+    quote = fold recursiveUpdate {} [
+      { "0.6.8".default = (f.quote."0.6.8".default or true); }
+      { "0.6.8".proc-macro =
+        (f.quote."0.6.8".proc-macro or false) ||
+        (f.quote."0.6.8".default or false) ||
+        (quote."0.6.8"."default" or false); }
+    ];
+  }) [
+    (features_.proc_macro2."${deps."quote"."0.6.8"."proc_macro2"}" deps)
+  ];
+
+
+  crates.rand."0.4.3" = deps: { features?(features_.rand."0.4.3" deps {}) }: buildRustCrate {
+    crateName = "rand";
+    version = "0.4.3";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1644wri45l147822xy7dgdm4k7myxzs66cb795ga0x7dan11ci4f";
+    dependencies = (if kernel == "fuchsia" then mapFeatures features ([
+      (crates."fuchsia_zircon"."${deps."rand"."0.4.3"."fuchsia_zircon"}" deps)
+    ]) 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 kernel == "windows" then mapFeatures features ([
+      (crates."winapi"."${deps."rand"."0.4.3"."winapi"}" deps)
+    ]) else []);
+    features = mkFeatures (features."rand"."0.4.3" or {});
+  };
+  features_.rand."0.4.3" = deps: f: updateFeatures f (rec {
+    fuchsia_zircon."${deps.rand."0.4.3".fuchsia_zircon}".default = true;
+    libc."${deps.rand."0.4.3".libc}".default = true;
+    rand = fold recursiveUpdate {} [
+      { "0.4.3".default = (f.rand."0.4.3".default or true); }
+      { "0.4.3".i128_support =
+        (f.rand."0.4.3".i128_support or false) ||
+        (f.rand."0.4.3".nightly or false) ||
+        (rand."0.4.3"."nightly" or false); }
+      { "0.4.3".libc =
+        (f.rand."0.4.3".libc or false) ||
+        (f.rand."0.4.3".std or false) ||
+        (rand."0.4.3"."std" or false); }
+      { "0.4.3".std =
+        (f.rand."0.4.3".std or false) ||
+        (f.rand."0.4.3".default or false) ||
+        (rand."0.4.3"."default" or false); }
+    ];
+    winapi = fold recursiveUpdate {} [
+      { "${deps.rand."0.4.3".winapi}"."minwindef" = true; }
+      { "${deps.rand."0.4.3".winapi}"."ntsecapi" = true; }
+      { "${deps.rand."0.4.3".winapi}"."profileapi" = true; }
+      { "${deps.rand."0.4.3".winapi}"."winnt" = true; }
+      { "${deps.rand."0.4.3".winapi}".default = true; }
+    ];
+  }) [
+    (features_.fuchsia_zircon."${deps."rand"."0.4.3"."fuchsia_zircon"}" deps)
+    (features_.libc."${deps."rand"."0.4.3"."libc"}" deps)
+    (features_.winapi."${deps."rand"."0.4.3"."winapi"}" deps)
+  ];
+
+
+  crates.redox_syscall."0.1.40" = deps: { features?(features_.redox_syscall."0.1.40" deps {}) }: buildRustCrate {
+    crateName = "redox_syscall";
+    version = "0.1.40";
+    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
+    sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611";
+    libName = "syscall";
+  };
+  features_.redox_syscall."0.1.40" = deps: f: updateFeatures f (rec {
+    redox_syscall."0.1.40".default = (f.redox_syscall."0.1.40".default or true);
+  }) [];
+
+
+  crates.redox_termios."0.1.1" = deps: { features?(features_.redox_termios."0.1.1" deps {}) }: buildRustCrate {
+    crateName = "redox_termios";
+    version = "0.1.1";
+    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
+    sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh";
+    libPath = "src/lib.rs";
+    dependencies = mapFeatures features ([
+      (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps)
+    ]);
+  };
+  features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec {
+    redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true;
+    redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true);
+  }) [
+    (features_.redox_syscall."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps)
+  ];
+
+
+  crates.redox_users."0.2.0" = deps: { features?(features_.redox_users."0.2.0" deps {}) }: buildRustCrate {
+    crateName = "redox_users";
+    version = "0.2.0";
+    authors = [ "Jose Narvaez <goyox86@gmail.com>" "Wesley Hershberger <mggmugginsmc@gmail.com>" ];
+    sha256 = "0s9jrh378jk8rfi1xfwxvh2r1gv6rn3bq6n7sbajkrqqq0xzijvf";
+    dependencies = mapFeatures features ([
+      (crates."argon2rs"."${deps."redox_users"."0.2.0"."argon2rs"}" deps)
+      (crates."failure"."${deps."redox_users"."0.2.0"."failure"}" deps)
+      (crates."rand"."${deps."redox_users"."0.2.0"."rand"}" deps)
+      (crates."redox_syscall"."${deps."redox_users"."0.2.0"."redox_syscall"}" deps)
+    ]);
+  };
+  features_.redox_users."0.2.0" = deps: f: updateFeatures f (rec {
+    argon2rs."${deps.redox_users."0.2.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.2.0".argon2rs}".default or false);
+    failure."${deps.redox_users."0.2.0".failure}".default = true;
+    rand."${deps.redox_users."0.2.0".rand}".default = true;
+    redox_syscall."${deps.redox_users."0.2.0".redox_syscall}".default = true;
+    redox_users."0.2.0".default = (f.redox_users."0.2.0".default or true);
+  }) [
+    (features_.argon2rs."${deps."redox_users"."0.2.0"."argon2rs"}" deps)
+    (features_.failure."${deps."redox_users"."0.2.0"."failure"}" deps)
+    (features_.rand."${deps."redox_users"."0.2.0"."rand"}" deps)
+    (features_.redox_syscall."${deps."redox_users"."0.2.0"."redox_syscall"}" deps)
+  ];
+
+
+  crates.regex."1.0.5" = deps: { features?(features_.regex."1.0.5" deps {}) }: buildRustCrate {
+    crateName = "regex";
+    version = "1.0.5";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1nb4dva9lhb3v76bdds9qcxldb2xy998sdraqnqaqdr6axfsfp02";
+    dependencies = mapFeatures features ([
+      (crates."aho_corasick"."${deps."regex"."1.0.5"."aho_corasick"}" deps)
+      (crates."memchr"."${deps."regex"."1.0.5"."memchr"}" deps)
+      (crates."regex_syntax"."${deps."regex"."1.0.5"."regex_syntax"}" deps)
+      (crates."thread_local"."${deps."regex"."1.0.5"."thread_local"}" deps)
+      (crates."utf8_ranges"."${deps."regex"."1.0.5"."utf8_ranges"}" deps)
+    ]);
+    features = mkFeatures (features."regex"."1.0.5" or {});
+  };
+  features_.regex."1.0.5" = deps: f: updateFeatures f (rec {
+    aho_corasick."${deps.regex."1.0.5".aho_corasick}".default = true;
+    memchr."${deps.regex."1.0.5".memchr}".default = true;
+    regex = fold recursiveUpdate {} [
+      { "1.0.5".default = (f.regex."1.0.5".default or true); }
+      { "1.0.5".pattern =
+        (f.regex."1.0.5".pattern or false) ||
+        (f.regex."1.0.5".unstable or false) ||
+        (regex."1.0.5"."unstable" or false); }
+      { "1.0.5".use_std =
+        (f.regex."1.0.5".use_std or false) ||
+        (f.regex."1.0.5".default or false) ||
+        (regex."1.0.5"."default" or false); }
+    ];
+    regex_syntax."${deps.regex."1.0.5".regex_syntax}".default = true;
+    thread_local."${deps.regex."1.0.5".thread_local}".default = true;
+    utf8_ranges."${deps.regex."1.0.5".utf8_ranges}".default = true;
+  }) [
+    (features_.aho_corasick."${deps."regex"."1.0.5"."aho_corasick"}" deps)
+    (features_.memchr."${deps."regex"."1.0.5"."memchr"}" deps)
+    (features_.regex_syntax."${deps."regex"."1.0.5"."regex_syntax"}" deps)
+    (features_.thread_local."${deps."regex"."1.0.5"."thread_local"}" deps)
+    (features_.utf8_ranges."${deps."regex"."1.0.5"."utf8_ranges"}" deps)
+  ];
+
+
+  crates.regex_syntax."0.6.2" = deps: { features?(features_.regex_syntax."0.6.2" deps {}) }: buildRustCrate {
+    crateName = "regex-syntax";
+    version = "0.6.2";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "109426mj7nhwr6szdzbcvn1a8g5zy52f9maqxjd9agm8wg87ylyw";
+    dependencies = mapFeatures features ([
+      (crates."ucd_util"."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps)
+    ]);
+  };
+  features_.regex_syntax."0.6.2" = deps: f: updateFeatures f (rec {
+    regex_syntax."0.6.2".default = (f.regex_syntax."0.6.2".default or true);
+    ucd_util."${deps.regex_syntax."0.6.2".ucd_util}".default = true;
+  }) [
+    (features_.ucd_util."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps)
+  ];
+
+
+  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";
+    authors = [ "Aaronepower <theaaronepower@gmail.com>" ];
+    sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7";
+    dependencies = (if kernel == "windows" then mapFeatures features ([
+      (crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps)
+    ]) else []);
+  };
+  features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec {
+    remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true);
+    winapi = fold recursiveUpdate {} [
+      { "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; }
+      { "${deps.remove_dir_all."0.5.1".winapi}"."fileapi" = true; }
+      { "${deps.remove_dir_all."0.5.1".winapi}"."std" = true; }
+      { "${deps.remove_dir_all."0.5.1".winapi}"."winbase" = true; }
+      { "${deps.remove_dir_all."0.5.1".winapi}"."winerror" = true; }
+      { "${deps.remove_dir_all."0.5.1".winapi}".default = true; }
+    ];
+  }) [
+    (features_.winapi."${deps."remove_dir_all"."0.5.1"."winapi"}" deps)
+  ];
+
+
+  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)
+  ];
+
+
+  crates.rustc_demangle."0.1.9" = deps: { features?(features_.rustc_demangle."0.1.9" deps {}) }: buildRustCrate {
+    crateName = "rustc-demangle";
+    version = "0.1.9";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "00ma4r9haq0zv5krps617mym6y74056pfcivyld0kpci156vfaax";
+  };
+  features_.rustc_demangle."0.1.9" = deps: f: updateFeatures f (rec {
+    rustc_demangle."0.1.9".default = (f.rustc_demangle."0.1.9".default or true);
+  }) [];
+
+
+  crates.ryu."0.2.6" = deps: { features?(features_.ryu."0.2.6" deps {}) }: buildRustCrate {
+    crateName = "ryu";
+    version = "0.2.6";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1vdh6z4aysc9kiiqhl7vxkqz3fykcnp24kgfizshlwfsz2j0p9dr";
+    build = "build.rs";
+    dependencies = mapFeatures features ([
+]);
+    features = mkFeatures (features."ryu"."0.2.6" or {});
+  };
+  features_.ryu."0.2.6" = deps: f: updateFeatures f (rec {
+    ryu."0.2.6".default = (f.ryu."0.2.6".default or true);
+  }) [];
+
+
+  crates.scoped_threadpool."0.1.9" = deps: { features?(features_.scoped_threadpool."0.1.9" deps {}) }: buildRustCrate {
+    crateName = "scoped_threadpool";
+    version = "0.1.9";
+    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
+    sha256 = "1arqj2skcfr46s1lcyvnlmfr5456kg5nhn8k90xyfjnxkp5yga2v";
+    features = mkFeatures (features."scoped_threadpool"."0.1.9" or {});
+  };
+  features_.scoped_threadpool."0.1.9" = deps: f: updateFeatures f (rec {
+    scoped_threadpool."0.1.9".default = (f.scoped_threadpool."0.1.9".default or true);
+  }) [];
+
+
+  crates.serde."1.0.80" = deps: { features?(features_.serde."1.0.80" deps {}) }: buildRustCrate {
+    crateName = "serde";
+    version = "1.0.80";
+    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "0vyciw2qhrws4hz87pfnsjdfzzdw2sclxqxq394g3a219a2rdcxz";
+    build = "build.rs";
+    dependencies = mapFeatures features ([
+]);
+    features = mkFeatures (features."serde"."1.0.80" or {});
+  };
+  features_.serde."1.0.80" = deps: f: updateFeatures f (rec {
+    serde = fold recursiveUpdate {} [
+      { "1.0.80".default = (f.serde."1.0.80".default or true); }
+      { "1.0.80".serde_derive =
+        (f.serde."1.0.80".serde_derive or false) ||
+        (f.serde."1.0.80".derive or false) ||
+        (serde."1.0.80"."derive" or false); }
+      { "1.0.80".std =
+        (f.serde."1.0.80".std or false) ||
+        (f.serde."1.0.80".default or false) ||
+        (serde."1.0.80"."default" or false); }
+      { "1.0.80".unstable =
+        (f.serde."1.0.80".unstable or false) ||
+        (f.serde."1.0.80".alloc or false) ||
+        (serde."1.0.80"."alloc" or false); }
+    ];
+  }) [];
+
+
+  crates.serde_derive."1.0.80" = deps: { features?(features_.serde_derive."1.0.80" deps {}) }: buildRustCrate {
+    crateName = "serde_derive";
+    version = "1.0.80";
+    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1akvzhbnnqhd92lfj7vp43scs1vdml7x27c82l5yh0kz7xf7jaky";
+    procMacro = true;
+    dependencies = mapFeatures features ([
+      (crates."proc_macro2"."${deps."serde_derive"."1.0.80"."proc_macro2"}" deps)
+      (crates."quote"."${deps."serde_derive"."1.0.80"."quote"}" deps)
+      (crates."syn"."${deps."serde_derive"."1.0.80"."syn"}" deps)
+    ]);
+    features = mkFeatures (features."serde_derive"."1.0.80" or {});
+  };
+  features_.serde_derive."1.0.80" = deps: f: updateFeatures f (rec {
+    proc_macro2."${deps.serde_derive."1.0.80".proc_macro2}".default = true;
+    quote."${deps.serde_derive."1.0.80".quote}".default = true;
+    serde_derive."1.0.80".default = (f.serde_derive."1.0.80".default or true);
+    syn = fold recursiveUpdate {} [
+      { "${deps.serde_derive."1.0.80".syn}"."visit" = true; }
+      { "${deps.serde_derive."1.0.80".syn}".default = true; }
+    ];
+  }) [
+    (features_.proc_macro2."${deps."serde_derive"."1.0.80"."proc_macro2"}" deps)
+    (features_.quote."${deps."serde_derive"."1.0.80"."quote"}" deps)
+    (features_.syn."${deps."serde_derive"."1.0.80"."syn"}" deps)
+  ];
+
+
+  crates.serde_json."1.0.32" = deps: { features?(features_.serde_json."1.0.32" deps {}) }: buildRustCrate {
+    crateName = "serde_json";
+    version = "1.0.32";
+    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1dqkvizi02j1bs5c21kw20idf4aa5399g29ndwl6vkmmrqkr1gr0";
+    dependencies = mapFeatures features ([
+      (crates."itoa"."${deps."serde_json"."1.0.32"."itoa"}" deps)
+      (crates."ryu"."${deps."serde_json"."1.0.32"."ryu"}" deps)
+      (crates."serde"."${deps."serde_json"."1.0.32"."serde"}" deps)
+    ]);
+    features = mkFeatures (features."serde_json"."1.0.32" or {});
+  };
+  features_.serde_json."1.0.32" = deps: f: updateFeatures f (rec {
+    itoa."${deps.serde_json."1.0.32".itoa}".default = true;
+    ryu."${deps.serde_json."1.0.32".ryu}".default = true;
+    serde."${deps.serde_json."1.0.32".serde}".default = true;
+    serde_json = fold recursiveUpdate {} [
+      { "1.0.32".default = (f.serde_json."1.0.32".default or true); }
+      { "1.0.32".indexmap =
+        (f.serde_json."1.0.32".indexmap or false) ||
+        (f.serde_json."1.0.32".preserve_order or false) ||
+        (serde_json."1.0.32"."preserve_order" or false); }
+    ];
+  }) [
+    (features_.itoa."${deps."serde_json"."1.0.32"."itoa"}" deps)
+    (features_.ryu."${deps."serde_json"."1.0.32"."ryu"}" deps)
+    (features_.serde."${deps."serde_json"."1.0.32"."serde"}" deps)
+  ];
+
+
+  crates.strsim."0.7.0" = deps: { features?(features_.strsim."0.7.0" deps {}) }: buildRustCrate {
+    crateName = "strsim";
+    version = "0.7.0";
+    authors = [ "Danny Guo <dannyguo91@gmail.com>" ];
+    sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv";
+  };
+  features_.strsim."0.7.0" = deps: f: updateFeatures f (rec {
+    strsim."0.7.0".default = (f.strsim."0.7.0".default or true);
+  }) [];
+
+
+  crates.syn."0.15.13" = deps: { features?(features_.syn."0.15.13" deps {}) }: buildRustCrate {
+    crateName = "syn";
+    version = "0.15.13";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1zvnppl08f2njpkl3m10h221sdl4vsm7v6vyq63dxk16nn37b1bh";
+    dependencies = mapFeatures features ([
+      (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 []));
+    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) ||
+        (syn."0.15.13"."proc-macro" or false) ||
+        (f."syn"."0.15.13"."proc-macro" 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) ||
+        (syn."0.15.13"."proc-macro" or false) ||
+        (f."syn"."0.15.13"."proc-macro" or false); }
+    ];
+    syn = fold recursiveUpdate {} [
+      { "0.15.13".clone-impls =
+        (f.syn."0.15.13".clone-impls or false) ||
+        (f.syn."0.15.13".default or false) ||
+        (syn."0.15.13"."default" or false); }
+      { "0.15.13".default = (f.syn."0.15.13".default or true); }
+      { "0.15.13".derive =
+        (f.syn."0.15.13".derive or false) ||
+        (f.syn."0.15.13".default or false) ||
+        (syn."0.15.13"."default" or false); }
+      { "0.15.13".parsing =
+        (f.syn."0.15.13".parsing or false) ||
+        (f.syn."0.15.13".default or false) ||
+        (syn."0.15.13"."default" or false); }
+      { "0.15.13".printing =
+        (f.syn."0.15.13".printing or false) ||
+        (f.syn."0.15.13".default or false) ||
+        (syn."0.15.13"."default" or false); }
+      { "0.15.13".proc-macro =
+        (f.syn."0.15.13".proc-macro or false) ||
+        (f.syn."0.15.13".default or false) ||
+        (syn."0.15.13"."default" or false); }
+      { "0.15.13".quote =
+        (f.syn."0.15.13".quote or false) ||
+        (f.syn."0.15.13".printing or false) ||
+        (syn."0.15.13"."printing" or false); }
+    ];
+    unicode_xid."${deps.syn."0.15.13".unicode_xid}".default = true;
+  }) [
+    (features_.proc_macro2."${deps."syn"."0.15.13"."proc_macro2"}" deps)
+    (features_.quote."${deps."syn"."0.15.13"."quote"}" deps)
+    (features_.unicode_xid."${deps."syn"."0.15.13"."unicode_xid"}" deps)
+  ];
+
+
+  crates.synstructure."0.10.0" = deps: { features?(features_.synstructure."0.10.0" deps {}) }: buildRustCrate {
+    crateName = "synstructure";
+    version = "0.10.0";
+    authors = [ "Nika Layzell <nika@thelayzells.com>" ];
+    sha256 = "1alb4hsbm5qf4jy7nmdkqrh3jagqk1xj88w0pmz67f16dvgpf0qf";
+    dependencies = mapFeatures features ([
+      (crates."proc_macro2"."${deps."synstructure"."0.10.0"."proc_macro2"}" deps)
+      (crates."quote"."${deps."synstructure"."0.10.0"."quote"}" deps)
+      (crates."syn"."${deps."synstructure"."0.10.0"."syn"}" deps)
+      (crates."unicode_xid"."${deps."synstructure"."0.10.0"."unicode_xid"}" deps)
+    ]);
+    features = mkFeatures (features."synstructure"."0.10.0" or {});
+  };
+  features_.synstructure."0.10.0" = deps: f: updateFeatures f (rec {
+    proc_macro2."${deps.synstructure."0.10.0".proc_macro2}".default = true;
+    quote."${deps.synstructure."0.10.0".quote}".default = true;
+    syn = fold recursiveUpdate {} [
+      { "${deps.synstructure."0.10.0".syn}"."extra-traits" = true; }
+      { "${deps.synstructure."0.10.0".syn}"."visit" = true; }
+      { "${deps.synstructure."0.10.0".syn}".default = true; }
+    ];
+    synstructure."0.10.0".default = (f.synstructure."0.10.0".default or true);
+    unicode_xid."${deps.synstructure."0.10.0".unicode_xid}".default = true;
+  }) [
+    (features_.proc_macro2."${deps."synstructure"."0.10.0"."proc_macro2"}" deps)
+    (features_.quote."${deps."synstructure"."0.10.0"."quote"}" deps)
+    (features_.syn."${deps."synstructure"."0.10.0"."syn"}" deps)
+    (features_.unicode_xid."${deps."synstructure"."0.10.0"."unicode_xid"}" deps)
+  ];
+
+
+  crates.tempdir."0.3.7" = deps: { features?(features_.tempdir."0.3.7" deps {}) }: buildRustCrate {
+    crateName = "tempdir";
+    version = "0.3.7";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy";
+    dependencies = mapFeatures features ([
+      (crates."rand"."${deps."tempdir"."0.3.7"."rand"}" deps)
+      (crates."remove_dir_all"."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps)
+    ]);
+  };
+  features_.tempdir."0.3.7" = deps: f: updateFeatures f (rec {
+    rand."${deps.tempdir."0.3.7".rand}".default = true;
+    remove_dir_all."${deps.tempdir."0.3.7".remove_dir_all}".default = true;
+    tempdir."0.3.7".default = (f.tempdir."0.3.7".default or true);
+  }) [
+    (features_.rand."${deps."tempdir"."0.3.7"."rand"}" deps)
+    (features_.remove_dir_all."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps)
+  ];
+
+
+  crates.termcolor."1.0.4" = deps: { features?(features_.termcolor."1.0.4" deps {}) }: buildRustCrate {
+    crateName = "termcolor";
+    version = "1.0.4";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "0xydrjc0bxg08llcbcmkka29szdrfklk4vh6l6mdd67ajifqw1mv";
+    dependencies = (if kernel == "windows" then mapFeatures features ([
+      (crates."wincolor"."${deps."termcolor"."1.0.4"."wincolor"}" deps)
+    ]) else []);
+  };
+  features_.termcolor."1.0.4" = deps: f: updateFeatures f (rec {
+    termcolor."1.0.4".default = (f.termcolor."1.0.4".default or true);
+    wincolor."${deps.termcolor."1.0.4".wincolor}".default = true;
+  }) [
+    (features_.wincolor."${deps."termcolor"."1.0.4"."wincolor"}" deps)
+  ];
+
+
+  crates.termion."1.5.1" = deps: { features?(features_.termion."1.5.1" deps {}) }: buildRustCrate {
+    crateName = "termion";
+    version = "1.5.1";
+    authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ];
+    sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1";
+    dependencies = (if !(kernel == "redox") then mapFeatures features ([
+      (crates."libc"."${deps."termion"."1.5.1"."libc"}" deps)
+    ]) else [])
+      ++ (if kernel == "redox" then mapFeatures features ([
+      (crates."redox_syscall"."${deps."termion"."1.5.1"."redox_syscall"}" deps)
+      (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps)
+    ]) else []);
+  };
+  features_.termion."1.5.1" = deps: f: updateFeatures f (rec {
+    libc."${deps.termion."1.5.1".libc}".default = true;
+    redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true;
+    redox_termios."${deps.termion."1.5.1".redox_termios}".default = true;
+    termion."1.5.1".default = (f.termion."1.5.1".default or true);
+  }) [
+    (features_.libc."${deps."termion"."1.5.1"."libc"}" deps)
+    (features_.redox_syscall."${deps."termion"."1.5.1"."redox_syscall"}" deps)
+    (features_.redox_termios."${deps."termion"."1.5.1"."redox_termios"}" deps)
+  ];
+
+
+  crates.textwrap."0.10.0" = deps: { features?(features_.textwrap."0.10.0" deps {}) }: buildRustCrate {
+    crateName = "textwrap";
+    version = "0.10.0";
+    authors = [ "Martin Geisler <martin@geisler.net>" ];
+    sha256 = "1s8d5cna12smhgj0x2y1xphklyk2an1yzbadnj89p1vy5vnjpsas";
+    dependencies = mapFeatures features ([
+      (crates."unicode_width"."${deps."textwrap"."0.10.0"."unicode_width"}" deps)
+    ]);
+  };
+  features_.textwrap."0.10.0" = deps: f: updateFeatures f (rec {
+    textwrap."0.10.0".default = (f.textwrap."0.10.0".default or true);
+    unicode_width."${deps.textwrap."0.10.0".unicode_width}".default = true;
+  }) [
+    (features_.unicode_width."${deps."textwrap"."0.10.0"."unicode_width"}" deps)
+  ];
+
+
+  crates.thread_local."0.3.6" = deps: { features?(features_.thread_local."0.3.6" deps {}) }: buildRustCrate {
+    crateName = "thread_local";
+    version = "0.3.6";
+    authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ];
+    sha256 = "02rksdwjmz2pw9bmgbb4c0bgkbq5z6nvg510sq1s6y2j1gam0c7i";
+    dependencies = mapFeatures features ([
+      (crates."lazy_static"."${deps."thread_local"."0.3.6"."lazy_static"}" deps)
+    ]);
+  };
+  features_.thread_local."0.3.6" = deps: f: updateFeatures f (rec {
+    lazy_static."${deps.thread_local."0.3.6".lazy_static}".default = true;
+    thread_local."0.3.6".default = (f.thread_local."0.3.6".default or true);
+  }) [
+    (features_.lazy_static."${deps."thread_local"."0.3.6"."lazy_static"}" deps)
+  ];
+
+
+  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)
+  ];
+
+
+  crates.toml."0.4.8" = deps: { features?(features_.toml."0.4.8" deps {}) }: buildRustCrate {
+    crateName = "toml";
+    version = "0.4.8";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "1xm3chgsvi3qqi7vj8sb5xvnbfpkqyl4fiwh7y2cl6r4brwlmif1";
+    dependencies = mapFeatures features ([
+      (crates."serde"."${deps."toml"."0.4.8"."serde"}" deps)
+    ]);
+  };
+  features_.toml."0.4.8" = deps: f: updateFeatures f (rec {
+    serde."${deps.toml."0.4.8".serde}".default = true;
+    toml."0.4.8".default = (f.toml."0.4.8".default or true);
+  }) [
+    (features_.serde."${deps."toml"."0.4.8"."serde"}" deps)
+  ];
+
+
+  crates.ucd_util."0.1.1" = deps: { features?(features_.ucd_util."0.1.1" deps {}) }: buildRustCrate {
+    crateName = "ucd-util";
+    version = "0.1.1";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0";
+  };
+  features_.ucd_util."0.1.1" = deps: f: updateFeatures f (rec {
+    ucd_util."0.1.1".default = (f.ucd_util."0.1.1".default or true);
+  }) [];
+
+
+  crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate {
+    crateName = "unicode-width";
+    version = "0.1.5";
+    authors = [ "kwantam <kwantam@gmail.com>" ];
+    sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w";
+    features = mkFeatures (features."unicode_width"."0.1.5" or {});
+  };
+  features_.unicode_width."0.1.5" = deps: f: updateFeatures f (rec {
+    unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true);
+  }) [];
+
+
+  crates.unicode_xid."0.1.0" = deps: { features?(features_.unicode_xid."0.1.0" deps {}) }: buildRustCrate {
+    crateName = "unicode-xid";
+    version = "0.1.0";
+    authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ];
+    sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj";
+    features = mkFeatures (features."unicode_xid"."0.1.0" or {});
+  };
+  features_.unicode_xid."0.1.0" = deps: f: updateFeatures f (rec {
+    unicode_xid."0.1.0".default = (f.unicode_xid."0.1.0".default or true);
+  }) [];
+
+
+  crates.utf8_ranges."1.0.1" = deps: { features?(features_.utf8_ranges."1.0.1" deps {}) }: buildRustCrate {
+    crateName = "utf8-ranges";
+    version = "1.0.1";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "1s56ihd2c8ba6191078wivvv59247szaiszrh8x2rxqfsxlfrnpp";
+  };
+  features_.utf8_ranges."1.0.1" = deps: f: updateFeatures f (rec {
+    utf8_ranges."1.0.1".default = (f.utf8_ranges."1.0.1".default or true);
+  }) [];
+
+
+  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);
+  }) [];
+
+
+  crates.vec_map."0.8.1" = deps: { features?(features_.vec_map."0.8.1" deps {}) }: buildRustCrate {
+    crateName = "vec_map";
+    version = "0.8.1";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Jorge Aparicio <japaricious@gmail.com>" "Alexis Beingessner <a.beingessner@gmail.com>" "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon <aturon@mozilla.com>" "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood <csouth3@illinois.edu>" "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens <markus@m-siemens.de>" "Josh Branchaud <jbranchaud@gmail.com>" "Huon Wilson <dbau.pp@gmail.com>" "Corey Farwell <coref@rwell.org>" "Aaron Liblong <>" "Nick Cameron <nrc@ncameron.org>" "Patrick Walton <pcwalton@mimiga.net>" "Felix S Klock II <>" "Andrew Paseltiner <apaseltiner@gmail.com>" "Sean McArthur <sean.monstar@gmail.com>" "Vadim Petrochenkov <>" ];
+    sha256 = "1jj2nrg8h3l53d43rwkpkikq5a5x15ms4rf1rw92hp5lrqhi8mpi";
+    dependencies = mapFeatures features ([
+]);
+    features = mkFeatures (features."vec_map"."0.8.1" or {});
+  };
+  features_.vec_map."0.8.1" = deps: f: updateFeatures f (rec {
+    vec_map = fold recursiveUpdate {} [
+      { "0.8.1".default = (f.vec_map."0.8.1".default or true); }
+      { "0.8.1".serde =
+        (f.vec_map."0.8.1".serde or false) ||
+        (f.vec_map."0.8.1".eders or false) ||
+        (vec_map."0.8.1"."eders" or false); }
+    ];
+  }) [];
+
+
+  crates.version_check."0.1.5" = deps: { features?(features_.version_check."0.1.5" deps {}) }: buildRustCrate {
+    crateName = "version_check";
+    version = "0.1.5";
+    authors = [ "Sergio Benitez <sb@sergio.bz>" ];
+    sha256 = "1yrx9xblmwbafw2firxyqbj8f771kkzfd24n3q7xgwiqyhi0y8qd";
+  };
+  features_.version_check."0.1.5" = deps: f: updateFeatures f (rec {
+    version_check."0.1.5".default = (f.version_check."0.1.5".default or true);
+  }) [];
+
+
+  crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate {
+    crateName = "winapi";
+    version = "0.3.6";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "1d9jfp4cjd82sr1q4dgdlrkvm33zhhav9d7ihr0nivqbncr059m4";
+    build = "build.rs";
+    dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([
+      (crates."winapi_i686_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps)
+    ]) else [])
+      ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([
+      (crates."winapi_x86_64_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps)
+    ]) else []);
+    features = mkFeatures (features."winapi"."0.3.6" or {});
+  };
+  features_.winapi."0.3.6" = deps: f: updateFeatures f (rec {
+    winapi."0.3.6".default = (f.winapi."0.3.6".default or true);
+    winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true;
+    winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true;
+  }) [
+    (features_.winapi_i686_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps)
+    (features_.winapi_x86_64_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps)
+  ];
+
+
+  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";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
+    build = "build.rs";
+  };
+  features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+    winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true);
+  }) [];
+
+
+  crates.winapi_util."0.1.1" = deps: { features?(features_.winapi_util."0.1.1" deps {}) }: buildRustCrate {
+    crateName = "winapi-util";
+    version = "0.1.1";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "10madanla73aagbklx6y73r2g2vwq9w8a0qcghbbbpn9vfr6a95f";
+    dependencies = (if kernel == "windows" then mapFeatures features ([
+      (crates."winapi"."${deps."winapi_util"."0.1.1"."winapi"}" deps)
+    ]) else []);
+  };
+  features_.winapi_util."0.1.1" = deps: f: updateFeatures f (rec {
+    winapi = fold recursiveUpdate {} [
+      { "${deps.winapi_util."0.1.1".winapi}"."consoleapi" = true; }
+      { "${deps.winapi_util."0.1.1".winapi}"."errhandlingapi" = true; }
+      { "${deps.winapi_util."0.1.1".winapi}"."fileapi" = true; }
+      { "${deps.winapi_util."0.1.1".winapi}"."minwindef" = true; }
+      { "${deps.winapi_util."0.1.1".winapi}"."processenv" = true; }
+      { "${deps.winapi_util."0.1.1".winapi}"."std" = true; }
+      { "${deps.winapi_util."0.1.1".winapi}"."winbase" = true; }
+      { "${deps.winapi_util."0.1.1".winapi}"."wincon" = true; }
+      { "${deps.winapi_util."0.1.1".winapi}"."winerror" = true; }
+      { "${deps.winapi_util."0.1.1".winapi}".default = true; }
+    ];
+    winapi_util."0.1.1".default = (f.winapi_util."0.1.1".default or true);
+  }) [
+    (features_.winapi."${deps."winapi_util"."0.1.1"."winapi"}" deps)
+  ];
+
+
+  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";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
+    build = "build.rs";
+  };
+  features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec {
+    winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true);
+  }) [];
+
+
+  crates.wincolor."1.0.1" = deps: { features?(features_.wincolor."1.0.1" deps {}) }: buildRustCrate {
+    crateName = "wincolor";
+    version = "1.0.1";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "0gr7v4krmjba7yq16071rfacz42qbapas7mxk5nphjwb042a8gvz";
+    dependencies = mapFeatures features ([
+      (crates."winapi"."${deps."wincolor"."1.0.1"."winapi"}" deps)
+      (crates."winapi_util"."${deps."wincolor"."1.0.1"."winapi_util"}" deps)
+    ]);
+  };
+  features_.wincolor."1.0.1" = deps: f: updateFeatures f (rec {
+    winapi = fold recursiveUpdate {} [
+      { "${deps.wincolor."1.0.1".winapi}"."minwindef" = true; }
+      { "${deps.wincolor."1.0.1".winapi}"."wincon" = true; }
+      { "${deps.wincolor."1.0.1".winapi}".default = true; }
+    ];
+    winapi_util."${deps.wincolor."1.0.1".winapi_util}".default = true;
+    wincolor."1.0.1".default = (f.wincolor."1.0.1".default or true);
+  }) [
+    (features_.winapi."${deps."wincolor"."1.0.1"."winapi"}" deps)
+    (features_.winapi_util."${deps."wincolor"."1.0.1"."winapi_util"}" deps)
+  ];
+
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d17b11c0b07..06ea1afb21d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7343,8 +7343,9 @@ with pkgs;
   inherit (rust) cargo rustc;
 
   buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };
+  buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
   buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests;
-
+  cratesIO = callPackage ../build-support/rust/crates-io.nix { };
   cargo-vendor = callPackage ../build-support/rust/cargo-vendor { };
 
   cargo-web = callPackage ../development/tools/cargo-web {
-- 
GitLab


From b580e195107ce5a74d4a585fa989a5ba680d2cbe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 17:06:50 -0700
Subject: [PATCH 0539/1065] jbake: 2.6.2 -> 2.6.3 (#49302)

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

diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index c11e6f15ce9..1a421cc47ed 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchzip, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "2.6.2";
+  version = "2.6.3";
   name = "jbake-${version}";
 
   src = fetchzip {
     url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip";
-    sha256 = "1q96z0pvkqgb4194m52z89q56cbc0g3faflyfpy55z099f655rx9";
+    sha256 = "000ax5vzirrhiykk86fmy4hibhl3pab0gkh5y35hiwhzhw5rwzk8";
   };
 
   buildInputs = [ makeWrapper jre ];
-- 
GitLab


From 0325373b56b0fea9df4cddd427cc35196b78dde8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 17:07:16 -0700
Subject: [PATCH 0540/1065] inboxer: 1.1.5 -> 1.2.1 (#49299)

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

diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index eb4d710857c..72b9ce09d76 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "inboxer-${version}";
-  version = "1.1.5";
+  version = "1.2.1";
 
   meta = with stdenv.lib; {
     description = "Unofficial, free and open-source Google Inbox Desktop App";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb";
-    sha256 = "11xid07rqn7j6nxn0azxwf0g8g3jhams2fmf9q7xc1is99zfy7z4";
+    sha256 = "0nyxas07d6ckgjazxapmc6iyakd2cddla6wflr5rhfp78d7kax3a";
   };
 
   unpackPhase = ''
-- 
GitLab


From d888c03784946508e26ff21c72687998d3ee2d34 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 17:11:48 -0700
Subject: [PATCH 0541/1065] libressl_2_8: 2.8.1 -> 2.8.2 (#49293)

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

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 1ac4a718512..154e84cfd0a 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -46,7 +46,7 @@ in {
   };
 
   libressl_2_8 = generic {
-    version = "2.8.1";
-    sha256 = "0hnga8j7svdbwcy01mh5pxssk7rxq4g5fc5vxrzhid0x1w2zfjrk";
+    version = "2.8.2";
+    sha256 = "1mag4lf3lmg2fh2yzkh663l69h4vjriadwl0zixmb50jkzjk3jxq";
   };
 }
-- 
GitLab


From 6e664678a45389f2d63b955e9b31a2c24a668a2e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 17:13:39 -0700
Subject: [PATCH 0542/1065] libqmatrixclient: 0.3.0.2 -> 0.4.0 (#49281)

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 8cca5333d08..2f20150ad16 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.3.0.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner  = "QMatrixClient";
     repo   = "libqmatrixclient";
     rev    = "v${version}";
-    sha256 = "03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5";
+    sha256 = "1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn";
   };
 
   buildInputs = [ qtbase ];
-- 
GitLab


From 5fd8de8137debe653bacc642610a9f7c2260b16a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 27 Oct 2018 17:14:23 -0700
Subject: [PATCH 0543/1065] pgroonga: 2.1.3 -> 2.1.6 (#49205)

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

diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix
index 615a199ddb5..aca5eb1f4ee 100644
--- a/pkgs/servers/sql/postgresql/pgroonga/default.nix
+++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pgroonga-${version}";
-  version = "2.1.3";
+  version = "2.1.6";
 
   src = fetchurl {
     url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz";
-    sha256 = "0qv82libl4rv6cq9klvzwx4g767mjl4jaap34sxbd3x0wvm364yd";
+    sha256 = "1scybfmmlz5p4xgkhfx7pzdiqj5cd60kvbk8m4xa6k3avz0p1sw9";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From bb54c88eb741e724bde213ab2174a9eee4e2a89a Mon Sep 17 00:00:00 2001
From: Mateusz Wykurz <wykurz@gmail.com>
Date: Sat, 27 Oct 2018 20:57:57 -0400
Subject: [PATCH 0544/1065] Add wykurz 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 08425d40b3d..b6add449b9b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4623,6 +4623,11 @@
     github = "wucke13";
     name = "Wucke";
   };
+  wykurz = {
+    email = "wykurz@gmail.com";
+    github = "wykurz";
+    name = "Mateusz Wykurz";
+  };
   wyvie = {
     email = "elijahrum@gmail.com";
     github = "wyvie";
-- 
GitLab


From 0cf647fe628407f7283fc7e62fc4a610945eeda9 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Sat, 27 Oct 2018 18:03:37 -0700
Subject: [PATCH 0545/1065] vlc: remove references to the Qt development
 headers

---
 pkgs/applications/video/vlc/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 06a53ead3ba..6cba5236a5f 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -12,6 +12,7 @@
 , withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null
 , jackSupport ? false
 , fetchpatch
+, removeReferencesTo
 }:
 
 with stdenv.lib;
@@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
   ] ++ optionals withQt5    [ qtbase qtsvg qtx11extras ]
     ++ optional jackSupport libjack2;
 
-  nativeBuildInputs = [ autoreconfHook perl pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ];
 
   enableParallelBuilding = true;
 
@@ -60,10 +61,14 @@ stdenv.mkDerivation rec {
       /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype
   '';
 
-  # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830
+  # - Touch plugins (plugins cache keyed off mtime and file size:
+  #     https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830
+  # - Remove references to the Qt development headers (used in error messages)
   postFixup = ''
     find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';'
     $out/lib/vlc/vlc-cache-gen $out/vlc/plugins
+
+    remove-references-to -t "${qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so
   '';
 
   # Most of the libraries are auto-detected so we don't need to set a bunch of
-- 
GitLab


From dad36e071b2f12358834f4c7b0f084fe4326d754 Mon Sep 17 00:00:00 2001
From: Ben Pye <ben@curlybracket.co.uk>
Date: Sun, 28 Oct 2018 02:18:00 +0000
Subject: [PATCH 0546/1065] maintainers: add benpye

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 08425d40b3d..00fc50eb761 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -495,6 +495,11 @@
     github = "bennofs";
     name = "Benno Fünfstück";
   };
+  benpye = {
+    email = "ben@curlybracket.co.uk";
+    github = "benpye";
+    name = "Ben Pye";
+  };
   benwbooth = {
     email = "benwbooth@gmail.com";
     github = "benwbooth";
-- 
GitLab


From bd7e0aec71f8f5fd4b3bad72de205843789bf2bc Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 28 Oct 2018 00:01:27 -0400
Subject: [PATCH 0547/1065] nixUnstable: 2.1pre6377_954d1f4d ->
 2.2pre6520_18b4c53f

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 975d36ddf19..030571d6a91 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -159,13 +159,13 @@ in rec {
   }; };
 
   nixUnstable = (lib.lowPrio (common rec {
-    name = "nix-2.1${suffix}";
-    suffix = "pre6377_954d1f4d";
+    name = "nix-2.2${suffix}";
+    suffix = "pre6520_18b4c53f";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "954d1f4d0a35063ff431b258beebadf753cb9efe";
-      sha256 = "0wnljxljvcwmniydgxlsjqmbgghmljs75m6083y2nkjql7dnrm7g";
+      rev = "18b4c53f71dfc626f5f5ffa0282afd1b9faad6a4";
+      sha256 = "1hn7bjrf6x7024nald7nk1c9m8fyddkzhazl7pwf6ssmiv12apxh";
     };
     fromGit = true;
   })) // { perl-bindings = perl-bindings {
-- 
GitLab


From 9b111955ec6852a7f95b970fb79f7c5d7a95e24f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 28 Oct 2018 00:25:39 -0400
Subject: [PATCH 0548/1065] nix-plugins: 5.0.0 -> 6.0.0

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

diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index d3a4b21b4b6..cc5a115ed71 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }:
-let version = "5.0.0"; in
+let version = "6.0.0"; in
 stdenv.mkDerivation {
   name = "nix-plugins-${version}";
 
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     owner = "shlevy";
     repo = "nix-plugins";
     rev = version;
-    sha256 = "0231j92504vx0f4wax9hwjdni1j4z0g8bx9wbakg6rbghl4svmdv";
+    sha256 = "08kxdci0sijj1hfkn3dbr7nbpb9xck0xr3xa3a0j116n4kvwb6qv";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06ea1afb21d..1c4b7a5a1eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11502,7 +11502,9 @@ with pkgs;
   };
   libnghttp2 = nghttp2.lib;
 
-  nix-plugins = callPackage ../development/libraries/nix-plugins {};
+  nix-plugins = callPackage ../development/libraries/nix-plugins {
+    nix = nixUnstable;
+  };
 
   nlohmann_json = callPackage ../development/libraries/nlohmann_json { };
 
-- 
GitLab


From 95fab6a09c4fd42eb9f69b9abd554735117dadd0 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Mon, 15 Oct 2018 13:17:12 +1000
Subject: [PATCH 0549/1065] linuxPackages.bpftrace: init at unstable-2018-10-27

---
 .../linux/bpftrace/bcc-source.patch           | 32 ++++++++
 pkgs/os-specific/linux/bpftrace/default.nix   | 57 +++++++++++++++
 .../linux/bpftrace/disable-gtests.patch       | 73 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 164 insertions(+)
 create mode 100644 pkgs/os-specific/linux/bpftrace/bcc-source.patch
 create mode 100644 pkgs/os-specific/linux/bpftrace/default.nix
 create mode 100644 pkgs/os-specific/linux/bpftrace/disable-gtests.patch

diff --git a/pkgs/os-specific/linux/bpftrace/bcc-source.patch b/pkgs/os-specific/linux/bpftrace/bcc-source.patch
new file mode 100644
index 00000000000..a4c9947f0c3
--- /dev/null
+++ b/pkgs/os-specific/linux/bpftrace/bcc-source.patch
@@ -0,0 +1,32 @@
+From fc0a5bd2ddb5827c5288ee284c1f2d834d79e432 Mon Sep 17 00:00:00 2001
+From: Rodney Lorrimar <dev@rodney.id.au>
+Date: Tue, 16 Oct 2018 09:55:59 +1000
+Subject: [PATCH 1/3] Don't use ExternalProject for bcc sources
+
+---
+ CMakeLists.txt | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eae850a..b20fb33 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,6 +31,15 @@ if (OFFLINE_BUILDS)
+     UPDATE_DISCONNECTED 1
+     BUILD_COMMAND ${CMAKE_COMMAND} --build . --target bcc-static
+     )
++elseif (NIX_BUILDS)
++  include(ExternalProject)
++  ExternalProject_Add(bcc
++    DOWNLOAD_COMMAND rmdir bcc && ln -sf $ENV{bccSrc} bcc
++    STEP_TARGETS build update
++    EXCLUDE_FROM_ALL 1
++    UPDATE_DISCONNECTED 1
++    BUILD_COMMAND ${CMAKE_COMMAND} --build . --target bcc-static
++    )
+ else()
+   include(ExternalProject)
+   ExternalProject_Add(bcc
+-- 
+2.17.1
+
diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix
new file mode 100644
index 00000000000..12773a95716
--- /dev/null
+++ b/pkgs/os-specific/linux/bpftrace/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchFromGitHub
+, cmake, pkgconfig, flex, bison
+, llvmPackages, kernel, linuxHeaders, elfutils, libelf, bcc
+}:
+
+stdenv.mkDerivation rec {
+  name = "bpftrace-unstable-${version}";
+  version = "2018-10-27";
+
+  src = fetchFromGitHub {
+    owner = "iovisor";
+    repo = "bpftrace";
+    rev = "c07b54f61fd7b7b49e0a254e746d6f442c5d780d";
+    sha256 = "1mpcjfyay9akmpqxag2ndwpz1qsdx8ii07jh9fky4w40wi9cipyg";
+  };
+
+  # bpftrace requires an unreleased version of bcc, added to the cmake
+  # build as an ExternalProject.
+  # https://github.com/iovisor/bpftrace/issues/184
+  bccSrc = fetchFromGitHub {
+    owner = "iovisor";
+    repo = "bcc";
+    rev = "afd00154865f3b2da6781cf92cecebaca4853950";
+    sha256 = "0ad78smrnipr1f377i5rv6ksns7v2vq54g5badbj5ldqs4x0hygd";
+  };
+
+  buildInputs = [
+    llvmPackages.llvm llvmPackages.clang-unwrapped kernel
+    elfutils libelf bccSrc
+  ];
+
+  nativeBuildInputs = [ cmake pkgconfig flex bison ]
+    # libelf is incompatible with elfutils-libelf
+    ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
+
+  patches = [
+    ./bcc-source.patch
+    # https://github.com/iovisor/bpftrace/issues/184
+    ./disable-gtests.patch
+  ];
+
+  configurePhase = ''
+    mkdir build
+    cd build
+    cmake ../                                   \
+      -DKERNEL_HEADERS_DIR=${linuxHeaders}      \
+      -DNIX_BUILDS:BOOL=ON                      \
+      -DCMAKE_INSTALL_PREFIX=$out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "High-level tracing language for Linux eBPF";
+    homepage = https://github.com/iovisor/bpftrace;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ rvl ];
+  };
+}
diff --git a/pkgs/os-specific/linux/bpftrace/disable-gtests.patch b/pkgs/os-specific/linux/bpftrace/disable-gtests.patch
new file mode 100644
index 00000000000..941d85a4112
--- /dev/null
+++ b/pkgs/os-specific/linux/bpftrace/disable-gtests.patch
@@ -0,0 +1,73 @@
+From 221eea24674fffb3b657b2bd0c923071b69d48a7 Mon Sep 17 00:00:00 2001
+From: Rodney Lorrimar <dev@rodney.id.au>
+Date: Tue, 16 Oct 2018 09:56:47 +1000
+Subject: [PATCH 2/3] Disable tests
+
+Would prefer to use gtest library in the normal way rather through
+ExternalProject.
+---
+ CMakeLists.txt       |  4 ++--
+ tests/CMakeLists.txt | 18 +++++++++++-------
+ 2 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b20fb33..7025d17 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@ add_compile_options("-Wno-format-security")
+ #add_compile_options("-Wstrict-overflow=5")
+ #add_compile_options("-Wdisabled-optimization")
+ 
+-enable_testing()
++# enable_testing()
+ 
+ if (OFFLINE_BUILDS)
+   include(ExternalProject)
+@@ -79,7 +79,7 @@ include_directories(${CLANG_INCLUDE_DIRS})
+ add_subdirectory(src/arch)
+ add_subdirectory(src/ast)
+ add_subdirectory(src)
+-add_subdirectory(tests)
++# add_subdirectory(tests)
+ add_subdirectory(resources)
+ add_subdirectory(tools)
+ add_subdirectory(man)
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index c283efa..6b5bff0 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -45,6 +45,8 @@ if (OFFLINE_BUILDS)
+     EXCLUDE_FROM_ALL 1
+     UPDATE_DISCONNECTED 1
+     )
++elseif (NIX_BUILDS)
++
+ else()
+   include(ExternalProject)
+   ExternalProject_Add(gtest-git
+@@ -54,13 +56,15 @@ else()
+     EXCLUDE_FROM_ALL 1
+     )
+ endif()
+-add_dependencies(bpftrace_test gtest-git-build)
+-ExternalProject_Get_Property(gtest-git source_dir binary_dir)
+-target_include_directories(bpftrace_test PUBLIC ${source_dir}/googletest/include)
+-target_include_directories(bpftrace_test PUBLIC ${source_dir}/googlemock/include)
+-target_link_libraries(bpftrace_test ${binary_dir}/googlemock/gtest/libgtest.a)
+-target_link_libraries(bpftrace_test ${binary_dir}/googlemock/gtest/libgtest_main.a)
+-target_link_libraries(bpftrace_test ${binary_dir}/googlemock/libgmock.a)
++
++find_library(LIBGTEST "gtest")
++if(LIBGTEST)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++       ${LIBGTEST}
++    )
++endif()
++
+ target_link_libraries(bpftrace_test ${CMAKE_THREAD_LIBS_INIT})
+ 
+ add_test(NAME bpftrace_test COMMAND bpftrace_test)
+-- 
+2.17.1
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e808b70fb41..276135f183e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14210,6 +14210,8 @@ with pkgs;
       python = python3;
     };
 
+    bpftrace = callPackage ../os-specific/linux/bpftrace { };
+
     bbswitch = callPackage ../os-specific/linux/bbswitch {};
 
     beegfs-module = callPackage ../os-specific/linux/beegfs/kernel-module.nix { };
-- 
GitLab


From fa0b1930fb2910c29c487269e98cbafac3b6a196 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Sun, 28 Oct 2018 16:26:36 +1000
Subject: [PATCH 0550/1065] electrum: fix sha256 for 3.2.3

I have checked pkgs.electrum.src against the GPG signature from
https://download.electrum.org/3.2.3/Electrum-3.2.3.tar.gz.asc
---
 pkgs/applications/misc/electrum/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 537627a10d2..843257a74e5 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "022iw4cq0c009wvqn7wd815jc0nv8198lq3cawn8h6c28hw2mhs1";
+    sha256 = "139kzapas1l61w1in9f7c6ybricid4fzryfnvsrfhpaqh83ydn2c";
   };
 
   propagatedBuildInputs = with python3Packages; [
-- 
GitLab


From 0c05fb262a52eb6189ef6e9650c956ec2d41342b Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Wed, 24 Oct 2018 19:00:00 +0200
Subject: [PATCH 0551/1065] scalafix: init at 0.9.0

---
 pkgs/development/tools/scalafix/default.nix | 43 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/tools/scalafix/default.nix

diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix
new file mode 100644
index 00000000000..bd8a013fe2d
--- /dev/null
+++ b/pkgs/development/tools/scalafix/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, jdk, jre, coursier, makeWrapper }:
+
+let
+  baseName = "scalafix";
+  version = "0.9.0";
+  deps = stdenv.mkDerivation {
+    name = "${baseName}-deps-${version}";
+    buildCommand = ''
+      export COURSIER_CACHE=$(pwd)
+      ${coursier}/bin/coursier fetch ch.epfl.scala:scalafix-cli_2.12.7:${version} > deps
+      mkdir -p $out/share/java
+      cp $(< deps) $out/share/java/
+    '';
+    outputHashMode = "recursive";
+    outputHashAlgo = "sha256";
+    outputHash     = "19j260prx7k010nxyvc1m9jj1ncxr73m2cym7if39360v5dc05c0";
+  };
+in
+stdenv.mkDerivation rec {
+  name = "${baseName}-${version}";
+
+  buildInputs = [ jdk makeWrapper deps ];
+
+  doCheck = true;
+
+  phases = [ "installPhase" "checkPhase" ];
+
+  installPhase = ''
+    makeWrapper ${jre}/bin/java $out/bin/${baseName} \
+      --add-flags "-cp $CLASSPATH scalafix.cli.Cli"
+  '';
+
+  checkPhase = ''
+    $out/bin/${baseName} --version | grep -q "${version}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Refactoring and linting tool for Scala";
+    homepage = https://scalacenter.github.io/scalafix/;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.tomahna ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45984c3e967..e8406e7a358 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7375,6 +7375,7 @@ with pkgs;
   scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; };
   scala = scala_2_12;
 
+  scalafix = callPackage ../development/tools/scalafix { };
   scalafmt = callPackage ../development/tools/scalafmt { };
 
   sdcc = callPackage ../development/compilers/sdcc {
-- 
GitLab


From fc476599adc6a990c0484e00ce16b76f31076092 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Sun, 28 Oct 2018 10:48:00 +0100
Subject: [PATCH 0552/1065] installation-device: set GC initial heap size to
 1MB

100000 (100kB) is too aggressive (too low) and gets ignored by the GC
See issue #43339
---
 nixos/modules/profiles/installation-device.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 370db2b0845..580ea4a58e5 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -63,7 +63,7 @@ with lib;
     # Tell the Nix evaluator to garbage collect more aggressively.
     # This is desirable in memory-constrained environments that don't
     # (yet) have swap set up.
-    environment.variables.GC_INITIAL_HEAP_SIZE = "100000";
+    environment.variables.GC_INITIAL_HEAP_SIZE = "1M";
 
     # Make the installer more likely to succeed in low memory
     # environments.  The kernel's overcommit heustistics bite us
-- 
GitLab


From b4c54485bfd8a39d4cfd742c1689dfd8b3a59eb6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 27 Oct 2018 14:42:03 +0200
Subject: [PATCH 0553/1065] remmina: clean up

Desktop file is included now, so no need to create it manually.
libgnome-keyring is not used anymore, libsecret replaced it.
---
 .../networking/remote/remmina/default.nix     | 36 ++++---------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index e823977db20..81ced3e641b 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook
+{ stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook
 , glib, gtk3, gettext, libxkbfile, libX11
 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
 , pcre, libdbusmenu-gtk3, libappindicator-gtk3
@@ -7,24 +7,11 @@
 , openssl, gsettings-desktop-schemas, json-glib
 # The themes here are soft dependencies; only icons are missing without them.
 , hicolor-icon-theme, adwaita-icon-theme
-, gnomeSupport ? true, libgnome-keyring
 }:
 
 with stdenv.lib;
 
-let
-
-  desktopItem = makeDesktopItem {
-    name = "remmina";
-    desktopName = "Remmina";
-    genericName = "Remmina Remote Desktop Client";
-    exec = "remmina";
-    icon = "remmina";
-    comment = "Connect to remote desktops";
-    categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
-  };
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "remmina-${version}";
   version = "1.2.32";
 
@@ -35,22 +22,16 @@ in stdenv.mkDerivation rec {
     sha256 = "15szv1xs6drxq6qyksmxcfdz516ja4zm52r4yf6hwij3fgl8qdpw";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ];
   buildInputs = [
-    cmake wrapGAppsHook gsettings-desktop-schemas
+    gsettings-desktop-schemas
     glib gtk3 gettext libxkbfile libX11
     freerdp libssh libgcrypt gnutls
     pcre libdbusmenu-gtk3 libappindicator-gtk3
     libvncserver libpthreadstubs libXdmcp libxkbcommon
     libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core
     openssl hicolor-icon-theme adwaita-icon-theme json-glib
-  ]
-  ++ optional gnomeSupport libgnome-keyring;
-
-  preConfigure = optionalString (!gnomeSupport) ''
-    substituteInPlace CMakeLists.txt \
-      --replace "add_subdirectory(remmina-plugins-gnome)" ""
-  '';
+  ];
 
   cmakeFlags = [
     "-DWITH_VTE=OFF"
@@ -68,13 +49,8 @@ in stdenv.mkDerivation rec {
     )
   '';
 
-  postInstall = ''
-    mkdir -pv $out/share/applications
-    cp ${desktopItem}/share/applications/* $out/share/applications
-  '';
-
   meta = {
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
     homepage = https://gitlab.com/Remmina/Remmina;
     description = "Remote desktop client written in GTK+";
     maintainers = with maintainers; [ melsigl ryantm ];
-- 
GitLab


From 9ac64e5bb65aeca34bef01e48fefaea186428bc1 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Sun, 28 Oct 2018 11:25:13 +0100
Subject: [PATCH 0554/1065] gtest: Use native cmake/ninja builder

Clean up the expression and add pkgconfig support
---
 pkgs/development/libraries/gtest/default.nix | 21 ++------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index 769cc1c768c..cf4069871d1 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, fetchFromGitHub }:
+{ stdenv, cmake, ninja, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   name = "gtest-${version}";
   version = "1.8.1";
@@ -10,24 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk";
   };
 
-  buildInputs = [ cmake ];
-
-  configurePhase = ''
-    mkdir build
-    cd build
-    cmake ../ -DCMAKE_INSTALL_PREFIX=$out
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib
-    cp -v googlemock/gtest/libgtest.a googlemock/gtest/libgtest_main.a googlemock/libgmock.a googlemock/libgmock_main.a $out/lib
-    ln -s $out/lib/libgmock.a $out/lib/libgoogletest.a
-    mkdir -p $out/include
-    cp -v -r ../googlemock/include/gmock $out/include
-    cp -v -r ../googletest/include/gtest $out/include
-    mkdir -p $out/src
-    cp -v -r ../googlemock/src/* ../googletest/src/* $out/src
-  '';
+  nativeBuildInputs = [ cmake ninja ];
 
   meta = with stdenv.lib; {
     description = "Google's framework for writing C++ tests";
-- 
GitLab


From e9309a83c17678c94b1e47991bb19365b6d45a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Sun, 28 Oct 2018 19:39:13 +0900
Subject: [PATCH 0555/1065] mdadm: 4.0 -> 4.1

---
 pkgs/os-specific/linux/mdadm/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index 52a5f16bc52..c6c5f843690 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -14,11 +14,11 @@ let
   '';
 in
 stdenv.mkDerivation rec {
-  name = "mdadm-4.0";
+  name = "mdadm-4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz";
-    sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx";
+    sha256 = "0jjgjgqijpdp7ijh8slzzjjw690kydb1jjadf0x5ilq85628hxmb";
   };
 
   # This is to avoid self-references, which causes the initrd to explode
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
     description = "Programs for managing RAID arrays under Linux";
     homepage = http://neil.brown.name/blog/mdadm;
     license = licenses.gpl2;
+    maintainers = with maintainers; [ ekleog ];
     platforms = platforms.linux;
   };
 }
-- 
GitLab


From 1246c317618f8d912c9f4ca9a1a83606d5b848ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 28 Oct 2018 10:39:35 +0000
Subject: [PATCH 0556/1065] pijul: 0.8.0 -> 0.10.0

---
 .../version-management/pijul/default.nix      | 23 +++++--
 .../version-management/pijul/libpijul.patch   | 61 +++++++++++++++++++
 2 files changed, 78 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/applications/version-management/pijul/libpijul.patch

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 1a8fe6f5fe5..7419c52c48b 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -1,24 +1,35 @@
-{ stdenv, fetchurl, rustPlatform, darwin }:
+{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, pkgconfig }:
 
 with rustPlatform;
 
 buildRustPackage rec {
   name = "pijul-${version}";
-  version = "0.8.0";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "https://pijul.org/releases/${name}.tar.gz";
-    sha256 = "00pi03yp2bgnjpsz2hgaapxfw2i4idbjqc88cagpvn4yr1612wqx";
+    sha256 = "1lkipcp83rfsj9yqddvb46dmqdf2ch9njwvjv8f3g91rmfjcngys";
   };
 
-  sourceRoot = "${name}/pijul";
+  cargoPatches = [
+    ./libpijul.patch
+  ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin
+  nativeBuildInputs = [ pkgconfig ];
+
+  postInstall = ''
+    mkdir -p $out/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d}
+    $out/bin/pijul generate-completions --bash > $out/share/bash-completion/completions/pijul
+    $out/bin/pijul generate-completions --zsh > $out/share/zsh/site-functions/_pijul
+    $out/bin/pijul generate-completions --fish > $out/share/fish/vendor_completions.d/pijul.fish
+  '';
+
+  buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin
     (with darwin.apple_sdk.frameworks; [ Security ]);
 
   doCheck = false;
 
-  cargoSha256 = "1cnr08qbpia3336l37k1jli20d7kwnrw2gys8s9mg271cb4vdx03";
+  cargoSha256 = "1419mlxa4p53hm5qzfd1yi2k0n1bcv8kaslls1nyx661vknhfamw";
 
   meta = with stdenv.lib; {
     description = "A distributed version control system";
diff --git a/pkgs/applications/version-management/pijul/libpijul.patch b/pkgs/applications/version-management/pijul/libpijul.patch
new file mode 100644
index 00000000000..9e4aa3cdd4b
--- /dev/null
+++ b/pkgs/applications/version-management/pijul/libpijul.patch
@@ -0,0 +1,61 @@
+--- 2/pijul-0.10.0/Cargo.lock	1970-01-01 01:00:00.000000000 +0100
++++ pijul-0.10.0/Cargo.lock	2018-10-28 10:09:48.557639255 +0000
+@@ -552,7 +552,7 @@
+ 
+ [[package]]
+ name = "libpijul"
+-version = "0.10.0"
++version = "0.10.1"
+ dependencies = [
+  "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -577,9 +577,29 @@
+ 
+ [[package]]
+ name = "libpijul"
+-version = "0.10.0"
++version = "0.10.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-replace = "libpijul 0.10.0"
++dependencies = [
++ "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bs58 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "flate2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ignore 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "sanakirja 0.8.16 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thrussh-keys 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
+ 
+ [[package]]
+ name = "line"
+@@ -917,7 +937,7 @@
+  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "ignore 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "isatty 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libpijul 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libpijul 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "line 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pager 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1796,7 +1816,7 @@
+ "checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef"
+ "checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b"
+ "checksum libflate 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1a429b86418868c7ea91ee50e9170683f47fd9d94f5375438ec86ec3adb74e8e"
+-"checksum libpijul 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "80fd579ba6762eac3f12c9624d5496edaba5a2f2e8785bcf8310372328e06ebe"
++"checksum libpijul 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cf6fc1aa0e9402f8283bdeb2507cfb6798d2f2f973da34c3f4b0c96a456b74cd"
+ "checksum line 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ecdd22a3856203276b7854e16213139428e82922530438f36356e5b361ea4a42"
+ "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
+ "checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2"
-- 
GitLab


From b23d92f8f259e95836481278d23fac97b5a69b74 Mon Sep 17 00:00:00 2001
From: Stefan Wiehler <me@sephalon.net>
Date: Sun, 28 Oct 2018 09:56:44 +0100
Subject: [PATCH 0557/1065] fmt: minor refactor

Add separate build outputs, enable parallel building, fix platforms,
adapt to styleguide.
---
 pkgs/development/libraries/fmt/default.nix | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index c120f7c9b43..fbe947e3afb 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -3,29 +3,41 @@
 stdenv.mkDerivation rec {
   version = "5.2.1";
   name = "fmt-${version}";
+
   src = fetchFromGitHub {
     owner = "fmtlib";
     repo = "fmt";
     rev = "${version}";
     sha256 = "1cd8yq8va457iir1hlf17ksx11fx2hlb8i4jml8gj1875pizm0pk";
   };
+
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [
+    "-DFMT_TEST=TRUE"
+    "-DBUILD_SHARED_LIBS=${if enableShared then "TRUE" else "FALSE"}"
+  ];
+
+  enableParallelBuilding = true;
+
   doCheck = true;
   # preCheckHook ensures the test binaries can find libfmt.so.5
   preCheck = if enableShared
              then "export LD_LIBRARY_PATH=\"$PWD\""
              else "";
-  cmakeFlags = [ "-DFMT_TEST=yes"
-                 "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" ];
+
   meta = with stdenv.lib; {
-    homepage = http://fmtlib.net/;
     description = "Small, safe and fast formatting library";
     longDescription = ''
       fmt (formerly cppformat) is an open-source formatting library. It can be
       used as a fast and safe alternative to printf and IOStreams.
     '';
+    homepage = http://fmtlib.net/;
+    downloadPage = https://github.com/fmtlib/fmt/;
     maintainers = [ maintainers.jdehaas ];
     license = licenses.bsd2;
-    platforms = platforms.unix;
+    platforms = platforms.all;
   };
 }
-- 
GitLab


From 8ef70a0b2957bc7ea78d4b7f86e6614a17dc507b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Sun, 28 Oct 2018 13:06:02 +0000
Subject: [PATCH 0558/1065] reason: 3.3.3 -> 3.3.7 (#49325)

* reason: 3.3.3 -> 3.3.7

* reason: makeWrapper needed at build time only
moved makeWrapper from buildInputs to nativeBuildInputs
---
 pkgs/development/compilers/reason/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index 81c935fc421..0832d14992d 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -4,18 +4,20 @@
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-reason-${version}";
-  version = "3.3.3";
+  version = "3.3.7";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "reason";
-    rev = "fefe5e4db3a54a7946c2220ee037dd2f407011c9";
-    sha256 = "1x0dbacgq9pa36zgzwrc0gm14wbb6v27y9bf7wcwk55a1ck0am18";
+    rev = "4d20e5b535c29c5ef1283e65958b32996e449e5a";
+    sha256 = "0f3pb61wg58g8f3wcnp1h4gpmnwmp7bq0cnqdfwldmh9cs0dqyfk";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
 
-  buildInputs = [ makeWrapper ocaml findlib dune utop menhir ];
+  buildInputs = [ ocaml findlib dune utop menhir ];
 
   buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
 
-- 
GitLab


From 83a65a91822413316300b7c3a21798133791dfaa Mon Sep 17 00:00:00 2001
From: FeepingCreature <default_357-line@yahoo.de>
Date: Sun, 28 Oct 2018 14:08:01 +0100
Subject: [PATCH 0559/1065] improve shell.nix warning messages

---
 nixos/modules/programs/shell.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 6aa0262e3a4..9842e2bef64 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -13,7 +13,7 @@ with lib;
         # Set up the per-user profile.
         mkdir -m 0755 -p "$NIX_USER_PROFILE_DIR"
         if [ "$(stat --printf '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)" ]; then
-            echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR, should be $(id -u)" >&2
+            echo "WARNING: the per-user profile dir $NIX_USER_PROFILE_DIR should belong to user id $(id -u)" >&2
         fi
 
         if [ -w "$HOME" ]; then
@@ -35,7 +35,7 @@ with lib;
           NIX_USER_GCROOTS_DIR="/nix/var/nix/gcroots/per-user/$USER"
           mkdir -m 0755 -p "$NIX_USER_GCROOTS_DIR"
           if [ "$(stat --printf '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)" ]; then
-              echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR, should be $(id -u)" >&2
+              echo "WARNING: the per-user gcroots dir $NIX_USER_GCROOTS_DIR should belong to user id $(id -u)" >&2
           fi
 
           # Set up a default Nix expression from which to install stuff.
-- 
GitLab


From fec3af14e52b41a384be6e914a74ee8f434cfc7b Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sun, 28 Oct 2018 11:33:56 +0100
Subject: [PATCH 0560/1065] xidlehook: 0.4.9 -> 0.5.0

---
 pkgs/tools/X11/xidlehook/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index b9623534140..0c64cbefb3e 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -1,22 +1,22 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub
+{ lib, stdenv, rustPlatform, fetchFromGitLab
 , xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf }:
 
 rustPlatform.buildRustPackage rec {
   name = "xidlehook-${version}";
-  version = "0.4.9";
+  version = "0.5.0";
 
   doCheck = false;
 
-  src = fetchFromGitHub {
+  src = fetchFromGitLab {
     owner = "jD91mZM2";
     repo = "xidlehook";
     rev = version;
 
-    sha256 = "1l2kmymwxal9v5g3q21i985yc201dpybp85qfws2n5rzw8qpg1dw";
+    sha256 = "1qrjwk91i31rww5lwgp84hc4h3b1prm60y45jm1f28g2bbv2qy19";
   };
 
   cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"];
-  cargoSha256 = "1mrg59flmmqg5wwi2l8lw6p1xpgdw597fdfsmpn8b126rgzqmjl8";
+  cargoSha256 = "1pdhbqnkgwp2v5zyin8z8049aq8c3kfk04v9wsbz8qla34rgi99s";
 
   buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ];
   nativeBuildInputs = [ pkgconfig patchelf ];
-- 
GitLab


From cba6c931ab7a3ae7608a471a9a2545741db021c4 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sun, 28 Oct 2018 14:21:12 +0100
Subject: [PATCH 0561/1065] powerline-rs: 0.1.8 -> 0.1.9

---
 pkgs/tools/misc/powerline-rs/default.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index 67f805988a3..3de81d3bd05 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -1,25 +1,29 @@
-{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }:
+{ stdenv, lib, rustPlatform, fetchFromGitLab, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }:
 rustPlatform.buildRustPackage rec {
   pname = "powerline-rs";
   name = "${pname}-${version}";
-  version = "0.1.8";
+  version = "0.1.9";
 
-  src = fetchFromGitHub {
+  src = fetchFromGitLab {
     owner = "jD91mZM2";
     repo = "powerline-rs";
-    rev = version;
+    #rev = version;
 
-    sha256 = "018i9qq98afbgv0nxs1n83zb09lqhqxpdrd95f2maic3rr5ngnj5";
+    # Support for $COMPLETION_OUT:
+    rev = "44679385a95dd9f3ebd9b093f9ef8925610e9a23";
+
+    sha256 = "1mxkw6ydnqjyplbki2j9pbnlhxmkw9qqw54443a3cjmn2g08jyzp";
   };
 
-  cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc";
+  cargoSha256 = "1sr9vbfk5bb3n0lv93y19in1clyvbj0w3p1gmp4sbw8lx84zwxhc";
 
   nativeBuildInputs = [ pkgconfig file perl cmake curl ];
   buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security;
 
+  COMPLETION_OUT = "out";
   postInstall = ''
-    install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}"
-    install -Dm 755 "${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}"
+    install -Dm 755 "${COMPLETION_OUT}/${pname}.bash" "$out/etc/bash_completion.d/${pname}"
+    install -Dm 755 "${COMPLETION_OUT}/${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}"
   '';
 
   meta = with lib; {
-- 
GitLab


From 9bbfc6f6e2c7d84136d344ca3182a47cb14cb32b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 28 Oct 2018 13:45:56 +0000
Subject: [PATCH 0562/1065] buildGoPackage: re-enable GOCACHE

If projects uses go1.11 modules GOCACHE is required.
Also if buildGoPackage is used in a nix-shell setting we don't
want to override GOCACHE to allow incremental builds.
This should be backported to 18.09
---
 pkgs/development/go-modules/generic/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 3faa4c268ac..0e092473bd5 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -103,6 +103,7 @@ go.stdenv.mkDerivation (
 
   '') + ''
     export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
+    export GOCACHE=$TMPDIR/go-cache
 
     runHook postConfigure
   '';
@@ -193,9 +194,6 @@ go.stdenv.mkDerivation (
     find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
   '';
 
-  # Disable go cache, which is not reused in nix anyway
-  GOCACHE = "off";
-
   shellHook = ''
     d=$(mktemp -d "--suffix=-$name")
   '' + toString (map (dep: ''
-- 
GitLab


From 503bcae31bc5208967cae31b22fa2eb8d50db5a5 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Sun, 28 Oct 2018 14:51:58 +0100
Subject: [PATCH 0563/1065] Revert "autobahn: 18.8.2 -> 18.9.2, txaio: 18.7.1
 -> 18.8.1" (#49345)

---
 pkgs/development/python-modules/autobahn/default.nix | 4 ++--
 pkgs/development/python-modules/txaio/default.nix    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 4105a5d965f..01922f98c40 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -4,11 +4,11 @@
 }:
 buildPythonPackage rec {
   pname = "autobahn";
-  version = "18.9.2";
+  version = "18.8.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mhj64rsnbi6rc0hskmllw280rvd99z045p6dq8h0mw60r7r52yr";
+    sha256 = "448df2e241011ea2948799918930042d81e63d26b01912c472f5a9a37f42f319";
   };
 
   propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++
diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index 01d7b04b3dd..2bfdbae918a 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "txaio";
-  version = "18.8.1";
+  version = "18.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zmpdph6zddgrnkkcykh6qk5s46l7s5mzfqrh82m4b5iffn61qv7";
+    sha256 = "701de939e90bb80f7e085357081552437526752199def5541dddfc34c0b0593f";
   };
 
   checkInputs = [ pytest mock ];
-- 
GitLab


From 66124646ee36eed857a402a833bcaab880263840 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 13 Oct 2018 23:29:53 +0900
Subject: [PATCH 0564/1065] licenses: add GPLv2.0 only + classpath exception

---
 lib/licenses.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 611e6ddb35b..940baf53b7c 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -309,6 +309,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "GNU General Public License v2.0 only";
   };
 
+  gpl2Classpath = {
+    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 = {
     fullName = "GNU General Public License v2.0 or later (with Classpath exception)";
     url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
-- 
GitLab


From 8faebb17ac811c784ff4d2ad55330223268524c4 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 13 Oct 2018 23:42:21 +0900
Subject: [PATCH 0565/1065] adoptopenjdk-bin: init at 11

---
 .../adoptopenjdk-bin/jdk-linux-base.nix       | 119 ++++++++++++++++++
 .../adoptopenjdk-bin/jdk11-linux.nix          |  36 ++++++
 pkgs/top-level/all-packages.nix               |   9 ++
 3 files changed, 164 insertions(+)
 create mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
 create mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix

diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
new file mode 100644
index 00000000000..cf38ca9eaeb
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -0,0 +1,119 @@
+{ name
+, url
+, sha256
+}:
+
+{ swingSupport ? true
+, stdenv
+, fetchurl
+, file
+, xorg ? null
+, glib
+, libxml2
+, ffmpeg_2
+, libxslt
+, libGL
+, freetype
+, fontconfig
+, gtk2
+, pango
+, cairo
+, alsaLib
+, atk
+, gdk_pixbuf
+, zlib
+, elfutils
+}:
+
+assert swingSupport -> xorg != null;
+
+let
+  rSubPaths = [
+    "lib/jli"
+    "lib/server"
+    "lib/compressedrefs" # OpenJ9
+    "lib/j9vm" # OpenJ9
+    "lib"
+  ];
+
+  libraries = [
+    stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL
+    xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf
+    atk zlib elfutils
+  ] ++ (stdenv.lib.optionals swingSupport [
+    xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt
+    xorg.libXrender
+    stdenv.cc.cc
+  ]);
+in
+
+let result = stdenv.mkDerivation rec {
+  inherit name;
+
+  src = fetchurl {
+    inherit url sha256;
+  };
+
+  nativeBuildInputs = [ file ];
+
+  # See: https://github.com/NixOS/patchelf/issues/10
+  dontStrip = 1;
+
+  installPhase = ''
+    cd ..
+
+    # Set PaX markings
+    exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+    for file in $exes; do
+      paxmark m "$file"
+      # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
+      ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}
+    done
+
+    mv $sourceRoot $out
+
+    rm -rf $out/demo
+
+    # Remove some broken manpages.
+    rm -rf $out/man/ja*
+
+    # for backward compatibility
+    ln -s $out $out/jre
+
+    mkdir -p $out/nix-support
+
+    # Set JAVA_HOME automatically.
+    cat <<EOF >> $out/nix-support/setup-hook
+    if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+    EOF
+  '';
+
+  postFixup = ''
+    rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}"
+
+    # set all the dynamic linkers
+    find $out -type f -perm -0100 \
+        -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath "$rpath" {} \;
+
+    find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
+  '';
+
+  rpath = stdenv.lib.strings.makeLibraryPath libraries;
+
+  # FIXME: use multiple outputs or return actual JRE package
+  passthru.jre = result;
+
+  passthru.home = result;
+
+  # for backward compatibility
+  passthru.architecture = "";
+
+  meta = with stdenv.lib; {
+    license = licenses.gpl2Classpath;
+    description = "AdoptOpenJDK, prebuilt OpenJDK binary";
+    platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
+    maintainers = with stdenv.lib.maintainers; [ taku0 ];
+  };
+
+}; in result
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
new file mode 100644
index 00000000000..6e00782c391
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
@@ -0,0 +1,36 @@
+let
+  version = "11";
+  buildNumber = "28";
+  baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}";
+  makePackage = { packageType, vmType, sha256 }: import ./jdk-linux-base.nix {
+    name = if packageType == "jdk"
+      then
+        "adoptopenjdk-${vmType}-bin-${version}"
+      else
+        "adoptopenjdk-${packageType}-${vmType}-bin-${version}";
+    url = "${baseUrl}/OpenJDK${version}-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz";
+    inherit sha256;
+  };
+in
+{
+  jdk-hotspot = makePackage {
+    packageType = "jdk";
+    vmType = "hotspot";
+    sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af";
+  };
+  jre-hotspot = makePackage {
+    packageType = "jre";
+    vmType = "hotspot";
+    sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c";
+  };
+  jdk-openj9 = makePackage {
+    packageType = "jdk";
+    vmType = "openj9";
+    sha256 = "fd77f22eb74078bcf974415abd888296284d2ceb81dbaca6ff32f59416ebc57f";
+  };
+  jre-openj9 = makePackage {
+    packageType = "jre";
+    vmType = "openj9";
+    sha256 = "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69e3c196ca5..9dd951d681c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6431,6 +6431,15 @@ with pkgs;
 
   abcl = callPackage ../development/compilers/abcl {};
 
+  adoptopenjdk-bin-11-packages = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix;
+  adoptopenjdk-hotspot-bin-11 = callPackage adoptopenjdk-bin-11-packages.jdk-hotspot {};
+  adoptopenjdk-jre-hotspot-bin-11 = callPackage adoptopenjdk-bin-11-packages.jre-hotspot {};
+  adoptopenjdk-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages.jdk-openj9 {};
+  adoptopenjdk-jre-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages.jre-openj9 {};
+
+  adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11;
+  adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11;
+
   aldor = callPackage ../development/compilers/aldor { };
 
   aliceml = callPackage ../development/compilers/aliceml { };
-- 
GitLab


From 7c3dd045ce323dc6e0a997175508399c8e7a42a5 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 20 Oct 2018 16:18:56 +0900
Subject: [PATCH 0566/1065] adoptopenjdk-bin: support darwin platform

---
 .../adoptopenjdk-bin/jdk-darwin-base.nix      | 59 +++++++++++++++++++
 .../adoptopenjdk-bin/jdk11-darwin.nix         | 26 ++++++++
 pkgs/top-level/all-packages.nix               | 18 ++++--
 3 files changed, 98 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
 create mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix

diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
new file mode 100644
index 00000000000..c2c13649f88
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
@@ -0,0 +1,59 @@
+{ name
+, url
+, sha256
+}:
+
+{ swingSupport ? true # not used for now
+, stdenv
+, fetchurl
+}:
+
+let result = stdenv.mkDerivation rec {
+  inherit name;
+
+  src = fetchurl {
+    inherit url sha256;
+  };
+
+  # See: https://github.com/NixOS/patchelf/issues/10
+  dontStrip = 1;
+
+  installPhase = ''
+    cd ..
+
+    mv $sourceRoot $out
+
+    rm -rf $out/Home/demo
+
+    # Remove some broken manpages.
+    rm -rf $out/Home/man/ja*
+
+    # for backward compatibility
+    ln -s $out/Contents/Home $out/jre
+
+    ln -s $out/Contents/Home/* $out/
+
+    mkdir -p $out/nix-support
+
+    # Set JAVA_HOME automatically.
+    cat <<EOF >> $out/nix-support/setup-hook
+    if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+    EOF
+  '';
+
+  # FIXME: use multiple outputs or return actual JRE package
+  passthru.jre = result;
+
+  passthru.home = result;
+
+  # for backward compatibility
+  passthru.architecture = "";
+
+  meta = with stdenv.lib; {
+    license = licenses.gpl2Classpath;
+    description = "AdoptOpenJDK, prebuilt OpenJDK binary";
+    platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms
+    maintainers = with stdenv.lib.maintainers; [ taku0 ];
+  };
+
+}; in result
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
new file mode 100644
index 00000000000..77d9d85aaa9
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
@@ -0,0 +1,26 @@
+let
+  version = "11";
+  buildNumber = "28";
+  baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}";
+  makePackage = { packageType, vmType, sha256 }: import ./jdk-darwin-base.nix {
+    name = if packageType == "jdk"
+      then
+        "adoptopenjdk-${vmType}-bin-${version}"
+      else
+        "adoptopenjdk-${packageType}-${vmType}-bin-${version}";
+    url = "${baseUrl}/OpenJDK${version}-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz";
+    inherit sha256;
+  };
+in
+{
+  jdk-hotspot = makePackage {
+    packageType = "jdk";
+    vmType = "hotspot";
+    sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3";
+  };
+  jre-hotspot = makePackage {
+    packageType = "jre";
+    vmType = "hotspot";
+    sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9dd951d681c..740c3111a20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6431,11 +6431,19 @@ with pkgs;
 
   abcl = callPackage ../development/compilers/abcl {};
 
-  adoptopenjdk-bin-11-packages = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix;
-  adoptopenjdk-hotspot-bin-11 = callPackage adoptopenjdk-bin-11-packages.jdk-hotspot {};
-  adoptopenjdk-jre-hotspot-bin-11 = callPackage adoptopenjdk-bin-11-packages.jre-hotspot {};
-  adoptopenjdk-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages.jdk-openj9 {};
-  adoptopenjdk-jre-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages.jre-openj9 {};
+  adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix;
+  adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix;
+
+  adoptopenjdk-hotspot-bin-11 = if stdenv.isLinux
+    then callPackage adoptopenjdk-bin-11-packages-linux.jdk-hotspot {}
+    else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-hotspot {};
+  adoptopenjdk-jre-hotspot-bin-11 = if stdenv.isLinux
+    then callPackage adoptopenjdk-bin-11-packages-linux.jre-hotspot {}
+    else callPackage adoptopenjdk-bin-11-packages-darwin.jre-hotspot {};
+
+  # no OpenJ9 for Darwin
+  adoptopenjdk-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jdk-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;
-- 
GitLab


From d2daf0dd6ffd60f4a8b7db3eaa4851c40d803f17 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 24 Oct 2018 21:25:36 +0000
Subject: [PATCH 0567/1065] chromium: build with clang

---
 .../networking/browsers/chromium/common.nix    | 18 +++++++++++++-----
 .../networking/browsers/chromium/default.nix   |  7 ++++---
 pkgs/top-level/all-packages.nix                | 10 ++++++++--
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 4cbd44c100d..a011d0a892e 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar
+{ stdenv, llvmPackages, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar
 
 # default dependencies
 , bzip2, flac, speex, libopus
@@ -130,14 +130,16 @@ let
     patches = optional enableWideVine ./patches/widevine.patch ++ [
       ./patches/nix_plugin_paths_68.patch
       ./patches/remove-webp-include-69.patch
+
       # Unfortunately, chromium regularly breaks on major updates and
-      # then needs various patches backported. Good sources for such patches and other hints:
+      # then needs various patches backported in order to be compiled with GCC.
+      # Good sources for such patches and other hints:
       # - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
       # - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
       # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits
       #
       # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
-    ]  ++ optionals (versionOlder version "71") [
+    ] ++ optionals (!stdenv.cc.isClang && (versionRange "70" "71")) [
        ( githubPatch "cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4" "0258qlffp6f6izswczb11p8zdpn550z5yqa9z7gdg2rg5171n5i8" )
        ( githubPatch "e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d" "1ky5xrzch6aya87kn0bgb31lksl3g8kh2v8k676ks7pdl2v132p9" )
        ( githubPatch "a4de8da116585357c123d71e5f54d1103824c6df" "1y7afnjrsz6j2l3vy1ms8mrkbb51xhcafw9r371algi48il7rajm" )
@@ -159,7 +161,7 @@ let
                 sha256    = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s";
               }
             );
-            
+
     postPatch = ''
       # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
       substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
@@ -207,10 +209,16 @@ let
     '' + optionalString stdenv.isAarch64 ''
       substituteInPlace build/toolchain/linux/BUILD.gn \
         --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
+    '' + optionalString stdenv.cc.isClang ''
+      mkdir -p third_party/llvm-build/Release+Asserts/bin
+      ln -s ${stdenv.cc}/bin/clang              third_party/llvm-build/Release+Asserts/bin/clang
+      ln -s ${stdenv.cc}/bin/clang++            third_party/llvm-build/Release+Asserts/bin/clang++
+      ln -s ${llvmPackages.llvm}/bin/llvm-ar    third_party/llvm-build/Release+Asserts/bin/llvm-ar
     '';
 
     gnFlags = mkGnFlags ({
       linux_use_bundled_binutils = false;
+      use_lld = false;
       use_gold = true;
       gold_path = "${stdenv.cc}/bin";
       is_debug = false;
@@ -224,7 +232,7 @@ let
       use_cups = cupsSupport;
 
       treat_warnings_as_errors = false;
-      is_clang = false;
+      is_clang = stdenv.cc.isClang;
       clang_use_chrome_plugins = false;
       remove_webcore_debug_symbols = true;
       enable_swiftshader = false;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 686e8fadec3..88b0a89db4b 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, makeWrapper, makeDesktopItem, ed
+{ newScope, stdenv, llvmPackages, makeWrapper, makeDesktopItem, ed
 , glib, gtk3, gnome3, gsettings-desktop-schemas
 
 # package customization
@@ -14,12 +14,13 @@
 , commandLineArgs ? ""
 }:
 
+assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv);
 let
   callPackage = newScope chromium;
 
   chromium = {
-    inherit stdenv;
-  
+    inherit stdenv llvmPackages;
+
     upstream-info = (callPackage ./update.nix {}).getChannel channel;
 
     mkChromiumDerivation = callPackage ./common.nix {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 740c3111a20..747696b1f1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16016,13 +16016,19 @@ with pkgs;
 
   bookworm = callPackage ../applications/office/bookworm { };
 
-  chromium = callPackage ../applications/networking/browsers/chromium {
+  chromium = callPackage ../applications/networking/browsers/chromium ({
     channel = "stable";
     pulseSupport = config.pulseaudio or true;
     enablePepperFlash = config.chromium.enablePepperFlash or false;
     enableWideVine = config.chromium.enableWideVine or false;
     gnome = gnome2;
-  };
+  } // (if stdenv.isAarch64 then {
+          stdenv = gcc8Stdenv;
+        } else {
+          llvmPackages = llvmPackages_7;
+          stdenv = llvmPackages_7.stdenv;
+        })
+   );
 
   chronos = callPackage ../applications/networking/cluster/chronos { };
 
-- 
GitLab


From 7eea24db5d64229b2372906391b5239a877c89ee Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 24 Oct 2018 21:56:13 +0200
Subject: [PATCH 0568/1065] chromium/plugins: specify gcc instead of stdenv.cc

---
 pkgs/applications/networking/browsers/chromium/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index c5622f0c63c..ed3a58f62db 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ stdenv, gcc
 , jshon
 , glib
 , nspr
@@ -69,7 +69,7 @@ let
       ! find -iname '*.so' -exec ldd {} + | grep 'not found'
     '';
 
-    PATCH_RPATH = mkrpath [ stdenv.cc.cc glib nspr nss ];
+    PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ];
 
     patchPhase = ''
       chmod +x libwidevinecdm.so libwidevinecdmadapter.so
@@ -110,7 +110,7 @@ let
 
     patchPhase = ''
       chmod +x libpepflashplayer.so
-      patchelf --set-rpath "${mkrpath [ stdenv.cc.cc ]}" libpepflashplayer.so
+      patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so
     '';
 
     doCheck = true;
-- 
GitLab


From b70ab5c405f3c3b1852286696130f0112b80979b Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 27 Oct 2018 20:23:12 +0200
Subject: [PATCH 0569/1065] chromium: make gcc8 build available via
 buildWithGcc flag

---
 .../networking/browsers/chromium/common.nix         |  3 ++-
 .../networking/browsers/chromium/default.nix        | 13 +++++++++----
 pkgs/top-level/all-packages.nix                     | 10 ++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index a011d0a892e..58459934de2 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -31,12 +31,13 @@
 , upstream-info
 }:
 
+assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv);
+
 buildFun:
 
 with stdenv.lib;
 
 # see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html
-
 let
   # The additional attributes for creating derivations based on the chromium
   # source tree.
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 88b0a89db4b..dbf5f4cb399 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,5 +1,6 @@
-{ newScope, stdenv, llvmPackages, makeWrapper, makeDesktopItem, ed
+{ newScope, makeWrapper, makeDesktopItem, ed
 , glib, gtk3, gnome3, gsettings-desktop-schemas
+, stdenv, llvmPackages_7, gcc8Stdenv
 
 # package customization
 , channel ? "stable"
@@ -9,17 +10,16 @@
 , proprietaryCodecs ? true
 , enablePepperFlash ? false
 , enableWideVine ? false
+, buildWithGcc ? false
 , cupsSupport ? true
 , pulseSupport ? false
 , commandLineArgs ? ""
 }:
 
-assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv);
 let
   callPackage = newScope chromium;
 
   chromium = {
-    inherit stdenv llvmPackages;
 
     upstream-info = (callPackage ./update.nix {}).getChannel channel;
 
@@ -34,7 +34,12 @@ let
     plugins = callPackage ./plugins.nix {
       inherit enablePepperFlash enableWideVine;
     };
-  };
+  } // (if buildWithGcc then {
+          stdenv = gcc8Stdenv;
+        } else {
+          llvmPackages = llvmPackages_7;
+          stdenv = llvmPackages_7.stdenv;
+        });
 
   desktopItem = makeDesktopItem {
     name = "chromium-browser";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 747696b1f1b..33f30c2126c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16021,14 +16021,8 @@ with pkgs;
     pulseSupport = config.pulseaudio or true;
     enablePepperFlash = config.chromium.enablePepperFlash or false;
     enableWideVine = config.chromium.enableWideVine or false;
-    gnome = gnome2;
-  } // (if stdenv.isAarch64 then {
-          stdenv = gcc8Stdenv;
-        } else {
-          llvmPackages = llvmPackages_7;
-          stdenv = llvmPackages_7.stdenv;
-        })
-   );
+    buildWithGcc = config.chromium.buildWithGcc or stdenv.isAarch64;
+  });
 
   chronos = callPackage ../applications/networking/cluster/chronos { };
 
-- 
GitLab


From 17585ff6d8e7db7cd665f1eb8212d795c926120b Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 27 Oct 2018 20:25:49 +0200
Subject: [PATCH 0570/1065] chromium: 70.0.3538.67 -> 70.0.3538.77

---
 .../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 bca9231e866..8162f43776d 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 = "0dqfwghl73gcmbnl9wb3i5wz8q65y1vhg7n0m2nh0hv33w1w4mp9";
-    sha256bin64 = "0x7npns1ng7p4w1qswcj889v9lplvy2wv1ccxrk4ilyqiwzvwy1z";
-    version = "70.0.3538.67";
+    sha256 = "0kkdfp5f3gmzngfj1nfw023bpyvm47h94k9rpwml2kxlijswd1gl";
+    sha256bin64 = "13ghx5ysl8f2iphdvjh698q4jksh765ljjrd74m6x0ih6qm0ksaq";
+    version = "71.0.3578.20";
   };
   dev = {
-    sha256 = "1kw0rn58s4nd43z2qkjph7aid0s3jnmm650d7k1yxppgmfsal246";
-    sha256bin64 = "0518qrghjk5jlzhmynk6nngp5i81bpxi3880gimpbd7bblj6dg7y";
-    version = "71.0.3578.10";
+    sha256 = "1d7q8hbqbxy2izdvv4d9126ljiglsfc3w7wns3zbbbiyqa2rj00y";
+    sha256bin64 = "0v6yahsvsgxcqg6k84lgr589rnx9af1r2axn7cggyn1a2lk63jck";
+    version = "72.0.3590.0";
   };
   stable = {
-    sha256 = "0dqfwghl73gcmbnl9wb3i5wz8q65y1vhg7n0m2nh0hv33w1w4mp9";
-    sha256bin64 = "0ihs2xfb2zn8aq11kg7miw9rnjwc6l4k5jgf24dm661463xmd3ha";
-    version = "70.0.3538.67";
+    sha256 = "0j84556r3m4igigqsx9zvw4kvbn4psfsi7m8xhcvfxc39ingh569";
+    sha256bin64 = "082cf9d1wm36w4i09ai4xnprvxfqdar6cbgsxz5q5srd41mqdy6p";
+    version = "70.0.3538.77";
   };
 }
-- 
GitLab


From 80bb1db72c495d77dacdb1c32c192a0d6a53829e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 27 Oct 2018 16:41:18 +0000
Subject: [PATCH 0571/1065] ocamlPackages.menhir: 20170712 -> 20181026

---
 pkgs/development/ocaml-modules/menhir/default.nix | 14 ++++++++------
 pkgs/development/ocaml-modules/menhir/generic.nix |  7 ++-----
 pkgs/top-level/ocaml-packages.nix                 |  8 ++++++--
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index 2a101da74d5..ce9ddeea0c4 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -1,12 +1,14 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild
-, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170712" else "20140422"
+, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20181026" else "20140422"
 }@args:
 
 let
-  sha256 =
-  if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"
-  else if version == "20170712" then "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a"
-  else throw ("menhir: unknown version " ++ version);
+  src = fetchurl (
+  if version == "20140422" then { url = "http://cristal.inria.fr/~fpottier/menhir/menhir-20140422.tar.gz"; sha256 = "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"; }
+  else if version == "20170712" then { url = "http://gallium.inria.fr/~fpottier/menhir/menhir-20170712.tar.gz"; sha256 = "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a"; }
+  else if version == "20181026" then { url = "https://gitlab.inria.fr/fpottier/menhir/repository/20181026/archive.tar.gz"; sha256 = "1zhacw60996i9b88kbnfvrvjk3ps9p9n9syjk9np545jp8l0582g"; }
+  else throw ("menhir: unknown version " ++ version)
+  );
 in
 
-import ./generic.nix (args // { inherit version sha256; })
+import ./generic.nix (args // { inherit version src; })
diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix
index d52da82d6d7..bac6cd70794 100644
--- a/pkgs/development/ocaml-modules/menhir/generic.nix
+++ b/pkgs/development/ocaml-modules/menhir/generic.nix
@@ -1,12 +1,9 @@
-{ version, sha256, stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
+{ version, src, stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
 
 stdenv.mkDerivation {
   name = "menhir-${version}";
 
-  src = fetchurl {
-    url = "http://pauillac.inria.fr/~fpottier/menhir/menhir-${version}.tar.gz";
-    inherit sha256;
-  };
+  inherit src;
 
   buildInputs = [ ocaml findlib ocamlbuild ];
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9f9bba933a1..62b773c51bf 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1024,11 +1024,15 @@ let
 
     omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
 
-    verasco = callPackage ../development/tools/analysis/verasco (
+    verasco = callPackage ../development/tools/analysis/verasco ((
       if system == "x86_64-linux"
       then { tools = pkgs.pkgsi686Linux.stdenv.cc; }
       else {}
-    );
+    ) // {
+      menhir = callPackage ../development/ocaml-modules/menhir {
+        version = "20170712";
+      };
+    });
 
     google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
 
-- 
GitLab


From ed91407784dce5a5ebe7518fcc51581207f8027f Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 28 Oct 2018 17:07:19 +0100
Subject: [PATCH 0572/1065] Revert "chromium: make gcc8 build available via
 buildWithGcc flag"

This partially reverts commit
b70ab5c405f3c3b1852286696130f0112b80979b (except for depending gnome2)

see #48922
---
 .../networking/browsers/chromium/common.nix         |  3 +--
 .../networking/browsers/chromium/default.nix        | 13 ++++---------
 pkgs/top-level/all-packages.nix                     |  9 +++++++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 58459934de2..a011d0a892e 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -31,13 +31,12 @@
 , upstream-info
 }:
 
-assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv);
-
 buildFun:
 
 with stdenv.lib;
 
 # see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html
+
 let
   # The additional attributes for creating derivations based on the chromium
   # source tree.
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index dbf5f4cb399..88b0a89db4b 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,6 +1,5 @@
-{ newScope, makeWrapper, makeDesktopItem, ed
+{ newScope, stdenv, llvmPackages, makeWrapper, makeDesktopItem, ed
 , glib, gtk3, gnome3, gsettings-desktop-schemas
-, stdenv, llvmPackages_7, gcc8Stdenv
 
 # package customization
 , channel ? "stable"
@@ -10,16 +9,17 @@
 , proprietaryCodecs ? true
 , enablePepperFlash ? false
 , enableWideVine ? false
-, buildWithGcc ? false
 , cupsSupport ? true
 , pulseSupport ? false
 , commandLineArgs ? ""
 }:
 
+assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv);
 let
   callPackage = newScope chromium;
 
   chromium = {
+    inherit stdenv llvmPackages;
 
     upstream-info = (callPackage ./update.nix {}).getChannel channel;
 
@@ -34,12 +34,7 @@ let
     plugins = callPackage ./plugins.nix {
       inherit enablePepperFlash enableWideVine;
     };
-  } // (if buildWithGcc then {
-          stdenv = gcc8Stdenv;
-        } else {
-          llvmPackages = llvmPackages_7;
-          stdenv = llvmPackages_7.stdenv;
-        });
+  };
 
   desktopItem = makeDesktopItem {
     name = "chromium-browser";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33f30c2126c..9dc5b7548af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16021,8 +16021,13 @@ with pkgs;
     pulseSupport = config.pulseaudio or true;
     enablePepperFlash = config.chromium.enablePepperFlash or false;
     enableWideVine = config.chromium.enableWideVine or false;
-    buildWithGcc = config.chromium.buildWithGcc or stdenv.isAarch64;
-  });
+  } // (if stdenv.isAarch64 then {
+          stdenv = gcc8Stdenv;
+        } else {
+          llvmPackages = llvmPackages_7;
+          stdenv = llvmPackages_7.stdenv;
+        })
+   );
 
   chronos = callPackage ../applications/networking/cluster/chronos { };
 
-- 
GitLab


From d46291dda554b8aad2b6cafd5408cb769e221d8d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 28 Oct 2018 17:22:11 +0100
Subject: [PATCH 0573/1065] opentracing: fix Nixpkgs evaluation errors

---
 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 9dc5b7548af..33f789328fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4543,7 +4543,7 @@ with pkgs;
 
   opae = callPackage ../development/libraries/opae { };
 
-  opentracing-cpp = callPackages ../development/libraries/opentracing-cpp { };
+  opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { };
 
   openvswitch = callPackage ../os-specific/linux/openvswitch { };
 
-- 
GitLab


From deacd0bd7325dea00d0e70b7255443c16541a4bc Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Sun, 28 Oct 2018 17:31:35 +0100
Subject: [PATCH 0574/1065] nixos/rngd: fix exec flags and udev rules

TPM1.2 support has been dropped in rng-tools v6.5
see https://github.com/nhorman/rng-tools/commit/caef8cce97396adc8c60749a0ce6ac039b57859a

rngd won't access /dev/tpm0 anymore and the "--no-tpm=1" option is now unrecognised
---
 nixos/modules/security/rngd.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix
index 81e04a44b11..63e00b54812 100644
--- a/nixos/modules/security/rngd.nix
+++ b/nixos/modules/security/rngd.nix
@@ -20,7 +20,6 @@ with lib;
       KERNEL=="random", TAG+="systemd"
       SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
       KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
-      ${if config.services.tcsd.enable then "" else ''KERNEL=="tpm0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"''}
     '';
 
     systemd.services.rngd = {
@@ -30,8 +29,7 @@ with lib;
 
       description = "Hardware RNG Entropy Gatherer Daemon";
 
-      serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v" +
-        (if config.services.tcsd.enable then " --no-tpm=1" else "");
+      serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v";
     };
   };
 }
-- 
GitLab


From 20a62ea591d2fb8b159997dd07a4cb77c7d7e89c Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Sun, 28 Oct 2018 19:44:06 +0100
Subject: [PATCH 0575/1065] graylogPlugins: update

graylog-plugin-aggregates: 2.0.0 -> 2.3.0
graylog-plugin-auth-sso: 2.3.0 -> 2.4.2
graylog-plugin-dnsresolver: 1.1.2 -> 1.2.0
graylog-plugin-internal-logs: 2.3.0 -> 2.4.0
graylog-plugin-jabber: 2.0.0 -> 2.4.0
graylog-plugin-slack: 2.4.0 -> 3.1.0
---
 pkgs/tools/misc/graylog/plugins.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix
index 3f476cfea94..a692933053d 100644
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/pkgs/tools/misc/graylog/plugins.nix
@@ -25,10 +25,10 @@ in {
   aggregates = glPlugin rec {
     name = "graylog-aggregates-${version}";
     pluginName = "graylog-plugin-aggregates";
-    version = "2.0.0";
+    version = "2.3.0";
     src = fetchurl {
       url = "https://github.com/cvtienhoven/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
-      sha256 = "0crgb49msjkvfpksbfhq2hlkc904j184wm1wp6q0x6lzhn07hm8y";
+      sha256 = "0yy455wyr01ci3nqvbhzxs6r4bb3xgac0xcmqaim1wsm1fdfi2ws";
     };
     meta = {
       homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates;
@@ -38,10 +38,10 @@ in {
   auth_sso = glPlugin rec {
     name = "graylog-auth-sso-${version}";
     pluginName = "graylog-plugin-auth-sso";
-    version = "2.3.0";
+    version = "2.4.2";
     src = fetchurl {
       url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
-      sha256 = "110ag10y0xyf3za6663vf68r5rwdi92315a37vysqvj00y7yak0l";
+      sha256 = "0nwzw7ddq2psnvj8jwaxp9i080l7y2daxy198wzb62m7i1srzcp8";
     };
     meta = {
       homepage = https://github.com/Graylog2/graylog-plugin-auth-sso;
@@ -51,10 +51,10 @@ in {
   dnsresolver = glPlugin rec {
     name = "graylog-dnsresolver-${version}";
     pluginName = "graylog-plugin-dnsresolver";
-    version = "1.1.2";
+    version = "1.2.0";
     src = fetchurl {
       url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
-      sha256 = "01s7wm6bwcpmdrl35gjp6rrqxixs2s9km2bdgzhv8pn25j5qnw28";
+      sha256 = "0djlyd4w4mrrqfbrs20j1xw0fygqsb81snz437v9bf80avmcyzg1";
     };
     meta = {
       homepage = https://github.com/graylog-labs/graylog-plugin-dnsresolver;
@@ -77,10 +77,10 @@ in {
   internal-logs = glPlugin rec {
     name = "graylog-internal-logs-${version}";
     pluginName = "graylog-plugin-internal-logs";
-    version = "2.3.0";
+    version = "2.4.0";
     src = fetchurl {
       url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
-      sha256 = "05r4m2gf1hj1b889rmpb6b5a6q2xd0qkl1rpj107yd219j2grzf4";
+      sha256 = "1jyy0wkjapv3xv5q957xxv2pcnd4n1yivkvkvg6cx7kv1ip75xwc";
     };
     meta = {
       homepage = https://github.com/graylog-labs/graylog-plugin-internal-logs;
@@ -103,10 +103,10 @@ in {
   jabber = glPlugin rec {
     name = "graylog-jabber-${version}";
     pluginName = "graylog-plugin-jabber";
-    version = "2.0.0";
+    version = "2.4.0";
     src = fetchurl {
       url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
-      sha256 = "1bqj5g9zjnw08bva7379c2ar3nhmyiilj7kjxd16qvfdn2674r5h";
+      sha256 = "0zy27q8y0bv7i5nypsfxad4yiw121sbwzd194jsz2w08jhk3skl5";
     };
     meta = {
       homepage = https://github.com/graylog-labs/graylog-plugin-jabber;
@@ -168,10 +168,10 @@ in {
   slack = glPlugin rec {
     name = "graylog-slack-${version}";
     pluginName = "graylog-plugin-slack";
-    version = "2.4.0";
+    version = "3.1.0";
     src = fetchurl {
       url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
-      sha256 = "0v8ilfhs8bnx87pjxg1i3p2vxw61rwpg4k3zhga7slavx70y986p";
+      sha256 = "067p8g94b007gypwyyi8vb6qhwdanpk8ah57abik54vv14jxg94k";
     };
     meta = {
       homepage = https://github.com/graylog-labs/graylog-plugin-slack;
-- 
GitLab


From 69498f7df18167a3448224c667c545d50e9b27e4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 26 Oct 2018 08:23:20 -0700
Subject: [PATCH 0576/1065] python36Packages.mysql-connector: 8.0.12 -> 8.0.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/python3.6-mysql-connector/versions
---
 pkgs/development/python-modules/mysql-connector/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix
index 4af0c6487b3..579fc4631f6 100644
--- a/pkgs/development/python-modules/mysql-connector/default.nix
+++ b/pkgs/development/python-modules/mysql-connector/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "mysql-connector";
-  version = "8.0.12";
+  version = "8.0.13";
 
   src = fetchFromGitHub {
     owner = "mysql";
     repo = "mysql-connector-python";
     rev = version;
-    sha256 = "1i3148dka4zfqzz4n4n5k0qaqbc585bdpmjwgx5vp6iiv7pgvrxp";
+    sha256 = "1qb6m3cp6zxmr49bp6g5g5b75yszgac1h26i2hza61mrvd235688";
   };
 
   propagatedBuildInputs = [ protobuf ];
-- 
GitLab


From f974b979a5a9d15bce4623713e0aab7ec08795b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 28 Oct 2018 19:11:17 +0000
Subject: [PATCH 0577/1065] nixos/plasma5: disable ocr tests

This is brittle and breaks the test
---
 nixos/tests/plasma5.nix | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index eb705536827..788c8719c8d 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -26,31 +26,20 @@ import ./make-test.nix ({ pkgs, ...} :
     services.xserver.displayManager.sddm.theme = "breeze-ocr-theme";
     services.xserver.desktopManager.plasma5.enable = true;
     services.xserver.desktopManager.default = "plasma5";
+    services.xserver.displayManager.sddm.autoLogin = {
+      enable = true;
+      user = "alice";
+    };
     virtualisation.memorySize = 1024;
     environment.systemPackages = [ sddm_theme ];
-
-    # fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why.
-    nixpkgs.config.packageOverrides = superPkgs: {
-      fontconfig-penultimate = superPkgs.fontconfig-penultimate.override {
-        version = "0.3.3";
-        sha256 = "1z76jbkb0nhf4w7fy647yyayqr4q02fgk6w58k0yi700p0m3h4c9";
-      };
-    };
   };
 
-  enableOCR = true;
-
   testScript = { nodes, ... }: let
     user = nodes.machine.config.users.users.alice;
     xdo = "${pkgs.xdotool}/bin/xdotool";
   in ''
     startAll;
-    # Wait for display manager to start
-    $machine->waitForText(qr/${user.description}/);
-    $machine->screenshot("sddm");
-
-    # Log in
-    $machine->sendChars("${user.password}\n");
+    # wait for log in
     $machine->waitForFile("/home/alice/.Xauthority");
     $machine->succeed("xauth merge ~alice/.Xauthority");
 
-- 
GitLab


From 5931204ae896180fb6a8d5f0ecc8558f1ccb31e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20P=C3=A4tzel?= <dpaetzel@posteo.de>
Date: Fri, 26 Oct 2018 15:21:26 +0200
Subject: [PATCH 0578/1065] tabula: init at 1.2.1

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

diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix
new file mode 100644
index 00000000000..52e39b98a3b
--- /dev/null
+++ b/pkgs/applications/misc/tabula/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchzip, jre, makeWrapper }:
+
+
+stdenv.mkDerivation rec {
+  name = "tabula-${version}";
+  version = "1.2.1";
+
+
+  src = fetchzip {
+    url = "https://github.com/tabulapdf/tabula/releases/download/v${version}/tabula-jar-${version}.zip";
+    sha256 = "0lkpv8hkji81fanyxm7ph8421fr9a6phqc3pbhw2bc4gljg7sgxi";
+  };
+
+
+  buildInputs = [ makeWrapper ];
+
+
+  installPhase = ''
+    mkdir -pv $out/share/tabula
+    cp -v * $out/share/tabula
+
+    makeWrapper ${jre}/bin/java $out/bin/tabula --add-flags "-jar $out/share/tabula/tabula.jar"
+  '';
+
+
+  meta = with stdenv.lib; {
+    description = "A tool for liberating data tables locked inside PDF files";
+    longDescription = ''
+      If you’ve ever tried to do anything with data provided to you in PDFs, you
+      know how painful it is — there's no easy way to copy-and-paste rows of data
+      out of PDF files. Tabula allows you to extract that data into a CSV or
+      Microsoft Excel spreadsheet using a simple, easy-to-use interface.
+    '';
+    homepage = https://tabula.technology/;
+    license = licenses.mit;
+    maintainers = [ maintainers.dpaetzel ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33f789328fc..4b6822b9af6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19175,6 +19175,8 @@ with pkgs;
 
   taskjuggler = callPackage ../applications/misc/taskjuggler { };
 
+  tabula = callPackage ../applications/misc/tabula { };
+
   tasknc = callPackage ../applications/misc/tasknc { };
 
   taskwarrior = callPackage ../applications/misc/taskwarrior { };
-- 
GitLab


From b9bd8dd4d3d0dfd5e6839fd0321d400123d033f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 23:35:55 -0700
Subject: [PATCH 0579/1065] python36Packages.requests_download: 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/python3.6-requests_download/versions
---
 .../python-modules/requests_download/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix
index 6d1264dee67..8062834e180 100644
--- a/pkgs/development/python-modules/requests_download/default.nix
+++ b/pkgs/development/python-modules/requests_download/default.nix
@@ -6,18 +6,18 @@
 
 buildPythonPackage rec {
   pname = "requests_download";
-  version = "0.1.1";
+  version = "0.1.2";
 
   format = "wheel";
 
   #src = pkgs.fetchurl {
-  #  url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.1-py2.py3-none-any.whl;
-  #  sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7";
+  #  url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.2-py2.py3-none-any.whl;
+  #  sha256 = "1ballx1hljpdpyvqzqn79m0dc21z2smrnxk2ylb6dbpg5crrskcr";
   #};
 
   src = fetchPypi {
     inherit pname version format;
-    sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7";
+    sha256 = "1ballx1hljpdpyvqzqn79m0dc21z2smrnxk2ylb6dbpg5crrskcr";
   };
 
   propagatedBuildInputs = [ requests ];
-- 
GitLab


From 76006342b21c2a93b07e86ad73bdd7de8295f0fb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 03:36:53 -0700
Subject: [PATCH 0580/1065] python36Packages.pyramid_multiauth: 0.8.0 -> 0.9.0

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

diff --git a/pkgs/development/python-modules/pyramid_multiauth/default.nix b/pkgs/development/python-modules/pyramid_multiauth/default.nix
index 7130e8b499f..7c01e3e093b 100644
--- a/pkgs/development/python-modules/pyramid_multiauth/default.nix
+++ b/pkgs/development/python-modules/pyramid_multiauth/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pyramid_multiauth";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lq292qakrm4ixi4vaif8dqywzj08pn6qy0wi4gw28blh39p0msk";
+    sha256 = "0lprqjyg3zcji6033p1l3s4nigjigc5423wgivkfhz46vq0jmniy";
   };
 
   propagatedBuildInputs = [ pyramid ];
-- 
GitLab


From 8520839b6a48c090ea3f29dd334b1ba4744b45a7 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Sun, 28 Oct 2018 13:41:21 -0700
Subject: [PATCH 0581/1065] nixos/systemd: support "suspend-then-hibernate"
 logind option

---
 nixos/modules/system/boot/systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index a1412bc3290..8bf5f1d4303 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -387,7 +387,7 @@ let
 
   logindHandlerType = types.enum [
     "ignore" "poweroff" "reboot" "halt" "kexec" "suspend"
-    "hibernate" "hybrid-sleep" "lock"
+    "hibernate" "hybrid-sleep" "suspend-then-hibernate" "lock"
   ];
 
 in
-- 
GitLab


From eaa4b7e0bd36671cea3c9ccd5506f22223ac130d Mon Sep 17 00:00:00 2001
From: "Tristan Helmich (omniIT)" <tristan.helmich@omniit.de>
Date: Sun, 28 Oct 2018 21:58:58 +0100
Subject: [PATCH 0582/1065] adwaita-icon-theme: 3.28.0 -> 3.30.0

---
 pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 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 ce596ec628e..1313527e20f 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "adwaita-icon-theme-${version}";
-  version = "3.28.0";
+  version = "3.30.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks";
+    sha256 = "0jz6wiq2yw5jda56jgi1dys7hlvzk1a49xql7lccrrm3fj8p41li";
   };
 
   passthru = {
-- 
GitLab


From c00b2b3074bcedc670500e352e31d4e3e206ee0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 28 Oct 2018 21:01:13 +0000
Subject: [PATCH 0583/1065] openopc: remove

The project is dead and it blocks the upgrade of Pyro (https://github.com/NixOS/nixpkgs/pull/49351)
---
 pkgs/tools/misc/openopc/default.nix | 48 -----------------------------
 pkgs/top-level/all-packages.nix     |  2 --
 2 files changed, 50 deletions(-)
 delete mode 100644 pkgs/tools/misc/openopc/default.nix

diff --git a/pkgs/tools/misc/openopc/default.nix b/pkgs/tools/misc/openopc/default.nix
deleted file mode 100644
index 8d3850745f1..00000000000
--- a/pkgs/tools/misc/openopc/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchurl, python }:
-
-let
-  pythonEnv = python.withPackages(ps: [ps.Pyro]);
-in stdenv.mkDerivation rec {
-  name = "openopc-${version}";
-  version = "1.2.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/project/openopc/openopc/${version}/OpenOPC-${version}.source.tar.bz2";
-    sha256 = "0mm77fiipz5zy82l6pr3wk18bfril81milv2rdxr954c4gw5smyd";
-  };
-
-  # There is no setup.py or any other "build system" file in the source archive.
-  installPhase = ''
-    mkdir -p "$out/bin"
-    mkdir -p "$out/share/doc/openopc"
-    mkdir -p "$out/${pythonEnv.python.sitePackages}"
-    mkdir -p "$out/libexec/opc"
-
-    cp src/OpenOPC.py "$out/${pythonEnv.python.sitePackages}"
-    cp src/opc.py "$out/libexec/opc/"
-
-    cat > "$out/bin/opc" << __EOF__
-    #!${stdenv.shell}
-    export PYTHONPATH="$out/${pythonEnv.python.sitePackages}"
-    exec ${pythonEnv}/bin/${pythonEnv.python.executable} "$out/libexec/opc/opc.py" "\$@"
-    __EOF__
-    chmod a+x "$out/bin/opc"
-
-    cp -R *.txt doc/* "$out/share/doc/openopc/"
-
-    # Copy these MS Windows tools, for reference.
-    cp src/OpenOPCService.py src/SystemHealth.py "$out/libexec/opc/"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "OPC (OLE for Process Control) toolkit designed for use with Python";
-    homepage = http://openopc.sourceforge.net/;
-    # """OpenOPC for Python is freely available under the terms of the GNU GPL.
-    # However, the OpenOPC library module is licensed under the "GPL + linking
-    # exception" license, which generally means that programs written using the
-    # OpenOPC library may be licensed under any terms."""
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b6822b9af6..56c5ef78e4a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4502,8 +4502,6 @@ with pkgs;
 
   openobex = callPackage ../tools/bluetooth/openobex { };
 
-  openopc = callPackage ../tools/misc/openopc { };
-
   openresolv = callPackage ../tools/networking/openresolv { };
 
   opensc = callPackage ../tools/security/opensc {
-- 
GitLab


From 12c9a36dad4375a6b3c3cff87b3bbef2726ea87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 28 Oct 2018 21:09:19 +0000
Subject: [PATCH 0584/1065] mono40: remove

---
 pkgs/development/compilers/mono/4.0.nix | 9 ---------
 pkgs/top-level/all-packages.nix         | 5 -----
 2 files changed, 14 deletions(-)
 delete mode 100644 pkgs/development/compilers/mono/4.0.nix

diff --git a/pkgs/development/compilers/mono/4.0.nix b/pkgs/development/compilers/mono/4.0.nix
deleted file mode 100644
index 892ae99abaf..00000000000
--- a/pkgs/development/compilers/mono/4.0.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ callPackage, Foundation, libobjc }:
-callPackage ./generic.nix (rec {
-  inherit Foundation libobjc;
-  version = "4.0.4.1";
-  sha256 = "1ydw9l89apc9p7xr5mdzy0h97g2q6v243g82mxswfc2rrqhfs4gd";
-  meta = {
-    knownVulnerabilities = [ "CVE-2009-0689" ];
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b6822b9af6..e2d9eaeb3d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7243,11 +7243,6 @@ with pkgs;
   mono5 = mono58;
   mono4 = mono48;
 
-  mono40 = lowPrio (callPackage ../development/compilers/mono/4.0.nix {
-    inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) Foundation;
-  });
-
   mono44 = lowPrio (callPackage ../development/compilers/mono/4.4.nix {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) Foundation;
-- 
GitLab


From c1748f0b091d911f6818f26102b3ac6ea56fb0dd Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <ignat.loskutov@gmail.com>
Date: Mon, 29 Oct 2018 00:19:46 +0300
Subject: [PATCH 0585/1065] cppcheck: 1.84 -> 1.85

---
 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 5a095c8b6a0..2f82c1ee66a 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.84";
+  version = "1.85";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1rp8j0akxzcpvr2na5zchz8zxq5ldngiwj7f6sibjq5p3dcyn2w5";
+    sha256 = "1xjc0gna9hrqc6liyzkzkr2naapj5bldzad8qdxcjgqz5yd6rb7i";
   };
 
   buildInputs = [ pcre ];
-- 
GitLab


From 80d4263526985ea7cd412ae00e54eeebb62fd478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 28 Oct 2018 21:30:39 +0000
Subject: [PATCH 0586/1065] mono44: remove insecure version

This version is also affected by CVE-2018-1002208.
It has no user in nixpkgs.
---
 pkgs/development/compilers/mono/4.4.nix | 8 --------
 pkgs/top-level/all-packages.nix         | 6 ------
 2 files changed, 14 deletions(-)
 delete mode 100644 pkgs/development/compilers/mono/4.4.nix

diff --git a/pkgs/development/compilers/mono/4.4.nix b/pkgs/development/compilers/mono/4.4.nix
deleted file mode 100644
index 9a3ccd1fd86..00000000000
--- a/pkgs/development/compilers/mono/4.4.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, Foundation, libobjc }:
-
-callPackage ./generic.nix (rec {
-  inherit Foundation libobjc;
-  version = "4.4.2.11";
-  sha256 = "0cxnypw1j7s253wr5hy05k42ghgg2s9qibp10kndwnp5bv12q34h";
-  enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65565737
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b6822b9af6..aca3b7fe41f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7247,12 +7247,6 @@ with pkgs;
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) Foundation;
   });
-
-  mono44 = lowPrio (callPackage ../development/compilers/mono/4.4.nix {
-    inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) Foundation;
-  });
-
   mono46 = lowPrio (callPackage ../development/compilers/mono/4.6.nix {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) Foundation;
-- 
GitLab


From 99edb7accb4d8a7bf14c560f601136162be0a41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 28 Oct 2018 21:34:36 +0000
Subject: [PATCH 0587/1065] mono46: add CVE-2018-1002208

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

diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix
index 2bba660b69c..5ccdadc2878 100644
--- a/pkgs/development/compilers/mono/4.6.nix
+++ b/pkgs/development/compilers/mono/4.6.nix
@@ -5,4 +5,5 @@ callPackage ./generic.nix (rec {
   version = "4.6.2.16";
   sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9";
   enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65617511
+  meta.knownVulnerabilities = [ "CVE-2018-1002208" ];
 })
-- 
GitLab


From e0a5689528fe58e8244331ad5d46c1b9344605ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 28 Oct 2018 21:55:26 +0000
Subject: [PATCH 0588/1065] defaultCrateOverrides: order alphabetically

---
 .../rust/default-crate-overrides.nix          | 71 ++++++++++++-------
 1 file changed, 44 insertions(+), 27 deletions(-)

diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index d93e0a5f56d..516bf456667 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -6,76 +6,93 @@ let
   inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
 in
 {
+  cairo-rs = attrs: {
+    buildInputs = [ cairo ];
+  };
+
   cargo = attrs: {
     buildInputs = [ openssl zlib curl ]
       ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ];
     # TODO: buildRustCrate seems to use incorrect default inference
     crateBin = [ {  name = "cargo"; path = "src/bin/cargo.rs"; } ];
   };
+
   cargo-vendor = attrs: {
     buildInputs = [ openssl zlib curl ];
     # TODO: this defaults to cargo_vendor; needs to be cargo-vendor to
     # be considered a cargo subcommand.
     crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
   };
+
   curl-sys = attrs: {
     buildInputs = [ pkgconfig zlib curl ];
     propagatedBuildInputs = [ curl zlib ];
     extraLinkFlags = ["-L${zlib.out}/lib"];
   };
+
+  dbus = attrs: {
+    buildInputs = [ pkgconfig dbus ];
+  };
+
+  gobject-sys = attrs: {
+    buildInputs = [ dbus-glib ];
+  };
+
+  gio-sys = attrs: {
+    buildInputs = [ dbus-glib ];
+  };
+
+  gdk-pixbuf-sys = attrs: {
+    buildInputs = [ dbus-glib ];
+  };
+
+  gdk-pixbuf = attrs: {
+    buildInputs = [ gdk_pixbuf ];
+  };
+
   libgit2-sys = attrs: {
     LIBGIT2_SYS_USE_PKG_CONFIG = true;
     buildInputs = [ pkgconfig openssl zlib libgit2 ];
   };
+
   libsqlite3-sys = attrs: {
     buildInputs = [ pkgconfig sqlite ];
   };
+
   libssh2-sys = attrs: {
     buildInputs = [ pkgconfig openssl zlib libssh2 ];
   };
+
+  libdbus-sys = attrs: {
+    buildInputs = [ pkgconfig dbus ];
+  };
+
   openssl = attrs: {
     buildInputs = [ openssl ];
   };
+
   openssl-sys = attrs: {
     buildInputs = [ pkgconfig openssl ];
   };
 
-  dbus = attrs: {
-    buildInputs = [ pkgconfig dbus ];
-  };
-  libdbus-sys = attrs: {
-    buildInputs = [ pkgconfig dbus ];
-  };
-  gobject-sys = attrs: {
-    buildInputs = [ dbus-glib ];
-  };
-  gio-sys = attrs: {
-    buildInputs = [ dbus-glib ];
-  };
-  gdk-pixbuf-sys = attrs: {
-    buildInputs = [ dbus-glib ];
-  };
-  gdk-pixbuf = attrs: {
-    buildInputs = [ gdk_pixbuf ];
+  pq-sys = attr: {
+    buildInputs = [ pkgconfig postgresql ];
   };
+
   rink = attrs: {
     buildInputs = [ gmp ];
     crateBin = [ {  name = "rink"; path = "src/bin/rink.rs"; } ];
   };
-  cairo-rs = attrs: {
-    buildInputs = [ cairo ];
-  };
-  xcb = attrs: {
-    buildInputs = [ python3 ];
+
+  security-framework-sys = attr: {
+    propagatedBuildInputs = [ Security ];
   };
 
   thrussh-libsodium = attrs: {
     buildInputs = [ pkgconfig libsodium ];
   };
-  pq-sys = attr: {
-    buildInputs = [ pkgconfig postgresql ];
-  };
-  security-framework-sys = attr: {
-    propagatedBuildInputs = [ Security ];
+
+  xcb = attrs: {
+    buildInputs = [ python3 ];
   };
 }
-- 
GitLab


From 96c627b3f60c79f5fd756db5c9978ec918a54a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 28 Oct 2018 21:56:30 +0000
Subject: [PATCH 0589/1065] defaultCrateOverrides: add serde_derive

---
 pkgs/build-support/rust/default-crate-overrides.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index 516bf456667..da3f0a59eb6 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -88,6 +88,10 @@ in
     propagatedBuildInputs = [ Security ];
   };
 
+  serde_derive = attrs: {
+    buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  };
+
   thrussh-libsodium = attrs: {
     buildInputs = [ pkgconfig libsodium ];
   };
-- 
GitLab


From f03929f6496ae3cacc050093040a279f894865b4 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 28 Oct 2018 18:46:16 +0100
Subject: [PATCH 0590/1065] nixdoc: init at 1.0.1

Adds nixdoc, a tool to generate documentation for Nix functions in the
standard library.

See #49275 for some background information.
---
 pkgs/tools/nix/nixdoc/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/nix/nixdoc/default.nix

diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix
new file mode 100644
index 00000000000..d84a85071df
--- /dev/null
+++ b/pkgs/tools/nix/nixdoc/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, callPackage, fetchFromGitHub, rustPlatform, darwin }:
+
+rustPlatform.buildRustPackage rec {
+  name    = "nixdoc-${version}";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "tazjin";
+    repo  = "nixdoc";
+    rev = "v${version}";
+    sha256 = "14d4dq06jdqazxvv7fq5872zy0capxyb0fdkp8qg06gxl1iw201s";
+  };
+
+  buildInputs =  stdenv.lib.optional stdenv.isDarwin [ darwin.Security ];
+
+  cargoSha256 = "1bfn1x1jhpyidai4cjwip5r1ibkqp26ivmqq3vjm71l00m6avb94";
+
+  meta = with stdenv.lib; {
+    description = "Generate documentation for Nix functions";
+    homepage    = https://github.com/tazjin/nixdoc;
+    license     = [ licenses.gpl3 ];
+    maintainers = [ maintainers.tazjin ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24d61f87322..c98ea384040 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22095,6 +22095,8 @@ with pkgs;
 
   nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; };
 
+  nixdoc = callPackage ../tools/nix/nixdoc {};
+
   nix-bundle = callPackage ../tools/package-management/nix-bundle { };
 
   nix-delegate = haskell.lib.justStaticExecutables haskellPackages.nix-delegate;
-- 
GitLab


From e7f2ce910219521c135592a843f03a73fe268874 Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <ignat.loskutov@gmail.com>
Date: Mon, 29 Oct 2018 02:59:11 +0300
Subject: [PATCH 0591/1065] jemalloc: 5.0.1 -> 5.1.0

---
 pkgs/development/libraries/jemalloc/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index 40c06cbffdf..8cb7c1f9673 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -1,10 +1,6 @@
 { stdenv, fetchurl, fetchpatch }:
 import ./common.nix {
   inherit stdenv fetchurl;
-  version = "5.0.1";
-  sha256 = "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9";
-  patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch {
-    url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch";
-    sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq";
-  });
+  version = "5.1.0";
+  sha256 = "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk";
 }
-- 
GitLab


From 9cc3aaa67635e3144a0b9c13e2c52425933dda94 Mon Sep 17 00:00:00 2001
From: Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
Date: Mon, 29 Oct 2018 13:29:07 +1300
Subject: [PATCH 0592/1065] google-fonts: Fix macOS argument list limit issue

---
 pkgs/data/fonts/google-fonts/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index 0be58d06fa4..207f3615d1b 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -37,9 +37,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     dest=$out/share/fonts/truetype
-    mkdir -p $dest
-    find . -name "*.ttf" -exec cp -v {} $dest \;
-    chmod -x $dest/*.ttf
+    find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' +
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 1bd7b98c7975136ddd6183a155e90688fd5b3e43 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Wed, 10 Oct 2018 12:54:53 -0400
Subject: [PATCH 0593/1065] openjdk: 10.0.2 -> 11.0.1

* the jre is no longer an official part of the jdk (jmod is
  recommended as a replacement when needing to create smaller runtime
  images)

* darwin continues to use zulu from azul

* apps that used 10 now use 11 (eclipse, bazel, josm)
---
 pkgs/applications/misc/josm/default.nix       |  6 +-
 .../compilers/openjdk/{10.nix => 11.nix}      | 70 ++++++-------------
 .../openjdk/darwin/{10.nix => 11.nix}         | 15 ++--
 pkgs/top-level/all-packages.nix               | 27 ++++---
 4 files changed, 42 insertions(+), 76 deletions(-)
 rename pkgs/development/compilers/openjdk/{10.nix => 11.nix} (67%)
 rename pkgs/development/compilers/openjdk/darwin/{10.nix => 11.nix} (79%)

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 4f98ec1bba9..808ff2d6f61 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre10 }:
+{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }:
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "102dph3479qskzf72cpb9139pq9ifka6pzna1c6s5rs2il6mfvsb";
   };
 
-  buildInputs = [ jre10 makeWrapper ];
+  buildInputs = [ jdk11 makeWrapper ];
 
   desktopItem = makeDesktopItem {
     name = "josm";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin $out/share/java
     cp -v $src $out/share/java/josm.jar
 
-    makeWrapper ${jre10}/bin/java $out/bin/josm \
+    makeWrapper ${jdk11}/bin/java $out/bin/josm \
       --add-flags "-jar $out/share/java/josm.jar"
 
     mkdir -p $out/share/applications
diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/11.nix
similarity index 67%
rename from pkgs/development/compilers/openjdk/10.nix
rename to pkgs/development/compilers/openjdk/11.nix
index 1c125fac62f..e2d89f3ef72 100644
--- a/pkgs/development/compilers/openjdk/10.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
+{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype
 , alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir
 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
 , libjpeg, giflib
@@ -10,31 +10,30 @@
 let
 
   /**
-   * The JRE libraries are in directories that depend on the CPU.
+   * The JDK libraries are in directories that depend on the CPU.
    */
   architecture =
     if stdenv.hostPlatform.system == "i686-linux" then
       "i386"
     else "amd64";
 
-  update = "10.0.2";
+  major = "11";
+  update = ".0.1";
   build = "13";
-  repover = "jdk-${update}+${build}";
+  repover = "jdk-${major}${update}+${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
 
-  openjdk10 = stdenv.mkDerivation {
-    name = "openjdk-${update}-b${build}";
+  openjdk = stdenv.mkDerivation {
+    name = "openjdk-${major}${update}-b${build}";
 
     src = fetchurl {
-      url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz";
-      sha256 = "0y7hyzgvn6z8gyp3h9xvxwj6zda899y6i629jn6yxqzj96q56jpk";
+      url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz";
+      sha256 = "1ri3fv67rvs9xxhc3ynklbprhxbdsgpwafbw6wqj950xy5crgysm";
     };
 
-    outputs = [ "out" "jre" ];
-
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [
-      cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
+      autoconf cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
       libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr lndir fontconfig
     ] ++ lib.optionals (!minimal && enableGnome2) [
@@ -55,12 +54,11 @@ let
 
       configureFlagsArray=(
         "--with-boot-jdk=${bootjdk.home}"
-        "--with-update-version=${update}"
+        "--with-update-version=${major}${update}"
         "--with-build-number=${build}"
         "--with-milestone=fcs"
         "--enable-unlimited-crypto"
         "--disable-debug-symbols"
-        "--disable-freetype-bundling"
         "--with-zlib=system"
         "--with-giflib=system"
         "--with-stdc++lib=dynamic"
@@ -86,7 +84,7 @@ let
     buildFlags = [ "all" ];
 
     installPhase = ''
-      mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
+      mkdir -p $out/lib/openjdk $out/share
 
       cp -av build/*/images/jdk/* $out/lib/openjdk
 
@@ -101,57 +99,29 @@ let
       # jni.h expects jni_md.h to be in the header search path.
       ln -s $out/include/linux/*_md.h $out/include/
 
-      # Copy the JRE to a separate output and setup fallback fonts
-      cp -av build/*/images/jre $jre/lib/openjdk/
-      mkdir $out/lib/openjdk/jre
-      ${lib.optionalString (!minimal) ''
-        mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback
-        lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
-      ''}
-
       # Remove crap from the installation.
       rm -rf $out/lib/openjdk/demo
       ${lib.optionalString minimal ''
-        for d in $out/lib/openjdk/lib $jre/lib/openjdk/jre/lib; do
-          rm ''${d}/{libjsound,libjsoundalsa,libfontmanager}.so
-        done
+        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
       ''}
 
-      lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
-
       # Set PaX markings
-      exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+      exes=$(file $out/lib/openjdk/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
       echo "to mark: *$exes*"
       for file in $exes; do
         echo "marking *$file*"
         paxmark ${paxflags} "$file"
       done
 
-      # Remove duplicate binaries.
-      for i in $(cd $out/lib/openjdk/bin && echo *); do
-        if [ "$i" = java ]; then continue; fi
-        if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
-          ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
-        fi
-      done
-
       ln -s $out/lib/openjdk/bin $out/bin
-      ln -s $jre/lib/openjdk/jre/bin $jre/bin
-      ln -s $jre/lib/openjdk/jre $out/jre
     '';
 
-    # FIXME: this is unnecessary once the multiple-outputs branch is merged.
     preFixup = ''
-      prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}"
-      patchELF $jre
-      propagatedBuildInputs+=" $jre"
-
-      # Propagate the setJavaClassPath setup hook from the JRE so that
-      # any package that depends on the JRE has $CLASSPATH set up
-      # properly.
-      mkdir -p $jre/nix-support
+      # Propagate the setJavaClassPath setup hook so that any package
+      # that depends on the JDK has $CLASSPATH set up properly.
+      mkdir -p $out/nix-support
       #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-      echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-build-inputs
+      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
 
       # Set JAVA_HOME automatically.
       mkdir -p $out/nix-support
@@ -196,7 +166,7 @@ let
 
     passthru = {
       inherit architecture;
-      home = "${openjdk10}/lib/openjdk";
+      home = "${openjdk}/lib/openjdk";
     };
   };
-in openjdk10
+in openjdk
diff --git a/pkgs/development/compilers/openjdk/darwin/10.nix b/pkgs/development/compilers/openjdk/darwin/11.nix
similarity index 79%
rename from pkgs/development/compilers/openjdk/darwin/10.nix
rename to pkgs/development/compilers/openjdk/darwin/11.nix
index 4969c12bff2..61c2d57423e 100644
--- a/pkgs/development/compilers/openjdk/darwin/10.nix
+++ b/pkgs/development/compilers/openjdk/darwin/11.nix
@@ -6,13 +6,13 @@ let
     sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";
   };
 
-  jdk = stdenv.mkDerivation {
-    name = "zulu10.3+5-jdk10";
+  jdk = stdenv.mkDerivation rec {
+    name = "zulu11.2.3-jdk11.0.1";
 
     src = fetchurl {
-      url = https://cdn.azul.com/zulu/bin/zulu10.3+5-jdk10.0.2-macosx_x64.zip;
-      sha256 = "05pxfjn8fqw6ddr8m5hzyphwzqgrq8w6b4h3lwc1s7ymh05xmspz";
-      curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
+      url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz";
+      sha256 = "1jxnxmy79inwf3146ygry1mzv3dj6yrzqll16j7dpr91x1p3dpqy";
+      curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-mac/";
     };
 
     buildInputs = [ unzip freetype ];
@@ -34,8 +34,8 @@ let
     '';
 
     preFixup = ''
-      # Propagate the setJavaClassPath setup hook from the JRE so that
-      # any package that depends on the JRE has $CLASSPATH set up
+      # Propagate the setJavaClassPath setup hook from the JDK so that
+      # any package that depends on the JDK has $CLASSPATH set up
       # properly.
       mkdir -p $out/nix-support
       printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
@@ -49,7 +49,6 @@ let
     '';
 
     passthru = {
-      jre = jdk;
       home = jdk;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c888fe1f5e..91e329dc8f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6940,11 +6940,11 @@ with pkgs;
         inherit (gnome2) GConf gnome_vfs;
       };
 
-  openjdk10 =
+  openjdk11 =
     if stdenv.isDarwin then
-      callPackage ../development/compilers/openjdk/darwin/10.nix { }
+      callPackage ../development/compilers/openjdk/darwin/11.nix { }
     else
-      callPackage ../development/compilers/openjdk/10.nix {
+      callPackage ../development/compilers/openjdk/11.nix {
         inherit (gnome2) GConf gnome_vfs;
       };
 
@@ -6964,17 +6964,14 @@ with pkgs;
         (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
           ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
 
-  jdk10 = openjdk10 // { outputs = [ "out" ]; };
-  jre10 = lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
-    (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
-      (openjdk10.jre // { outputs = [ "jre" ]; }));
-  jre10_headless =
+  jdk11 = openjdk11 // { outputs = [ "out" ]; };
+  jdk11_headless =
     if stdenv.isDarwin then
-      jre10
+      jdk11
     else
-      lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless"
-        (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
-          ((openjdk10.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
+      lib.setName "openjdk-${lib.getVersion pkgs.openjdk11}-headless"
+        (lib.addMetaAttrs {}
+          ((openjdk11.override { minimal = true; }) // {}));
 
   jdk = jdk8;
   jre = jre8;
@@ -8098,10 +8095,10 @@ with pkgs;
     inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
   };
-  bazel_jdk10 = callPackage ../development/tools/build-managers/bazel {
+  bazel_jdk11 = callPackage ../development/tools/build-managers/bazel {
     inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
-    runJdk = jdk10;
+    runJdk = jdk11;
   };
 
   bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { };
@@ -16172,7 +16169,7 @@ with pkgs;
   eaglemode = callPackage ../applications/misc/eaglemode { };
 
   eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse {
-    jdk = jdk10;
+    jdk = jdk11;
   });
 
   ecs-agent = callPackage ../applications/virtualization/ecs-agent { };
-- 
GitLab


From 34e1fa4a509fde351d4c9102ca766d92cfaebb51 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Mon, 29 Oct 2018 00:48:05 +0000
Subject: [PATCH 0594/1065] buildRubyGem: Provide manpages for Ruby gems
 (#49334)

---
 .../ruby-modules/bundler-app/default.nix      | 27 ++++++++++++-------
 pkgs/development/ruby-modules/gem/default.nix |  9 +++++++
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix
index c8f61389ad3..656896a8f7a 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/pkgs/development/ruby-modules/bundler-app/default.nix
@@ -24,6 +24,7 @@
 , gemset ? null
 , preferLocalBuild ? false
 , allowSubstitutes ? false
+, installManpages ? true
 , meta ? {}
 , postBuild ? ""
 , gemConfig ? null
@@ -36,14 +37,22 @@ let
   // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults
 in
    runCommand basicEnv.name cmdArgs ''
-    mkdir -p $out/bin;
-      ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)}
-      ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " +
-              "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+
-              "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+
-              "--set BUNDLE_FROZEN 1 "+
-              "--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+
-              "--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+
-              "--run \"cd $srcdir\";\n") scripts)}
+    mkdir -p $out/bin
+    ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)}
+    ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " +
+            "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+
+            "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+
+            "--set BUNDLE_FROZEN 1 "+
+            "--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+
+            "--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+
+            "--run \"cd $srcdir\";\n") scripts)}
+
+    ${lib.optionalString installManpages ''
+    for section in {1..9}; do
+      mandir="$out/share/man/man$section"
+      find -L ${basicEnv}/${ruby.gemPath}/gems/${basicEnv.name} \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) -print -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \;
+    done
+    ''}
+
     ${postBuild}
   ''
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix
index d00ce7fccf5..b0abb2c54fc 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/pkgs/development/ruby-modules/gem/default.nix
@@ -44,6 +44,7 @@ lib.makeOverridable (
 # git checkout).
 # If you need to apply patches, make sure to set `dontBuild = false`;
 , dontBuild ? true
+, dontInstallManpages ? false
 , propagatedBuildInputs ? []
 , propagatedUserEnvPkgs ? []
 , buildFlags ? []
@@ -206,6 +207,14 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
     ruby ${./gem-post-build.rb} "$spec"
     ''}
 
+    ${lib.optionalString (!dontInstallManpages) ''
+    for section in {1..9}; do
+      mandir="$out/share/man/man$section"
+      find $out/lib \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) \
+        -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \;
+    done
+    ''}
+
     runHook postInstall
   '';
 
-- 
GitLab


From 8609ff17ed8681762ec17bf7466eb4b1b727465d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 29 Oct 2018 07:42:14 +0000
Subject: [PATCH 0595/1065] zfs{Stable,Unstable}: mark as incompatible with
 4.19

---
 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 cae06dbd0f3..ed83313e5dd 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -158,7 +158,7 @@ in {
   # to be adapted
   zfsStable = common {
     # comment/uncomment if breaking kernel versions are known
-    # incompatibleKernelVersion = null;
+    incompatibleKernelVersion = "4.19";
 
     # this package should point to the latest release.
     version = "0.7.11";
@@ -177,7 +177,7 @@ in {
 
   zfsUnstable = common rec {
     # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = null;
+    incompatibleKernelVersion = "4.19";
 
     # this package should point to a version / git revision compatible with the latest kernel release
     version = "0.8.0-rc1";
-- 
GitLab


From 0560caa57893a3c8dd11aeece110672c720c9496 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sat, 27 Oct 2018 17:44:17 +0200
Subject: [PATCH 0596/1065] lib/strings: Update documentation comments for doc
 generation

Updates documentation comments with extra information for nixdoc[1]
compatibility.

Some documentation strings have additionally been reworded for
clarity.

"Faux types" are added where applicable, but some functions do things
that are not trivially representable in the type notation used so they
were ignored for this purpose.

[1]: https://github.com/tazjin/nixdoc
---
 lib/strings.nix | 204 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 153 insertions(+), 51 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 0c4095bb55c..d6e449552ec 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -12,6 +12,8 @@ rec {
 
   /* Concatenate a list of strings.
 
+    Type: concatStrings :: [string] -> string
+
      Example:
        concatStrings ["foo" "bar"]
        => "foobar"
@@ -20,15 +22,19 @@ rec {
 
   /* Map a function over a list and concatenate the resulting strings.
 
+    Type: concatMapStrings :: (a -> string) -> [a] -> string
+
      Example:
        concatMapStrings (x: "a" + x) ["foo" "bar"]
        => "afooabar"
   */
   concatMapStrings = f: list: concatStrings (map f list);
 
-  /* Like `concatMapStrings' except that the f functions also gets the
+  /* Like `concatMapStrings` except that the f functions also gets the
      position as a parameter.
 
+     Type: concatImapStrings :: (int -> a -> string) -> [a] -> string
+
      Example:
        concatImapStrings (pos: x: "${toString pos}-${x}") ["foo" "bar"]
        => "1-foo2-bar"
@@ -37,17 +43,25 @@ rec {
 
   /* Place an element between each element of a list
 
+     Type: intersperse :: a -> [a] -> [a]
+
      Example:
        intersperse "/" ["usr" "local" "bin"]
        => ["usr" "/" "local" "/" "bin"].
   */
-  intersperse = separator: list:
+  intersperse =
+    # Separator to add between elements
+    separator:
+    # Input list
+    list:
     if list == [] || length list == 1
     then list
     else tail (lib.concatMap (x: [separator x]) list);
 
   /* Concatenate a list of strings with a separator between each element
 
+     Type: concatStringsSep :: string -> [string] -> string
+
      Example:
         concatStringsSep "/" ["usr" "local" "bin"]
         => "usr/local/bin"
@@ -55,43 +69,77 @@ rec {
   concatStringsSep = builtins.concatStringsSep or (separator: list:
     concatStrings (intersperse separator list));
 
-  /* First maps over the list and then concatenates it.
+  /* Maps a function over a list of strings and then concatenates the
+     result with the specified separator interspersed between
+     elements.
+
+     Type: concatMapStringsSep :: string -> (string -> string) -> [string] -> string
 
      Example:
         concatMapStringsSep "-" (x: toUpper x)  ["foo" "bar" "baz"]
         => "FOO-BAR-BAZ"
   */
-  concatMapStringsSep = sep: f: list: concatStringsSep sep (map f list);
+  concatMapStringsSep =
+    # Separator to add between elements
+    sep:
+    # Function to map over the list
+    f:
+    # List of input strings
+    list: concatStringsSep sep (map f list);
 
-  /* First imaps over the list and then concatenates it.
+  /* Same as `concatMapStringsSep`, but the mapping function
+     additionally receives the position of its argument.
 
-     Example:
+     Type: concatMapStringsSep :: string -> (int -> string -> string) -> [string] -> string
 
+     Example:
        concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ]
        => "6-3-2"
   */
-  concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap1 f list);
+  concatImapStringsSep =
+    # Separator to add between elements
+    sep:
+    # Function that receives elements and their positions
+    f:
+    # List of input strings
+    list: concatStringsSep sep (lib.imap1 f list);
 
-  /* Construct a Unix-style search path consisting of each `subDir"
-     directory of the given list of packages.
+  /* Construct a Unix-style, colon-separated search path consisting of
+     the given `subDir` appended to each of the given paths.
+
+     Type: makeSearchPath :: string -> [string] -> string
 
      Example:
        makeSearchPath "bin" ["/root" "/usr" "/usr/local"]
        => "/root/bin:/usr/bin:/usr/local/bin"
-       makeSearchPath "bin" ["/"]
-       => "//bin"
+       makeSearchPath "bin" [""]
+       => "/bin"
   */
-  makeSearchPath = subDir: packages:
-    concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) packages));
+  makeSearchPath =
+    # Directory name to append
+    subDir:
+    # List of base paths
+    paths:
+    concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) paths));
+
+  /* Construct a Unix-style search path by appending the given
+     `subDir` to the specified `output` of each of the packages. If no
+     output by the given name is found, fallback to `.out` and then to
+     the default.
 
-  /* Construct a Unix-style search path, using given package output.
-     If no output is found, fallback to `.out` and then to the default.
+     Type: string -> string -> [package] -> string
 
      Example:
        makeSearchPathOutput "dev" "bin" [ pkgs.openssl pkgs.zlib ]
        => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin"
   */
-  makeSearchPathOutput = output: subDir: pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs);
+  makeSearchPathOutput =
+    # Package output to use
+    output:
+    # Directory name to append
+    subDir:
+    # List of packages
+    pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs);
 
   /* Construct a library search path (such as RPATH) containing the
      libraries for a set of packages
@@ -117,13 +165,12 @@ rec {
 
   /* Construct a perl search path (such as $PERL5LIB)
 
-     FIXME(zimbatm): this should be moved in perl-specific code
-
      Example:
        pkgs = import <nixpkgs> { }
        makePerlPath [ pkgs.perlPackages.libnet ]
        => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl"
   */
+  # FIXME(zimbatm): this should be moved in perl-specific code
   makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl";
 
   /* Construct a perl search path recursively including all dependencies (such as $PERL5LIB)
@@ -138,34 +185,51 @@ rec {
   /* Depending on the boolean `cond', return either the given string
      or the empty string. Useful to concatenate against a bigger string.
 
+     Type: optionalString :: bool -> string -> string
+
      Example:
        optionalString true "some-string"
        => "some-string"
        optionalString false "some-string"
        => ""
   */
-  optionalString = cond: string: if cond then string else "";
+  optionalString =
+    # Condition
+    cond:
+    # String to return if condition is true
+    string: if cond then string else "";
 
   /* Determine whether a string has given prefix.
 
+     Type: hasPrefix :: string -> string -> bool
+
      Example:
        hasPrefix "foo" "foobar"
        => true
        hasPrefix "foo" "barfoo"
        => false
   */
-  hasPrefix = pref: str:
-    substring 0 (stringLength pref) str == pref;
+  hasPrefix =
+    # Prefix to check for
+    pref:
+    # Input string
+    str: substring 0 (stringLength pref) str == pref;
 
   /* Determine whether a string has given suffix.
 
+     Type: hasSuffix :: string -> string -> bool
+
      Example:
        hasSuffix "foo" "foobar"
        => false
        hasSuffix "foo" "barfoo"
        => true
   */
-  hasSuffix = suffix: content:
+  hasSuffix =
+    # Suffix to check for
+    suffix:
+    # Input string
+    content:
     let
       lenContent = stringLength content;
       lenSuffix = stringLength suffix;
@@ -180,6 +244,8 @@ rec {
      Also note that Nix treats strings as a list of bytes and thus doesn't
      handle unicode.
 
+     Type: stringtoCharacters :: string -> [string]
+
      Example:
        stringToCharacters ""
        => [ ]
@@ -194,18 +260,25 @@ rec {
   /* Manipulate a string character by character and replace them by
      strings before concatenating the results.
 
+     Type: stringAsChars :: (string -> string) -> string -> string
+
      Example:
        stringAsChars (x: if x == "a" then "i" else x) "nax"
        => "nix"
   */
-  stringAsChars = f: s:
-    concatStrings (
+  stringAsChars =
+    # Function to map over each individual character
+    f:
+    # Input string
+    s: concatStrings (
       map f (stringToCharacters s)
     );
 
-  /* Escape occurrence of the elements of ‘list’ in ‘string’ by
+  /* Escape occurrence of the elements of `list` in `string` by
      prefixing it with a backslash.
 
+     Type: escape :: [string] -> string -> string
+
      Example:
        escape ["(" ")"] "(foo)"
        => "\\(foo\\)"
@@ -214,6 +287,8 @@ rec {
 
   /* Quote string to be used safely within the Bourne shell.
 
+     Type: escapeShellArg :: string -> string
+
      Example:
        escapeShellArg "esc'ape\nme"
        => "'esc'\\''ape\nme'"
@@ -222,6 +297,8 @@ rec {
 
   /* Quote all arguments to be safely passed to the Bourne shell.
 
+     Type: escapeShellArgs :: [string] -> string
+
      Example:
        escapeShellArgs ["one" "two three" "four'five"]
        => "'one' 'two three' 'four'\\''five'"
@@ -230,13 +307,15 @@ rec {
 
   /* Turn a string into a Nix expression representing that string
 
+     Type: string -> string
+
      Example:
        escapeNixString "hello\${}\n"
        => "\"hello\\\${}\\n\""
   */
   escapeNixString = s: escape ["$"] (builtins.toJSON s);
 
-  /* Obsolete - use replaceStrings instead. */
+  # Obsolete - use replaceStrings instead.
   replaceChars = builtins.replaceStrings or (
     del: new: s:
     let
@@ -256,6 +335,8 @@ rec {
 
   /* Converts an ASCII string to lower-case.
 
+     Type: toLower :: string -> string
+
      Example:
        toLower "HOME"
        => "home"
@@ -264,6 +345,8 @@ rec {
 
   /* Converts an ASCII string to upper-case.
 
+     Type: toUpper :: string -> string
+
      Example:
        toUpper "home"
        => "HOME"
@@ -273,7 +356,7 @@ rec {
   /* Appends string context from another string.  This is an implementation
      detail of Nix.
 
-     Strings in Nix carry an invisible `context' which is a list of strings
+     Strings in Nix carry an invisible `context` which is a list of strings
      representing store paths.  If the string is later used in a derivation
      attribute, the derivation will properly populate the inputDrvs and
      inputSrcs.
@@ -319,8 +402,9 @@ rec {
     in
       recurse 0 0;
 
-  /* Return the suffix of the second argument if the first argument matches
-     its prefix.
+  /* Return a string without the specified prefix, if the prefix matches.
+
+     Type: string -> string -> string
 
      Example:
        removePrefix "foo." "foo.bar.baz"
@@ -328,18 +412,23 @@ rec {
        removePrefix "xxx" "foo.bar.baz"
        => "foo.bar.baz"
   */
-  removePrefix = pre: s:
+  removePrefix =
+    # Prefix to remove if it matches
+    prefix:
+    # Input string
+    str:
     let
-      preLen = stringLength pre;
-      sLen = stringLength s;
+      preLen = stringLength prefix;
+      sLen = stringLength str;
     in
-      if hasPrefix pre s then
-        substring preLen (sLen - preLen) s
+      if hasPrefix prefix str then
+        substring preLen (sLen - preLen) str
       else
-        s;
+        str;
+
+  /* Return a string without the specified suffix, if the suffix matches.
 
-  /* Return the prefix of the second argument if the first argument matches
-     its suffix.
+     Type: string -> string -> string
 
      Example:
        removeSuffix "front" "homefront"
@@ -347,17 +436,21 @@ rec {
        removeSuffix "xxx" "homefront"
        => "homefront"
   */
-  removeSuffix = suf: s:
+  removeSuffix =
+    # Suffix to remove if it matches
+    suffix:
+    # Input string
+    str:
     let
-      sufLen = stringLength suf;
-      sLen = stringLength s;
+      sufLen = stringLength suffix;
+      sLen = stringLength str;
     in
-      if sufLen <= sLen && suf == substring (sLen - sufLen) sufLen s then
-        substring 0 (sLen - sufLen) s
+      if sufLen <= sLen && suffix == substring (sLen - sufLen) sufLen str then
+        substring 0 (sLen - sufLen) str
       else
-        s;
+        str;
 
-  /* Return true iff string v1 denotes a version older than v2.
+  /* Return true if string v1 denotes a version older than v2.
 
      Example:
        versionOlder "1.1" "1.2"
@@ -367,7 +460,7 @@ rec {
   */
   versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
 
-  /* Return true iff string v1 denotes a version equal to or newer than v2.
+  /* Return true if string v1 denotes a version equal to or newer than v2.
 
      Example:
        versionAtLeast "1.1" "1.0"
@@ -459,6 +552,11 @@ rec {
   /* Create a fixed width string with additional prefix to match
      required width.
 
+     This function will fail if the input string is longer than the
+     requested length.
+
+     Type: fixedWidthString :: int -> string -> string
+
      Example:
        fixedWidthString 5 "0" (toString 15)
        => "00015"
@@ -506,8 +604,9 @@ rec {
     && builtins.substring 0 1 (toString x) == "/"
     && dirOf x == builtins.storeDir;
 
-  /* Convert string to int
-     Obviously, it is a bit hacky to use fromJSON that way.
+  /* Parse a string string as an int.
+
+     Type: string -> int
 
      Example:
        toInt "1337"
@@ -517,17 +616,18 @@ rec {
        toInt "3.14"
        => error: floating point JSON numbers are not supported
   */
+  # Obviously, it is a bit hacky to use fromJSON this way.
   toInt = str:
     let may_be_int = builtins.fromJSON str; in
     if builtins.isInt may_be_int
     then may_be_int
     else throw "Could not convert ${str} to int.";
 
-  /* Read a list of paths from `file', relative to the `rootPath'. Lines
-     beginning with `#' are treated as comments and ignored. Whitespace
-     is significant.
+  /* Read a list of paths from `file`, relative to the `rootPath`.
+     Lines beginning with `#` are treated as comments and ignored.
+     Whitespace is significant.
 
-     NOTE: this function is not performant and should be avoided
+     NOTE: This function is not performant and should be avoided.
 
      Example:
        readPathsFromFile /prefix
@@ -549,6 +649,8 @@ rec {
 
   /* Read the contents of a file removing the trailing \n
 
+     Type: fileContents :: path -> string
+
      Example:
        $ echo "1.0" > ./version
 
-- 
GitLab


From 65f50a9bb01a6e2041db1a4e41449e8ea0436adc Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sat, 27 Oct 2018 19:23:06 +0200
Subject: [PATCH 0597/1065] lib/lists: Update documentation comments for doc
 generation

Updates documentation comments with extra information for nixdoc[1]
compatibility.

[1]: https://github.com/tazjin/nixdoc
---
 lib/lists.nix | 184 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 136 insertions(+), 48 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 9ecd8f22003..be541427c24 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -1,4 +1,5 @@
 # General list operations.
+
 { lib }:
 with lib.trivial;
 let
@@ -8,21 +9,23 @@ rec {
 
   inherit (builtins) head tail length isList elemAt concatLists filter elem genList;
 
-  /*  Create a list consisting of a single element.  `singleton x' is
-      sometimes more convenient with respect to indentation than `[x]'
+  /*  Create a list consisting of a single element.  `singleton x` is
+      sometimes more convenient with respect to indentation than `[x]`
       when x spans multiple lines.
 
+      Type: singleton :: a -> [a]
+
       Example:
         singleton "foo"
         => [ "foo" ]
   */
   singleton = x: [x];
 
-  /* “right fold” a binary function `op' between successive elements of
-     `list' with `nul' as the starting value, i.e.,
-     `foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'.
-     Type:
-       foldr :: (a -> b -> b) -> b -> [a] -> b
+  /* “right fold” a binary function `op` between successive elements of
+     `list` with `nul' as the starting value, i.e.,
+     `foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))`.
+
+     Type: foldr :: (a -> b -> b) -> b -> [a] -> b
 
      Example:
        concat = foldr (a: b: a + b) "z"
@@ -42,16 +45,15 @@ rec {
         else op (elemAt list n) (fold' (n + 1));
     in fold' 0;
 
-  /* `fold' is an alias of `foldr' for historic reasons */
+  /* `fold` is an alias of `foldr` for historic reasons */
   # FIXME(Profpatsch): deprecate?
   fold = foldr;
 
 
-  /* “left fold”, like `foldr', but from the left:
+  /* “left fold”, like `foldr`, but from the left:
      `foldl op nul [x_1 x_2 ... x_n] == op (... (op (op nul x_1) x_2) ... x_n)`.
 
-     Type:
-       foldl :: (b -> a -> b) -> b -> [a] -> b
+     Type: foldl :: (b -> a -> b) -> b -> [a] -> b
 
      Example:
        lconcat = foldl (a: b: a + b) "z"
@@ -70,16 +72,20 @@ rec {
         else op (foldl' (n - 1)) (elemAt list n);
     in foldl' (length list - 1);
 
-  /* Strict version of `foldl'.
+  /* Strict version of `foldl`.
 
      The difference is that evaluation is forced upon access. Usually used
      with small whole results (in contract with lazily-generated list or large
      lists where only a part is consumed.)
+
+     Type: foldl' :: (b -> a -> b) -> b -> [a] -> b
   */
   foldl' = builtins.foldl' or foldl;
 
   /* Map with index starting from 0
 
+     Type: imap0 :: (int -> a -> b) -> [a] -> [b]
+
      Example:
        imap0 (i: v: "${v}-${toString i}") ["a" "b"]
        => [ "a-0" "b-1" ]
@@ -88,6 +94,8 @@ rec {
 
   /* Map with index starting from 1
 
+     Type: imap1 :: (int -> a -> b) -> [a] -> [b]
+
      Example:
        imap1 (i: v: "${v}-${toString i}") ["a" "b"]
        => [ "a-1" "b-2" ]
@@ -96,6 +104,8 @@ rec {
 
   /* Map and concatenate the result.
 
+     Type: concatMap :: (a -> [b]) -> [a] -> [b]
+
      Example:
        concatMap (x: [x] ++ ["z"]) ["a" "b"]
        => [ "a" "z" "b" "z" ]
@@ -118,15 +128,21 @@ rec {
 
   /* Remove elements equal to 'e' from a list.  Useful for buildInputs.
 
+     Type: remove :: a -> [a] -> [a]
+
      Example:
        remove 3 [ 1 3 4 3 ]
        => [ 1 4 ]
   */
-  remove = e: filter (x: x != e);
+  remove =
+    # Element to remove from the list
+    e: filter (x: x != e);
 
   /* Find the sole element in the list matching the specified
-     predicate, returns `default' if no such element exists, or
-     `multiple' if there are multiple matching elements.
+     predicate, returns `default` if no such element exists, or
+     `multiple` if there are multiple matching elements.
+
+     Type: findSingle :: (a -> bool) -> a -> a -> [a] -> a
 
      Example:
        findSingle (x: x == 3) "none" "multiple" [ 1 3 3 ]
@@ -136,14 +152,24 @@ rec {
        findSingle (x: x == 3) "none" "multiple" [ 1 9 ]
        => "none"
   */
-  findSingle = pred: default: multiple: list:
+  findSingle =
+    # Predicate
+    pred:
+    # Default value to return if element was not found.
+    default:
+    # Default value to return if more than one element was found
+    multiple:
+    # Input list
+    list:
     let found = filter pred list; len = length found;
     in if len == 0 then default
       else if len != 1 then multiple
       else head found;
 
   /* Find the first element in the list matching the specified
-     predicate or returns `default' if no such element exists.
+     predicate or return `default` if no such element exists.
+
+     Type: findFirst :: (a -> bool) -> a -> [a] -> a
 
      Example:
        findFirst (x: x > 3) 7 [ 1 6 4 ]
@@ -151,12 +177,20 @@ rec {
        findFirst (x: x > 9) 7 [ 1 6 4 ]
        => 7
   */
-  findFirst = pred: default: list:
+  findFirst =
+    # Predicate
+    pred:
+    # Default value to return
+    default:
+    # Input list
+    list:
     let found = filter pred list;
     in if found == [] then default else head found;
 
-  /* Return true iff function `pred' returns true for at least element
-     of `list'.
+  /* Return true if function `pred` returns true for at least one
+     element of `list`.
+
+     Type: any :: (a -> bool) -> [a] -> bool
 
      Example:
        any isString [ 1 "a" { } ]
@@ -166,8 +200,10 @@ rec {
   */
   any = builtins.any or (pred: foldr (x: y: if pred x then true else y) false);
 
-  /* Return true iff function `pred' returns true for all elements of
-     `list'.
+  /* Return true if function `pred` returns true for all elements of
+     `list`.
+
+     Type: all :: (a -> bool) -> [a] -> bool
 
      Example:
        all (x: x < 3) [ 1 2 ]
@@ -177,19 +213,25 @@ rec {
   */
   all = builtins.all or (pred: foldr (x: y: if pred x then y else false) true);
 
-  /* Count how many times function `pred' returns true for the elements
-     of `list'.
+  /* Count how many elements of `list` match the supplied predicate
+     function.
+
+     Type: count :: (a -> bool) -> [a] -> int
 
      Example:
        count (x: x == 3) [ 3 2 3 4 6 ]
        => 2
   */
-  count = pred: foldl' (c: x: if pred x then c + 1 else c) 0;
+  count =
+    # Predicate
+    pred: foldl' (c: x: if pred x then c + 1 else c) 0;
 
   /* Return a singleton list or an empty list, depending on a boolean
      value.  Useful when building lists with optional elements
      (e.g. `++ optional (system == "i686-linux") flashplayer').
 
+     Type: optional :: bool -> a -> [a]
+
      Example:
        optional true "foo"
        => [ "foo" ]
@@ -200,13 +242,19 @@ rec {
 
   /* Return a list or an empty list, depending on a boolean value.
 
+     Type: optionals :: bool -> [a] -> [a]
+
      Example:
        optionals true [ 2 3 ]
        => [ 2 3 ]
        optionals false [ 2 3 ]
        => [ ]
   */
-  optionals = cond: elems: if cond then elems else [];
+  optionals =
+    # Condition
+    cond:
+    # List to return if condition is true
+    elems: if cond then elems else [];
 
 
   /* If argument is a list, return it; else, wrap it in a singleton
@@ -223,20 +271,28 @@ rec {
 
   /* Return a list of integers from `first' up to and including `last'.
 
+     Type: range :: int -> int -> [int]
+
      Example:
        range 2 4
        => [ 2 3 4 ]
        range 3 2
        => [ ]
   */
-  range = first: last:
+  range =
+    # First integer in the range
+    first:
+    # Last integer in the range
+    last:
     if first > last then
       []
     else
       genList (n: first + n) (last - first + 1);
 
-  /* Splits the elements of a list in two lists, `right' and
-     `wrong', depending on the evaluation of a predicate.
+  /* Splits the elements of a list in two lists, `right` and
+     `wrong`, depending on the evaluation of a predicate.
+
+     Type: (a -> bool) -> [a] -> { right :: [a], wrong :: [a] }
 
      Example:
        partition (x: x > 2) [ 5 1 2 3 4 ]
@@ -252,7 +308,7 @@ rec {
   /* Splits the elements of a list into many lists, using the return value of a predicate.
      Predicate should return a string which becomes keys of attrset `groupBy' returns.
 
-     `groupBy'' allows to customise the combining function and initial value
+     `groupBy'` allows to customise the combining function and initial value
 
      Example:
        groupBy (x: boolToString (x > 2)) [ 5 1 2 3 4 ]
@@ -268,10 +324,6 @@ rec {
             xfce  = [ { name = "xfce";  script = "xfce4-session &"; } ];
           }
 
-
-     groupBy' allows to customise the combining function and initial value
-
-     Example:
        groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ]
        => { true = 12; false = 3; }
   */
@@ -289,17 +341,27 @@ rec {
      the merging stops at the shortest. How both lists are merged is defined
      by the first argument.
 
+     Type: zipListsWith :: (a -> b -> c) -> [a] -> [b] -> [c]
+
      Example:
        zipListsWith (a: b: a + b) ["h" "l"] ["e" "o"]
        => ["he" "lo"]
   */
-  zipListsWith = f: fst: snd:
+  zipListsWith =
+    # Function to zip elements of both lists
+    f:
+    # First list
+    fst:
+    # Second list
+    snd:
     genList
       (n: f (elemAt fst n) (elemAt snd n)) (min (length fst) (length snd));
 
   /* Merges two lists of the same size together. If the sizes aren't the same
      the merging stops at the shortest.
 
+     Type: zipLists :: [a] -> [b] -> [{ fst :: a, snd :: b}]
+
      Example:
        zipLists [ 1 2 ] [ "a" "b" ]
        => [ { fst = 1; snd = "a"; } { fst = 2; snd = "b"; } ]
@@ -308,6 +370,8 @@ rec {
 
   /* Reverse the order of the elements of a list.
 
+     Type: reverseList :: [a] -> [a]
+
      Example:
 
        reverseList [ "b" "o" "j" ]
@@ -321,8 +385,7 @@ rec {
      `before a b == true` means that `b` depends on `a` (there's an
      edge from `b` to `a`).
 
-     Examples:
-
+     Example:
          listDfs true hasPrefix [ "/home/user" "other" "/" "/home" ]
            == { minimal = "/";                  # minimal element
                 visited = [ "/home/user" ];     # seen elements (in reverse order)
@@ -336,7 +399,6 @@ rec {
                 rest    = [ "/home" "other" ];  # everything else
 
    */
-
   listDfs = stopOnCycles: before: list:
     let
       dfs' = us: visited: rest:
@@ -361,7 +423,7 @@ rec {
      `before a b == true` means that `b` should be after `a`
      in the result.
 
-     Examples:
+     Example:
 
          toposort hasPrefix [ "/home/user" "other" "/" "/home" ]
            == { result = [ "/" "/home" "/home/user" "other" ]; }
@@ -376,7 +438,6 @@ rec {
          toposort (a: b: a < b) [ 3 2 1 ] == { result = [ 1 2 3 ]; }
 
    */
-
   toposort = before: list:
     let
       dfsthis = listDfs true before list;
@@ -467,26 +528,38 @@ rec {
 
   /* Return the first (at most) N elements of a list.
 
+     Type: take :: int -> [a] -> [a]
+
      Example:
        take 2 [ "a" "b" "c" "d" ]
        => [ "a" "b" ]
        take 2 [ ]
        => [ ]
   */
-  take = count: sublist 0 count;
+  take =
+    # Number of elements to take
+    count: sublist 0 count;
 
   /* Remove the first (at most) N elements of a list.
 
+     Type: drop :: int -> [a] -> [a]
+
      Example:
        drop 2 [ "a" "b" "c" "d" ]
        => [ "c" "d" ]
        drop 2 [ ]
        => [ ]
   */
-  drop = count: list: sublist count (length list) list;
+  drop =
+    # Number of elements to drop
+    count:
+    # Input list
+    list: sublist count (length list) list;
+
+  /* Return a list consisting of at most `count` elements of `list`,
+     starting at index `start`.
 
-  /* Return a list consisting of at most ‘count’ elements of ‘list’,
-     starting at index ‘start’.
+     Type: sublist :: int -> int -> [a] -> [a]
 
      Example:
        sublist 1 3 [ "a" "b" "c" "d" "e" ]
@@ -494,7 +567,13 @@ rec {
        sublist 1 3 [ ]
        => [ ]
   */
-  sublist = start: count: list:
+  sublist =
+    # Index at which to start the sublist
+    start:
+    # Number of elements to take
+    count:
+    # Input list
+    list:
     let len = length list; in
     genList
       (n: elemAt list (n + start))
@@ -504,6 +583,10 @@ rec {
 
   /* Return the last element of a list.
 
+     This function throws an error if the list is empty.
+
+     Type: last :: [a] -> a
+
      Example:
        last [ 1 2 3 ]
        => 3
@@ -512,7 +595,11 @@ rec {
     assert lib.assertMsg (list != []) "lists.last: list must not be empty!";
     elemAt list (length list - 1);
 
-  /* Return all elements but the last
+  /* Return all elements but the last.
+
+     This function throws an error if the list is empty.
+
+     Type: init :: [a] -> [a]
 
      Example:
        init [ 1 2 3 ]
@@ -523,7 +610,7 @@ rec {
     take (length list - 1) list;
 
 
-  /* return the image of the cross product of some lists by a function
+  /* Return the image of the cross product of some lists by a function.
 
     Example:
       crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]]
@@ -534,8 +621,9 @@ rec {
 
   /* Remove duplicate elements from the list. O(n^2) complexity.
 
-     Example:
+     Type: unique :: [a] -> [a]
 
+     Example:
        unique [ 3 2 3 4 ]
        => [ 3 2 4 ]
    */
-- 
GitLab


From b4c7ff59f19fea9f75dae8a18677ee8021119b84 Mon Sep 17 00:00:00 2001
From: David Costa <david@zarel.net>
Date: Sat, 27 Oct 2018 14:52:26 +0100
Subject: [PATCH 0598/1065] splix: add missing printer models
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add support for ML-2160 ML-2165 ML-3310 ML-3310ND.
The PPD files were not picked up by the Makefile because they were
in the wrong directory of the original source.

Co-authored-by: Merlin Göttlinger <megoettlinger@gmail.com>
---
 pkgs/misc/cups/drivers/splix/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index 9cb9aa3ec58..012b37959d8 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -31,6 +31,7 @@ in stdenv.mkDerivation {
   };
 
   postPatch = ''
+    mv -v *.ppd ppd/
     substituteInPlace src/pstoqpdl.cpp \
       --replace "RASTERDIR \"/\" RASTERTOQPDL" "\"$out/lib/cups/filter/rastertoqpdl\"" \
       --replace "RASTERDIR" "\"${cups-filters}/lib/cups/filter\"" \
-- 
GitLab


From da18b9263505e957f41c97d801557fd8e5535c79 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 28 Oct 2018 20:51:26 +0100
Subject: [PATCH 0599/1065] lib/debug: Update documentation comments for docs
 generation

Documents functions in `lib.debug` for docs generation with nixdoc.

Note that type signatures and clearer descriptions are still missing
on some of these functions, but this is good enough for a first run.
---
 lib/debug.nix | 94 ++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 75 insertions(+), 19 deletions(-)

diff --git a/lib/debug.nix b/lib/debug.nix
index 383eb32d75d..2879f72ed2b 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -23,27 +23,54 @@ rec {
 
   # -- TRACING --
 
-  /* Trace msg, but only if pred is true.
+  /* Conditionally trace the supplied message, based on a predicate.
+
+     Type: traceIf :: bool -> string -> a -> a
 
      Example:
        traceIf true "hello" 3
        trace: hello
        => 3
   */
-  traceIf = pred: msg: x: if pred then trace msg x else x;
+  traceIf =
+    # Predicate to check
+    pred:
+    # Message that should be traced
+    msg:
+    # Value to return
+    x: if pred then trace msg x else x;
+
+  /* Trace the supplied value after applying a function to it, and
+     return the original value.
 
-  /* Trace the value and also return it.
+     Type: traceValFn :: (a -> b) -> a -> a
 
      Example:
        traceValFn (v: "mystring ${v}") "foo"
        trace: mystring foo
        => "foo"
   */
-  traceValFn = f: x: trace (f x) x;
+  traceValFn =
+    # Function to apply
+    f:
+    # Value to trace and return
+    x: trace (f x) x;
+
+  /* Trace the supplied value and return it.
+
+     Type: traceVal :: a -> a
+
+     Example:
+       traceVal 42
+       # trace: 42
+       => 42
+  */
   traceVal = traceValFn id;
 
   /* `builtins.trace`, but the value is `builtins.deepSeq`ed first.
 
+     Type: traceSeq :: a -> b -> b
+
      Example:
        trace { a.b.c = 3; } null
        trace: { a = <CODE>; }
@@ -52,7 +79,11 @@ rec {
        trace: { a = { b = { c = 3; }; }; }
        => null
   */
-  traceSeq = x: y: trace (builtins.deepSeq x x) y;
+  traceSeq =
+    # The value to trace
+    x:
+    # The value to return
+    y: trace (builtins.deepSeq x x) y;
 
   /* Like `traceSeq`, but only evaluate down to depth n.
      This is very useful because lots of `traceSeq` usages
@@ -76,27 +107,49 @@ rec {
     in trace (generators.toPretty { allowPrettyValues = true; }
                (modify depth snip x)) y;
 
-  /* A combination of `traceVal` and `traceSeq` */
-  traceValSeqFn = f: v: traceValFn f (builtins.deepSeq v v);
+  /* A combination of `traceVal` and `traceSeq` that applies a
+     provided function to the value to be traced after `deepSeq`ing
+     it.
+  */
+  traceValSeqFn =
+    # Function to apply
+    f:
+    # Value to trace
+    v: traceValFn f (builtins.deepSeq v v);
+
+  /* A combination of `traceVal` and `traceSeq`. */
   traceValSeq = traceValSeqFn id;
 
+  /* A combination of `traceVal` and `traceSeqN` that applies a
+  provided function to the value to be traced. */
+  traceValSeqNFn =
+    # Function to apply
+    f:
+    depth:
+    # Value to trace
+    v: traceSeqN depth (f v) v;
+
   /* A combination of `traceVal` and `traceSeqN`. */
-  traceValSeqNFn = f: depth: v: traceSeqN depth (f v) v;
   traceValSeqN = traceValSeqNFn id;
 
 
   # -- TESTING --
 
-  /* Evaluate a set of tests.  A test is an attribute set {expr,
-     expected}, denoting an expression and its expected result.  The
-     result is a list of failed tests, each represented as {name,
-     expected, actual}, denoting the attribute name of the failing
-     test and its expected and actual results.  Used for regression
-     testing of the functions in lib; see tests.nix for an example.
-     Only tests having names starting with "test" are run.
-     Add attr { tests = ["testName"]; } to run these test only
+  /* Evaluate a set of tests.  A test is an attribute set `{expr,
+     expected}`, denoting an expression and its expected result.  The
+     result is a list of failed tests, each represented as `{name,
+     expected, actual}`, denoting the attribute name of the failing
+     test and its expected and actual results.
+
+     Used for regression testing of the functions in lib; see
+     tests.nix for an example. Only tests having names starting with
+     "test" are run.
+
+     Add attr { tests = ["testName"]; } to run these tests only.
   */
-  runTests = tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test:
+  runTests =
+    # Tests to run
+    tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test:
     let testsToRun = if tests ? tests then tests.tests else [];
     in if (substring 0 4 name == "test" ||  elem name testsToRun)
        && ((testsToRun == []) || elem name tests.tests)
@@ -105,8 +158,11 @@ rec {
       then [ { inherit name; expected = test.expected; result = test.expr; } ]
       else [] ) tests));
 
-  # create a test assuming that list elements are true
-  # usage: { testX = allTrue [ true ]; }
+  /* Create a test assuming that list elements are `true`.
+
+     Example:
+       { testX = allTrue [ true ]; }
+  */
   testAllTrue = expr: { inherit expr; expected = map (x: true) expr; };
 
 
-- 
GitLab


From 238496688010e3cffd19bbd7d04118ba7d1a52a1 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 28 Oct 2018 21:31:35 +0100
Subject: [PATCH 0600/1065] lib/options: Update documentation comments for docs
 generation

Documents functions in `lib.options` for docs generation with nixdoc.

The formatting change in the `mkOption` arguments is due to the way
`nixdoc` parses documentation comments on pattern arguments. It's not
ideal, but it works.
---
 lib/options.nix | 155 +++++++++++++++++++++++++++---------------------
 1 file changed, 88 insertions(+), 67 deletions(-)

diff --git a/lib/options.nix b/lib/options.nix
index 0e342117530..791930eafbd 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -8,61 +8,72 @@ with lib.strings;
 
 rec {
 
-  # Returns true when the given argument is an option
-  #
-  # Examples:
-  #   isOption 1             // => false
-  #   isOption (mkOption {}) // => true
+  /* Returns true when the given argument is an option
+
+     Type: isOption :: a -> bool
+
+     Example:
+       isOption 1             // => false
+       isOption (mkOption {}) // => true
+  */
   isOption = lib.isType "option";
 
-  # Creates an Option attribute set. mkOption accepts an attribute set with the following keys:
-  #
-  #  default:     Default value used when no definition is given in the configuration.
-  #  defaultText: Textual representation of the default, for in the manual.
-  #  example:     Example value used in the manual.
-  #  description: String describing the option.
-  #  type:        Option type, providing type-checking and value merging.
-  #  apply:       Function that converts the option value to something else.
-  #  internal:    Whether the option is for NixOS developers only.
-  #  visible:     Whether the option shows up in the manual.
-  #  readOnly:    Whether the option can be set only once
-  #  options:     Obsolete, used by types.optionSet.
-  #
-  # All keys default to `null` when not given.
-  #
-  # Examples:
-  #   mkOption { }  // => { _type = "option"; }
-  #   mkOption { defaultText = "foo"; } // => { _type = "option"; defaultText = "foo"; }
+  /* Creates an Option attribute set. mkOption accepts an attribute set with the following keys:
+
+     All keys default to `null` when not given.
+
+     Example:
+       mkOption { }  // => { _type = "option"; }
+       mkOption { defaultText = "foo"; } // => { _type = "option"; defaultText = "foo"; }
+  */
   mkOption =
-    { default ? null # Default value used when no definition is given in the configuration.
-    , defaultText ? null # Textual representation of the default, for in the manual.
-    , example ? null # Example value used in the manual.
-    , description ? null # String describing the option.
-    , relatedPackages ? null # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix).
-    , type ? null # Option type, providing type-checking and value merging.
-    , apply ? null # Function that converts the option value to something else.
-    , internal ? null # Whether the option is for NixOS developers only.
-    , visible ? null # Whether the option shows up in the manual.
-    , readOnly ? null # Whether the option can be set only once
-    , options ? null # Obsolete, used by types.optionSet.
+    {
+    # Default value used when no definition is given in the configuration.
+    default ? null,
+    # Textual representation of the default, for the manual.
+    defaultText ? null,
+    # Example value used in the manual.
+    example ? null,
+    # String describing the option.
+    description ? null,
+    # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix).
+    relatedPackages ? null,
+    # Option type, providing type-checking and value merging.
+    type ? null,
+    # Function that converts the option value to something else.
+    apply ? null,
+    # Whether the option is for NixOS developers only.
+    internal ? null,
+    # Whether the option shows up in the manual.
+    visible ? null,
+    # Whether the option can be set only once
+    readOnly ? null,
+    # Obsolete, used by types.optionSet.
+    options ? null
     } @ attrs:
     attrs // { _type = "option"; };
 
-  # Creates a Option attribute set for a boolean value option i.e an option to be toggled on or off:
-  #
-  # Examples:
-  #   mkEnableOption "foo" // => { _type = "option"; default = false; description = "Whether to enable foo."; example = true; type = { ... }; }
-  mkEnableOption = name: mkOption {
+  /* Creates an Option attribute set for a boolean value option i.e an
+     option to be toggled on or off:
+
+     Example:
+       mkEnableOption "foo"
+       => { _type = "option"; default = false; description = "Whether to enable foo."; example = true; type = { ... }; }
+  */
+  mkEnableOption =
+    # Name for the created option
+    name: mkOption {
     default = false;
     example = true;
     description = "Whether to enable ${name}.";
     type = lib.types.bool;
   };
 
-  # This option accept anything, but it does not produce any result.  This
-  # is useful for sharing a module across different module sets without
-  # having to implement similar features as long as the value of the options
-  # are not expected.
+  /* This option accepts anything, but it does not produce any result.
+
+     This is useful for sharing a module across different module sets
+     without having to implement similar features as long as the
+     values of the options are not accessed. */
   mkSinkUndeclaredOptions = attrs: mkOption ({
     internal = true;
     visible = false;
@@ -102,18 +113,24 @@ rec {
       else
         val) (head defs).value defs;
 
-  # Extracts values of all "value" keys of the given list
-  #
-  # Examples:
-  #   getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ]
-  #   getValues [ ]                               // => [ ]
+  /* Extracts values of all "value" keys of the given list.
+
+     Type: getValues :: [ { value :: a } ] -> [a]
+
+     Example:
+       getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ]
+       getValues [ ]                               // => [ ]
+  */
   getValues = map (x: x.value);
 
-  # Extracts values of all "file" keys of the given list
-  #
-  # Examples:
-  #   getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ]
-  #   getFiles [ ]                                         // => [ ]
+  /* Extracts values of all "file" keys of the given list
+
+     Type: getFiles :: [ { file :: a } ] -> [a]
+
+     Example:
+       getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ]
+       getFiles [ ]                                         // => [ ]
+  */
   getFiles = map (x: x.file);
 
   # Generate documentation template from the list of option declaration like
@@ -146,10 +163,13 @@ rec {
 
 
   /* This function recursively removes all derivation attributes from
-     `x' except for the `name' attribute.  This is to make the
-     generation of `options.xml' much more efficient: the XML
-     representation of derivations is very large (on the order of
-     megabytes) and is not actually used by the manual generator. */
+     `x` except for the `name` attribute.
+
+     This is to make the generation of `options.xml` much more
+     efficient: the XML representation of derivations is very large
+     (on the order of megabytes) and is not actually used by the
+     manual generator.
+  */
   scrubOptionValue = x:
     if isDerivation x then
       { type = "derivation"; drvPath = x.name; outPath = x.name; name = x.name; }
@@ -158,20 +178,21 @@ rec {
     else x;
 
 
-  /* For use in the ‘example’ option attribute.  It causes the given
-     text to be included verbatim in documentation.  This is necessary
-     for example values that are not simple values, e.g.,
-     functions. */
+  /* For use in the `example` option attribute. It causes the given
+     text to be included verbatim in documentation. This is necessary
+     for example values that are not simple values, e.g., functions.
+  */
   literalExample = text: { _type = "literalExample"; inherit text; };
 
+  # Helper functions.
 
-  /* Helper functions. */
+  /* Convert an option, described as a list of the option parts in to a
+     safe, human readable version.
 
-  # Convert an option, described as a list of the option parts in to a
-  # safe, human readable version. ie:
-  #
-  # (showOption ["foo" "bar" "baz"]) == "foo.bar.baz"
-  # (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux"
+     Example:
+       (showOption ["foo" "bar" "baz"]) == "foo.bar.baz"
+       (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux"
+  */
   showOption = parts: let
     escapeOptionPart = part:
       let
-- 
GitLab


From e212399d448b47df5b74586801617bb21a95e8ca Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Sun, 28 Oct 2018 18:03:57 +0100
Subject: [PATCH 0601/1065] python.pkgs.Pyro4: new package (at version 4.74)

includes its dependency python.pkgs.serpent (at version 1.27)
---
 .../python-modules/pyro4/default.nix          | 46 +++++++++++++++++++
 .../python-modules/selectors34/default.nix    | 32 +++++++++++++
 .../python-modules/serpent/default.nix        | 34 ++++++++++++++
 pkgs/top-level/python-packages.nix            |  6 +++
 4 files changed, 118 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyro4/default.nix
 create mode 100644 pkgs/development/python-modules/selectors34/default.nix
 create mode 100644 pkgs/development/python-modules/serpent/default.nix

diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix
new file mode 100644
index 00000000000..df8df2cb93c
--- /dev/null
+++ b/pkgs/development/python-modules/pyro4/default.nix
@@ -0,0 +1,46 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, lib
+, python
+, serpent
+, dill
+, cloudpickle
+, msgpack
+, isPy27
+, isPy33
+, selectors34
+}:
+
+buildPythonPackage rec {
+
+  name = "${pname}-${version}";
+  pname = "Pyro4";
+  version = "4.74";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "89ed7b12c162e5124f322f992f9506c44f5e1a379926cf01ee73ef810d3bf75f";
+  };
+
+  propagatedBuildInputs = [
+    serpent
+  ] ++ lib.optionals (isPy27 || isPy33) [ selectors34 ];
+
+  buildInputs = [
+    dill
+    cloudpickle
+    msgpack
+  ];
+
+  checkPhase = ''
+    ${python.interpreter} setup.py test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Distributed object middleware for Python (RPC)";
+    homepage = https://github.com/irmen/Pyro4;
+    license = licenses.mit;
+    maintainers = with maintainers; [ prusnak ];
+    };
+}
diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix
new file mode 100644
index 00000000000..76f6232bafa
--- /dev/null
+++ b/pkgs/development/python-modules/selectors34/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, lib
+, python
+, six
+}:
+
+buildPythonPackage rec {
+
+  name = "${pname}-${version}";
+  pname = "selectors34";
+  version = "1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09f5066337f8a76fb5233f267873f89a27a17c10bf79575954894bb71686451c";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  checkPhase = ''
+    ${python.interpreter} setup.py test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A backport of the selectors module from Python 3.4";
+    homepage = https://github.com/berkerpeksag/selectors34;
+    license = licenses.psfl;
+    maintainers = with maintainers; [ prusnak ];
+    };
+}
diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix
new file mode 100644
index 00000000000..5ea59eb6a2a
--- /dev/null
+++ b/pkgs/development/python-modules/serpent/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, lib
+, python
+, isPy27
+, isPy33
+, enum34
+}:
+
+buildPythonPackage rec {
+
+  name = "${pname}-${version}";
+  pname = "serpent";
+  version = "1.27";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6f8dc4317fb5b5a9629b5e518846bc9fee374b8171533726dc68df52b36ee912";
+  };
+
+  propagatedBuildInputs = lib.optionals (isPy27 || isPy33) [ enum34 ];
+
+  checkPhase = ''
+    ${python.interpreter} setup.py test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple serialization library based on ast.literal_eval";
+    homepage = https://github.com/irmen/Serpent;
+    license = licenses.mit;
+    maintainers = with maintainers; [ prusnak ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93aee66a567..e999afe373d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4684,6 +4684,12 @@ in {
 
   Pyro = callPackage ../development/python-modules/pyro { };
 
+  serpent = callPackage ../development/python-modules/serpent { };
+
+  selectors34 = callPackage ../development/python-modules/selectors34 { };
+
+  Pyro4 = callPackage ../development/python-modules/pyro4 { };
+
   pyrsistent = buildPythonPackage (rec {
     name = "pyrsistent-0.11.12";
 
-- 
GitLab


From b7201c5c69c8d341731d005c96a31eac466427e0 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Mon, 29 Oct 2018 11:21:03 +0100
Subject: [PATCH 0602/1065] python.pkgs.Pyro remove package - Pyro4 should be
 used instead

---
 .../python-modules/pyro/default.nix           | 22 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 24 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyro/default.nix

diff --git a/pkgs/development/python-modules/pyro/default.nix b/pkgs/development/python-modules/pyro/default.nix
deleted file mode 100644
index 3a74a1fe6fa..00000000000
--- a/pkgs/development/python-modules/pyro/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, buildPythonPackage, isPy3k }:
-
-buildPythonPackage rec {
-  pname = "Pyro";
-  version = "3.16";
-  name = pname + "-" + version;
-
-  disabled = isPy3k;
-
-  src = fetchurl {
-    url = "mirror://pypi/P/Pyro/${name}.tar.gz";
-    sha256 = "1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578";
-  };
-
-  meta = with stdenv.lib; {
-    description = "Distributed object middleware for Python (IPC/RPC)";
-    homepage = https://pythonhosted.org/Pyro/;
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ bjornfor ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e999afe373d..c6c59eb31e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4682,8 +4682,6 @@ in {
 
   PyStemmer = callPackage ../development/python-modules/pystemmer {};
 
-  Pyro = callPackage ../development/python-modules/pyro { };
-
   serpent = callPackage ../development/python-modules/serpent { };
 
   selectors34 = callPackage ../development/python-modules/selectors34 { };
-- 
GitLab


From f90d4de02f73e392d7df84ff513fe64b7ca840ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 26 Oct 2018 20:49:57 +0200
Subject: [PATCH 0603/1065] hugo: 0.47.1 -> 0.49.2

Changelog: https://github.com/gohugoio/hugo/releases

Adresses #49125
---
 pkgs/applications/misc/hugo/default.nix |   4 +-
 pkgs/applications/misc/hugo/deps.nix    | 417 ++++++++++++++++++------
 2 files changed, 327 insertions(+), 94 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index c353a779b64..29b6e41a90d 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.47.1";
+  version = "0.49.2";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "gohugoio";
     repo   = "hugo";
     rev    = "v${version}";
-    sha256 = "0n27vyg66jfx4lwswsmdlybly8c9gy5rk7yhy7wzs3rwzlqv1jzj";
+    sha256 = "0a320mv6x770vppbz0aw5ikywmy0mxqq1lhc0syp48hgg42d46is";
   };
 
   patches = [
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 47487029ea0..002fb6351b8 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -1,488 +1,721 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
 [
+
   {
     goPackagePath = "github.com/BurntSushi/locker";
     fetch = {
       type = "git";
       url = "https://github.com/BurntSushi/locker";
-      rev = "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a";
+      rev = "a6e239ea1c69";
       sha256 = "1xak4aync4klswq5217qvw191asgla51jr42y94vp109lirm5dzg";
     };
   }
+
   {
     goPackagePath = "github.com/BurntSushi/toml";
     fetch = {
       type = "git";
       url = "https://github.com/BurntSushi/toml";
-      rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
-      sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
+      rev = "a368813c5e64";
+      sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
     };
   }
+
   {
     goPackagePath = "github.com/PuerkitoBio/purell";
     fetch = {
       type = "git";
       url = "https://github.com/PuerkitoBio/purell";
-      rev = "975f53781597ed779763b7b65566e74c4004d8de";
-      sha256 = "1j5l793zxrjv09z3cdgs05qn45sbhbm9njsw5cfv168x8z88pd3l";
+      rev = "v1.1.0";
+      sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91";
     };
   }
+
   {
     goPackagePath = "github.com/PuerkitoBio/urlesc";
     fetch = {
       type = "git";
       url = "https://github.com/PuerkitoBio/urlesc";
-      rev = "de5bf2ad457846296e2031421a34e2568e304e35";
+      rev = "de5bf2ad4578";
       sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw";
     };
   }
+
+  {
+    goPackagePath = "github.com/alecthomas/assert";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/assert";
+      rev = "405dbfeb8e38";
+      sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l";
+    };
+  }
+
   {
     goPackagePath = "github.com/alecthomas/chroma";
     fetch = {
       type = "git";
       url = "https://github.com/alecthomas/chroma";
-      rev = "5d7fef2ae60b501bbf28d476c3f273b8017d8261";
+      rev = "v0.5.0";
       sha256 = "150jv4vhsdi1gj3liwkgicdrwnzgv5qkq2fwznlnzf64vmfb0b9f";
     };
   }
+
+  {
+    goPackagePath = "github.com/alecthomas/colour";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/colour";
+      rev = "60882d9e2721";
+      sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/alecthomas/repr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/repr";
+      rev = "117648cd9897";
+      sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp";
+    };
+  }
+
   {
     goPackagePath = "github.com/bep/debounce";
     fetch = {
       type = "git";
       url = "https://github.com/bep/debounce";
-      rev = "844797fa1dd9ba969d71b62797ff19d1e49d4eac";
+      rev = "v1.1.0";
       sha256 = "1sh4zv0hv7f454mhzpl2mbv7ar5rm00wyy5qr78x1h84bgph87wy";
     };
   }
+
   {
     goPackagePath = "github.com/bep/gitmap";
     fetch = {
       type = "git";
       url = "https://github.com/bep/gitmap";
-      rev = "ecb6fe06dbfd6bb4225e7fda7dc15612ecc8d960";
+      rev = "v1.0.0";
       sha256 = "0zqdl5h4ayi2gi5aqf35f1sjszhbcriksm2bf84fkrg7ngr48jn6";
     };
   }
+
   {
     goPackagePath = "github.com/bep/go-tocss";
     fetch = {
       type = "git";
       url = "https://github.com/bep/go-tocss";
-      rev = "2abb118dc8688b6c7df44e12f4152c2bded9b19c";
+      rev = "v0.5.0";
       sha256 = "12q7h6nydklq4kg65kcgd85209rx7zf64ba6nf3k7y16knj4233q";
     };
   }
+
   {
     goPackagePath = "github.com/chaseadamsio/goorgeous";
     fetch = {
       type = "git";
       url = "https://github.com/chaseadamsio/goorgeous";
-      rev = "dcf1ef873b8987bf12596fe6951c48347986eb2f";
+      rev = "v1.1.0";
       sha256 = "07qdqi46klizq3wigxqbiksnlgbrdc8hvmizgzg0aas5iqy88dcb";
     };
   }
+
   {
     goPackagePath = "github.com/cpuguy83/go-md2man";
     fetch = {
       type = "git";
       url = "https://github.com/cpuguy83/go-md2man";
-      rev = "691ee98543af2f262f35fbb54bdd42f00b9b9cc5";
-      sha256 = "1864g10y9n6ni0p1yqjhvwyjdh0lgxnf7dlb0c4njazdg5rppww9";
+      rev = "v1.0.8";
+      sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2";
     };
   }
+
   {
     goPackagePath = "github.com/danwakefield/fnmatch";
     fetch = {
       type = "git";
       url = "https://github.com/danwakefield/fnmatch";
-      rev = "cbb64ac3d964b81592e64f957ad53df015803288";
+      rev = "cbb64ac3d964";
       sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz";
     };
   }
+
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "v1.1.1";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+
   {
     goPackagePath = "github.com/disintegration/imaging";
     fetch = {
       type = "git";
       url = "https://github.com/disintegration/imaging";
-      rev = "0bd5694c78c9c3d9a3cd06a706a8f3c59296a9ac";
+      rev = "v1.5.0";
       sha256 = "1laxccmzi7q51zxn81ringmdwp8iaipivrl375yc3gq56d70sp0r";
     };
   }
+
   {
     goPackagePath = "github.com/dlclark/regexp2";
     fetch = {
       type = "git";
       url = "https://github.com/dlclark/regexp2";
-      rev = "7632a260cbaf5e7594fc1544a503456ecd0827f1";
-      sha256 = "0vhp5r0ywv9p1c74fm8xzclnwx2mg9f0764b3id7a9nwh0plisx2";
+      rev = "v1.1.6";
+      sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5";
     };
   }
+
   {
     goPackagePath = "github.com/eknkc/amber";
     fetch = {
       type = "git";
       url = "https://github.com/eknkc/amber";
-      rev = "cdade1c073850f4ffc70a829e31235ea6892853b";
+      rev = "cdade1c07385";
       sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9";
     };
   }
+
   {
-    goPackagePath = "github.com/fsnotify/fsnotify";
+    goPackagePath = "github.com/fortytw2/leaktest";
     fetch = {
       type = "git";
-      url = "https://github.com/fsnotify/fsnotify";
-      rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
-      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+      url = "https://github.com/fortytw2/leaktest";
+      rev = "v1.2.0";
+      sha256 = "1lf9l6zgzjbcc7hmcjhhg3blx0y8icyxvjmjqqwfbwdk502803ra";
     };
   }
+
   {
-    goPackagePath = "github.com/gobuffalo/envy";
+    goPackagePath = "github.com/fsnotify/fsnotify";
     fetch = {
       type = "git";
-      url = "https://github.com/gobuffalo/envy";
-      rev = "3c96536452167a705ca5a70b831d3810e1e10452";
-      sha256 = "0ixqpdmb7kjlarkv0qlbwnbr194sajx9flysnhcldzmciqgk5bqs";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev = "v1.4.7";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
     };
   }
+
   {
     goPackagePath = "github.com/gobwas/glob";
     fetch = {
       type = "git";
       url = "https://github.com/gobwas/glob";
-      rev = "f756513aec94125582ee6c0dc94179251ef87370";
-      sha256 = "1pyzlvb950864syf2safazv39s7rpi08r7x2vby82kj9ykqgvhc4";
+      rev = "v0.2.3";
+      sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z";
     };
   }
+
   {
     goPackagePath = "github.com/gorilla/websocket";
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/websocket";
-      rev = "3ff3320c2a1756a3691521efc290b4701575147c";
-      sha256 = "1b0kpix2qxv3qiiq739nk9fjh453if0mcpr9gmlizicdpjp5alw2";
+      rev = "v1.4.0";
+      sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk";
     };
   }
+
   {
     goPackagePath = "github.com/hashicorp/go-immutable-radix";
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-immutable-radix";
-      rev = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf";
-      sha256 = "13nv1dac6i2mjdy8vsd4vwawwja78vggdjcnj1xfykg2k8jbkphv";
+      rev = "v1.0.0";
+      sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/hashicorp/go-uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-uuid";
+      rev = "v1.0.0";
+      sha256 = "1jflywlani7583qm4ysph40hsgx3n66n5zr2k84i057fmwa1ypfy";
     };
   }
+
   {
     goPackagePath = "github.com/hashicorp/golang-lru";
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/golang-lru";
-      rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3";
-      sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2";
+      rev = "v0.5.0";
+      sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
     };
   }
+
   {
     goPackagePath = "github.com/hashicorp/hcl";
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/hcl";
-      rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
-      sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
+      rev = "v1.0.0";
+      sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev = "v1.0.0";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
     };
   }
+
   {
     goPackagePath = "github.com/jdkato/prose";
     fetch = {
       type = "git";
       url = "https://github.com/jdkato/prose";
-      rev = "99216ea17cba4e2f2a4e8bca778643e5a529b7aa";
-      sha256 = "1mdh276lmj21jbi22ky8ngdsl9hfcdv6czshycbaiwjr5y9cv7bn";
+      rev = "v1.1.0";
+      sha256 = "1gjqgrpc7wbqvnhgwyfhxng24qvx37qjy0x2mbikiw1vaygxqsmy";
     };
   }
+
   {
-    goPackagePath = "github.com/joho/godotenv";
+    goPackagePath = "github.com/kr/pretty";
     fetch = {
       type = "git";
-      url = "https://github.com/joho/godotenv";
-      rev = "1709ab122c988931ad53508747b3c061400c2984";
-      sha256 = "1pym5lydb28ggxrz80q9s26bj2bd80ax1igm1zfhyhx9i3060kif";
+      url = "https://github.com/kr/pretty";
+      rev = "v0.1.0";
+      sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
     };
   }
+
+  {
+    goPackagePath = "github.com/kr/pty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pty";
+      rev = "v1.1.1";
+      sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/kr/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/text";
+      rev = "v0.1.0";
+      sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+    };
+  }
+
   {
     goPackagePath = "github.com/kyokomi/emoji";
     fetch = {
       type = "git";
       url = "https://github.com/kyokomi/emoji";
-      rev = "2e9a9507333f3ee28f3fab88c2c3aba34455d734";
+      rev = "v1.5.1";
       sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a";
     };
   }
+
+  {
+    goPackagePath = "github.com/magefile/mage";
+    fetch = {
+      type = "git";
+      url = "https://github.com/magefile/mage";
+      rev = "v1.4.0";
+      sha256 = "177hzmmzhk7bcm3jj2cj6d5l9h5ql3cikvndhk4agkslrhwr3xka";
+    };
+  }
+
   {
     goPackagePath = "github.com/magiconair/properties";
     fetch = {
       type = "git";
       url = "https://github.com/magiconair/properties";
-      rev = "c2353362d570a7bfa228149c62842019201cfb71";
+      rev = "v1.8.0";
       sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
     };
   }
+
   {
     goPackagePath = "github.com/markbates/inflect";
     fetch = {
       type = "git";
       url = "https://github.com/markbates/inflect";
-      rev = "84854b5b4c0dbb0c107480d480a71f7db1fc7dae";
-      sha256 = "0b7shs0mxhkl7v7mwp799n7jgjsdbgi81f5hbaz2b936gbxksw7d";
+      rev = "a12c3aec81a6";
+      sha256 = "0mawr6z9nav4f5j0nmjdxg9lbfhr7wz8zi34g7b6wndmzyf8jbsd";
+    };
+  }
+
+  {
+    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 = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
+      rev = "v0.0.3";
       sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
     };
   }
+
   {
     goPackagePath = "github.com/miekg/mmark";
     fetch = {
       type = "git";
       url = "https://github.com/miekg/mmark";
-      rev = "057eb9e3ae87944c038036d046101dec0c56e21f";
-      sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk";
+      rev = "v1.3.6";
+      sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m";
     };
   }
+
   {
     goPackagePath = "github.com/mitchellh/hashstructure";
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/hashstructure";
-      rev = "2bca23e0e452137f789efbc8610126fd8b94f73b";
-      sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1";
+      rev = "v1.0.0";
+      sha256 = "0zgl5c03ip2yzkb9b7fq9ml08i7j8prgd46ha1fcg8c6r7k9xl3i";
     };
   }
+
   {
     goPackagePath = "github.com/mitchellh/mapstructure";
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/mapstructure";
-      rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac";
-      sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al";
+      rev = "v1.0.0";
+      sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm";
     };
   }
+
   {
     goPackagePath = "github.com/muesli/smartcrop";
     fetch = {
       type = "git";
       url = "https://github.com/muesli/smartcrop";
-      rev = "f6ebaa786a12a0fdb2d7c6dee72808e68c296464";
+      rev = "f6ebaa786a12";
       sha256 = "0xbv5wbn0z36nkw9ay3ly6z23lpsrs0khryl1w54fz85lvwh66gp";
     };
   }
+
+  {
+    goPackagePath = "github.com/nfnt/resize";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nfnt/resize";
+      rev = "83c6a9932646";
+      sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya";
+    };
+  }
+
   {
     goPackagePath = "github.com/nicksnyder/go-i18n";
     fetch = {
       type = "git";
       url = "https://github.com/nicksnyder/go-i18n";
-      rev = "04f547cc50da4c144c5fdfd4495aef143637a236";
-      sha256 = "1h4ndn822k7i04h9k5dxm6c29mhhhqhl63vzpmz2l1k0zpj7xyd1";
+      rev = "v1.10.0";
+      sha256 = "1nlvq85c232z5yjs86pxpmkv7hk6gb5pa6j4hhzgdz85adk2ma04";
     };
   }
+
   {
     goPackagePath = "github.com/olekukonko/tablewriter";
     fetch = {
       type = "git";
       url = "https://github.com/olekukonko/tablewriter";
-      rev = "d4647c9c7a84d847478d890b816b7d8b62b0b279";
+      rev = "d4647c9c7a84";
       sha256 = "1274k5r9ardh1f6gsmadxmdds7zy8rkr55fb9swvnm0vazr3y01l";
     };
   }
+
   {
     goPackagePath = "github.com/pelletier/go-toml";
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-toml";
-      rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602";
-      sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz";
+      rev = "v1.2.0";
+      sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "v0.8.0";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
     };
   }
+
+  {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "v1.0.0";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+
   {
     goPackagePath = "github.com/russross/blackfriday";
     fetch = {
       type = "git";
       url = "https://github.com/russross/blackfriday";
-      rev = "46c73eb196baff5bb07288f245b223bd1a30fba6";
+      rev = "46c73eb196ba";
       sha256 = "01z1jsdkac09cw95lqq4pahkw9xnini2mb956lvb772bby2x3dmj";
     };
   }
+
+  {
+    goPackagePath = "github.com/sanity-io/litter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sanity-io/litter";
+      rev = "v1.1.0";
+      sha256 = "09nywwxxd6rmhxc7rsvs96ynjszmnvmhwr7dvh1n35hb6h9y7s2r";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/sergi/go-diff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sergi/go-diff";
+      rev = "v1.0.0";
+      sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
+    };
+  }
+
   {
     goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
     fetch = {
       type = "git";
       url = "https://github.com/shurcooL/sanitized_anchor_name";
-      rev = "86672fcb3f950f35f2e675df2240550f2a50762f";
+      rev = "86672fcb3f95";
       sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h";
     };
   }
+
   {
     goPackagePath = "github.com/spf13/afero";
     fetch = {
       type = "git";
       url = "https://github.com/spf13/afero";
-      rev = "787d034dfe70e44075ccc060d346146ef53270ad";
-      sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
+      rev = "v1.1.2";
+      sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
     };
   }
+
   {
     goPackagePath = "github.com/spf13/cast";
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cast";
-      rev = "8965335b8c7107321228e3e3702cab9832751bac";
-      sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
+      rev = "v1.3.0";
+      sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
     };
   }
+
   {
     goPackagePath = "github.com/spf13/cobra";
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cobra";
-      rev = "ff0d02e8555041edecbd0ce27f32c6ea4b214483";
-      sha256 = "1ilw6b2nir1bg7hmx8hrn60za37qqm18xvamv90fx5vxq85fsml9";
+      rev = "v0.0.3";
+      sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
     };
   }
+
   {
     goPackagePath = "github.com/spf13/fsync";
     fetch = {
       type = "git";
       url = "https://github.com/spf13/fsync";
-      rev = "12a01e648f05a938100a26858d2d59a120307a18";
+      rev = "12a01e648f05";
       sha256 = "1vvbgxbbsc4mvi1axgqgn9pzjz1p495dsmwpc7mr8qxh8f6s0nhv";
     };
   }
+
   {
     goPackagePath = "github.com/spf13/jwalterweatherman";
     fetch = {
       type = "git";
       url = "https://github.com/spf13/jwalterweatherman";
-      rev = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2";
-      sha256 = "1f9154lijbz0kkgqwmbphykwl4adv4fvkx6n1p7fdq3x5j9g8i17";
+      rev = "4a4406e478ca";
+      sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
     };
   }
+
   {
     goPackagePath = "github.com/spf13/nitro";
     fetch = {
       type = "git";
       url = "https://github.com/spf13/nitro";
-      rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8";
+      rev = "24d7ef30a12d";
       sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib";
     };
   }
+
   {
     goPackagePath = "github.com/spf13/pflag";
     fetch = {
       type = "git";
       url = "https://github.com/spf13/pflag";
-      rev = "947b89bd1b7dabfed991ac30e1a56f5193f0c88b";
-      sha256 = "0n4h5cb07n96fcw9k8dwnj6yisf2x357lsiwjmrq6xr1vkzdlk8c";
+      rev = "v1.0.2";
+      sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2";
     };
   }
+
   {
     goPackagePath = "github.com/spf13/viper";
     fetch = {
       type = "git";
       url = "https://github.com/spf13/viper";
-      rev = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9";
-      sha256 = "177ziws6mwxdlvicmgpv7w7zy5ri2wgnw2f2v3789b5skv9d6a6b";
+      rev = "v1.2.0";
+      sha256 = "0klv7dyllvv9jkyspy4ww5nrz24ngb3adlh884cbdjn7562bhi47";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "f2347ac6c9c9";
+      sha256 = "0ns8zc2n8gpcsd1fdaqbq7a8d939lnaxraqx5nr2fi2zdxqyh7hm";
     };
   }
+
   {
     goPackagePath = "github.com/tdewolff/minify";
     fetch = {
       type = "git";
       url = "https://github.com/tdewolff/minify";
-      rev = "948b6490cf3cacab5f4d7474104c3d21bf6eda46";
-      sha256 = "1js5l0405kbic53qgim0lj3crw7cc2a2sbga35h9qcnm8l3cx22f";
+      rev = "v2.3.5";
+      sha256 = "0x67kgjhc6mfzjhr4xmw0j3qapzhkgwwahvv5b44rb449ml2qx5m";
     };
   }
+
   {
     goPackagePath = "github.com/tdewolff/parse";
     fetch = {
       type = "git";
       url = "https://github.com/tdewolff/parse";
-      rev = "dd9676af8dd934a61082c5b3038e79626847fa32";
-      sha256 = "1hp9qh8knx3q57aw5qavsf7ia3mxm8ka0bk6kjkqkqq8k9jq97qk";
+      rev = "v2.3.3";
+      sha256 = "190y2jykp8qyp6y58ky1v1fvmaqjnrsr1ksbqrrspf1gpjy69i94";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/tdewolff/test";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tdewolff/test";
+      rev = "265427085153";
+      sha256 = "1h0cmsjjia92w50dzr06c5h10zd5c7snhpixqjv94wbl7dv80yp0";
     };
   }
+
   {
     goPackagePath = "github.com/wellington/go-libsass";
     fetch = {
       type = "git";
       url = "https://github.com/wellington/go-libsass";
-      rev = "615eaa47ef794d037c1906a0eb7bf85375a5decf";
+      rev = "615eaa47ef79";
       sha256 = "0imjiskn4vq7nml5jwb1scgl61jg53cfpkjnb9rsc6m8gsd8s16s";
     };
   }
+
   {
     goPackagePath = "github.com/yosssi/ace";
     fetch = {
       type = "git";
       url = "https://github.com/yosssi/ace";
-      rev = "2b21b56204aee785bf8d500c3f9dcbe3ed7d4515";
-      sha256 = "0cgpq1zdnh8l8zsn9w63asc9k7cm6k4qvjgrb4hr1106h8fjwfma";
+      rev = "v0.0.5";
+      sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f";
     };
   }
+
   {
     goPackagePath = "golang.org/x/image";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/image";
-      rev = "c73c2afc3b812cdd6385de5a50616511c4a3d458";
+      rev = "c73c2afc3b81";
       sha256 = "1kkafy29vz5xf6r29ghbvvbwrgjxwxvzk6dsa2qhyp1ddk6l2vkz";
     };
   }
+
   {
     goPackagePath = "golang.org/x/net";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "922f4815f713f213882e8ef45e0d315b164d705c";
-      sha256 = "1ci1rxk2d6hmfsjjc19n2sxhyn4jqr5ia3ykyah1h08p0pn7k52w";
+      rev = "161cd47e91fd";
+      sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv";
     };
   }
+
   {
     goPackagePath = "golang.org/x/sync";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sync";
-      rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+      rev = "1d60e4601c6f";
       sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
     };
   }
+
   {
     goPackagePath = "golang.org/x/sys";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "4ea2f632f6e912459fe60b26b1749377f0d889d5";
-      sha256 = "16pdi4mmjlcrjdcz7k559jqnsvkhdmff68bbqq7ii1lp8vrpqqmy";
+      rev = "d0be0721c37e";
+      sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12";
     };
   }
+
   {
     goPackagePath = "golang.org/x/text";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "6e3c4e7365ddcc329f090f96e4348398f6310088";
-      sha256 = "1r511ncipn7sdlssn06fpzcpy4mp4spagni4ryxq86p2b0bi8pn4";
+      rev = "v0.3.0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+
+  {
+    goPackagePath = "gopkg.in/check.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/check.v1";
+      rev = "788fd7840127";
+      sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
     };
   }
+
   {
     goPackagePath = "gopkg.in/yaml.v2";
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      rev = "v2.2.1";
       sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
     };
   }
-- 
GitLab


From c49aa0d0dfb223675ca956f01747d97bdfb37005 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 24 Oct 2018 23:31:17 +0100
Subject: [PATCH 0604/1065] bb: add Darwin compatibility

It even has working sound, unlike on Linux!
---
 pkgs/applications/misc/bb/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix
index 0689843af61..f085e4bd7dd 100644
--- a/pkgs/applications/misc/bb/default.nix
+++ b/pkgs/applications/misc/bb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, aalib, ncurses, xorg, libmikmod }:
+{ stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }:
 
 stdenv.mkDerivation rec {
   name    = "bb-${version}";
@@ -12,13 +12,17 @@ stdenv.mkDerivation rec {
   buildInputs = [
     aalib ncurses libmikmod
     xorg.libXau xorg.libXdmcp xorg.libX11
-  ];
+  ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudio;
 
-  meta = with stdenv.lib; {
+  postPatch = lib.optionalString stdenv.isDarwin ''
+    sed -i -e '/^#include <malloc.h>$/d' *.c
+  '';
+
+  meta = with lib; {
     homepage    = http://aa-project.sourceforge.net/bb;
     description = "AA-lib demo";
     license     = licenses.gpl2;
     maintainers = [ maintainers.rnhmjoj ];
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
   };
 }
-- 
GitLab


From c20c4be0475ad06596831f5538dd4f1959122e96 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@users.noreply.github.com>
Date: Mon, 29 Oct 2018 11:56:56 +0100
Subject: [PATCH 0605/1065] gron: 0.5.2 -> 0.6.0 (#49282)

---
 pkgs/development/tools/gron/default.nix |  4 ++--
 pkgs/development/tools/gron/deps.nix    | 26 +++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix
index 14c8f53a394..ebe76197ef4 100644
--- a/pkgs/development/tools/gron/default.nix
+++ b/pkgs/development/tools/gron/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "gron-${version}";
-  version = "0.5.2";
+  version = "0.6.0";
 
   owner = "tomnomnom";
   repo = "gron";
@@ -11,7 +11,7 @@ buildGoPackage rec {
   src = fetchFromGitHub {
     inherit owner repo;
     rev = "v${version}";
-    sha256 = "0nxcvih8n5a4f0a53dxaipab5ckqxgnsznzymhfw5kv4inr9v6j6";
+    sha256 = "05f3w4zr15wd7xk75l12y5kip4gnv719a2x9w2hy23q3pnss9wk0";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/gron/deps.nix b/pkgs/development/tools/gron/deps.nix
index c5b1feb888a..effc255d877 100644
--- a/pkgs/development/tools/gron/deps.nix
+++ b/pkgs/development/tools/gron/deps.nix
@@ -6,8 +6,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/${owner}/${repo}";
-      rev = "v1.6.0";
-      sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7";
+      rev = "v1.7.0";
+      sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
     };
   }
   rec {
@@ -32,4 +32,26 @@
       sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
     };
   }
+  rec {
+    owner = "mattn";
+    repo = "go-colorable";
+    goPackagePath = "github.com/${owner}/${repo}";
+    fetch = {
+      type = "git";
+      url = "https://github.com/${owner}/${repo}";
+      rev = "v0.0.9";
+      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+    };
+  }
+  rec {
+    owner = "mattn";
+    repo = "go-isatty";
+    goPackagePath = "github.com/${owner}/${repo}";
+    fetch = {
+      type = "git";
+      url = "https://github.com/${owner}/${repo}";
+      rev = "v0.0.4";
+      sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+    };
+  }
 ]
-- 
GitLab


From b489c57f35905c309217b46adcb5e8747e6b1fb8 Mon Sep 17 00:00:00 2001
From: xzfc <xzfc@users.noreply.github.com>
Date: Mon, 29 Oct 2018 18:00:34 +0700
Subject: [PATCH 0606/1065] ahoviewer: 1.5.0 -> 1.6.4 (#49307)

---
 pkgs/applications/graphics/ahoviewer/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 53264580380..52df41c683c 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -8,13 +8,13 @@ assert useUnrar -> unrar != null;
 
 stdenv.mkDerivation rec {
   name = "ahoviewer-${version}";
-  version = "1.5.0";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "ahodesuka";
     repo = "ahoviewer";
     rev = version;
-    sha256 = "1adzxp30fwh41y339ha8i5qp89zf21dw18vcicqqnzvyxbk5r3ig";
+    sha256 = "144jmk8w7dnmqy4w81b3kzama7i97chx16pgax2facn72a92921q";
   };
 
   enableParallelBuilding = true;
@@ -29,11 +29,6 @@ stdenv.mkDerivation rec {
     gst_all_1.gst-plugins-base
   ] ++ stdenv.lib.optional useUnrar unrar;
 
-  # https://github.com/ahodesuka/ahoviewer/issues/60
-  # Already fixed in the master branch
-  # TODO: remove this next release
-  makeFlags = [ ''LIBS=-lssl -lcrypto'' ];
-
   postPatch = ''patchShebangs version.sh'';
 
   postInstall = ''
-- 
GitLab


From cfd3db5c6634e7ab189ee6a47dd8d78419889cc3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 29 Oct 2018 04:04:29 -0700
Subject: [PATCH 0607/1065] python36Packages.flask_migrate: 2.2.1 -> 2.3.0
 (#49020)

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-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 89cbdf0fbf8..1f9177832c3 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.2.1";
+  version = "2.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cd1b4e6cb829eeb41c02ad9202d83bef5f4b7a036dd9fad72ce96ad1e22efb07";
+    sha256 = "19rxhva9i5n643vm3d11f8p98jwai2pavysa217p5w5h5cnksnx2";
   };
 
   checkInputs = optional isPy3k glibcLocales;
-- 
GitLab


From 188ce907e3933c7f079aff7b5cca4b3e46cc0a35 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 29 Oct 2018 04:11:16 -0700
Subject: [PATCH 0608/1065] python27Packages.gipc: 0.5.0 -> 0.6.0 (#49005)

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-gipc/versions
---
 pkgs/development/python-modules/gipc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix
index 9780b46fa5a..4b174468a7a 100644
--- a/pkgs/development/python-modules/gipc/default.nix
+++ b/pkgs/development/python-modules/gipc/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "gipc";
-  version = "0.5.0";
+  version = "0.6.0";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "08c35xzv7nr12d9xwlywlbyzzz2igy0yy6y52q2nrkmh5d4slbpc";
+    sha256 = "0pd9by719qh882hqs6xpby61sn1x5h98hms5p2p8yqnycrf1s0h2";
   };
 
   propagatedBuildInputs = [ gevent ];
-- 
GitLab


From a57bbf4e6319ca5c9a22968fc74845d29d3c6f80 Mon Sep 17 00:00:00 2001
From: Pavel Goran <me@pvgoran.name>
Date: Mon, 29 Oct 2018 18:26:22 +0700
Subject: [PATCH 0609/1065] nixos/tomcat: add purifyOnStart option

With this option enabled, before creating file/directories/symlinks in baseDir
according to configuration, old occurences of them are removed.

This prevents remainders of an old configuration (libraries, webapps, you name
it) from persisting after activating a new configuration.
---
 nixos/modules/services/web-servers/tomcat.nix | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index be54e9255c7..68261c50324 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -31,10 +31,26 @@ in
         '';
       };
 
+      purifyOnStart = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          On startup, the `baseDir` directory is populated with various files,
+          subdirectories and symlinks. If this option is enabled, these items
+          (except for the `logs` and `work` subdirectories) are first removed.
+          This prevents interference from remainders of an old configuration
+          (libraries, webapps, etc.), so it's recommended to enable this option.
+        '';
+      };
+
       baseDir = mkOption {
         type = lib.types.path;
         default = "/var/tomcat";
-        description = "Location where Tomcat stores configuration files, webapplications and logfiles";
+        description = ''
+          Location where Tomcat stores configuration files, web applications
+          and logfiles. Note that it is partially cleared on each service startup
+          if `purifyOnStart` is enabled.
+        '';
       };
 
       logDirs = mkOption {
@@ -197,6 +213,15 @@ in
       after = [ "network.target" ];
 
       preStart = ''
+        ${lib.optionalString cfg.purifyOnStart ''
+          # Delete most directories/symlinks we create from the existing base directory,
+          # to get rid of remainders of an old configuration.
+          # The list of directories to delete is taken from the "mkdir" command below,
+          # excluding "logs" (because logs are valuable) and "work" (because normally
+          # session files are there), and additionally including "bin".
+          rm -rf ${cfg.baseDir}/{conf,virtualhosts,temp,lib,shared/lib,webapps,bin}
+        ''}
+
         # Create the base directory
         mkdir -p \
           ${cfg.baseDir}/{conf,virtualhosts,logs,temp,lib,shared/lib,webapps,work}
-- 
GitLab


From 1288766e617feed61ba9b6d31b44956d9671302b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 29 Oct 2018 04:28:15 -0700
Subject: [PATCH 0610/1065] python36Packages.foolscap: 0.12.6 -> 0.13.1
 (#49012)

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-foolscap/versions
---
 pkgs/development/python-modules/foolscap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix
index 94b90a25d13..8680ff2d2aa 100644
--- a/pkgs/development/python-modules/foolscap/default.nix
+++ b/pkgs/development/python-modules/foolscap/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "foolscap";
-  version = "0.12.6";
+  version = "0.13.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bpmqq6485mmr5jza9q2c55l9m1bfsvsbd9drsip7p5qcsi22jrz";
+    sha256 = "0sqxp4fshnpcv69c2j04v8c22pjak28iwscxv998h2s3054knxz2";
   };
 
   propagatedBuildInputs = [ mock twisted pyopenssl service-identity ];
-- 
GitLab


From 99aff820e72beeb93e0e983eb87cde9259a5056a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 29 Oct 2018 04:30:22 -0700
Subject: [PATCH 0611/1065] python27Packages.gevent-websocket: 0.9.3 -> 0.10.1
 (#49010)

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-gevent-websocket/versions
---
 pkgs/development/python-modules/gevent-websocket/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix
index 28dab3a257f..78986ec7d30 100644
--- a/pkgs/development/python-modules/gevent-websocket/default.nix
+++ b/pkgs/development/python-modules/gevent-websocket/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "gevent-websocket";
-  version = "0.9.3";
+  version = "0.10.1";
   # SyntaxError in tests.
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07rqwfpbv13mk6gg8mf0bmvcf6siyffjpgai1xd8ky7r801j4xb4";
+    sha256 = "1c2zv2rahp1gil3cj66hfsqgy0n35hz9fny3ywhr2319d0lz7bky";
   };
 
   propagatedBuildInputs = [ gevent ];
-- 
GitLab


From 9a03df974ccf61a7b0efc12e29d5f222612dd533 Mon Sep 17 00:00:00 2001
From: Ben Pye <ben@curlybracket.co.uk>
Date: Sun, 28 Oct 2018 02:18:11 +0000
Subject: [PATCH 0612/1065] miniflux: init at 2.0.12

---
 pkgs/servers/miniflux/default.nix |  38 ++++++++
 pkgs/servers/miniflux/deps.nix    | 153 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |   2 +
 3 files changed, 193 insertions(+)
 create mode 100644 pkgs/servers/miniflux/default.nix
 create mode 100644 pkgs/servers/miniflux/deps.nix

diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix
new file mode 100644
index 00000000000..80fb5575e4d
--- /dev/null
+++ b/pkgs/servers/miniflux/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, buildGoPackage
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  name = "miniflux-${version}";
+  version = "2.0.12";
+
+  goPackagePath = "miniflux.app";
+
+  src = fetchFromGitHub {
+    owner = "miniflux";
+    repo = "miniflux";
+    rev = "refs/tags/${version}";
+    sha256 = "13d1dwcwig7b5phymgxqm227k5l3zzzvx997cywarbl953ji2y1d";
+  };
+    
+  goDeps = ./deps.nix;
+
+  doCheck = true;
+
+  buildFlagsArray = ''
+    -ldflags=-X ${goPackagePath}/version.Version=${version}
+  '';
+
+  postInstall = ''
+    mv $bin/bin/miniflux.app $bin/bin/miniflux
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Miniflux is a minimalist and opinionated feed reader.";
+    homepage = https://miniflux.app/;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benpye ];
+  };
+}
+
diff --git a/pkgs/servers/miniflux/deps.nix b/pkgs/servers/miniflux/deps.nix
new file mode 100644
index 00000000000..4ef30bec3b8
--- /dev/null
+++ b/pkgs/servers/miniflux/deps.nix
@@ -0,0 +1,153 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+
+  {
+    goPackagePath = "github.com/PuerkitoBio/goquery";
+    fetch = {
+      type = "git";
+      url = "https://github.com/PuerkitoBio/goquery";
+      rev = "v1.4.1";
+      sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/andybalholm/cascadia";
+    fetch = {
+      type = "git";
+      url = "https://github.com/andybalholm/cascadia";
+      rev = "v1.0.0";
+      sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "v1.1.0";
+      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/gorilla/context";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/context";
+      rev = "v1.1.1";
+      sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/gorilla/mux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/mux";
+      rev = "v1.6.2";
+      sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/lib/pq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lib/pq";
+      rev = "v1.0.0";
+      sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/tdewolff/minify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tdewolff/minify";
+      rev = "v2.3.5";
+      sha256 = "0x67kgjhc6mfzjhr4xmw0j3qapzhkgwwahvv5b44rb449ml2qx5m";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/tdewolff/parse";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tdewolff/parse";
+      rev = "v2.3.3";
+      sha256 = "190y2jykp8qyp6y58ky1v1fvmaqjnrsr1ksbqrrspf1gpjy69i94";
+    };
+  }
+
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "614d502a4dac";
+      sha256 = "1rcyvsl8b8pk7h8lwl0fpiflrx8zs121wi5490ln0qnvkk8d4bwy";
+    };
+  }
+
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "8a410e7b638d";
+      sha256 = "0hp0l8f6fir5gmgrjq0mhh5ikc0rlrm72774228800kfwqjrxxny";
+    };
+  }
+
+  {
+    goPackagePath = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev = "d2e6202438be";
+      sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7";
+    };
+  }
+
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "1d60e4601c6f";
+      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+    };
+  }
+
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "4910a1d54f87";
+      sha256 = "0p2pp6mny34gjcvylx3ddzdaxn7hv008hppsr11w1bvyzj7s27by";
+    };
+  }
+
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "v0.3.0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+
+  {
+    goPackagePath = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev = "v1.1.0";
+      sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06ea1afb21d..8afe2d67e0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13537,6 +13537,8 @@ with pkgs;
 
   mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
 
+  miniflux = callPackage ../servers/miniflux { };
+
   nagios = callPackage ../servers/monitoring/nagios { };
 
   munin = callPackage ../servers/monitoring/munin { };
-- 
GitLab


From b79dc80b2f57db784589deb773feb097f14b2e3a Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Mon, 29 Oct 2018 05:23:42 -0700
Subject: [PATCH 0613/1065] ffmpeg: enable libdrm

---
 pkgs/development/libraries/ffmpeg/generic.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 7c3b3447d61..d11ef732a01 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
 , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
-, libssh, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr
+, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
 , x264, x265, xvidcore, zlib, libopus, speex
 , openglSupport ? false, libGLU_combined ? null
 # Build options
@@ -130,6 +130,7 @@ stdenv.mkDerivation rec {
       "--enable-libtheora"
       (ifMinVer "2.1" "--enable-libssh")
       (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
+      (ifMinVer "3.4" (enableFeature vaapiSupport "libdrm"))
       "--enable-vdpau"
       "--enable-libvorbis"
       (ifMinVer "0.6" (enableFeature vpxSupport "libvpx"))
@@ -165,6 +166,7 @@ stdenv.mkDerivation rec {
     ++ optional vpxSupport libvpx
     ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM
     ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva
+    ++ optional ((isLinux || isFreeBSD) && !isAarch32) libdrm
     ++ optional isLinux alsaLib
     ++ optionals isDarwin darwinFrameworks
     ++ optional vdpauSupport libvdpau
-- 
GitLab


From 5adfcb951a1243aa777e1371ef2cb6a03be46ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urban=20=C5=A0kudnik?= <urban.skudnik@gmail.com>
Date: Mon, 29 Oct 2018 13:24:24 +0100
Subject: [PATCH 0614/1065] pythonPackages.aioprocessing: init at 1.0.1
 (#49170)

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

diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix
new file mode 100644
index 00000000000..f2f95911268
--- /dev/null
+++ b/pkgs/development/python-modules/aioprocessing/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonAtLeast
+}:
+
+buildPythonPackage rec {
+  pname = "aioprocessing";
+  version = "1.0.1";
+  disabled = !(pythonAtLeast "3.4");
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1yq1gfsky2kjimwdmzqk893sp6387vbl4bw0sbha5hl6cm3jp5dn";
+  };
+
+  # Tests aren't included in pypi package
+  doCheck = false;
+
+  meta = {
+    description = "A library that integrates the multiprocessing module with asyncio";
+    homepage = https://github.com/dano/aioprocessing;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ uskudnik ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c6c59eb31e9..043d20d0482 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -708,6 +708,8 @@ in {
 
   aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };
 
+  aioprocessing = callPackage ../development/python-modules/aioprocessing { };
+
   ajpy = callPackage ../development/python-modules/ajpy { };
 
   alabaster = callPackage ../development/python-modules/alabaster {};
-- 
GitLab


From a586c14cc436b01673af2738b702dbcea18fc123 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 26 Oct 2018 13:58:18 +0000
Subject: [PATCH 0615/1065] python3Packages.priority: init at 1.3.0

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

diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix
new file mode 100644
index 00000000000..90b58b665de
--- /dev/null
+++ b/pkgs/development/python-modules/priority/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, pytest, hypothesis }:
+
+buildPythonPackage rec {
+  pname = "priority";
+  version = "1.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1gpzn9k9zgks0iw5wdmad9b4dry8haiz2sbp6gycpjkzdld9dhbb";
+  };
+
+  checkInputs = [ pytest hypothesis ];
+  checkPhase = ''
+    PYTHONPATH="src:$PYTHONPATH" pytest
+  '';
+
+  meta = with lib; {
+    homepage = https://python-hyper.org/priority/;
+    description = "A pure-Python implementation of the HTTP/2 priority tree";
+    license = licenses.mit;
+    maintainers = [ maintainers.qyliss ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 043d20d0482..e732eb38bb3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1856,6 +1856,8 @@ in {
 
   poyo = callPackage ../development/python-modules/poyo { };
 
+  priority = callPackage ../development/python-modules/priority { };
+
   prov = callPackage ../development/python-modules/prov { };
 
   pudb = callPackage ../development/python-modules/pudb { };
-- 
GitLab


From 6017fdfe919e325b5ebd823a53112ce2c92d557a 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 13:30:06 +0100
Subject: [PATCH 0616/1065] nixos/tests/home-assistant: no longer ignore "Timer
 got out of sync" error

That error message was removed in https://github.com/home-assistant/home-assistant/pull/17398.
---
 nixos/tests/home-assistant.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 2d74b59bca4..0b3da0d59c6 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -74,7 +74,6 @@ in {
     print "$log\n";
 
     # Check that no errors were logged
-    # The timer can get out of sync due to Hydra's load, so this error is ignored
-    $hass->fail("cat ${configDir}/home-assistant.log | grep -vF 'Timer got out of sync' | grep -qF ERROR");
+    $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR");
   '';
 })
-- 
GitLab


From e9871745a13e7bfc819c592b875167a286701aeb 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 13:39:37 +0100
Subject: [PATCH 0617/1065] home-assistant: 0.81.0 -> 0.81.1

---
 pkgs/servers/home-assistant/component-packages.nix | 10 +++++-----
 pkgs/servers/home-assistant/default.nix            |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 6ad3facc071..611fabc4301 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.81.0";
+  version = "0.81.1";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
@@ -322,13 +322,14 @@
     "device_tracker" = ps: with ps; [  ];
     "device_tracker.actiontec" = ps: with ps; [  ];
     "device_tracker.aruba" = ps: with ps; [ pexpect ];
-    "device_tracker.asuswrt" = ps: with ps; [ pexpect ];
+    "device_tracker.asuswrt" = ps: with ps; [  ];
     "device_tracker.automatic" = ps: with ps; [ aiohttp-cors ];
     "device_tracker.bbox" = ps: with ps; [  ];
     "device_tracker.bluetooth_le_tracker" = ps: with ps; [  ];
     "device_tracker.bluetooth_tracker" = ps: with ps; [  ];
     "device_tracker.bmw_connected_drive" = ps: with ps; [  ];
     "device_tracker.bt_home_hub_5" = ps: with ps; [  ];
+    "device_tracker.bt_smarthub" = ps: with ps; [  ];
     "device_tracker.cisco_ios" = ps: with ps; [ pexpect ];
     "device_tracker.ddwrt" = ps: with ps; [  ];
     "device_tracker.demo" = ps: with ps; [  ];
@@ -1096,7 +1097,7 @@
     "sensor.twitch" = ps: with ps; [  ];
     "sensor.uber" = ps: with ps; [  ];
     "sensor.uk_transport" = ps: with ps; [  ];
-    "sensor.upnp" = ps: with ps; [ aiohttp-cors ];
+    "sensor.upnp" = ps: with ps; [  ];
     "sensor.ups" = ps: with ps; [  ];
     "sensor.uptime" = ps: with ps; [  ];
     "sensor.uscis" = ps: with ps; [  ];
@@ -1124,7 +1125,6 @@
     "sensor.xbox_live" = ps: with ps; [  ];
     "sensor.xiaomi_aqara" = ps: with ps; [  ];
     "sensor.xiaomi_miio" = ps: with ps; [ construct ];
-    "sensor.yahoo_finance" = ps: with ps; [  ];
     "sensor.yr" = ps: with ps; [ xmltodict ];
     "sensor.yweather" = ps: with ps; [ yahooweather ];
     "sensor.zabbix" = ps: with ps; [  ];
@@ -1298,7 +1298,7 @@
     "unifi.errors" = ps: with ps; [  ];
     "upcloud" = ps: with ps; [  ];
     "updater" = ps: with ps; [ distro ];
-    "upnp" = ps: with ps; [ aiohttp-cors ];
+    "upnp" = ps: with ps; [  ];
     "upnp.config_flow" = ps: with ps; [  ];
     "upnp.const" = ps: with ps; [  ];
     "upnp.device" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 48ad27c9619..b3d32ef2ed7 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -79,7 +79,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.81.0";
+  hassVersion = "0.81.1";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -94,7 +94,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "05cdx2pax7vx0v7arnciqrq38k2xyiv7iagxd3qs5m6gra72qlqw";
+    sha256 = "0z686fpcv9xy4dwcphx5npwvvw8gibcqjp6s898dbhscldg0ffmh";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 69931e1eeee1d64dcd623517b63104b85da8f697 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 13:44:00 +0100
Subject: [PATCH 0618/1065] python3.pkgs.netdisco: 2.0.0 -> 2.2.0

---
 .../python-modules/netdisco/default.nix            | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix
index 1e404370284..036d6f9dea7 100644
--- a/pkgs/development/python-modules/netdisco/default.nix
+++ b/pkgs/development/python-modules/netdisco/default.nix
@@ -1,17 +1,14 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, requests, zeroconf, netifaces, pytest }:
+{ stdenv, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }:
 
 buildPythonPackage rec {
   pname = "netdisco";
-  version = "2.0.0";
+  version = "2.2.0";
 
   disabled = !isPy3k;
 
-  # PyPI is missing tests/ directory
-  src = fetchFromGitHub {
-    owner = "home-assistant";
-    repo = pname;
-    rev = version;
-    sha256 = "08x5ab7v6a20753y9br7pvfm6a054ywn7y7gh6fydqski0gad6l7";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b5e810721a266660f7f90fc43f12c4635ec95c3db87d9e30ca408bb922cb1007";
   };
 
   propagatedBuildInputs = [ requests zeroconf netifaces ];
@@ -26,7 +23,6 @@ buildPythonPackage rec {
     description = "Python library to scan local network for services and devices";
     homepage = https://github.com/home-assistant/netdisco;
     license = licenses.asl20;
-    platforms = platforms.unix;
     maintainers = with maintainers; [ dotlambda ];
   };
 }
-- 
GitLab


From 15af3177d88d765d65bf091980427276a3b43ded Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 29 Oct 2018 05:59:34 -0700
Subject: [PATCH 0619/1065] python36Packages.pycares: 1.0.0 -> 2.3.0 (#48983)

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-pycares/versions
---
 pkgs/development/python-modules/pycares/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix
index bf863fae57b..4755bf908fd 100644
--- a/pkgs/development/python-modules/pycares/default.nix
+++ b/pkgs/development/python-modules/pycares/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pycares";
-  version = "1.0.0";
+  version = "2.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a18341ea030e2cc0743acdf4aa72302bdf6b820938b36ce4bd76e43faa2276a3";
+    sha256 = "0h4fxw5drrhfyslzmfpljk0qnnpbhhb20hnnndzahhbwylyw1x1n";
   };
 
   propagatedBuildInputs = [ pkgs.c-ares ];
-- 
GitLab


From a8973bb75a64b77bca055d5049e6959e77a4e973 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 28 Oct 2018 16:38:32 -0500
Subject: [PATCH 0620/1065] fd: 7.1.0 -> 7.2.0

---
 pkgs/tools/misc/fd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 48ca8ad65c7..75c7897ac84 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "fd-${version}";
-  version = "7.1.0";
+  version = "7.2.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "fd";
     rev = "v${version}";
-    sha256 = "11x9zqhahgyf0icfnl8xzdb2mn35jrmvxmnz5xzh581mmhs355m2";
+    sha256 = "1h7ar1m7w3vmakg9rp1nfmz7q5pqwvd8yyxwj335ixb49gph1zi5";
   };
 
-  cargoSha256 = "02r0lvfh37y1bij0fqmgyh8rywap714zvxrk0l108y8cqkq2ghnd";
+  cargoSha256 = "0y6xp7fdjfmjfqf9avbq9bdvzvwkf3v1dv7a4k03w5279vxafzi4";
 
   preFixup = ''
     mkdir -p "$out/man/man1"
-- 
GitLab


From e8df5045cac40f9919e7b14d356308ace53a947e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 29 Oct 2018 06:00:17 -0700
Subject: [PATCH 0621/1065] python36Packages.mail-parser: 3.3.1 -> 3.4.1
 (#48974)

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-mail-parser/versions
---
 pkgs/development/python-modules/mail-parser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix
index e05dc3f2861..da74830f879 100644
--- a/pkgs/development/python-modules/mail-parser/default.nix
+++ b/pkgs/development/python-modules/mail-parser/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "mail-parser";
-  version = "3.3.1";
+  version = "3.4.1";
 
   # no tests in PyPI tarball
   src = fetchFromGitHub {
     owner = "SpamScope";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1b1v61zwgdx2xjzds3hp6bv53yq424hhlrhf445n4faj1l0c4lkg";
+    sha256 = "0nxilshq4gwpicdklja9p275yf8l5kr1lk620c3cx9w4qai4cmbv";
   };
 
   LC_ALL = "en_US.utf-8";
-- 
GitLab


From fdf626944c8ebf4d607aa43177aa47158922baf3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 26 Oct 2018 22:57:46 -0500
Subject: [PATCH 0622/1065] xapian: 1.4.7 -> 1.4.8, drop included patch

---
 pkgs/development/libraries/xapian/default.nix |  9 +-----
 .../xapian/fix-notmuch-tagging.patch          | 31 -------------------
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pkgs/development/libraries/xapian/fix-notmuch-tagging.patch

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index f93f7ed8746..7b92c1c66cd 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -11,13 +11,6 @@ let
       inherit sha256;
     };
 
-    patches = stdenv.lib.optional (version == "1.4.7") [
-      # fix notmuch build, see https://notmuchmail.org/faq/#index12h2
-      # cannot fetchpatch this because base directory differs
-      # TODO: remove on next xapian update
-      ./fix-notmuch-tagging.patch
-    ];
-
     outputs = [ "out" "man" "doc" ];
 
     buildInputs = [ libuuid zlib ];
@@ -43,5 +36,5 @@ let
 in {
   # xapian-ruby needs 1.2.22 as of 2017-05-06
   xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
-  xapian_1_4 = generic "1.4.7" "1lxmlds3v5s1gng9nk1rvmln1zcksrw5ds509y0glylwch5qmw0k";
+  xapian_1_4 = generic "1.4.8" "0528841hn5lddaa317ax3i3d01zf1izpzh4njiz6s84mxpn06q6s";
 }
diff --git a/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch b/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch
deleted file mode 100644
index 6deae76d2aa..00000000000
--- a/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f9e6f45b1c8f66bca8a3387f371b20d434b23a7d Mon Sep 17 00:00:00 2001
-From: Olly Betts <olly@survex.com>
-Date: Thu, 26 Jul 2018 17:26:52 +1200
-Subject: [PATCH 1/1] Revert "Enable open_nearby_postlist for writable
- databases"
-
-The amended check isn't conservative enough as there may be postlist
-changes in the inverter while the table is unmodified.  This breaks
-testcase T150-tagging.sh in notmuch's testsuite, reported by David
-Bremner.
-
-This reverts commit 5489fb2f838c0f0b0a593b4c17df282a93a1fe5a.
----
- xapian-core/backends/glass/glass_postlist.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xapian-core/backends/glass/glass_postlist.cc b/xapian-core/backends/glass/glass_postlist.cc
-index 80e578b85..a47f14a68 100644
---- a/backends/glass/glass_postlist.cc
-+++ b/backends/glass/glass_postlist.cc
-@@ -759,7 +759,7 @@ GlassPostList::open_nearby_postlist(const std::string & term_,
-     (void)need_pos;
-     if (term_.empty())
- 	RETURN(NULL);
--    if (!this_db.get() || this_db->postlist_table.is_modified())
-+    if (!this_db.get() || this_db->postlist_table.is_writable())
- 	RETURN(NULL);
-     RETURN(new GlassPostList(this_db, term_, cursor->clone()));
- }
--- 
-2.11.0
-- 
GitLab


From 2e76bf06d8940ac6bf5490b81f9cc654b913679c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 13 Sep 2018 07:04:54 -0500
Subject: [PATCH 0623/1065] upower: 0.99.7 -> 0.99.8

(cherry picked from commit 67ac9c649ffc036c49006191c64555eae2e6012f)
---
 pkgs/os-specific/linux/upower/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 629f61bf5b1..9525c4d9c15 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "upower-0.99.7";
+  name = "upower-0.99.8";
 
   src = fetchurl {
-    url = "https://upower.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "00d4830yvg84brdhz4kn60lr3r8rn2y8gdbhmhxm78i5mgvc5g14";
+    url = https://gitlab.freedesktop.org/upower/upower/uploads/9125ab7ee96fdc4ecc68cfefb50c1cab/upower-0.99.8.tar.xz;
+    sha256 = "00lzr0vyxz5lvmgya48gdb2cdgmfdim4b34jlfdyqakk1i9sl8xv";
   };
 
   buildInputs =
-- 
GitLab


From b5bac7d8a8c155a7b1fe1f3868fd876125e02086 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 25 Oct 2018 13:52:46 -0500
Subject: [PATCH 0624/1065] upower: 0.99.8 -> 0.99.9

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

diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 9525c4d9c15..6c6e411000a 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "upower-0.99.8";
+  name = "upower-0.99.9";
 
   src = fetchurl {
-    url = https://gitlab.freedesktop.org/upower/upower/uploads/9125ab7ee96fdc4ecc68cfefb50c1cab/upower-0.99.8.tar.xz;
-    sha256 = "00lzr0vyxz5lvmgya48gdb2cdgmfdim4b34jlfdyqakk1i9sl8xv";
+    url = https://gitlab.freedesktop.org/upower/upower/uploads/2282c7c0e53fb31816b824c9d1f547e8/upower-0.99.9.tar.xz;
+    sha256 = "046ix7j7hmb7ycv8v54668kjsrgjhzwxn299c1d87vdnkd38kfh1";
   };
 
   buildInputs =
-- 
GitLab


From d7e4c49ffc4c3879bc2edb287f0758c17b0e00e3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 12 Oct 2018 16:41:53 -0500
Subject: [PATCH 0625/1065] nixos/upower: lockdown service using upstream
 settings

---
 nixos/modules/services/hardware/upower.nix | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix
index 2198842a451..1da47349c07 100644
--- a/nixos/modules/services/hardware/upower.nix
+++ b/nixos/modules/services/hardware/upower.nix
@@ -56,6 +56,32 @@ in
           { Type = "dbus";
             BusName = "org.freedesktop.UPower";
             ExecStart = "@${cfg.package}/libexec/upowerd upowerd";
+            Restart = "on-failure";
+            # Upstream lockdown:
+            # Filesystem lockdown
+            ProtectSystem = "strict";
+            # Needed by keyboard backlight support
+            ProtectKernelTunables = false;
+            ProtectControlGroups = true;
+            ReadWritePaths = "/var/lib/upower";
+            ProtectHome = true;
+            PrivateTmp = true;
+
+            # Network
+            # PrivateNetwork=true would block udev's netlink socket
+            RestrictAddressFamilies = "AF_UNIX AF_NETLINK";
+
+            # Execute Mappings
+            MemoryDenyWriteExecute = true;
+
+            # Modules
+            ProtectKernelModules = true;
+
+            # Real-time
+            RestrictRealtime = true;
+
+            # Privilege escalation
+            NoNewPrivileges = true;
           };
       };
 
-- 
GitLab


From 65b4c9b3d4ae831463dc252f9f75b70a220fbe33 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:15:45 +0100
Subject: [PATCH 0626/1065] python.pkgs.python-packer: remove dependency
 pinning

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

diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix
index 3f0c1f8138f..ff3d28b4746 100644
--- a/pkgs/development/python-modules/python-packer/default.nix
+++ b/pkgs/development/python-modules/python-packer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, sh }:
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, sh }:
 
 buildPythonPackage rec {
   pname = "python-packer";
@@ -9,6 +9,12 @@ buildPythonPackage rec {
     sha256 = "fd363dae9bd2efd447739bbf7a4f29c1e4741596ae7b02d252fe525b2b4176e7";
   };
 
+  patches = fetchpatch {
+    url = "${meta.homepage}/commit/de3421bf13bf7c3ec11fe0a381f0944e102b1d97.patch";
+    excludes = [ "dev-requirements.txt" ];
+    sha256 = "0rgmkyn7i6y1xs8m75dpl8hq7j2ns2s3dvp7kv9j4zwic93rrlsc";
+  };
+
   propagatedBuildInputs = [ sh ];
   
   # Tests requires network connections
-- 
GitLab


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

---
 pkgs/stdenv/generic/make-derivation.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index e06faed30a1..8fd58c3cbe9 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -12,7 +12,9 @@ rec {
   # * https://nixos.org/nix/manual/#ssec-derivation
   #   Explanation about derivations in general
   mkDerivation =
-    { name ? ""
+    { name ? if builtins.hasAttr "pname" attrs && builtins.hasAttr "version" attrs
+        then "${attrs.pname}-${attrs.version}"
+        else ""
 
     # These types of dependencies are all exhaustively documented in
     # the "Specifying Dependencies" section of the "Standard
-- 
GitLab


From 149a55eca77279c683a48d274a2f295d8027977c Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 7 Jun 2018 16:16:14 +0200
Subject: [PATCH 0628/1065] make-derivation: get position info from version

---
 pkgs/stdenv/generic/make-derivation.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 8fd58c3cbe9..dcf73a38a1d 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -67,6 +67,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" ]
-- 
GitLab


From 2962f94fec198cd378471e2b6acc89d0af6ae226 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 29 Oct 2018 14:58:12 +0100
Subject: [PATCH 0629/1065] make-derivation: add check that the name is
 consistent with pname and version

---
 pkgs/stdenv/generic/make-derivation.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index dcf73a38a1d..6f31e09b125 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -82,6 +82,10 @@ rec {
 
     , ... } @ attrs:
 
+    # Check that the name is consistent with pname and version:
+    assert lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"]
+      -> lib.strings.hasSuffix "${attrs.pname}-${attrs.version}" attrs.name;
+
     let
       # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
       # no package has `doCheck = true`.
-- 
GitLab


From 5be927db142448207c6a1d0c6e58ac5eb2af1fc5 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 29 Oct 2018 15:17:13 +0100
Subject: [PATCH 0630/1065] make-derivation: use `?` instead of
 `builtins.hasAttr`

As suggested by @edolstra
---
 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 6f31e09b125..9f6fee93710 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -12,7 +12,7 @@ rec {
   # * https://nixos.org/nix/manual/#ssec-derivation
   #   Explanation about derivations in general
   mkDerivation =
-    { name ? if builtins.hasAttr "pname" attrs && builtins.hasAttr "version" attrs
+    { name ? if attrs ? pname && attrs ? version
         then "${attrs.pname}-${attrs.version}"
         else ""
 
-- 
GitLab


From 044ceae2806480555a44c91c386546cffb46ba74 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Mon, 29 Oct 2018 13:06:55 +0100
Subject: [PATCH 0631/1065] nixos/lib/eval-config.nix: toString modulesPath

Referencing modulesPath in NixOS configurations can cause evaluation
errors in restricted mode.  If used as `${modulesPath}` (as in all
use-sites in nixpkgs) the modules subtree is copied into its own store
path. Access to this path will be forbidden in restricted mode.

Converting to a string solves this issue.
`${builtins.toString modulesPath}` will point to a subdirectory of the
nixpkgs tree out of which evalModules is called.

This change converts modulesPath to a string by default so that the
call-site doesn't have to anymore.
---
 nixos/lib/eval-config.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index a87b285c5b7..98b9a7e9e43 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -49,7 +49,8 @@ in rec {
     inherit prefix check;
     modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ];
     args = extraArgs;
-    specialArgs = { modulesPath = ../modules; } // specialArgs;
+    specialArgs =
+      { modulesPath = builtins.toString ../modules; } // specialArgs;
   }) config options;
 
   # These are the extra arguments passed to every module.  In
-- 
GitLab


From 33925ef2b468eb368be92641c22ca90f0b848743 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 29 Oct 2018 08:09:24 -0700
Subject: [PATCH 0632/1065] python36Packages.pip-tools: 2.0.2 -> 3.1.0 (#48986)

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-pip-tools/versions
---
 pkgs/development/python-modules/pip-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 89b0d56a401..de35a06d6d4 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "pip-tools";
-  version = "2.0.2";
+  version = "3.1.0";
   name = pname + "-" + version;
 
   src = fetchurl {
     url = "mirror://pypi/p/pip-tools/${name}.tar.gz";
-    sha256 = "f11fc3bf1d87a0b4a68d4d595f619814e2396e92d75d7bdd2500edbf002ea6de";
+    sha256 = "0w1qdkr5n612nb3b890mbdyjb3cxn2mna1c7ysr4d0x4nh1wmkmi";
   };
 
   LC_ALL = "en_US.UTF-8";
-- 
GitLab


From d60faae44155d72dc618d9b1a2711c8432e2ab77 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 29 Oct 2018 08:19:33 -0700
Subject: [PATCH 0633/1065] imagemagick7: 7.0.8-12 -> 7.0.8-14 (#49298)

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

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index e164a789459..8fb21e65c95 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -13,8 +13,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.8-12";
-    sha256 = "0rq7qhbfsxvclazi1l6kqi4wqsph7hmzcjbh2pmf0276mrkgm7cd";
+    version = "7.0.8-14";
+    sha256 = "0pbrmzsjc8l4klfsz739rnmw61m712r82ryjl8ycvbxdzxwnwm9v";
     patches = [];
   };
 in
-- 
GitLab


From 5f3054ef70908c1c3f2333a388580a898196c5b2 Mon Sep 17 00:00:00 2001
From: Pavel Goran <me@pvgoran.name>
Date: Mon, 29 Oct 2018 23:16:47 +0700
Subject: [PATCH 0634/1065] gitea: include "options" directory in "data" output

This directory contains template files needed for initializing new repositories.

Fixes #49404.
---
 pkgs/applications/version-management/gitea/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 58cfa186260..a25492e4546 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -39,7 +39,7 @@ buildGoPackage rec {
 
   postInstall = ''
     mkdir $data
-    cp -R $src/{public,templates} $data
+    cp -R $src/{public,templates,options} $data
     mkdir -p $out
     cp -R $src/options/locale $out/locale
 
-- 
GitLab


From ac499a345ae698d07bf240ca13bb37b4b4501c4d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 29 Oct 2018 18:18:39 +0100
Subject: [PATCH 0635/1065] pythonPackages.dlib: disable AVX instructions
 during checkPhase

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c495cdabde..164e7504e8b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -964,6 +964,10 @@ in {
   dlib = buildPythonPackage rec {
     inherit (pkgs.dlib) name src nativeBuildInputs meta buildInputs;
 
+    checkPhase = ''
+      ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS
+    '';
+
     patches = [ ../development/python-modules/dlib/build-cores.patch ];
 
     checkInputs = with self; [ pytest ];
-- 
GitLab


From c7e026bec483582bf2b8ac624519555f9476751c Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 29 Oct 2018 18:25:59 +0100
Subject: [PATCH 0636/1065] make-derivation: use `lib.assertMsg`

As suggested by @Profpatsch
---
 pkgs/stdenv/generic/make-derivation.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 9f6fee93710..2ff7db947fe 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -83,8 +83,10 @@ rec {
     , ... } @ attrs:
 
     # Check that the name is consistent with pname and version:
-    assert lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"]
-      -> lib.strings.hasSuffix "${attrs.pname}-${attrs.version}" attrs.name;
+    assert lib.assertMsg
+      (lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"]
+        -> lib.strings.hasSuffix "${attrs.pname}-${attrs.version}" attrs.name)
+      "mkDerivation: `name` must be consistent with `pname-version`";
 
     let
       # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
-- 
GitLab


From 79f148c2e0c12a41f377dcf6b5e74022de28857c Mon Sep 17 00:00:00 2001
From: timor <timor.dd@googlemail.com>
Date: Mon, 29 Oct 2018 18:28:51 +0100
Subject: [PATCH 0637/1065] libmtp: 1.1.15 -> 1.1.16

This fixes the problem of connecting android phones via MTP in kde/dolphin.

Original Bug description: https://bugs.kde.org/show_bug.cgi?id=387454
---
 pkgs/development/libraries/libmtp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index 1d8dd7e20f1..e750c2c6c70 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb1, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "libmtp-1.1.15";
+  name = "libmtp-1.1.16";
 
   src = fetchurl {
     url = "mirror://sourceforge/libmtp/${name}.tar.gz";
-    sha256 = "089h79nkz7wcr3lbqi7025l8p75hbp0aigxk3wdk2zkm8q5r0h6h";
+    sha256 = "185vh9bds6dcy00ycggg69g4v7m3api40zv8vrcfb3fk3vfzjs2v";
   };
 
   outputs = [ "bin" "dev" "out" ];
-- 
GitLab


From b7bc6e7f6ca33775643553fe046e804425c8ce5d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 29 Oct 2018 18:57:19 +0100
Subject: [PATCH 0638/1065] pythonPackages.dlib: move expression

Initially the expression was quite small (just inherited properties from
`pkgs.dlib`), but the more it grows the better it is to store it into
its own file.
---
 pkgs/development/python-modules/dlib/default.nix | 13 +++++++++++++
 pkgs/top-level/python-packages.nix               | 12 ++----------
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/python-modules/dlib/default.nix

diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix
new file mode 100644
index 00000000000..90e2c526789
--- /dev/null
+++ b/pkgs/development/python-modules/dlib/default.nix
@@ -0,0 +1,13 @@
+{ buildPythonPackage, dlib, python, pytest }:
+
+buildPythonPackage {
+  inherit (dlib) name src nativeBuildInputs buildInputs meta;
+
+  checkPhase = ''
+    ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS
+  '';
+
+  patches = [ ./build-cores.patch ];
+
+  checkInputs = [ pytest ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 164e7504e8b..5e3a3cc21ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -961,16 +961,8 @@ in {
 
   cypari2 = callPackage ../development/python-modules/cypari2 { };
 
-  dlib = buildPythonPackage rec {
-    inherit (pkgs.dlib) name src nativeBuildInputs meta buildInputs;
-
-    checkPhase = ''
-      ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS
-    '';
-
-    patches = [ ../development/python-modules/dlib/build-cores.patch ];
-
-    checkInputs = with self; [ pytest ];
+  dlib = callPackage ../development/python-modules/dlib {
+    inherit (pkgs) dlib;
   };
 
   datadog = callPackage ../development/python-modules/datadog {};
-- 
GitLab


From 075e4883e0abea400aecb886e6244a6c2acf7bd8 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 29 Oct 2018 10:15:19 -0500
Subject: [PATCH 0639/1065] ibus: fix cross compilation

gtk-doc is a native input so we need to use buildPackages here.
---
 pkgs/tools/inputmethods/ibus/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 540779477e3..3b6f3c989a3 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig
 , vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2
 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true
-, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }:
+, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null
+, buildPackages }:
 
 assert withWayland -> wayland != null && libxkbcommon != null;
 
@@ -76,7 +77,7 @@ stdenv.mkDerivation rec {
     substituteInPlace data/dconf/Makefile.am --replace "dconf update" true
     substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus
     echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh
-    cp ${gtk-doc}/share/gtk-doc/data/gtk-doc.make .
+    cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make .
   '';
 
   preAutoreconf = "touch ChangeLog";
-- 
GitLab


From c0f6a83cc858fdb8da56cf471df5d70d8c1e969e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 29 Oct 2018 20:03:09 +0100
Subject: [PATCH 0640/1065] androidStudioPackages.{dev,canary}: 3.4.0.0 ->
 3.4.0.1

---
 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 b6a6acf8ab7..bf9c7b7e129 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "0bg1h0msd6mpkvirkg4pssa1ak32smv2rlxxsjdm3p29p8gg59px";
   };
   latestVersion = { # canary & dev
-    version = "3.4.0.0"; # "Android Studio 3.4 Canary 1"
-    build = "182.5070326";
-    sha256Hash = "03h2yns8s9dqbbc9agxhidpmziy9g3z89nm3byydw43hdz54hxab";
+    version = "3.4.0.1"; # "Android Studio 3.4 Canary 2"
+    build = "183.5081642";
+    sha256Hash = "0ck6habkgnwbr10pr3bfy8ywm3dsm21k9jdj7g685v22sw0zy3yk";
   };
 in rec {
   # Old alias
-- 
GitLab


From d59a9ac7cf5e17f42aa1d971028f108864f2d252 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 12 Oct 2018 15:09:59 -0500
Subject: [PATCH 0641/1065] avr: use new compilation infrastructure

Gets rid of:
  avrbinutils
  avrgcc

to replace with:
  pkgsCross.avr.buildPackages.binutils
  pkgsCross.avr.buildPackages.gcc
---
 lib/systems/examples.nix                      |  4 ++
 lib/systems/inspect.nix                       |  1 +
 lib/systems/parse.nix                         |  5 ++
 .../bintools-wrapper/default.nix              |  1 +
 .../development/misc/avr/binutils/default.nix | 22 -------
 .../misc/avr/gcc/avrbinutils-path.patch       | 15 -----
 pkgs/development/misc/avr/gcc/default.nix     | 60 -------------------
 pkgs/development/misc/avr/libc/default.nix    | 17 +-----
 pkgs/top-level/all-packages.nix               | 12 ++--
 9 files changed, 19 insertions(+), 118 deletions(-)
 delete mode 100644 pkgs/development/misc/avr/binutils/default.nix
 delete mode 100644 pkgs/development/misc/avr/gcc/avrbinutils-path.patch
 delete mode 100644 pkgs/development/misc/avr/gcc/default.nix

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 8ba03a63fd8..e1914354390 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -99,6 +99,10 @@ rec {
   riscv64 = riscv "64";
   riscv32 = riscv "32";
 
+  arduino-uno = {
+    config = "avr";
+    platform = { name = "avr5"; };
+  };
 
   #
   # Darwin
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 65f560328af..2fcf1afe462 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -19,6 +19,7 @@ rec {
     isRiscV        = { cpu = { family = "riscv"; }; };
     isSparc        = { cpu = { family = "sparc"; }; };
     isWasm         = { cpu = { family = "wasm"; }; };
+    isAvr          = { cpu = { family = "avr"; }; };
 
     is32bit        = { cpu = { bits = 32; }; };
     is64bit        = { cpu = { bits = 64; }; };
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index bb26c93f3d7..058d4bed908 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -101,6 +101,8 @@ rec {
 
     wasm32   = { bits = 32; significantByte = littleEndian; family = "wasm"; };
     wasm64   = { bits = 64; significantByte = littleEndian; family = "wasm"; };
+
+    avr      = { bits = 8; family = "avr"; };
   };
 
   ################################################################################
@@ -255,6 +257,9 @@ rec {
     setType "system" components;
 
   mkSkeletonFromList = l: {
+    "1" = if elemAt l 0 == "avr"
+      then { cpu = elemAt l 0; kernel = "none"; abi = "unknown"; }
+      else throw "Target specification with 1 components is ambiguous";
     "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";   }
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index f9ca245beea..99f556b973a 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -186,6 +186,7 @@ stdenv.mkDerivation {
         }.${targetPlatform.parsed.cpu.name}
       else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc"
       else if targetPlatform.isSparc then "sparc"
+      else if targetPlatform.isAvr then "avr"
       else throw "unknown emulation for platform: " + targetPlatform.config;
     in targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
 
diff --git a/pkgs/development/misc/avr/binutils/default.nix b/pkgs/development/misc/avr/binutils/default.nix
deleted file mode 100644
index 83ba93e63b7..00000000000
--- a/pkgs/development/misc/avr/binutils/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
-  version = "2.31.1";
-in
-stdenv.mkDerivation {
-  name = "avr-binutils-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnu/binutils/binutils-${version}.tar.bz2";
-    sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z";
-  };
-  configureFlags = [ "--target=avr" "--enable-languages=c,c++" ];
-
-  meta = with stdenv.lib; {
-    description = "the GNU Binutils for AVR microcontrollers";
-    homepage = http://www.gnu.org/software/binutils/;
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ mguentner ];
-  };
-}
diff --git a/pkgs/development/misc/avr/gcc/avrbinutils-path.patch b/pkgs/development/misc/avr/gcc/avrbinutils-path.patch
deleted file mode 100644
index f0ec21b7589..00000000000
--- a/pkgs/development/misc/avr/gcc/avrbinutils-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/gcc/gcc-ar.c b/gcc/gcc-ar.c
-index 838ebc2..3ac4ee7 100644
---- a/gcc/gcc-ar.c
-+++ b/gcc/gcc-ar.c
-@@ -118,8 +118,8 @@ setup_prefixes (const char *exec_path)
- 				dir_separator, NULL);
-   prefix_from_string (self_libexec_prefix, &target_path);
- 
--  /* Add path as a last resort.  */
--  prefix_from_env ("PATH", &path);
-+  /* Add path to avrbinutils.  */
-+  prefix_from_string ("@avrbinutils@/bin", &path);
- }
- 
- int 
diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix
deleted file mode 100644
index 5c9b56c9918..00000000000
--- a/pkgs/development/misc/avr/gcc/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ stdenv, fetchurl, gmp, mpfr, libmpc, zlib, avrbinutils, texinfo }:
-
-let
-  version = "8.2.0";
-in
-stdenv.mkDerivation {
-
-  name = "avr-gcc-${version}";
-  src = fetchurl {
-    url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
-    sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r";
-  };
-
-  patches = [
-    ./avrbinutils-path.patch
-  ];
-
-  # avrbinutils-path.patch introduces a reference to @avrbinutils@, substitute
-  # it now.
-  postPatch = ''
-    substituteInPlace gcc/gcc-ar.c --subst-var-by avrbinutils ${avrbinutils}
-  '';
-
-  buildInputs = [ gmp mpfr libmpc zlib avrbinutils ];
-
-  nativeBuildInputs = [ texinfo ];
-
-  hardeningDisable = [ "format" ];
-
-  stripDebugList= [ "bin" "libexec" ];
-
-  enableParallelBuilding = true;
-
-  configurePhase = ''
-    mkdir gcc-build
-    cd gcc-build
-    ../configure   \
-    --prefix=$out  \
-    --host=$CHOST  \
-    --build=$CHOST \
-    --target=avr   \
-    --with-as=${avrbinutils}/bin/avr-as \
-    --with-gnu-as  \
-    --with-gnu-ld  \
-    --with-ld=${avrbinutils}/bin/avr-ld \
-    --with-system-zlib \
-    --disable-install-libiberty \
-    --disable-nls \
-    --disable-libssp \
-    --with-dwarf2 \
-    --enable-languages=c,c++'';
-
-  meta = with stdenv.lib; {
-    description = "GNU Compiler Collection, version ${version} for AVR microcontrollers";
-    homepage = http://gcc.gnu.org;
-    license = licenses.gpl3Plus;
-    platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ mguentner ];
-  };
-}
diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix
index 039846d5fcf..9bfffe7b2fe 100644
--- a/pkgs/development/misc/avr/libc/default.nix
+++ b/pkgs/development/misc/avr/libc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, avrgcc, avrbinutils, automake, autoconf }:
+{ stdenv, fetchurl, automake, autoconf }:
 
 let
   version = "2.0.0";
@@ -11,18 +11,7 @@ stdenv.mkDerivation {
     sha256 = "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj";
   };
 
-  buildInputs = [ avrgcc avrbinutils automake autoconf ];
-  configurePhase = ''
-    unset LD
-    unset AS
-    unset AR
-    unset CC
-    unset CXX
-    unset RANLIB
-    unset STRIP
-
-    ./configure --prefix=$out --build=$(./config.guess) --host=avr
-  '';
+  nativeBuildInputs = [ automake autoconf ];
 
   # Make sure we don't strip the libraries in lib/gcc/avr.
   stripDebugList= "bin";
@@ -32,7 +21,7 @@ stdenv.mkDerivation {
     description = "a C runtime library for AVR microcontrollers";
     homepage = http://savannah.nongnu.org/projects/avr-libc/;
     license = licenses.bsd3;
-    platforms = platforms.unix;
+    platforms = platforms.all;
     maintainers = with maintainers; [ mguentner ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ace934df95..c6e2205a0bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7991,13 +7991,10 @@ with pkgs;
 
   amtk = callPackage ../development/libraries/amtk { };
 
-  avrgcclibc = throw "avrgcclibs are now separate packages, install avrbinutils, avrgcc and avrlibc";
-
-  avrbinutils = callPackage ../development/misc/avr/binutils {};
-
-  avrgcc      = callPackage ../development/misc/avr/gcc {};
-
-  avrlibc     = callPackage ../development/misc/avr/libc {};
+  avrlibc      = callPackage ../development/misc/avr/libc {};
+  avrlibcCross = callPackage ../development/misc/avr/libc {
+    stdenv = crossLibcStdenv;
+  };
 
   avr8burnomat = callPackage ../development/misc/avr8-burn-omat { };
 
@@ -9746,6 +9743,7 @@ with pkgs;
     /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross
     else if name == "bionic" then targetPackages.bionic
     else if name == "uclibc" then targetPackages.uclibcCross
+    else if name == "avrlibc" then targetPackages.avrlibcCross
     else if name == "musl" then targetPackages.muslCross or muslCross
     else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
     else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries
-- 
GitLab


From 72e3b2a6629dbe12f184ed0156d9c34af271e158 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 14 Oct 2018 20:41:33 -0500
Subject: [PATCH 0642/1065] systems: add avrlibc for avr systems

---
 lib/systems/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 8f5ef44ae72..0b3475fefb9 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -32,6 +32,7 @@ rec {
         else if final.isUClibc              then "uclibc"
         else if final.isAndroid             then "bionic"
         else if final.isLinux /* default */ then "glibc"
+        else if final.isAvr                 then "avrlibc"
         # TODO(@Ericson2314) think more about other operating systems
         else                                     "native/impure";
       extensions = {
-- 
GitLab


From 412093994b9a4fe0fa7da99d1947effc85d9070b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 15 Oct 2018 16:11:20 -0500
Subject: [PATCH 0643/1065] gcc: support avr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- respect libc’s incdir and libdir
- make non-unix systems single threaded
- set LIMITS_H_TEST to false for avr
- misc updates to support new libc’s
- use multilib with avr

For threads we want to use:
- posix on unix systems
- win32 on windows
- single on everything else

For avr:
- add library directories for avrlibc
- to disable relro and bind
- avr5 should have precedence over avr3 - otherwise gcc uses the wrong one
---
 lib/systems/examples.nix                      | 18 +++++++-
 .../bintools-wrapper/default.nix              | 12 +++++-
 pkgs/build-support/cc-wrapper/default.nix     | 16 +++++++-
 .../development/compilers/gcc/4.8/default.nix | 29 +++++++------
 .../development/compilers/gcc/4.9/default.nix | 29 +++++++------
 pkgs/development/compilers/gcc/5/default.nix  | 29 +++++++------
 pkgs/development/compilers/gcc/6/default.nix  | 29 +++++++------
 pkgs/development/compilers/gcc/7/default.nix  | 41 ++++++++++++-------
 pkgs/development/compilers/gcc/8/default.nix  | 32 +++++++--------
 .../compilers/gcc/snapshot/default.nix        | 25 ++++++-----
 pkgs/development/misc/avr/libc/default.nix    |  6 ++-
 11 files changed, 171 insertions(+), 95 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index e1914354390..2bfa9700ccd 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -99,9 +99,23 @@ rec {
   riscv64 = riscv "64";
   riscv32 = riscv "32";
 
-  arduino-uno = {
+  avr = {
     config = "avr";
-    platform = { name = "avr5"; };
+  };
+
+  arm-embedded = {
+    config = "arm-none-eabi";
+    libc = "newlib";
+  };
+
+  aarch64-embedded = {
+    config = "aarch64-none-elf";
+    libc = "newlib";
+  };
+
+  ppc-embedded = {
+    config = "powerpc-none-eabi";
+    libc = "newlib";
   };
 
   #
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 99f556b973a..3ac1e52f309 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -210,7 +210,7 @@ stdenv.mkDerivation {
       ## General libc support
       ##
 
-      echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags
+      echo "-L${libc_lib}${libc.libdir or "/lib"}" > $out/nix-support/libc-ldflags
 
       echo "${libc_lib}" > $out/nix-support/orig-libc
       echo "${libc_dev}" > $out/nix-support/orig-libc-dev
@@ -293,6 +293,16 @@ stdenv.mkDerivation {
       hardening_unsupported_flags+=" pic"
     ''
 
+    + optionalString targetPlatform.isAvr ''
+      hardening_unsupported_flags+=" relro bindnow"
+    ''
+
+    + optionalString (libc != null && targetPlatform.isAvr) ''
+      for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do
+        echo "-L${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-cflags
+      done
+    ''
+
     + ''
       set +u
       substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index e59758371a3..06aa9436bfc 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -232,7 +232,7 @@ stdenv.mkDerivation {
       # compile, because it uses "#include_next <limits.h>" to find the
       # limits.h file in ../includes-fixed. To remedy the problem,
       # another -idirafter is necessary to add that directory again.
-      echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include ${optionalString isGNU "-idirafter ${cc}/lib/gcc/*/*/include-fixed"}" > $out/nix-support/libc-cflags
+      echo "-B${libc_lib}${libc.libdir or "/lib/"} -idirafter ${libc_dev}${libc.incdir or "/include"} ${optionalString isGNU "-idirafter ${cc}/lib/gcc/*/*/include-fixed"}" > $out/nix-support/libc-cflags
 
       echo "${libc_lib}" > $out/nix-support/orig-libc
       echo "${libc_dev}" > $out/nix-support/orig-libc-dev
@@ -284,6 +284,20 @@ stdenv.mkDerivation {
       hardening_unsupported_flags+=" stackprotector"
     ''
 
+    + optionalString targetPlatform.isAvr ''
+      hardening_unsupported_flags+=" stackprotector pic"
+    ''
+
+    + optionalString (targetPlatform.libc == "newlib") ''
+      hardening_unsupported_flags+=" stackprotector fortify pie pic"
+    ''
+
+    + optionalString (libc != null && targetPlatform.isAvr) ''
+      for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do
+        echo "-B${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-cflags
+      done
+    ''
+
     + ''
       substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
       substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index d9376f597a7..e585f296e87 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -130,7 +130,7 @@ let version = "4.8.5";
         "--disable-libmpx" # requires libc
       ] else [
         (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
-         else                "--with-headers=${getDev libcCross}/include")
+         else                "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
         "--enable-__cxa_atexit"
         "--enable-long-long"
       ] ++
@@ -148,10 +148,15 @@ let version = "4.8.5";
             # In uclibc cases, libgomp needs an additional '-ldl'
             # and as I don't know how to pass it, I disable libgomp.
             "--disable-libgomp"
-          ] ++ [
-          "--enable-threads=posix"
-          "--enable-nls"
-          "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+          ]
+          ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+          ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+          ++ [
+            "--enable-threads=${if targetPlatform.isUnix then "posix"
+                                else if targetPlatform.isWindows then "win32"
+                                else "single"}"
+            "--enable-nls"
+            "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
         ]));
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
     crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
@@ -270,7 +275,7 @@ stdenv.mkDerivation ({
       }"
     ] ++
 
-    (if enableMultilib
+    (if (enableMultilib || targetPlatform.isAvr)
       then ["--enable-multilib" "--disable-libquadmath"]
       else ["--disable-multilib"]) ++
     optional (!enableShared) "--disable-shared" ++
@@ -360,20 +365,20 @@ stdenv.mkDerivation ({
   EXTRA_TARGET_FLAGS = optionals
     (targetPlatform != hostPlatform && libcCross != null)
     ([
-      "-idirafter ${libcCross.dev}/include"
+      "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
     ] ++ optionals (! crossStageStatic) [
-      "-B${libcCross.out}/lib"
+      "-B${libcCross.out}${libcCross.libdir or "/lib"}"
     ]);
 
   EXTRA_TARGET_LDFLAGS = optionals
     (targetPlatform != hostPlatform && libcCross != null)
     ([
-      "-Wl,-L${libcCross.out}/lib"
+      "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
     ] ++ (if crossStageStatic then [
-        "-B${libcCross.out}/lib"
+        "-B${libcCross.out}${libcCross.libdir or "/lib"}"
       ] else [
-        "-Wl,-rpath,${libcCross.out}/lib"
-        "-Wl,-rpath-link,${libcCross.out}/lib"
+        "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+        "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
     ]));
 
   passthru = {
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index c60f54f1560..9dae061ecbb 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -135,7 +135,7 @@ let version = "4.9.4";
         "--disable-libmpx" # requires libc
       ] else [
         (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
-         else                "--with-headers=${getDev libcCross}/include")
+         else                "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
         "--enable-__cxa_atexit"
         "--enable-long-long"
       ] ++
@@ -156,10 +156,15 @@ let version = "4.9.4";
             # In uclibc cases, libgomp needs an additional '-ldl'
             # and as I don't know how to pass it, I disable libgomp.
             "--disable-libgomp"
-          ] ++ [
-          "--enable-threads=posix"
-          "--enable-nls"
-          "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+          ]
+          ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+          ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+          ++ [
+            "--enable-threads=${if targetPlatform.isUnix then "posix"
+                                else if targetPlatform.isWindows then "win32"
+                                else "single"}"
+            "--enable-nls"
+            "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
         ]));
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
     crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
@@ -292,7 +297,7 @@ stdenv.mkDerivation ({
       }"
     ] ++
 
-    (if enableMultilib
+    (if (enableMultilib || targetPlatform.isAvr)
       then ["--enable-multilib" "--disable-libquadmath"]
       else ["--disable-multilib"]) ++
     optional (!enableShared) "--disable-shared" ++
@@ -381,20 +386,20 @@ stdenv.mkDerivation ({
   EXTRA_TARGET_FLAGS = optionals
     (targetPlatform != hostPlatform && libcCross != null)
     ([
-      "-idirafter ${getDev libcCross}/include"
+      "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
     ] ++ optionals (! crossStageStatic) [
-      "-B${libcCross.out}/lib"
+      "-B${libcCross.out}${libcCross.libdir or "/lib"}"
     ]);
 
   EXTRA_TARGET_LDFLAGS = optionals
     (targetPlatform != hostPlatform && libcCross != null)
     ([
-      "-Wl,-L${libcCross.out}/lib"
+      "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
     ] ++ (if crossStageStatic then [
-        "-B${libcCross.out}/lib"
+        "-B${libcCross.out}${libcCross.libdir or "/lib"}"
       ] else [
-        "-Wl,-rpath,${libcCross.out}/lib"
-        "-Wl,-rpath-link,${libcCross.out}/lib"
+        "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+        "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
     ]));
 
   passthru =
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 47c849d2dcc..fbc192752c7 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -122,7 +122,7 @@ let version = "5.5.0";
         "--disable-libmpx" # requires libc
       ] else [
         (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
-         else                "--with-headers=${getDev libcCross}/include")
+         else                "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
         "--enable-__cxa_atexit"
         "--enable-long-long"
       ] ++
@@ -143,10 +143,15 @@ let version = "5.5.0";
             # In uclibc cases, libgomp needs an additional '-ldl'
             # and as I don't know how to pass it, I disable libgomp.
             "--disable-libgomp"
-          ] ++ [
-          "--enable-threads=posix"
-          "--enable-nls"
-          "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+          ]
+          ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+          ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+          ++ [
+            "--enable-threads=${if targetPlatform.isUnix then "posix"
+                                else if targetPlatform.isWindows then "win32"
+                                else "single"}"
+            "--enable-nls"
+            "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
         ]));
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
     crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
@@ -296,7 +301,7 @@ stdenv.mkDerivation ({
       }"
     ] ++
 
-    (if enableMultilib
+    (if (enableMultilib || targetPlatform.isAvr)
       then ["--enable-multilib" "--disable-libquadmath"]
       else ["--disable-multilib"]) ++
     optional (!enableShared) "--disable-shared" ++
@@ -387,20 +392,20 @@ stdenv.mkDerivation ({
   EXTRA_TARGET_FLAGS = optionals
     (targetPlatform != hostPlatform && libcCross != null)
     ([
-      "-idirafter ${getDev libcCross}/include"
+      "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
     ] ++ optionals (! crossStageStatic) [
-      "-B${libcCross.out}/lib"
+      "-B${libcCross.out}${libcCross.libdir or "/lib"}"
     ]);
 
   EXTRA_TARGET_LDFLAGS = optionals
     (targetPlatform != hostPlatform && libcCross != null)
     ([
-      "-Wl,-L${libcCross.out}/lib"
+      "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
     ] ++ (if crossStageStatic then [
-        "-B${libcCross.out}/lib"
+        "-B${libcCross.out}${libcCross.libdir or "/lib"}"
       ] else [
-        "-Wl,-rpath,${libcCross.out}/lib"
-        "-Wl,-rpath-link,${libcCross.out}/lib"
+        "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+        "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
     ]));
 
   passthru =
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index eeb57be9715..793752dee19 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -120,7 +120,7 @@ let version = "6.4.0";
         "--disable-libmpx" # requires libc
       ] else [
         (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
-         else                "--with-headers=${getDev libcCross}/include")
+         else                "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
         "--enable-__cxa_atexit"
         "--enable-long-long"
       ] ++
@@ -143,10 +143,15 @@ let version = "6.4.0";
             "--disable-libgomp"
             # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
             "--disable-libmpx"
-          ] ++ [
-          "--enable-threads=posix"
-          "--enable-nls"
-          "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+          ]
+          ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+          ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+          ++ [
+            "--enable-threads=${if targetPlatform.isUnix then "posix"
+                                else if targetPlatform.isWindows then "win32"
+                                else "single"}"
+            "--enable-nls"
+            "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
         ]));
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
     crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
@@ -301,7 +306,7 @@ stdenv.mkDerivation ({
       }"
     ] ++
 
-    (if enableMultilib
+    (if (enableMultilib || targetPlatform.isAvr)
       then ["--enable-multilib" "--disable-libquadmath"]
       else ["--disable-multilib"]) ++
     optional (!enableShared) "--disable-shared" ++
@@ -391,20 +396,20 @@ stdenv.mkDerivation ({
   EXTRA_TARGET_FLAGS = optionals
     (targetPlatform != hostPlatform && libcCross != null)
     ([
-      "-idirafter ${getDev libcCross}/include"
+      "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
     ] ++ optionals (! crossStageStatic) [
-      "-B${libcCross.out}/lib"
+      "-B${libcCross.out}${libcCross.libdir or "/lib"}"
     ]);
 
   EXTRA_TARGET_LDFLAGS = optionals
     (targetPlatform != hostPlatform && libcCross != null)
     ([
-      "-Wl,-L${libcCross.out}/lib"
+      "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
     ] ++ (if crossStageStatic then [
-        "-B${libcCross.out}/lib"
+        "-B${libcCross.out}${libcCross.libdir or "/lib"}"
       ] else [
-        "-Wl,-rpath,${libcCross.out}/lib"
-        "-Wl,-rpath-link,${libcCross.out}/lib"
+        "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+        "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
     ]));
 
   passthru =
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 59897ccff42..c75a6c6e68f 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -67,7 +67,7 @@ let version = "7.3.0";
       [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
         "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
       (if crossMingw && crossStageStatic then [
-        "--with-headers=${libcCross}/include"
+        "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}"
         "--with-gcc"
         "--with-gnu-as"
         "--with-gnu-ld"
@@ -92,7 +92,7 @@ let version = "7.3.0";
         "--disable-libmpx" # requires libc
       ] else [
         (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
-         else                "--with-headers=${getDev libcCross}/include")
+         else                "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
         "--enable-__cxa_atexit"
         "--enable-long-long"
       ] ++
@@ -115,11 +115,17 @@ let version = "7.3.0";
             "--disable-libgomp"
             # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
             "--disable-libmpx"
-          ] ++ [
-          "--enable-threads=posix"
-          "--enable-nls"
-          "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
-        ]));
+          ]
+          ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+          ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+          ++ [
+            "--enable-threads=${if targetPlatform.isUnix then "posix"
+                                else if targetPlatform.isWindows then "win32"
+                                else "single"}"
+            "--enable-nls"
+            # No final libdecnumber (it may work only in 386)
+            "--disable-decimal-float"
+          ]));
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
     crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
 
@@ -188,7 +194,12 @@ stdenv.mkDerivation ({
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
         )
-    else "");
+    else "")
+      + stdenv.lib.optionalString targetPlatform.isAvr ''
+        makeFlagsArray+=(
+           'LIMITS_H_TEST=false'
+        )
+      '';
 
   inherit noSysDirs staticCompiler crossStageStatic
     libcCross crossMingw;
@@ -267,7 +278,7 @@ stdenv.mkDerivation ({
       }"
     ] ++
 
-    (if enableMultilib
+    (if (enableMultilib || targetPlatform.isAvr)
       then ["--enable-multilib" "--disable-libquadmath"]
       else ["--disable-multilib"]) ++
     optional (!enableShared) "--disable-shared" ++
@@ -334,20 +345,20 @@ stdenv.mkDerivation ({
   EXTRA_TARGET_FLAGS = optionals
     (targetPlatform != hostPlatform && libcCross != null)
     ([
-      "-idirafter ${getDev libcCross}/include"
+      "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
     ] ++ optionals (! crossStageStatic) [
-      "-B${libcCross.out}/lib"
+      "-B${libcCross.out}${libcCross.libdir or "/lib"}"
     ]);
 
   EXTRA_TARGET_LDFLAGS = optionals
     (targetPlatform != hostPlatform && libcCross != null)
     ([
-      "-Wl,-L${libcCross.out}/lib"
+      "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
     ] ++ (if crossStageStatic then [
-        "-B${libcCross.out}/lib"
+        "-B${libcCross.out}${libcCross.libdir or "/lib"}"
       ] else [
-        "-Wl,-rpath,${libcCross.out}/lib"
-        "-Wl,-rpath-link,${libcCross.out}/lib"
+        "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+        "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
     ]));
 
   passthru =
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 7842110a214..bcac577712a 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -87,7 +87,7 @@ let version = "8.2.0";
         "--disable-libmpx" # requires libc
       ] else [
         (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
-         else                "--with-headers=${getDev libcCross}/include")
+         else                "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
         "--enable-__cxa_atexit"
         "--enable-long-long"
       ] ++
@@ -110,10 +110,15 @@ let version = "8.2.0";
             "--disable-libgomp"
             # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
             "--disable-libmpx"
-          ] ++ [
-          "--enable-threads=posix"
-          "--enable-nls"
-          "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+          ]
+          ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+          ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+          ++ [
+            "--enable-threads=${if targetPlatform.isUnix then "posix"
+                                else if targetPlatform.isWindows then "win32"
+                                else "single"}"
+            "--enable-nls"
+            "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
         ]));
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
     crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
@@ -261,7 +266,7 @@ stdenv.mkDerivation ({
       }"
     ] ++
 
-    (if enableMultilib
+    (if (enableMultilib || targetPlatform.isAvr)
       then ["--enable-multilib" "--disable-libquadmath"]
       else ["--disable-multilib"]) ++
     optional (!enableShared) "--disable-shared" ++
@@ -322,23 +327,16 @@ stdenv.mkDerivation ({
 
   LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
 
-  EXTRA_TARGET_FLAGS = optionals
-    (targetPlatform != hostPlatform && libcCross != null)
-    ([
-      "-idirafter ${getDev libcCross}/include"
-    ] ++ optionals (! crossStageStatic) [
-      "-B${libcCross.out}/lib"
-    ]);
 
   EXTRA_TARGET_LDFLAGS = optionals
     (targetPlatform != hostPlatform && libcCross != null)
     ([
-      "-Wl,-L${libcCross.out}/lib"
+      "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
     ] ++ (if crossStageStatic then [
-        "-B${libcCross.out}/lib"
+        "-B${libcCross.out}${libcCross.libdir or "/lib"}"
       ] else [
-        "-Wl,-rpath,${libcCross.out}/lib"
-        "-Wl,-rpath-link,${libcCross.out}/lib"
+        "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+        "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
     ]));
 
   passthru =
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 0de6be36c35..a308abd9c16 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -104,10 +104,15 @@ let version = "7-20170409";
             # In uclibc cases, libgomp needs an additional '-ldl'
             # and as I don't know how to pass it, I disable libgomp.
             "--disable-libgomp"
-          ] ++ [
-          "--enable-threads=posix"
-          "--enable-nls"
-          "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+          ]
+          ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+          ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+          ++ [
+            "--enable-threads=${if targetPlatform.isUnix then "posix"
+                                else if targetPlatform.isWindows then "win32"
+                                else "single"}"
+            "--enable-nls"
+            "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
         ]));
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
     crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
@@ -290,20 +295,20 @@ stdenv.mkDerivation ({
   EXTRA_TARGET_FLAGS = optionals
     (targetPlatform != hostPlatform && libcCross != null)
     ([
-      "-idirafter ${getDev libcCross}/include"
+      "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
     ] ++ optionals (! crossStageStatic) [
-      "-B${libcCross.out}/lib"
+      "-B${libcCross.out}${libcCross.libdir or "/lib"}"
     ]);
 
   EXTRA_TARGET_LDFLAGS = optionals
     (targetPlatform != hostPlatform && libcCross != null)
     ([
-      "-Wl,-L${libcCross.out}/lib"
+      "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
     ] ++ (if crossStageStatic then [
-        "-B${libcCross.out}/lib"
+        "-B${libcCross.out}${libcCross.libdir or "/lib"}"
       ] else [
-        "-Wl,-rpath,${libcCross.out}/lib"
-        "-Wl,-rpath-link,${libcCross.out}/lib"
+        "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+        "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
     ]));
 
   passthru =
diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix
index 9bfffe7b2fe..afe30e4b5ee 100644
--- a/pkgs/development/misc/avr/libc/default.nix
+++ b/pkgs/development/misc/avr/libc/default.nix
@@ -14,9 +14,13 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ automake autoconf ];
 
   # Make sure we don't strip the libraries in lib/gcc/avr.
-  stripDebugList= "bin";
+  stripDebugList = "bin";
   dontPatchELF = true;
 
+  passthru = {
+    incdir = "/avr/include";
+  };
+
   meta = with stdenv.lib; {
     description = "a C runtime library for AVR microcontrollers";
     homepage = http://savannah.nongnu.org/projects/avr-libc/;
-- 
GitLab


From 2650a1f91ed08049cc6a70051ef238d0fb3dc9e5 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 17 Oct 2018 12:55:06 -0500
Subject: [PATCH 0644/1065] dfu-programmer: supports macos

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

diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix
index 1c0f80e1ddd..ba95889b5a8 100644
--- a/pkgs/development/tools/misc/dfu-programmer/default.nix
+++ b/pkgs/development/tools/misc/dfu-programmer/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader";
     homepage = http://dfu-programmer.sourceforge.net/;
     maintainers = [ maintainers.the-kenny ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From 8db71d9d773956d41778b88d88ead126a0138e67 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 19 Oct 2018 11:43:33 -0500
Subject: [PATCH 0645/1065] newlib: init at 3.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #47533

newlib seems to think it’s a compiler when it’s not. Anyway had to
make host refer to build platform for things to work.
---
 pkgs/development/misc/newlib/default.nix | 34 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  8 +++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/misc/newlib/default.nix

diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix
new file mode 100644
index 00000000000..e26f0f78f21
--- /dev/null
+++ b/pkgs/development/misc/newlib/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, buildPackages }:
+
+let version = "3.0.0";
+in stdenv.mkDerivation {
+  name = "newlib-${version}";
+  src = fetchurl {
+    url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz";
+    sha256 = "0chka3szh50krcz2dcxcsr1v1i000jylwnsrp2pgrrblxqsn6mn8";
+  };
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  # newlib expects CC to build for build platform, not host platform
+  preConfigure = ''
+    export CC=cc
+  '';
+
+  configurePlatforms = [ "build" "target" ];
+  configureFlags = [
+    "--host=${stdenv.buildPlatform.config}"
+
+    "--disable-newlib-supplied-syscalls"
+    "--disable-nls"
+    "--enable-newlib-io-long-long"
+    "--enable-newlib-register-fini"
+  ];
+
+  dontDisableStatic = true;
+
+  passthru = {
+    incdir = "/${stdenv.hostPlatform.config}/include";
+    libdir = "/${stdenv.hostPlatform.config}/lib";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6e2205a0bb..d4749c1f49b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9743,7 +9743,8 @@ with pkgs;
     /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross
     else if name == "bionic" then targetPackages.bionic
     else if name == "uclibc" then targetPackages.uclibcCross
-    else if name == "avrlibc" then targetPackages.avrlibcCross
+    else if name == "avrlibc" then targetPackages.avrlibcCross or avrlibcCross
+    else if name == "newlib" then targetPackages.newlibCross or newlibCross
     else if name == "musl" then targetPackages.muslCross or muslCross
     else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
     else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries
@@ -22836,4 +22837,9 @@ with pkgs;
   };
 
   tsung = callPackage ../applications/networking/tsung {};
+
+  newlib = callPackage ../development/misc/newlib { };
+  newlibCross = callPackage ../development/misc/newlib {
+    stdenv = crossLibcStdenv;
+  };
 }
-- 
GitLab


From 52dbd3380e0e9328d69c4abaae2d28b3e7e76bce Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 19 Oct 2018 11:47:43 -0500
Subject: [PATCH 0646/1065] systems/parse.nix: support weird system configs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There are some weird ones out there that don’t follow any pattern:

- arm-none-eabi
- powerpc-none-eabi
- aarch64-none-elf
---
 lib/systems/parse.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 058d4bed908..a390a098c60 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -119,6 +119,7 @@ rec {
     apple = {};
     pc = {};
 
+    none = {};
     unknown = {};
   };
 
@@ -202,6 +203,7 @@ rec {
     cygnus       = {};
     msvc         = {};
     eabi         = {};
+    elf         = {};
 
     androideabi  = {};
     android      = {
@@ -263,6 +265,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   { cpu = elemAt l 0;                      kernel = elemAt l 1;                   };
     "3" = # Awkwards hacks, beware!
       if elemAt l 1 == "apple"
@@ -273,6 +277,10 @@ 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 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)}
-- 
GitLab


From 946598d071af5e3265a3fad72afe620944976835 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 16 Oct 2018 22:31:22 -0500
Subject: [PATCH 0647/1065] release-cross: add new targets

adds:

- arm-embedded
- avr
- aarch64-embedded
- powerpc-embedded
---
 pkgs/top-level/release-cross.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 89a8af6794f..3dec10ad0db 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -12,6 +12,12 @@ with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
 let
   nativePlatforms = all;
 
+  embedded = {
+    buildPackages.binutils = nativePlatforms;
+    buildPackages.gcc = nativePlatforms;
+    libcCross = nativePlatforms;
+  };
+
   common = {
     buildPackages.binutils = nativePlatforms;
     gmp = nativePlatforms;
@@ -134,6 +140,11 @@ in
   android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt (linuxCommon // {
   });
 
+  avr = mapTestOnCross lib.systems.examples.avr embedded;
+  arm-embedded = mapTestOnCross lib.systems.examples.arm-embedded embedded;
+  powerpc-embedded = mapTestOnCross lib.systems.examples.powerpc-embedded embedded;
+  aarch64-embedded = mapTestOnCross lib.systems.examples.aarch64-embedded embedded;
+
   /* Cross-built bootstrap tools for every supported platform */
   bootstrapTools = let
     tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; };
-- 
GitLab


From 501d072b5ff48d55b97027a38626cb252c4d026c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 19 Oct 2018 12:22:29 -0500
Subject: [PATCH 0648/1065] gnuk{-git,-unstable}: remove

These two are unmaintained, no reason to keep them when they are
out-of-date
---
 pkgs/misc/gnuk/git.nix          | 11 -----------
 pkgs/misc/gnuk/unstable.nix     | 11 -----------
 pkgs/top-level/all-packages.nix |  6 ------
 3 files changed, 28 deletions(-)
 delete mode 100644 pkgs/misc/gnuk/git.nix
 delete mode 100644 pkgs/misc/gnuk/unstable.nix

diff --git a/pkgs/misc/gnuk/git.nix b/pkgs/misc/gnuk/git.nix
deleted file mode 100644
index 142c4a0e7e5..00000000000
--- a/pkgs/misc/gnuk/git.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ callPackage, fetchgit, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "2015-04-22";
-
-  src = fetchgit {
-    url = "git://git.gniibe.org/gnuk/gnuk.git";
-    rev = "3d5a776ab15a4ae6e17d91341a58eda3db09f700";
-    sha256 = "1f9l1rwy630z8cnjd6lfv0zp6ij3c9ifbm3fym245049hh2xds7v";
-  };
-})
diff --git a/pkgs/misc/gnuk/unstable.nix b/pkgs/misc/gnuk/unstable.nix
deleted file mode 100644
index 16dbe5d21fc..00000000000
--- a/pkgs/misc/gnuk/unstable.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ callPackage, fetchgit, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "1.1.4";
-
-  src = fetchgit {
-    url = "git://git.gniibe.org/gnuk/gnuk.git";
-    rev = "e7e8b9f5ca414a5c901f61b0f043c8da42414103";
-    sha256 = "0js9dc1iyvrrcb0d8a2irivrli3yb7mxmpxws5a2n53hj5xc4n6l";
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4749c1f49b..15f50090576 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21984,12 +21984,6 @@ with pkgs;
   gnuk = callPackage ../misc/gnuk {
     gcc-arm-embedded = gcc-arm-embedded-4_9;
   };
-  gnuk-unstable = lowPrio (callPackage ../misc/gnuk/unstable.nix {
-    gcc-arm-embedded = gcc-arm-embedded-4_9;
-  });
-  gnuk-git = lowPrio (callPackage ../misc/gnuk/git.nix {
-    gcc-arm-embedded = gcc-arm-embedded-4_9;
-  });
 
   greybird = callPackage ../misc/themes/greybird { };
 
-- 
GitLab


From 3aec5309642afd882f1e842c7ed3933f8a6bc9a4 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 29 Oct 2018 19:23:46 +0100
Subject: [PATCH 0649/1065] gitlab: 11.4.0 -> 11.4.3

---
 .../applications/version-management/gitlab/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index ba37091c433..ace0df5efdf 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -11,29 +11,29 @@ let
     groups = [ "default" "unicorn" "ed25519" "metrics" ];
   };
 
-  version = "11.4.0";
+  version = "11.4.3";
 
   sources = if gitlabEnterprise then {
     gitlabDeb = fetchurl {
       url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb";
-      sha256 = "1y2a8acgsgrgcjazijsflhxq4fwqvd9yhrjx5pcncb24vl0x6dg4";
+      sha256 = "1cw75qj508z6n00rqgqjzdm2013kyb7c57cypmq0m08nc6f3jspz";
     };
     gitlab = fetchFromGitLab {
       owner = "gitlab-org";
       repo = "gitlab-ee";
       rev = "v${version}-ee";
-      sha256 = "1pyqk1c5bml7chs4pq1fcxkrhk5r327xx9my6zmp2cb503s5m590";
+      sha256 = "1vqc77whpbsifbm9vgcmpxnw13v8jz1s9q04i8jfv99c59fjlids";
     };
   } else {
     gitlabDeb = fetchurl {
       url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb";
-      sha256 = "0wiizjihn1a6hg6a2wpwmnh5a34n102va4djac3sgx74mwx4bniq";
+      sha256 = "0vk03k42pp92h520wnynl9czcigjhj9m7y68z1x0gwqr9m61r7zm";
     };
     gitlab = fetchFromGitLab {
       owner = "gitlab-org";
       repo = "gitlab-ce";
       rev = "v${version}";
-      sha256 = "1a8pavqc9bblss5z9ikc9b0k0ra33vw73zy7rvn0v1wgvbqpc24k";
+      sha256 = "1zvjz2gv2vwqqjz52zcvi0ap3d8rdbpgsqk9wv80hqq4v37a5gfx";
     };
   };
 
-- 
GitLab


From 20643a78073ecd95e960317c6b7488ba0febbf06 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 29 Oct 2018 16:10:24 -0400
Subject: [PATCH 0650/1065] texlive: provide repstopdf

repstopdf is supposed to be a symlink to epstopdf. Then epstopdf looks
at "$0" to detect when restricted mode needs to be enabled.  Unfortunately
our wrapper will drop all intermediate symlinks, which messes up "$0".
Restricted mode appears to be a security feature, so a test is
introduced to verify that the wrapper works as expected.
---
 .../tools/typesetting/tex/texlive/combine.nix | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index f76b71ced3c..ea292674819 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -218,8 +218,29 @@ in buildEnv {
         ln -sv "$(realpath $s)" "$out/bin/$tName" # wrapped below
       done
     )
+  '' +
+    # A hacky way to provide repstopdf
+    #  * Copy is done to have a correct "$0" so that epstopdf enables the restricted mode
+    #  * ./bin/repstopdf needs to be a symlink to be processed by wrapBin
+  ''
+    if [[ -e ./bin/epstopdf ]]; then
+      cp $(realpath ./bin/epstopdf) ./share/texmf/scripts/repstopdf
+      ln -s "$out"/share/texmf/scripts/repstopdf ./bin/repstopdf
+    fi
+  '' +
+    # finish up the wrappers
+  ''
     rm "$out"/bin/*-sys
     wrapBin
+  '' +
+    # Perform a small test to verify that the restricted mode get enabled when
+    # needed (detected by checking if it disallows --gscmd)
+  ''
+    if [[ -e ./bin/epstopdf ]]; then
+      echo "Testing restricted mode for {,r}epstopdf"
+      ! (epstopdf --gscmd echo /dev/null 2>&1 || true) | grep forbidden
+      (repstopdf --gscmd echo /dev/null 2>&1 || true) | grep forbidden
+    fi
   '' +
   # TODO: a context trigger https://www.preining.info/blog/2015/06/debian-tex-live-2015-the-new-layout/
     # http://wiki.contextgarden.net/ConTeXt_Standalone#Unix-like_platforms_.28Linux.2FMacOS_X.2FFreeBSD.2FSolaris.29
-- 
GitLab


From 2cf654a64e3d7bbcd54ff0c17bcf37230a0b6178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denny=20Sch=C3=A4fer?= <denny.schaefer@tuxinaut.de>
Date: Mon, 29 Oct 2018 21:58:42 +0100
Subject: [PATCH 0651/1065] vim-plugins/iceberg init

---
 pkgs/misc/vim-plugins/generated.nix    | 424 +++++++++++++------------
 pkgs/misc/vim-plugins/vim-plugin-names |   1 +
 2 files changed, 218 insertions(+), 207 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4c6c577ce6d..bd3458b98c8 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-05-23";
+    name = "agda-vim-2018-10-29";
     src = fetchFromGitHub {
       owner = "derekelkins";
       repo = "agda-vim";
-      rev = "24169e70c1dbd784349b1551b6a3753680d9bb87";
-      sha256 = "1bn2g89dvwccfl4ki07jb8iydb3d0s4rm7z5gv5q1bv3lccndax6";
+      rev = "75853188f15175728e938e1e69da8916148d7f7a";
+      sha256 = "1xv3il21fl602hilb3hk1r2bsbnf8brjyv61hprxsj8xd2s36a4d";
     };
   };
 
@@ -53,12 +53,12 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-10-03";
+    name = "ale-2018-10-29";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "e984497ec9dc8a465c2873d64c51629c9a559111";
-      sha256 = "074s3rgd71nvnanzz1ivd3xpji3qqnsd4ix9ka2xajlscn7i5x6q";
+      rev = "cae40e1c347064bd3ab5eb4c04e9e357d3d82105";
+      sha256 = "0f7qsp0gpafk7fimcbivx2cm53hpjz6hr6lzdg8wnxcm0gdw7827";
     };
   };
 
@@ -103,12 +103,12 @@
   };
 
   base16-vim = buildVimPluginFrom2Nix {
-    name = "base16-vim-2018-05-24";
+    name = "base16-vim-2018-10-08";
     src = fetchFromGitHub {
       owner = "chriskempson";
       repo = "base16-vim";
-      rev = "fcce6bce6a2f4b14eea7ea388031c0aa65e4b67d";
-      sha256 = "0wi8k80v2brmxqbkk0lrvl4v2sslkjfwpvflm55b3n0ii8qy39nk";
+      rev = "7e9af12d680d81cc1277c07ef5acee8c83828f3f";
+      sha256 = "1al00wf0bf61r0bfsfbq8g2qq8sbzj6z8c85787d3qfinvniz0cl";
     };
   };
 
@@ -123,12 +123,12 @@
   };
 
   calendar-vim = buildVimPluginFrom2Nix {
-    name = "calendar-vim-2018-08-05";
+    name = "calendar-vim-2018-10-23";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "calendar.vim";
-      rev = "1f20b779171d4d3a20abd47508692fbae32e3188";
-      sha256 = "01aiaslaww117kdwf7qxjc647g6bxcqr694mi3l0llblq549ih5l";
+      rev = "3c6a7677543824aab0eb9946d376fe5d45a935c5";
+      sha256 = "0jnk2hi9n1p7fqclifiyckrcady6fbkag6z29v7n6bbzhvz0qzzs";
     };
   };
 
@@ -204,12 +204,12 @@
   };
 
   committia-vim = buildVimPluginFrom2Nix {
-    name = "committia-vim-2018-09-16";
+    name = "committia-vim-2018-10-23";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "committia.vim";
-      rev = "7d762c61b3907249cc1f13ec19c72ccd02ed1ade";
-      sha256 = "0sq40m748xmjqqwhvkgly9205h1q5c7d70wzahjbnnzqi5mlk4pb";
+      rev = "d367190c7ffe95f4ac5d30b2e9da4cd9898579b9";
+      sha256 = "1yqsdy1mxc775qcrcl1yi930m2q6364mgjdj06vwnph1rg98w0ql";
     };
   };
 
@@ -264,12 +264,12 @@
   };
 
   csv-vim = buildVimPluginFrom2Nix {
-    name = "csv-vim-2018-09-26";
+    name = "csv-vim-2018-10-04";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "csv.vim";
-      rev = "41e9bd08371c253e7c8d1cb4d16066f8132c5a1c";
-      sha256 = "1fvlw39a8vv3vxrpsg6f25is3drp2j83giydp06h3fyzgqgqfsfx";
+      rev = "7aa17f00a6cc96b9c9c364c6786c24f97c04605b";
+      sha256 = "06mdnpfch0rfhwdwqp4dhg7qx1gwsmkd6dlsd1ypc44r7wdjk38d";
     };
   };
 
@@ -304,12 +304,12 @@
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix {
-    name = "ctrlp-vim-2018-09-13";
+    name = "ctrlp-vim-2018-10-28";
     src = fetchFromGitHub {
       owner = "ctrlpvim";
       repo = "ctrlp.vim";
-      rev = "ebc568c3992d9002d1d35b85737dfa0d9ce70d9f";
-      sha256 = "0hh4wcyx0smv70axn18gdscmcmhwbbccam9klx0c613qccl5w70i";
+      rev = "5e40e555d31d9cce2188d9fa724d1debcad28aa6";
+      sha256 = "1skn8p527541w1kynk08dfpai2wlbmylw5sa4z2b7kmmnxa1lq47";
     };
   };
 
@@ -334,22 +334,22 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-09-30";
+    name = "denite-nvim-2018-10-28";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "3ffc9a27dd6c2ae4c98f0a153564ee64da2722b2";
-      sha256 = "1q1rh1nw90g04jghc4jhaccssv1r7lc69ij00b3v2253ld9bdmlv";
+      rev = "0a089bb122eb88e182420334a4f1df0c22917856";
+      sha256 = "1virb8lr591jbzmb91dhki32jx9g15a89dsxbh0vy9lcawaikypj";
     };
   };
 
   deol-nvim = buildVimPluginFrom2Nix {
-    name = "deol-nvim-2018-10-03";
+    name = "deol-nvim-2018-10-12";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "61283778287107a5e2a80b360d6d53610a27774f";
-      sha256 = "099dqlrz5baycrgz27m8hk6xy103jrdgph1yg7nmkchavvjp2rz1";
+      rev = "04a5295ebad2df1a2141b85dc0b78cc51ea86fb4";
+      sha256 = "1v5qip8kzrsq8qmmjrvhm15d9wrn48iz2s62qddcgvc0sdzk1y64";
     };
   };
 
@@ -365,23 +365,23 @@
   };
 
   deoplete-go = buildVimPluginFrom2Nix {
-    name = "deoplete-go-2018-09-30";
+    name = "deoplete-go-2018-10-20";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-go";
-      rev = "5b2c70947eaeafabe3d5429527dc0fbd7e1aad64";
-      sha256 = "0vwsd5mpyaa4ixqavqvxc0b0515v9iidqzxzv1di73xlxrmaghzi";
+      rev = "8bb6d5f51ca825ef88d474c8aa9231692d6c2961";
+      sha256 = "15qwhkx24m7drahksrsvvpdzj9wpm0k1722ry6sdwgd40q8d3jrh";
       fetchSubmodules = true;
     };
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix {
-    name = "deoplete-jedi-2018-09-18";
+    name = "deoplete-jedi-2018-10-24";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
-      rev = "d49b166458784585dc0cbfb0d7643bc02eba3dd8";
-      sha256 = "1dza6bzij0f8bfs7k9j954f8xccjjcrc7wrcgrm1qw0d2jbm4bgq";
+      rev = "4ffb3a5ace39143813d63c7f78137bf8478b91e9";
+      sha256 = "1fik8snm6f7f337qidlkkhgri756rgyaswk3ndfiqw5vj673r4dw";
       fetchSubmodules = true;
     };
   };
@@ -417,42 +417,42 @@
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix {
-    name = "deoplete-nvim-2018-10-03";
+    name = "deoplete-nvim-2018-10-28";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "63fb188c547eb5ccf8cd713a33fbb7c80ac03ec9";
-      sha256 = "1f2cfqyc17b8jvd0a2qw0njaw8ac15zbsnjvnwls3wm1f9mmhh6g";
+      rev = "aa43a5f03b7b995841b416c40e8bbc8bcbf9b1a2";
+      sha256 = "1ixjrf1rrdznfprd9w5fx86k0ni67c9amgvwwbbzhqz3i1zgwc3g";
     };
   };
 
   dhall-vim = buildVimPluginFrom2Nix {
-    name = "dhall-vim-2018-07-30";
+    name = "dhall-vim-2018-10-25";
     src = fetchFromGitHub {
       owner = "vmchale";
       repo = "dhall-vim";
-      rev = "2693bfaf9167ac69ee96c1165b4354f03f4d8b24";
-      sha256 = "0qm6z8z70cxqqlmxgq497w96nv5sn2gbxnc74balbhpk17bms4m0";
+      rev = "aac9deeb695c810fee8a702fc5fca99a26f1d4bd";
+      sha256 = "17avn55dixv0rxhc3jzpnadkvldrbq7r81nwgnzi4xlr3fjxjwfc";
     };
   };
 
   echodoc-vim = buildVimPluginFrom2Nix {
-    name = "echodoc-vim-2018-09-30";
+    name = "echodoc-vim-2018-10-20";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
-      rev = "4e229bdc8fadf9842ce873665b63149db200adbf";
-      sha256 = "0xqh1fdi89nph3f400bxqdsp6j0pcxi7l3ay4wldxlljhpva20zr";
+      rev = "3fa121e0a0abee0762867a01b25f4e891594da6e";
+      sha256 = "17qckl9x1yd70zxgwvpkh5nwx8zs5f6d8xismd0rbpigd08qd06q";
     };
   };
 
   editorconfig-vim = buildVimPluginFrom2Nix {
-    name = "editorconfig-vim-2018-07-25";
+    name = "editorconfig-vim-2018-10-14";
     src = fetchFromGitHub {
       owner = "editorconfig";
       repo = "editorconfig-vim";
-      rev = "2c3e5323609d97ad7bda6fc22ae1f7746caab3d4";
-      sha256 = "0a1nszrhxh9ixp5n47w89ijkvjk3rf29ypiz5blf4pnja39r336x";
+      rev = "736451ae203c5e3bcce39f1be11d68009b783d82";
+      sha256 = "01j2y02z23ylydkm7yij2m9nimk54m06ik2hyldj99yz8qi5vp18";
       fetchSubmodules = true;
     };
   };
@@ -468,12 +468,12 @@
   };
 
   ensime-vim = buildVimPluginFrom2Nix {
-    name = "ensime-vim-2018-04-20";
+    name = "ensime-vim-2018-10-10";
     src = fetchFromGitHub {
       owner = "ensime";
       repo = "ensime-vim";
-      rev = "634cce6eae10a31cd6eec259890bdcda326ee3c2";
-      sha256 = "03sr53680kcwxaa5xbqzdfbsgday3bkzja33wym49w9gjmlaa320";
+      rev = "caa734e84f002b25446c615706283a74edd4ecfe";
+      sha256 = "190qq8r2zs7xzmsag7ygk6dvpav3cnzlc40lc3fvwmkfwgci5zg0";
     };
   };
 
@@ -498,12 +498,12 @@
   };
 
   ferret = buildVimPluginFrom2Nix {
-    name = "ferret-2018-03-23";
+    name = "ferret-2018-10-18";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
-      rev = "b1ef0cf4af92c3a896821597d0d1a44b9c93dc5a";
-      sha256 = "1gpbk396a7pihi6pg2jmxwv6nibprbcr8fg73kxs6kj0d60wgasy";
+      rev = "984f0364f8a4ea77c7075e67cd753037ecfdafdf";
+      sha256 = "0vis6zgknjmwjhv5vxiv4k5d78971sv61rjc8gh32sq2ksxk07zr";
     };
   };
 
@@ -549,12 +549,12 @@
   };
 
   fzf-vim = buildVimPluginFrom2Nix {
-    name = "fzf-vim-2018-10-01";
+    name = "fzf-vim-2018-10-22";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "c6275ee1080de4d94bb3f3cfd6e7cc0ccecd9e64";
-      sha256 = "1xy7yk4d9p7mbk8s9nj5kqihdgb4a4b004ivbnxwappj52znzw1g";
+      rev = "50707b089b1c61fcdb300ec1ecbc4249ead4af11";
+      sha256 = "1h0x701jcj2zwyzaxlzzfax3z8jxrn255wawxcjw9fskz9kldd68";
     };
   };
 
@@ -648,6 +648,16 @@
     };
   };
 
+  iceberg-vim = buildVimPluginFrom2Nix {
+    name = "iceberg-vim-2018-10-17";
+    src = fetchFromGitHub {
+      owner = "cocopon";
+      repo = "iceberg.vim";
+      rev = "0a18b0fbfdcdace35ee7ff4397ab6932d6dae1da";
+      sha256 = "1p5x8kzxs491c2naxqhmqwdk85p3b6qr1aini746qm9ks5afhcgn";
+    };
+  };
+
   idris-vim = buildVimPluginFrom2Nix {
     name = "idris-vim-2017-12-04";
     src = fetchFromGitHub {
@@ -719,12 +729,12 @@
   };
 
   julia-vim = buildVimPluginFrom2Nix {
-    name = "julia-vim-2018-10-01";
+    name = "julia-vim-2018-10-21";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
-      rev = "6e218a18d7b753423c59790105feb33d0388e2d0";
-      sha256 = "1wl3djm8fc44da6srvw7g3r1xi5j6742wjbz8i98qalai5fkcibd";
+      rev = "934618a71bcf64ff0fb94780dc1aefa58e81470a";
+      sha256 = "1pw4snax7ibxhd8xff41lb86vk7a38yrcq85p89sis6nln6larq5";
     };
   };
 
@@ -809,12 +819,12 @@
   };
 
   ncm2 = buildVimPluginFrom2Nix {
-    name = "ncm2-2018-09-30";
+    name = "ncm2-2018-10-15";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
-      rev = "02a263f7e38ee9569d8338da2d1cab2708b59150";
-      sha256 = "0gz3vyv9a3kl3bd3mq7qlgkfvz1p9gnk7fjjb7bsabayq3854di9";
+      rev = "4aaf9e1e313109d32fd2b64a5299416357d901b2";
+      sha256 = "09rg3pa0yirhsn1x558k3bzh6fyy4whnfqlm89wvmzxw6rm8xnpw";
     };
   };
 
@@ -909,12 +919,12 @@
   };
 
   neodark-vim = buildVimPluginFrom2Nix {
-    name = "neodark-vim-2018-05-26";
+    name = "neodark-vim-2018-10-17";
     src = fetchFromGitHub {
       owner = "KeitaNakamura";
       repo = "neodark.vim";
-      rev = "c966731b54a64b379ca5519c25d3cedb90df1d31";
-      sha256 = "0rimpx3569lr4whg7lc0nym0irminwf6r6f2wr320pdhhfx7a0ch";
+      rev = "e95e924081f95ec18d9b6d7239a445db982669e8";
+      sha256 = "11mib0yf3kq626r9afw1127w2hxbqci3fgvh3lfl36mk06sm1qqb";
     };
   };
 
@@ -939,12 +949,12 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-10-01";
+    name = "neomake-2018-10-28";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "a6715ed7df767ac75166b22305232687f47f5be8";
-      sha256 = "0g8rm6y9vvzy1wxrxwjg6y0vw8na727z7mvjf8d20zmscpvmarj0";
+      rev = "35f4c002d55d5f722a08eb9acf126f7717072812";
+      sha256 = "0ad5dqyjpwn78nadg90jd03n0mkllm0r4jxq72h77dwxsd1prgl9";
     };
   };
 
@@ -969,22 +979,22 @@
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix {
-    name = "neosnippet-vim-2018-07-30";
+    name = "neosnippet-vim-2018-10-23";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet.vim";
-      rev = "70700ddef65f8f0639b336d04a0d2dbdc4eb0830";
-      sha256 = "0szhmdqqgpfy6shwiw7wnsd06cz8c7v5zmpaa3hzs32gyrx49rza";
+      rev = "32583e605ebe96bba805bdf0d526b951345c8b3e";
+      sha256 = "105jnnw35ffxwx6zqazh6rizwqdndqc3n656xhljfng33c0lr5mk";
     };
   };
 
   neoyank-vim = buildVimPluginFrom2Nix {
-    name = "neoyank-vim-2018-03-26";
+    name = "neoyank-vim-2018-10-17";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neoyank.vim";
-      rev = "ea3cd47ccb40cb2e26cb607d28475aa0fdb26fef";
-      sha256 = "1zbf8062rpk56nd1zxqhwa8bdpxl9zp887l9nm4s9hc4ndsk4928";
+      rev = "ba337d80769c4f2f19c04df4349a196f52fe5094";
+      sha256 = "0sq595xlijz6xsil2z21kf4662cvmzzm6bsvysfz43wgl16dd5s6";
     };
   };
 
@@ -999,12 +1009,12 @@
   };
 
   nerdtree = buildVimPluginFrom2Nix {
-    name = "nerdtree-2018-09-17";
+    name = "nerdtree-2018-10-25";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "599238ad99642e8767c4be6adda75bd84afdfd42";
-      sha256 = "1yjx254lmwil42hild0nprxpb26rw84872cnxrzaqfljwsyq7wwv";
+      rev = "91e0f2253fbecefa7e14f095950341584877ef19";
+      sha256 = "1lkmxplrv211drzmwi93v1fmicdjm146vl471s3h21y77k0hd2f5";
     };
   };
 
@@ -1059,22 +1069,22 @@
   };
 
   nvimdev-nvim = buildVimPluginFrom2Nix {
-    name = "nvimdev-nvim-2018-09-08";
+    name = "nvimdev-nvim-2018-10-05";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvimdev.nvim";
-      rev = "cf5acd7712524886881efdba8f2e4cee0f133ed9";
-      sha256 = "02jqgbkzn47xljv6kk1lk6gzq3c900lfs2s4dpg1vapd5n0yi4am";
+      rev = "ef05db6817d8083f8daf9ddd99b79acc364d57a6";
+      sha256 = "1c44pwsjllhcmlabz9pc9qb5p6lgilfzdsx4rcjc8q8ixijc7w99";
     };
   };
 
   onehalf = buildVimPluginFrom2Nix {
-    name = "onehalf-2018-09-16";
+    name = "onehalf-2018-10-21";
     src = fetchFromGitHub {
       owner = "sonph";
       repo = "onehalf";
-      rev = "ecc3d8d5691b8d3b39345a4400e631638bc078f7";
-      sha256 = "13w5n64wlwp70m74j2k12csm6ajq7jwgg7dq25azwrvxixi3iy9p";
+      rev = "9c2afdf4254cb6029c8b57f69b5018ba15c3ad9f";
+      sha256 = "0qvf3zjw1c9b7am4imqip5xgdn92rx1dph2q4fi1jwxd23d9jd5d";
     };
   };
 
@@ -1219,12 +1229,12 @@
   };
 
   riv-vim = buildVimPluginFrom2Nix {
-    name = "riv-vim-2018-06-20";
+    name = "riv-vim-2018-10-17";
     src = fetchFromGitHub {
       owner = "Rykka";
       repo = "riv.vim";
-      rev = "fb6d6f8c9d85128fd69c74f11bb7413addc002e8";
-      sha256 = "1mjp90lz6jf3w9j4h1sidz7kfxhi9hk27pdnvb0hrvxw0q3bj9ch";
+      rev = "09ae81f1fcf43d77a36705a7b9201f8cc1c85e23";
+      sha256 = "0a3zzyxz2djy8dwmqjvhfqsingll28dnmnqdw0yii8r4xqxg6a8v";
     };
   };
 
@@ -1249,12 +1259,12 @@
   };
 
   rust-vim = buildVimPluginFrom2Nix {
-    name = "rust-vim-2018-09-16";
+    name = "rust-vim-2018-10-26";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "5e4672c8ba490d2663c34d89616729b36b294594";
-      sha256 = "189vjd2v271h4634i1fxi9g1sfxkgsb087454na67jrz1pwd8xvw";
+      rev = "039b7c7c4f0b9fec9879027d6700229c33daae3e";
+      sha256 = "09g9q91qvbrrb2hrybdw6p8jm3q3v9j9yffpm9q0nz6g8p6zi8xq";
     };
   };
 
@@ -1349,12 +1359,12 @@
   };
 
   syntastic = buildVimPluginFrom2Nix {
-    name = "syntastic-2018-10-03";
+    name = "syntastic-2018-10-18";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "syntastic";
-      rev = "df9f7057d18f996b9e40c9c57eea3e016350abdf";
-      sha256 = "1yrs2yli39wjvmwnzsxg57i6kldhcmbwr90cqgbf6qi09rba828p";
+      rev = "89e485c7f8b1f285b43bb397394f22b79021aac1";
+      sha256 = "0xy54pllpr2bn1wp2fhq5nwrjpcclp61mhzls99cbzzpxfiwirlz";
     };
   };
 
@@ -1409,12 +1419,12 @@
   };
 
   targets-vim = buildVimPluginFrom2Nix {
-    name = "targets-vim-2018-05-27";
+    name = "targets-vim-2018-10-24";
     src = fetchFromGitHub {
       owner = "wellle";
       repo = "targets.vim";
-      rev = "c3042dc18acc0dfcee479310d3efc6aefe92db75";
-      sha256 = "0shnlgwrxzrd0m3k6hnmr66i2l4zknp0pn7f71d2frx937gih34q";
+      rev = "19586689fab6f1ff81743a675645f62adf745b0b";
+      sha256 = "0bvx3dynbsralywkhsi9yjr188ayczp263di3y00dzwymxh7m1p5";
     };
   };
 
@@ -1479,12 +1489,12 @@
   };
 
   typescript-vim = buildVimPluginFrom2Nix {
-    name = "typescript-vim-2018-08-15";
+    name = "typescript-vim-2018-10-17";
     src = fetchFromGitHub {
       owner = "leafgarland";
       repo = "typescript-vim";
-      rev = "db131b8cd42973ed26928e9e445c1a745a98cff8";
-      sha256 = "1l7wbwv3xirl9nvjb2f693knxsif5qanjknd9lija8m7gnwagzm4";
+      rev = "0e9d92eead2df21abe342c4341c55536dd36b0af";
+      sha256 = "1mf8cwkppfnxgjjgy762m1zbxmqxb9fpgxr6kbcjsi8qhzip0cvd";
     };
   };
 
@@ -1499,12 +1509,12 @@
   };
 
   undotree = buildVimPluginFrom2Nix {
-    name = "undotree-2018-09-17";
+    name = "undotree-2018-10-15";
     src = fetchFromGitHub {
       owner = "mbbill";
       repo = "undotree";
-      rev = "c15a0409d9d5a7eacf18d3061a8a37d114532765";
-      sha256 = "0iaj69cc7ysylql43ybprsls9liprmg46ak9mmbh1vjgny2c1nf0";
+      rev = "9172c17f6d07405f14707ff273e3ca9f35aa9e42";
+      sha256 = "12z9y7lljhq3gsxpn1ivyf2cvasc0br3fdkdhnrz305zxib97r5q";
     };
   };
 
@@ -1519,32 +1529,32 @@
   };
 
   verilog_systemverilog-vim = buildVimPluginFrom2Nix {
-    name = "verilog_systemverilog-vim-2018-09-29";
+    name = "verilog_systemverilog-vim-2018-10-22";
     src = fetchFromGitHub {
       owner = "vhda";
       repo = "verilog_systemverilog.vim";
-      rev = "b82caf39715d7645bd6229e033bea5bb5144ae8c";
-      sha256 = "0i7bqg9aw6c3f0zhs7rq38m44xv7qlhhg0nabnhpk2xkw84cms69";
+      rev = "4809e36569363bc3b44c981cda842d5bb31e95ff";
+      sha256 = "124ak7596b19rz4vk2f05z6wkfhfrlawlz0y4am8fm4y1mdxsprm";
     };
   };
 
   vim = buildVimPluginFrom2Nix {
-    name = "vim-2018-09-20";
+    name = "vim-2018-10-27";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "15d0ff9f1a1a5455201dbf62221e8b119cfa9161";
-      sha256 = "1cmmx99hs10mnr5x5kmac39kxjf9n3riphirhmijsnym8yijrcz1";
+      rev = "854886980635eb70e119d2bd3bb94a0ce46fc71d";
+      sha256 = "1ff88clly227cj83ng6bwc8jn3zp20614agg94izqhsxr5bpdp5z";
     };
   };
 
   vim-abolish = buildVimPluginFrom2Nix {
-    name = "vim-abolish-2018-08-02";
+    name = "vim-abolish-2018-10-25";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-abolish";
-      rev = "40e8b973971beb5da279a499231464ae1d959c8b";
-      sha256 = "0ibhd9d57cwb2kls99wmbyl49w7v2niwqrf3pp7191pj46157720";
+      rev = "56a76a8c10ca91f3e8f0a2cd9afa2be32d262e24";
+      sha256 = "087l7mvb0rzcdfmrmng82s0abli6w2i4cbyiwps9k588sfcj0w7h";
     };
   };
 
@@ -1739,22 +1749,22 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-10-03";
+    name = "vim-airline-2018-10-22";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "f045452743736d53c7471bfb4698fd48569dc1e0";
-      sha256 = "16wmigvwxxryx1jkpsfbxwmlglrv1jjmmpckgsxwg4j6v4vkgk4g";
+      rev = "08e9aa5386eecfd6a6cbde1eff240619cd81beed";
+      sha256 = "0g9rlr6067sqyp0l4yacnr14phx1wn2jvjcq2x2zwkc0b28hxyrs";
     };
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix {
-    name = "vim-airline-themes-2018-09-05";
+    name = "vim-airline-themes-2018-10-25";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline-themes";
-      rev = "725789c110fbab52f8c18021f9d043839d7e31ed";
-      sha256 = "15k5s8yysnvm0swfi27g2yhrnkb8kzvswb58k1jbzb65nwdw139z";
+      rev = "65217b41da31f05d305b819f2a42a803dd0db434";
+      sha256 = "1pv9plmbmygcnkbkdjp7gr3rp42zdh4qkmv2cfbndhdfx4yd331g";
     };
   };
 
@@ -1789,12 +1799,12 @@
   };
 
   vim-autoformat = buildVimPluginFrom2Nix {
-    name = "vim-autoformat-2018-09-08";
+    name = "vim-autoformat-2018-10-22";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
-      rev = "98233b8f353fa5d237e89859a8f1b91c14c21397";
-      sha256 = "18xb803vx11wx9yhxvp6aq8kh0vbidxmwhwrjfcslrw0k1zis3yl";
+      rev = "db17ccbacb55beea82fdaa9a1cde82f6a928d16d";
+      sha256 = "0nnykvbz5hm4cpv9jqk0jb4zzywlwgbybbirf1655rqrqfv126pp";
     };
   };
 
@@ -1899,12 +1909,12 @@
   };
 
   vim-css-color = buildVimPluginFrom2Nix {
-    name = "vim-css-color-2018-09-12";
+    name = "vim-css-color-2018-10-20";
     src = fetchFromGitHub {
       owner = "ap";
       repo = "vim-css-color";
-      rev = "7ecfc4810f34dbcd5d22a14013f977a9aa699312";
-      sha256 = "1hds83biz0wv12rcqcdab1zm6lck1z4bdk67jq30x8siwcjvkwfy";
+      rev = "0ee02ec9753c74d356106f0a0c4ddb0dcf9705f0";
+      sha256 = "1fqngj2a4ky4z96vjryjfkblnr50jw99cfzc7xsjjpdy8j7wvrfk";
     };
   };
 
@@ -2109,22 +2119,22 @@
   };
 
   vim-fugitive = buildVimPluginFrom2Nix {
-    name = "vim-fugitive-2018-09-24";
+    name = "vim-fugitive-2018-10-28";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "a9100fafb8c6deb187ee1cfaa37a4a02018d6c9a";
-      sha256 = "0p37gywcwbdd2sl09s2c3dhr0cvf2s53jpwyz93jls2dgnlbdri8";
+      rev = "6d497b0e63173f89cfabe12ea27a7a5a8b29ac8a";
+      sha256 = "1ma9zxqf0ybl6y6qd9wjp97lgrwvgzpqy5zca0c6da29gm03kb02";
     };
   };
 
   vim-ghost = buildVimPluginFrom2Nix {
-    name = "vim-ghost-2018-10-02";
+    name = "vim-ghost-2018-10-05";
     src = fetchFromGitHub {
       owner = "raghur";
       repo = "vim-ghost";
-      rev = "306d83c152cd9db54bc45c5a21b92615d07bd4c7";
-      sha256 = "1p6fjqlp1w7zy36isb1i3xzmjvlh2ng6iv3mb2ixllmiq4bdk26i";
+      rev = "8a3acdde943688d52407b5da08988dfc528ea10c";
+      sha256 = "0x7mgziyx8gs5cc37c4rm0hrzgzpg4klnkfviyj2k3h4qqj9hkaj";
     };
   };
 
@@ -2149,12 +2159,12 @@
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix {
-    name = "vim-gitgutter-2018-08-15";
+    name = "vim-gitgutter-2018-10-18";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "50a7062909d91a290fae04219887b1b45f3138db";
-      sha256 = "1bgpy85dxvn40ybzxih25gysy941jvylxm0fmkd5qpwkf7xm26wq";
+      rev = "0597380f6b22f43a3ea6ff8364d5c239bb2504ea";
+      sha256 = "18v4y616q29al2lx62gkcv5q9ka8042dk8y6i9b5jmyjfwps0q53";
     };
   };
 
@@ -2169,12 +2179,12 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-10-04";
+    name = "vim-go-2018-10-23";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "92b360fca43553b56766aaccaf3d9166575e6061";
-      sha256 = "0wq2v9damr8yp3nxxwdl1kd1vkndb456m33yjky7nrmxyshhxgnm";
+      rev = "d5ce080c25806d68189be641e19996898138f1a4";
+      sha256 = "09kq1zjq98vzy8gjgxiqkb7ibl3wpjz8lkzqjm110axxmx01b317";
     };
   };
 
@@ -2189,12 +2199,12 @@
   };
 
   vim-grepper = buildVimPluginFrom2Nix {
-    name = "vim-grepper-2018-09-10";
+    name = "vim-grepper-2018-10-29";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-grepper";
-      rev = "f61a745c1e19c80427a251f556f28fc31e962f6d";
-      sha256 = "0l465qpphyi2c53hfwhc6fvj1s7vs2yc2l2spw387av6yqw83m9g";
+      rev = "54cb4c55bd8d80fc046f62b8f6486db2de424399";
+      sha256 = "1bzzyh2yav9f54gn17ny8gpi5h70yvjqdyg9lg0b1rglvirjpb1r";
     };
   };
 
@@ -2259,12 +2269,12 @@
   };
 
   vim-highlightedyank = buildVimPluginFrom2Nix {
-    name = "vim-highlightedyank-2018-10-02";
+    name = "vim-highlightedyank-2018-10-08";
     src = fetchFromGitHub {
       owner = "machakann";
       repo = "vim-highlightedyank";
-      rev = "26a2ecc1ac08462680074a721c265e42b1c545ba";
-      sha256 = "0ak8jws7qxjf52l3a97ks1ylf5ri7x03b90s2v4q3il4sry5h0m7";
+      rev = "51e25c9fa3bd2dca500ee0c910a45641d57a57fa";
+      sha256 = "1way32pgp0cb74p47g0fa5dqrz804lrypbddy65zcf3nd6rnr5qy";
     };
   };
 
@@ -2369,12 +2379,12 @@
   };
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
-    name = "vim-javacomplete2-2018-09-18";
+    name = "vim-javacomplete2-2018-10-09";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
-      rev = "3436162781c215f638af5ad8e83df9000edfa203";
-      sha256 = "1ak1czp7dnz376bvalpnr0n8y1s0x4cpwrhb596phfa2567c4f41";
+      rev = "a3af9721afcd3ce8972dd4ab0f40da947245c2fa";
+      sha256 = "0pgfgf82dv0dys2d4dq48d0n4gnbmxbqpvsy3fwmqdrw9zn9bw79";
     };
   };
 
@@ -2399,12 +2409,12 @@
   };
 
   vim-jsbeautify = buildVimPluginFrom2Nix {
-    name = "vim-jsbeautify-2018-01-31";
+    name = "vim-jsbeautify-2018-10-23";
     src = fetchFromGitHub {
       owner = "maksimr";
       repo = "vim-jsbeautify";
-      rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624";
-      sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq";
+      rev = "7c586568716263e27449d9b3f2475636bcd1f4dc";
+      sha256 = "1v1fcf1gm9p70l5nl9ba3xzdavx0jmz2v7x25v996dnfihaf494v";
       fetchSubmodules = true;
     };
   };
@@ -2430,12 +2440,12 @@
   };
 
   vim-jsonnet = buildVimPluginFrom2Nix {
-    name = "vim-jsonnet-2018-04-11";
+    name = "vim-jsonnet-2018-10-08";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-jsonnet";
-      rev = "1425166887329363381194adc457b02b663b1354";
-      sha256 = "0kkpvp1r06l3glhgw4wv3ihqisjhs5m0x7mxgy388hy4r73fx08j";
+      rev = "824dcfe76568dba38135332fc4729e2b2c4d9b3a";
+      sha256 = "1i79fc7yww5cpv9ck36smxq2yidj323kliyy5hw4fvsx7b4ahwsg";
     };
   };
 
@@ -2470,12 +2480,12 @@
   };
 
   vim-leader-guide = buildVimPluginFrom2Nix {
-    name = "vim-leader-guide-2017-03-18";
+    name = "vim-leader-guide-2018-10-06";
     src = fetchFromGitHub {
       owner = "hecal3";
       repo = "vim-leader-guide";
-      rev = "6ac8c663e65c9c0ded70417b84f66ee59457893e";
-      sha256 = "1hqha3ig40ls15bnb10xpbl91swn0gxqnhmz5frkvvdzj4wq55fw";
+      rev = "8dff63fcc29811bb30fccb135f31ad488a9a6170";
+      sha256 = "1n1qgvr729r28rprjkam0blh4qscs8bxf6ay7v8x732axg9gpyav";
     };
   };
 
@@ -2490,12 +2500,12 @@
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix {
-    name = "vim-localvimrc-2018-09-24";
+    name = "vim-localvimrc-2018-10-29";
     src = fetchFromGitHub {
       owner = "embear";
       repo = "vim-localvimrc";
-      rev = "e0ce126a2a8baf3816ae722b604121951a73e092";
-      sha256 = "0wi5gyafzdfwin6bxk369fz59gbw5w4xm4pgq2jpz5hxk7krwkll";
+      rev = "109962b3b7359ee2978417264b168ac6842db9cf";
+      sha256 = "13jpp5g91bynl91n8i8q8ldicii3ns42fq3hlnjcrhz5ml734wlf";
     };
   };
 
@@ -2520,12 +2530,12 @@
   };
 
   vim-markdown = buildVimPluginFrom2Nix {
-    name = "vim-markdown-2018-07-30";
+    name = "vim-markdown-2018-10-24";
     src = fetchFromGitHub {
       owner = "plasticboy";
       repo = "vim-markdown";
-      rev = "f19506b1bfe5e60c39581dd53f6913a09385f5dd";
-      sha256 = "0x0lsynmwg41fq8zf7149a2anj2b7fnm0d7b0vqnj3dwdwrjj5a1";
+      rev = "52ee2eb68a706972a1840ca036035033046568d6";
+      sha256 = "1w186rbnhk1y6sqqrwvgfs4xigf2c1f1xhjlhvmmb174cp5c84v2";
     };
   };
 
@@ -2550,12 +2560,12 @@
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix {
-    name = "vim-multiple-cursors-2018-08-10";
+    name = "vim-multiple-cursors-2018-10-16";
     src = fetchFromGitHub {
       owner = "terryma";
       repo = "vim-multiple-cursors";
-      rev = "dd9289af03abafa76b28c503e20747ff7d7d89e5";
-      sha256 = "082y4xsvsq2psllds7bncshzjsvh48l4200mri9vkv3f5mydz985";
+      rev = "f4fd6ad4e4075dd14d208af059063f1f3cfb7d55";
+      sha256 = "17fgwvs8qyyl1yywbmhb7wsv0i0nzl40bgaqik7w72zgndvai7ig";
     };
   };
 
@@ -2660,12 +2670,12 @@
   };
 
   vim-pandoc = buildVimPluginFrom2Nix {
-    name = "vim-pandoc-2018-08-13";
+    name = "vim-pandoc-2018-10-07";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc";
-      rev = "d0911146c68512defcf9d947542b06d7f7eed37e";
-      sha256 = "13qqwpmnzida7bm57r306w3fpb397h6b2gxclq9in0ccq5h92xid";
+      rev = "6be5e23d8ab5df9be20e324fffdc2f978cac2077";
+      sha256 = "07f91w4z49xgrachra78hnfs9jl2hqx15amhcr4phnpb9f3hmjbg";
     };
   };
 
@@ -2740,12 +2750,12 @@
   };
 
   vim-polyglot = buildVimPluginFrom2Nix {
-    name = "vim-polyglot-2018-07-08";
+    name = "vim-polyglot-2018-10-10";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
-      rev = "055f7710b65dfa2df52fc0b5be2486ae36ac5751";
-      sha256 = "1yyqsy3q1kjvlqffc10zn3kl0k468xj8mycc22xp1hp1zrkxcf5x";
+      rev = "ec1c94306953b678bb36572897bd218fe6c76506";
+      sha256 = "1n3s52ncmdbhygrdycrnqk9sj42413q0ah1q8a7s6q4z6zdm4scz";
     };
   };
 
@@ -2760,12 +2770,12 @@
   };
 
   vim-projectionist = buildVimPluginFrom2Nix {
-    name = "vim-projectionist-2018-09-18";
+    name = "vim-projectionist-2018-10-21";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-projectionist";
-      rev = "2f7ccf211326e06b89b5a677b2eee3ddb4b644a2";
-      sha256 = "13v9j32p16ak237gwvhk69s6q6maxpg41xd66dqvkj0d7hb21i0v";
+      rev = "ea1347bc475bb58a3c6aa8da37e5a4a019efbf17";
+      sha256 = "1sw4vnb0w78vjaxgx3w4gx6j8jdcb1146fnf7wv497wa2grmi9n9";
     };
   };
 
@@ -2790,12 +2800,12 @@
   };
 
   vim-quickrun = buildVimPluginFrom2Nix {
-    name = "vim-quickrun-2018-09-06";
+    name = "vim-quickrun-2018-10-16";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-quickrun";
-      rev = "0a78a3fe79b3607e01543cd33d8f2d8aceb35909";
-      sha256 = "1alpirkl6gi840ja21wn62gfmcyri6669p8r2c0qyjsajwx8gm8y";
+      rev = "9dbda9dcdc8ef3150c414b9b1ea347b04b942665";
+      sha256 = "06ssvyk84097vqzyrnrmxsr63diy8mjy8mv8xkhq5cmvqhavz91s";
     };
   };
 
@@ -2880,12 +2890,12 @@
   };
 
   vim-sensible = buildVimPluginFrom2Nix {
-    name = "vim-sensible-2018-09-17";
+    name = "vim-sensible-2018-10-27";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-sensible";
-      rev = "679e53d61558466933fbffc87fab8735eeb8fea8";
-      sha256 = "1sq836sy6kn9z092mnwjxs9p3ijka82gm0nhfvlym348yv1s03wn";
+      rev = "7f46e82fc7e343be84df6c06bec63dd6494b6712";
+      sha256 = "1xizcrxn34fbpdcbs0ydc1s9kma9cmk1llz0xbmrdgdf2yaz2558";
     };
   };
 
@@ -2940,12 +2950,12 @@
   };
 
   vim-snippets = buildVimPluginFrom2Nix {
-    name = "vim-snippets-2018-09-25";
+    name = "vim-snippets-2018-10-27";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "b51c01137259ac7cd59381001279fa36baefbc5f";
-      sha256 = "00ydadqq5nj94ldcd9ld45hkx6micd3mfllvn5csxbg4vw0p5472";
+      rev = "06161e65cd238d5f462f21e3f549c61860db85d1";
+      sha256 = "10n94s90jjwsg58cm5lrcs553mwsdyvy34rmf6xsa2mq9ql21vy1";
     };
   };
 
@@ -3030,12 +3040,12 @@
   };
 
   vim-table-mode = buildVimPluginFrom2Nix {
-    name = "vim-table-mode-2018-05-16";
+    name = "vim-table-mode-2018-10-21";
     src = fetchFromGitHub {
       owner = "dhruvasagar";
       repo = "vim-table-mode";
-      rev = "5483e163bd0a67e729e0e8436315f33f9e126baf";
-      sha256 = "0mmpa7zhrj8mqf4931ldf6n9jlpfxc4kg8xdhqlp7srlnq4h8siw";
+      rev = "130e835ff73ae16c5827fe37f1d1b09456c5f7dc";
+      sha256 = "1dlyszky76z8kj6vy4sfn5zkjdi12hwfn29g8adds04zbaxi61gg";
     };
   };
 
@@ -3060,12 +3070,12 @@
   };
 
   vim-test = buildVimPluginFrom2Nix {
-    name = "vim-test-2018-09-23";
+    name = "vim-test-2018-10-24";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "5aa77d57d22d453bd53f28a18f80e7bfecccf811";
-      sha256 = "1w0x4xfj3fl5zwnk14sh9sp1hkj25grrw1wan0g3y7ar8ygjyl7f";
+      rev = "cecb28e55a29ecde7cea926852998c47027bd759";
+      sha256 = "1av9fmva2ki180wikfik3yl83hzirj43rwhwwms65bk590cf4h95";
     };
   };
 
@@ -3090,12 +3100,12 @@
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix {
-    name = "vim-tmux-navigator-2018-07-13";
+    name = "vim-tmux-navigator-2018-10-19";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-tmux-navigator";
-      rev = "18b775fbccde5ff02e516c014290650bb40e257d";
-      sha256 = "09v8amrdk8h4hsr9va8v9wdgzvj89z04y4j71l94rd7r6smxinbj";
+      rev = "7eb75a10e3ab0504673a0e7eb32af6e5521b80ec";
+      sha256 = "0kafk2b8zxwx354p8inww0cyrw9w4arbiixbvvhrhxks7cccfxx6";
     };
   };
 
@@ -3160,22 +3170,22 @@
   };
 
   vim-vue = buildVimPluginFrom2Nix {
-    name = "vim-vue-2018-09-01";
+    name = "vim-vue-2018-10-08";
     src = fetchFromGitHub {
       owner = "posva";
       repo = "vim-vue";
-      rev = "2df46524311e719af51394726f5f88fc2aa08bd2";
-      sha256 = "0bsg8j4871jvmsyi5mmpyhkmjxajf5ss3dx9072wdc21cx8pn185";
+      rev = "720ca48e0207f2aca331b9d949ce9d4ff5702737";
+      sha256 = "1cqny4vppyaw29g6bx1qlfdjb5fa0avpy41jkidazv76ym4ahi2x";
     };
   };
 
   vim-wakatime = buildVimPluginFrom2Nix {
-    name = "vim-wakatime-2018-10-03";
+    name = "vim-wakatime-2018-10-27";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
-      rev = "3fe47846572032fc83d8300c596de6ded4f456a2";
-      sha256 = "0qgy2chdisym34892kzs3gbvq7bj64mxs4q4475hhwpr46p7lyrn";
+      rev = "656853504feb4aab3168e007aab5a1aee355bff5";
+      sha256 = "1dpi6dc1gdwq4smsis9nxd2p3cq9jm88yj3kn12gfrsb5w1j9k7q";
     };
   };
 
@@ -3220,12 +3230,12 @@
   };
 
   vim-yapf = buildVimPluginFrom2Nix {
-    name = "vim-yapf-2018-06-05";
+    name = "vim-yapf-2018-10-04";
     src = fetchFromGitHub {
       owner = "mindriot101";
       repo = "vim-yapf";
-      rev = "cae79733a1a39732c5305d4a89cd093d17cb917d";
-      sha256 = "16bmzvzks6kbqm6dk908k23b9wj7qf3x8bz3kikrzj27s0p7s9cc";
+      rev = "b0c31bd73a6d1026765e659bd0a62c625ec057ad";
+      sha256 = "0ncv6kjyywljsq5fz71rkmgmqxm7msyscgndnj055bnx5sh9wk80";
     };
   };
 
@@ -3260,12 +3270,12 @@
   };
 
   vimproc-vim = buildVimPluginFrom2Nix {
-    name = "vimproc-vim-2018-01-07";
+    name = "vimproc-vim-2018-10-11";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "vimproc.vim";
-      rev = "2300224d366642f4f8d6f88861535d4ccbe20143";
-      sha256 = "0b8ljqnix8bs667bpymg3s0g5f49fnphgddl6196dj6jvdfn1xia";
+      rev = "9136f03680db82c552f4a84e3b461f83c6e232d5";
+      sha256 = "0d930qgz049k55xgrgsihqqg1dw22zf3j1vbzyb9c65ys60x2q69";
     };
   };
 
@@ -3280,22 +3290,22 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-10-03";
+    name = "vimtex-2018-10-29";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "10f3304f39ec1b49e77bb351d0972db179cce1b3";
-      sha256 = "1yqajhr5q12yfjn9nvw4d8s89pcgkgv5hi1gd9wj7wjxk85wa6xm";
+      rev = "8a32372e4fc3c628d36b8215c6d30bd05eeade28";
+      sha256 = "1h1fp0jnv4wj96mam9dgnr5y1i4a4bdi4law3y1qh937bx7nk2vd";
     };
   };
 
   vimwiki = buildVimPluginFrom2Nix {
-    name = "vimwiki-2018-09-17";
+    name = "vimwiki-2018-10-12";
     src = fetchFromGitHub {
       owner = "vimwiki";
       repo = "vimwiki";
-      rev = "f882cf01528e471d78d10df28ce407bc1cc23bc9";
-      sha256 = "1c6vkz3y168akh0c6a8api4g0nwsh90gkd6l0pyqpr03glwyqg61";
+      rev = "7ffc295094debc3d521cecf267d736cc8562c20e";
+      sha256 = "0gl2d7xqzisinsgxpcwkkpryva8pklca9x860bqsirajr8mcdbpc";
     };
   };
 
@@ -3380,12 +3390,12 @@
   };
 
   youcompleteme = buildVimPluginFrom2Nix {
-    name = "youcompleteme-2018-09-20";
+    name = "youcompleteme-2018-10-14";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "e37923a752c7eee184cd6d96ac34e303fb7cfae9";
-      sha256 = "1dhh88f1mz7rajxyjbarqf3qiia6n34salknri3a0dffbih5y8rc";
+      rev = "f67e5ff27b048d8c55a10ba6a27c6c5b16d0f6ba";
+      sha256 = "14v7kqv4d2013imc5qkh22lwl5d9x419jjfj5qinld04n56banmv";
       fetchSubmodules = true;
     };
   };
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a503f0bedad..bccb97b72d2 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -32,6 +32,7 @@ chrisgeo/sparkup
 chriskempson/base16-vim
 christoomey/vim-sort-motion
 christoomey/vim-tmux-navigator
+cocopon/iceberg.vim
 ctjhoa/spacevim
 ctrlpvim/ctrlp.vim
 dag/vim2hs
-- 
GitLab


From 69dcb1a2c0c5596fbbbe7fa50d4f8277c6f1ea6a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 29 Oct 2018 21:39:51 +0000
Subject: [PATCH 0652/1065] bundlerApp: take buildInputs (#45435)

It would be reasonable to have a Ruby program that depends on some other
program being in the PATH. In this case, the obvious thing to do would
be something like this:

    bundlerApp {
      # ...
      buildInputs = [ makeWrapper ];
      postBuild = ''
        wrapProgram "$out/bin/foo" \
          --prefix PATH : ${lib.makeBinPath [ dep ]}
      '';
    }

However, this doesn't work, because even though it just forwards most of
its arguments to `runCommand`, `bundlerApp` won't take a `buildInputs`
parameter. It doesn't even specify its own `buildInputs`, which means
that the `scripts` parameter to `bundlerApp` (which depends on
`makeWrapper`) is completely broken, and, as far as I can tell, has been
since its inception. I've added a `makeWrapper` build input if the
scripts parameter is present to fix this.

I've added a `buildInputs` option to `bundlerApp`. It's also passed
through to bundled-common because `postBuild` scripts are run there as
well. This actually means that in this example we'd end up going through
two layers of wrappers (one from `bundlerApp` and one from
bundled-common), but that has always been the case and isn't likely to
break anything. That oddity does suggest that it might be prudent to
not forward `postBuild` to bundled-common (or to at least use a
different option) though...

FWIW, as far as I can tell no package in nixpkgs uses either the
`scripts` or `postBuild` options to `bundlerApp`.
---
 .../ruby-modules/bundled-common/default.nix   |  3 ++-
 .../ruby-modules/bundler-app/default.nix      | 24 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index f902ca58c38..415457b86e1 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -19,6 +19,7 @@
 , meta ? {}
 , groups ? ["default"]
 , ignoreCollisions ? false
+, buildInputs ? []
 , ...
 }@args:
 
@@ -96,7 +97,7 @@ let
   envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
 
   basicEnv = buildEnv {
-    inherit  ignoreCollisions;
+    inherit buildInputs ignoreCollisions;
 
     name = name';
 
diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix
index 656896a8f7a..60e3a38517c 100644
--- a/pkgs/development/ruby-modules/bundler-app/default.nix
+++ b/pkgs/development/ruby-modules/bundler-app/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, callPackage, runCommand, ruby }@defs:
+{ lib, stdenv, callPackage, runCommand, makeWrapper, ruby }@defs:
 
 # Use for simple installation of Ruby tools shipped in a Gem.
 # Start with a Gemfile that includes `gem <toolgem>`
@@ -26,6 +26,7 @@
 , allowSubstitutes ? false
 , installManpages ? true
 , meta ? {}
+, buildInputs ? []
 , postBuild ? ""
 , gemConfig ? null
 }@args:
@@ -33,19 +34,22 @@
 let
   basicEnv = (callPackage ../bundled-common {}) args;
 
-  cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" ]
-  // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults
+  cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" ] // {
+    inherit preferLocalBuild allowSubstitutes; # pass the defaults
+
+    buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper;
+  };
 in
-   runCommand basicEnv.name cmdArgs ''
+  runCommand basicEnv.name cmdArgs ''
     mkdir -p $out/bin
     ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)}
     ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " +
-            "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+
-            "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+
-            "--set BUNDLE_FROZEN 1 "+
-            "--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+
-            "--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+
-            "--run \"cd $srcdir\";\n") scripts)}
+                                "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+
+                                "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+
+                                "--set BUNDLE_FROZEN 1 "+
+                                "--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+
+                                "--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+
+                                "--run \"cd $srcdir\";\n") scripts)}
 
     ${lib.optionalString installManpages ''
     for section in {1..9}; do
-- 
GitLab


From e1ff8dc5dfdf39f1cb411fe4274b74ef8c85fa96 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 29 Oct 2018 23:44:34 +0100
Subject: [PATCH 0653/1065] pythonPackages.django_classytags: clarify why tests
 are disabled

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

diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix
index 3de7412462b..d3ed0fd1841 100644
--- a/pkgs/development/python-modules/django_classytags/default.nix
+++ b/pkgs/development/python-modules/django_classytags/default.nix
@@ -15,8 +15,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ django ];
 
-  # tests appear to be broken on 0.8.0 at least
-  doCheck = ( version != "0.8.0" );
+  # pypi version doesn't include runtest.py, needed to run tests
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Class based template tags for Django";
-- 
GitLab


From 89c09d7ba139722915aace83d4a3db13370cd0c8 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Tue, 30 Oct 2018 00:31:45 +0100
Subject: [PATCH 0654/1065] osrm-backend: 5.18.0 -> 5.19.0 (#49108)

---
 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 04fd2e37b35..97612f656cb 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.18.0";
+  version = "5.19.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner  = "Project-OSRM";
     repo   = "osrm-backend";
-    sha256 = "0ffdw02rgjb4z7xi8fk97c0hl1i7z04csjh3yd18zsb19bk1mkva";
+    sha256 = "1y3k2j4c3jparzm9ck1jkw5g12jr6kd9llq50jran2dwikc6hpyz";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
GitLab


From e96d14d1776ef61236fc2efed4a0231bcc9424a0 Mon Sep 17 00:00:00 2001
From: Edmund Wu <22758444+eadwu@users.noreply.github.com>
Date: Mon, 29 Oct 2018 19:45:25 -0400
Subject: [PATCH 0655/1065] vscode-extensions.ms-vscode.cpptools: update build
 (#48850)

---
 .../vscode-extensions/cpptools/default.nix    |  6 ++---
 .../package-activation-events-0-16-1.json     | 22 ----------------
 .../cpptools/package-activation-events.json   | 25 +++++++++++++++++++
 3 files changed, 28 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json
 create mode 100644 pkgs/misc/vscode-extensions/cpptools/package-activation-events.json

diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index e3463246ab2..55e126d64a5 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -34,8 +34,8 @@ let
     name = "cpptools-language-component-binaries";
 
     src = fetchzip {
-      url = https://download.visualstudio.microsoft.com/download/pr/11991016/8a81aa8f89aac452956b0e4c68e6620b/Bin_Linux.zip;
-      sha256 = "0ma59fxfldbgh6ijlvfbs3hnl4g0cnw5gs6286zdrp065n763sv4";
+      url = "https://download.visualstudio.microsoft.com/download/pr/e8bc2ccc-bb10-4d40-8e29-edcd78986e9a/2e86fa29aefdbde2ea2cd1a6fceadeaa/bin_linux.zip";
+      sha256 = "1hvrbp3c4733aryslgyh3l5azmqkw398j2wbgr3w788fphg4v6cc";
     };
 
     patchPhase = ''
@@ -81,7 +81,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime.
     # 2. Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`.
     cat ./package_ori.json | \
-      jq --slurpfile actEvts ${./package-activation-events-0-16-1.json} '(.activationEvents) = $actEvts[0]' | \
+      jq --slurpfile actEvts ${./package-activation-events.json} '(.activationEvents) = $actEvts[0]' | \
       jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \
       ./package.json
 
diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json b/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json
deleted file mode 100644
index 3a12a8bc047..00000000000
--- a/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-"onLanguage:cpp",
-"onLanguage:c",
-"onCommand:extension.pickNativeProcess",
-"onCommand:extension.pickRemoteNativeProcess",
-"onCommand:C_Cpp.ConfigurationEdit",
-"onCommand:C_Cpp.ConfigurationSelect",
-"onCommand:C_Cpp.SwitchHeaderSource",
-"onCommand:C_Cpp.Navigate",
-"onCommand:C_Cpp.GoToDeclaration",
-"onCommand:C_Cpp.PeekDeclaration",
-"onCommand:C_Cpp.ToggleErrorSquiggles",
-"onCommand:C_Cpp.ToggleIncludeFallback",
-"onCommand:C_Cpp.ToggleDimInactiveRegions",
-"onCommand:C_Cpp.ShowReleaseNotes",
-"onCommand:C_Cpp.ResetDatabase",
-"onCommand:C_Cpp.PauseParsing",
-"onCommand:C_Cpp.ResumeParsing",
-"onCommand:C_Cpp.ShowParsingCommands",
-"onCommand:C_Cpp.TakeSurvey",
-"onDebug"
-]
\ No newline at end of file
diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json b/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json
new file mode 100644
index 00000000000..c2d8a10f340
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json
@@ -0,0 +1,25 @@
+[
+  "onLanguage:cpp",
+  "onLanguage:c",
+  "onCommand:extension.pickNativeProcess",
+  "onCommand:extension.pickRemoteNativeProcess",
+  "onCommand:C_Cpp.ConfigurationEdit",
+  "onCommand:C_Cpp.ConfigurationSelect",
+  "onCommand:C_Cpp.ConfigurationProviderSelect",
+  "onCommand:C_Cpp.SwitchHeaderSource",
+  "onCommand:C_Cpp.Navigate",
+  "onCommand:C_Cpp.GoToDeclaration",
+  "onCommand:C_Cpp.PeekDeclaration",
+  "onCommand:C_Cpp.ToggleErrorSquiggles",
+  "onCommand:C_Cpp.ToggleIncludeFallback",
+  "onCommand:C_Cpp.ToggleDimInactiveRegions",
+  "onCommand:C_Cpp.ToggleSnippets",
+  "onCommand:C_Cpp.ShowReleaseNotes",
+  "onCommand:C_Cpp.ResetDatabase",
+  "onCommand:C_Cpp.PauseParsing",
+  "onCommand:C_Cpp.ResumeParsing",
+  "onCommand:C_Cpp.ShowParsingCommands",
+  "onCommand:C_Cpp.TakeSurvey",
+  "onDebug",
+  "workspaceContains:/.vscode/c_cpp_properties.json"
+]
-- 
GitLab


From d837fe68aebbc46339a9821d1dde9b35c6899073 Mon Sep 17 00:00:00 2001
From: Andrew Miller <andrewmiller237@gmail.com>
Date: Mon, 29 Oct 2018 20:07:07 -0400
Subject: [PATCH 0656/1065] hy: 0.14.0 -> 0.15.0 (#49428)

---
 pkgs/development/interpreters/hy/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix
index 3f08ca8f7c2..02ce07bdf47 100644
--- a/pkgs/development/interpreters/hy/default.nix
+++ b/pkgs/development/interpreters/hy/default.nix
@@ -2,20 +2,20 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "hy-${version}";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchurl {
     url = "mirror://pypi/h/hy/${name}.tar.gz";
-    sha256 = "0cbdh1q0zm00p4h7i44kir4qhw0p6sid78xf6llrx2p21llsnv98";
+    sha256 = "01vzaib1imr00j5d7f7xk44v800h06s3yv9inhlqm6f3b25ywpl1";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ appdirs clint astor rply ];
-
-  # The build generates a .json parser file in the home directory under .cache.
-  # This is needed to get it to not try and open files in /homeless-shelter
-  preConfigure = ''
-    export HOME=$TMP
-  '';
+  propagatedBuildInputs = with pythonPackages; [
+    appdirs
+    astor
+    clint
+    funcparserlib
+    rply
+  ];
 
   meta = {
     description = "A LISP dialect embedded in Python";
-- 
GitLab


From b8040919b01b5d70b029fe4824a65a7928a6d100 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 30 Oct 2018 01:08:51 +0100
Subject: [PATCH 0657/1065] dmrconfig: 2018-10-20 -> 2018-10-29 (#49419)

Support for more devices were added.
---
 pkgs/applications/misc/dmrconfig/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix
index 20c6ff57b24..9edf5e4f88c 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-10-20";
+  version = "2018-10-29";
 
   src = fetchFromGitHub {
     owner = "sergev";
     repo = "dmrconfig";
-    rev = "a4c5f893d2749727493427320c7f01768966ba51";
-    sha256 = "0h7hv6fv6v5g922nvgrb0w7hsqbhaw7xmdc6vydh2p3l7sp31vg2";
+    rev = "4924d00283c3c81a4b8251669e42aecd96b6145a";
+    sha256 = "00a4hmbr71g0d4faskb8q96y6z212g2r4n533yvp88z8rq8vbxxn";
   };
 
   buildInputs = [
-- 
GitLab


From 2f9fc897eb305abee1206061a20f65c12243b0b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Tue, 30 Oct 2018 01:24:07 +0100
Subject: [PATCH 0658/1065] Add mention of nix-prefetch-github. (#49336)

---
 doc/coding-conventions.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index b3f7f093835..3e8a0ea4a70 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -842,9 +842,12 @@ src = fetchFromGitHub {
   owner = "NixOS";
   repo = "nix";
   rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
-  sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9";
+  sha256 = "1i2yxndxb6yc9l6c99pypbd92lfq5aac4klq7y2v93c9qvx2cgpc";
 }
 </programlisting>
+      Find the value to put as <literal>sha256</literal> by running
+      <literal>nix run -f '&lt;nixpkgs&gt;' nix-prefetch-github -c nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix</literal>
+      or <literal>nix-prefetch-url --unpack https://github.com/NixOS/nix/archive/1f795f9f44607cc5bec70d1300150bfefcef2aae.tar.gz</literal>.
      </para>
     </listitem>
    </itemizedlist>
-- 
GitLab


From 30d27920911c728a8aefc26e636588627d0d2841 Mon Sep 17 00:00:00 2001
From: Eric Wolf <ericwolf42@gmail.com>
Date: Sat, 27 Oct 2018 23:54:28 +0200
Subject: [PATCH 0659/1065] nixos/release-notes for 18.09: fix missing entry

 - the addition of the groups kvm and render breaks the configuration of
   users, which added them
---
 nixos/doc/manual/release-notes/rl-1809.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 0ddf40acbfc..8715a05f508 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -637,6 +637,11 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      anyways for clarity.
     </para>
    </listitem>
+   <listitem>
+    <para>
+        Groups <literal>kvm</literal> and <literal>render</literal> are introduced now, as systemd requires them.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
-- 
GitLab


From 9bc10e12916979c5c620be5b521b9218a0077cba Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Tue, 30 Oct 2018 09:10:47 +0100
Subject: [PATCH 0660/1065] NixOS tests: Wait for shell for 10x longer (50m)

---
 nixos/lib/test-driver/Machine.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index a00fe25c2b8..abcc1c50d4d 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -250,7 +250,8 @@ sub connect {
         $self->start;
 
         local $SIG{ALRM} = sub { die "timed out waiting for the VM to connect\n"; };
-        alarm 300;
+        # 50 minutes -- increased as a test, see #49441
+        alarm 3000;
         readline $self->{socket} or die "the VM quit before connecting\n";
         alarm 0;
 
-- 
GitLab


From 74cfbd63e13abb7e0144d5ed821be5e50a3a5d90 Mon Sep 17 00:00:00 2001
From: Stefan Siegl <stesie@brokenpipe.de>
Date: Tue, 30 Oct 2018 10:08:39 +0100
Subject: [PATCH 0661/1065] tomboy: build against mono 5, refs #49369

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1ab34eba6f..80864ab1ce6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22720,9 +22720,7 @@ with pkgs;
 
   tomb = callPackage ../os-specific/linux/tomb {};
 
-  tomboy = callPackage ../applications/misc/tomboy {
-    mono = mono46;
-  };
+  tomboy = callPackage ../applications/misc/tomboy { };
 
   imatix_gsl = callPackage ../development/tools/imatix_gsl {};
 
-- 
GitLab


From f51f526f6ba23f143cf54f0c05672aedbc0e3682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 30 Oct 2018 06:34:49 -0300
Subject: [PATCH 0662/1065] deepin-gtk-theme: 17.10.8 -> 17.10.9 (#49432)

---
 pkgs/desktops/deepin/deepin-gtk-theme/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
index a36a9677190..c46dea2875a 100644
--- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
@@ -2,24 +2,24 @@
 
 stdenv.mkDerivation rec {
   name = "deepin-gtk-theme-${version}";
-  version = "17.10.8";
+  version = "17.10.9";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "deepin-gtk-theme";
     rev = version;
-    sha256 = "1z5f5dnda18gixkjcxpvsavhv9m5l2kq61958fdfm1idi0cbr7fp";
+    sha256 = "02yn76h007hlmrd7syd82f0mz1c79rlkz3gy1w17zxfy0gdvagz3";
   };
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Deepin GTK Theme";
     homepage = https://github.com/linuxdeepin/deepin-gtk-theme;
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    license = licenses.lgpl3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
   };
 }
-- 
GitLab


From eee6890fc762bee08f96c9342b5f37d6c3b23f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 30 Oct 2018 06:35:33 -0300
Subject: [PATCH 0663/1065] matcha: 2018-10-21 -> 2018-10-30 (#49433)

---
 pkgs/misc/themes/matcha/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/matcha/default.nix b/pkgs/misc/themes/matcha/default.nix
index 9967de78639..6e14d1587a7 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-10-21";
+  version = "2018-10-30";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "matcha";
     rev = version;
-    sha256 = "112xfnwlq9ih72qbfrin78ly7bc4i94my3i6s7yhc46qg1lncl73";
+    sha256 = "1ks30xm7jhyxgs0blxxnc9ygmyfwrwc9k8d0y0i6yb7608p8zxzq";
   };
 
   buildInputs = [ gdk_pixbuf librsvg ];
-- 
GitLab


From 7df72ad92873eac668c315894a2defb6459ac6af Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 30 Oct 2018 10:58:53 +0100
Subject: [PATCH 0664/1065] google-cloud-sdk: 215.0.0 -> 222.0.0

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 016ea957f6c..aa8cc12ece8 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -19,18 +19,18 @@ let
   sources = name: system: {
     x86_64-darwin = {
       url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
-      sha256 = "1d5z575vw07jk7528bsqgdd875b3zwayrdnidvxpd2n8j4bip654";
+      sha256 = "03ymvfhk8azyvdm6j4pbqx2fsh178kw81yqwkycbhmm6mnyc8yv1";
     };
 
     x86_64-linux = {
       url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
-      sha256 = "0ljslvp68ml5mglrl7kakgkqskbzglf3i5jv5d7jld28d0kbzj2c";
+      sha256 = "1pw4w3v81mp8alm6vxq10242xxwv8rfs59bjxrmy0pfkjgsr4x4v";
     };
   }.${system};
 
 in stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "215.0.0";
+  version = "222.0.0";
 
   src = fetchurl (sources name stdenv.hostPlatform.system);
 
-- 
GitLab


From 64f6b9eb95a98057cca759a5071feced839a5054 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 30 Oct 2018 11:18:59 +0100
Subject: [PATCH 0665/1065] pythonPackages.memory_profiler: add plotting
 dependency, enable checks

---
 .../memory_profiler/default.nix               | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix
index 7587e5f33c9..cf976f06ff0 100644
--- a/pkgs/development/python-modules/memory_profiler/default.nix
+++ b/pkgs/development/python-modules/memory_profiler/default.nix
@@ -1,32 +1,28 @@
 { stdenv
-, buildPythonPackage
-, fetchPypi
-, psutil
 , python
 }:
 
-buildPythonPackage rec {
+python.pkgs.buildPythonPackage rec {
   pname = "memory_profiler";
   version = "0.54.0";
 
-  src = fetchPypi {
+  src = python.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "d64342a23f32e105f4929b408a8b89d9222c3ce8afbbb3359817555811448d1a";
+    sha256 = "06ld8h8mhm8pk0sv7fxgx0y2q8nri65qlh4vjbs0bq9j7yi44hyn";
   };
 
-  propagatedBuildInputs = [ psutil ];
-
-  checkPhase = ''
-    make test PYTHON=${python.interpreter}
-  '';
-
-  # Tests don't import profile
-  # doCheck = false;
+  propagatedBuildInputs = with python.pkgs; [
+    psutil # needed to profile child processes
+    matplotlib # needed for plotting memory usage
+  ];
 
   meta = with stdenv.lib; {
-    description = "A module for monitoring memory usage of a python program";
+    description = "A module for monitoring memory usage of a process";
+    longDescription = ''
+      This is a python module for monitoring memory consumption of a process as
+      well as line-by-line analysis of memory consumption for python programs.
+    '';
     homepage = https://pypi.python.org/pypi/memory_profiler;
     license = licenses.bsd3;
   };
-
 }
-- 
GitLab


From b348f8568fd3e503919021045522995885bddb1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 23 Oct 2018 09:03:13 -0300
Subject: [PATCH 0666/1065] jwm-settings-manager: init at 2018-10-19

---
 .../jwm/jwm-settings-manager.nix              | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/applications/window-managers/jwm/jwm-settings-manager.nix

diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
new file mode 100644
index 00000000000..3b764e7095b
--- /dev/null
+++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }:
+
+stdenv.mkDerivation rec {
+  name = "jwm-settings-manager-${version}";
+  version = "2018-10-19";
+  
+  src = fetchFromGitHub {
+    owner = "Israel-D";
+    repo = "jwm-settings-manager";
+    rev = "cb32a70563cf1f3927339093481542b85ec3c8c8";
+    sha256 = "0d5bqf74p8zg8azns44g46q973blhmp715k8kcd73x88g7sfir8s";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    gettext
+  ];
+
+  buildInputs = [
+    libXpm
+    libGL
+    fltk
+    hicolor-icon-theme
+    which # needed at runtime to locate optional programs
+    glib.bin # provides gsettings
+    gnome2.GConf # provides gconftool-2
+  ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace 'CMAKE_INSTALL_PREFIX "/usr"' "CMAKE_INSTALL_PREFIX $out"
+    substituteInPlace data/CMakeLists.txt \
+      --replace 'DESTINATION usr/share' "DESTINATION share"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A full configuration manager for JWM";
+    homepage = https://joewing.net/projects/jwm;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07068cc2917..3e99997915d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17403,6 +17403,8 @@ with pkgs;
 
   jwm = callPackage ../applications/window-managers/jwm { };
 
+  jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };
+
   k3d = callPackage ../applications/graphics/k3d {
     inherit (pkgs.gnome2) gtkglext;
     stdenv = overrideCC stdenv gcc6;
-- 
GitLab


From ac8acb283c6380d01e6a9d6722ccebb4cdddaa9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 30 Oct 2018 11:40:53 +0000
Subject: [PATCH 0667/1065] rambox: fix crash when native filesystem dialogs
 are created

---
 .../instant-messengers/rambox/default.nix     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 7c630e522af..46157c2a35f 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem
+{ stdenv, newScope, makeWrapper
+, wrapGAppsHook, gnome3, glib
+, electron, xdg_utils, makeDesktopItem
 , auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
 , auth0Domain ? "nixpkgs.auth0.com" }:
 
@@ -26,16 +28,25 @@ with self;
 stdenv.mkDerivation {
   name = "rambox-${rambox-bare.version}";
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
 
+  buildInputs = [ glib gnome3.gsettings_desktop_schemas ];
   unpackPhase = ":";
 
+  dontWrapGApps = true; # we only want $gappsWrapperArgs here
+
   installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications
+    runHook postInstall
+  '';
+
+  postFixup = ''
     makeWrapper ${electron}/bin/electron $out/bin/rambox \
       --add-flags "${rambox-bare} --without-update" \
+      "''${gappsWrapperArgs[@]}" \
       --prefix PATH : ${xdg_utils}/bin
-    mkdir -p $out/share/applications
-    ln -s ${desktopItem}/share/applications/* $out/share/applications
   '';
 
   inherit (rambox-bare.meta // {
-- 
GitLab


From 9d9f7d27a1930642de86c6660d0326ce89a61c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 23 Oct 2018 09:58:20 +0100
Subject: [PATCH 0668/1065] SenchaCmd: 6.5.3.6 -> 6.6.0.13

This package is internally used by rambox
---
 .../networking/instant-messengers/rambox/sencha/bare.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
index af92462a2a4..efecebe169e 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, gzip, which, unzip, jdk }:
 
 let
-  version = "6.5.3.6";
+  version = "6.6.0.13";
   srcs = {
     i686-linux = fetchurl {
       url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip";
-      sha256 = "0g3hk3fdgmkdsr6ck1fgsmaxa9wbj2fpk84rk382ff9ny55bbzv9";
+      sha256 = "15b197108b49mf0afpihkh3p68lxm7580zz2w0xsbahglnvhwyfz";
     };
     x86_64-linux = fetchurl {
       url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip";
-      sha256 = "08j8gak1xsxdjgkv6s24jv97jc49pi5yf906ynjmxb27wqpxn9mz";
+      sha256 = "1cxhckmx1802p9qiw09cgb1v5f30wcvnrwkshmia8p8n0q47lpp4";
     };
   };
 in
-- 
GitLab


From 1dd7443c935eb3c91b0b7201ca68a6e4e0bdf1b0 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 30 Oct 2018 11:57:58 +0100
Subject: [PATCH 0669/1065] pythonPackages.sympy: 1.2 -> 1.3

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

diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix
index fb702e046a4..1bf7511d2bb 100644
--- a/pkgs/development/python-modules/sympy/default.nix
+++ b/pkgs/development/python-modules/sympy/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "sympy";
-  version = "1.2"; # Upgrades may break sage. Please test.
+  version = "1.3"; # Upgrades may break sage. Please test or ping @timokau.
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0pr2v7dl51ngch1cfs423qsb472l9ys1m8m7vrhhh99fsxqa0v18";
+    sha256 = "0m0vhyv15zszn19mk5xq3py4iijjbr7f3fpy1s57b8q7c9arncg1";
   };
 
   checkInputs = [ glibcLocales ];
-- 
GitLab


From 2380f6a4faa57c6b91fed26c496e1c8ca5d91982 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 30 Oct 2018 14:27:44 +0200
Subject: [PATCH 0670/1065] nixos/tests/rsyslogd: Fix eval

---
 nixos/tests/rsyslogd.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/rsyslogd.nix b/nixos/tests/rsyslogd.nix
index 4836419f0c2..969d59e0f2c 100644
--- a/nixos/tests/rsyslogd.nix
+++ b/nixos/tests/rsyslogd.nix
@@ -1,10 +1,11 @@
 { system ? builtins.currentSystem }:
 
 with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
 {
   test1 = makeTest {
     name = "rsyslogd-test1";
-    meta.maintainers = [ lib.maintainers.aanderse ];
+    meta.maintainers = [ maintainers.aanderse ];
 
     machine =
       { config, pkgs, ... }:
@@ -21,7 +22,7 @@ with import ../lib/testing.nix { inherit system; };
 
   test2 = makeTest {
     name = "rsyslogd-test2";
-    meta.maintainers = [ lib.maintainers.aanderse ];
+    meta.maintainers = [ maintainers.aanderse ];
 
     machine =
       { config, pkgs, ... }:
-- 
GitLab


From 9594b59f1320aa05200bfbec9a425d22408eb488 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 23 Oct 2018 16:09:43 +0200
Subject: [PATCH 0671/1065] postgresql10: rename from postgresql100

---
 nixos/tests/postgis.nix                 | 2 +-
 pkgs/servers/sql/postgresql/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/tests/postgis.nix b/nixos/tests/postgis.nix
index f8b63c5b6a2..0ff880e7aa5 100644
--- a/nixos/tests/postgis.nix
+++ b/nixos/tests/postgis.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       { pkgs, ... }:
 
       {
-        services.postgresql = let mypg = pkgs.postgresql100; in {
+        services.postgresql = let mypg = pkgs.postgresql10; in {
             enable = true;
             package = mypg;
             extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ];
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index bccd54ca4ba..6ca17240420 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -123,7 +123,7 @@ in {
     sha256 = "09l4zqs74fqnazdsyln9x657mq3wsbgng9wpvq71yh26cv2sq5c6";
   };
 
-  postgresql100 = common {
+  postgresql10 = common {
     version = "10.5";
     psqlSchema = "10.0";
     sha256 = "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8cd54c3a5bd..eb4f891b45a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -225,6 +225,7 @@ mapAliases ({
   piwik = matomo; # added 2018-01-16
   pltScheme = racket; # just to be sure
   poppler_qt5 = libsForQt5.poppler;  # added 2015-12-19
+  postgresql100 = throw "deprecated 2018-10-21: use postgresql10 instead";
   procps-ng = procps; # added 2018-06-08
   prometheus-statsd-bridge = prometheus-statsd-exporter;  # added 2017-08-27
   pulseaudioLight = pulseaudio; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 130a3495c6d..502f7907b1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13610,7 +13610,7 @@ with pkgs;
     postgresql94
     postgresql95
     postgresql96
-    postgresql100;
+    postgresql10;
 
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
-- 
GitLab


From 94360c11e96e816f9c9ac320691c1dc7b5caf4b1 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 23 Oct 2018 17:35:37 +0100
Subject: [PATCH 0672/1065] docs: update sample postgresql package

postgresql90 no longer exists in nixpkgs.
---
 nixos/doc/manual/configuration/config-file.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index 8a1a39c98c1..2c9d4215173 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -197,10 +197,10 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
     pkgs.emacs
   ];
 
-<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql90;
+<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql10;
 </programlisting>
       The latter option definition changes the default PostgreSQL package used
-      by NixOS’s PostgreSQL service to 9.0. For more information on packages,
+      by NixOS’s PostgreSQL service to 10.x. For more information on packages,
       including how to add new ones, see <xref linkend="sec-custom-packages"/>.
      </para>
     </listitem>
-- 
GitLab


From 863a795281203d8c53281ce5196030528cb94e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 30 Oct 2018 13:55:20 +0100
Subject: [PATCH 0673/1065] home-assistant: 0.81.1 -> 0.81.2

---
 pkgs/servers/home-assistant/component-packages.nix | 10 +++++-----
 pkgs/servers/home-assistant/default.nix            |  8 ++++----
 pkgs/servers/home-assistant/frontend.nix           |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 611fabc4301..73cc0128149 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.81.1";
+  version = "0.81.2";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
@@ -322,14 +322,13 @@
     "device_tracker" = ps: with ps; [  ];
     "device_tracker.actiontec" = ps: with ps; [  ];
     "device_tracker.aruba" = ps: with ps; [ pexpect ];
-    "device_tracker.asuswrt" = ps: with ps; [  ];
+    "device_tracker.asuswrt" = ps: with ps; [ pexpect ];
     "device_tracker.automatic" = ps: with ps; [ aiohttp-cors ];
     "device_tracker.bbox" = ps: with ps; [  ];
     "device_tracker.bluetooth_le_tracker" = ps: with ps; [  ];
     "device_tracker.bluetooth_tracker" = ps: with ps; [  ];
     "device_tracker.bmw_connected_drive" = ps: with ps; [  ];
     "device_tracker.bt_home_hub_5" = ps: with ps; [  ];
-    "device_tracker.bt_smarthub" = ps: with ps; [  ];
     "device_tracker.cisco_ios" = ps: with ps; [ pexpect ];
     "device_tracker.ddwrt" = ps: with ps; [  ];
     "device_tracker.demo" = ps: with ps; [  ];
@@ -1097,7 +1096,7 @@
     "sensor.twitch" = ps: with ps; [  ];
     "sensor.uber" = ps: with ps; [  ];
     "sensor.uk_transport" = ps: with ps; [  ];
-    "sensor.upnp" = ps: with ps; [  ];
+    "sensor.upnp" = ps: with ps; [ aiohttp-cors ];
     "sensor.ups" = ps: with ps; [  ];
     "sensor.uptime" = ps: with ps; [  ];
     "sensor.uscis" = ps: with ps; [  ];
@@ -1125,6 +1124,7 @@
     "sensor.xbox_live" = ps: with ps; [  ];
     "sensor.xiaomi_aqara" = ps: with ps; [  ];
     "sensor.xiaomi_miio" = ps: with ps; [ construct ];
+    "sensor.yahoo_finance" = ps: with ps; [  ];
     "sensor.yr" = ps: with ps; [ xmltodict ];
     "sensor.yweather" = ps: with ps; [ yahooweather ];
     "sensor.zabbix" = ps: with ps; [  ];
@@ -1298,7 +1298,7 @@
     "unifi.errors" = ps: with ps; [  ];
     "upcloud" = ps: with ps; [  ];
     "updater" = ps: with ps; [ distro ];
-    "upnp" = ps: with ps; [  ];
+    "upnp" = ps: with ps; [ aiohttp-cors ];
     "upnp.config_flow" = ps: with ps; [  ];
     "upnp.const" = ps: with ps; [  ];
     "upnp.device" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index b3d32ef2ed7..932995513af 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -34,8 +34,8 @@ let
       "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6")
     (mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1
       "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46")
-    (mkOverride "requests" "2.19.1"
-      "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a")
+    (mkOverride "requests" "2.20.0"
+      "99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c")
     (mkOverride "voluptuous" "0.11.5"
       "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef")
     (mkOverride "voluptuous-serialize" "2.0.0"
@@ -79,7 +79,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.81.1";
+  hassVersion = "0.81.2";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -94,7 +94,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "0z686fpcv9xy4dwcphx5npwvvw8gibcqjp6s898dbhscldg0ffmh";
+    sha256 = "0qg3kh99bqhsraa8jpqqrvaxz9l1gsbh3aazg3v0d6q6ng42y2bq";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 7bf1e687141..4af2a4ec922 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 = "20181026.0";
+  version = "20181026.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fa877803ec7201a9b2129e96d6c19822cbcb28fa8ad5d422974bd3c872da1531";
+    sha256 = "ea5e7fb769df2f096e2993c23d1aa3dc8652e0f0aa09a89863af22e095b80aa8";
   };
 
   propagatedBuildInputs = [ user-agents ];
-- 
GitLab


From cc161d738ba60f183da8de2ef43845400e76b839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 30 Oct 2018 14:10:44 +0100
Subject: [PATCH 0674/1065] qutebrowser: 1.5.1 -> 1.5.2

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

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index bf3debf6c7b..8b7dfc86027 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -28,12 +28,12 @@ let
 
 in python3Packages.buildPythonApplication rec {
   pname = "qutebrowser";
-  version = "1.5.1";
+  version = "1.5.2";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "1yn181gscj04ni58swk6cmggn047q29siqwgn66pvxhfdf0ny7fq";
+    sha256 = "0ki19mynq91aih3kxhipnay3jmn56s7p6rilws0gq0k98li6a4my";
   };
 
   # Needs tox
-- 
GitLab


From b5ad6154743436b5acc791ccec5cde4be36dd18b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 28 Oct 2018 20:43:34 +0000
Subject: [PATCH 0675/1065] verasco: remove unmaintained project

Verasco is no longer maintained by upstream and blocks updates of some libraries.
Removing it also makes it possible to remove coq 8.4.
---
 .../tools/analysis/verasco/default.nix        | 51 -------------------
 pkgs/top-level/all-packages.nix               |  4 --
 pkgs/top-level/ocaml-packages.nix             | 10 ----
 3 files changed, 65 deletions(-)
 delete mode 100644 pkgs/development/tools/analysis/verasco/default.nix

diff --git a/pkgs/development/tools/analysis/verasco/default.nix b/pkgs/development/tools/analysis/verasco/default.nix
deleted file mode 100644
index 7f623e72dc3..00000000000
--- a/pkgs/development/tools/analysis/verasco/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, lib, fetchurl
-, coq, ocaml, findlib, menhir, zarith
-, tools ? stdenv.cc
-}:
-
-assert lib.versionAtLeast ocaml.version "4.02";
-
-stdenv.mkDerivation rec {
-  name = "verasco-1.3";
-  src = fetchurl {
-    url = "http://compcert.inria.fr/verasco/release/${name}.tgz";
-    sha256 = "0zvljrpwnv443k939zlw1f7ijwx18nhnpr8jl3f01jc5v66hr2k8";
-  };
-
-  buildInputs = [ coq ocaml findlib menhir zarith ];
-
-  preConfigure = ''
-    substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
-  '';
-
-  configureFlags = [
-    "-toolprefix ${tools}/bin/"
-    (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux")
-  ];
-
-  prefixKey = "-prefix ";
-
-  enableParallelBuilding = true;
-  buildFlags = "proof extraction ccheck";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ccheck $out/bin/
-    ln -s $out/bin/ccheck $out/bin/verasco
-    if [ -e verasco.ini ]
-    then
-      mkdir -p $out/share
-      cp verasco.ini $out/share/
-    fi
-    mkdir -p $out/lib/compcert
-    cp -riv runtime/include $out/lib/compcert
-  '';
-
-  meta = {
-    homepage = http://compcert.inria.fr/verasco/;
-    description = "A static analyzer for the CompCert subset of ISO C 1999";
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
-    license = stdenv.lib.licenses.unfree;
-    platforms = with stdenv.lib.platforms; darwin ++ linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5179e1f3a58..5127ad2421c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8984,10 +8984,6 @@ with pkgs;
 
   qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind {};
 
-  verasco = ocaml-ng.ocamlPackages_4_02.verasco.override {
-    coq = coq_8_4;
-  };
-
   visualvm = callPackage ../development/tools/java/visualvm { };
 
   vultr = callPackage ../development/tools/vultr { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 62b773c51bf..2f6992e1c9a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1024,16 +1024,6 @@ let
 
     omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
 
-    verasco = callPackage ../development/tools/analysis/verasco ((
-      if system == "x86_64-linux"
-      then { tools = pkgs.pkgsi686Linux.stdenv.cc; }
-      else {}
-    ) // {
-      menhir = callPackage ../development/ocaml-modules/menhir {
-        version = "20170712";
-      };
-    });
-
     google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
 
 
-- 
GitLab


From 8df0ca2bbcc98a787fccf623a91f5ea79161fce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 28 Oct 2018 20:45:04 +0000
Subject: [PATCH 0676/1065] coq_8_4: remove

verasco was its only user
---
 pkgs/applications/science/logic/coq/8.4.nix   | 97 -------------------
 .../science/logic/coq/configure.patch         | 11 ---
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/coq-packages.nix               |  3 -
 4 files changed, 1 insertion(+), 112 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/coq/8.4.nix
 delete mode 100644 pkgs/applications/science/logic/coq/configure.patch

diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix
deleted file mode 100644
index c3da1205ab0..00000000000
--- a/pkgs/applications/science/logic/coq/8.4.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-# - coqide compilation can be disabled by setting lablgtk to null;
-# - The csdp program used for the Micromega tactic is statically referenced.
-#   However, coq can build without csdp by setting it to null.
-#   In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
-
-{stdenv, fetchurl, pkgconfig, writeText, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
-
-let
-  version = "8.4pl6";
-  coq-version = "8.4";
-  buildIde = lablgtk != null;
-  ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
-  csdpPatch = if csdp != null then ''
-    substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
-    substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
-  '' else "";
-
-self =
-stdenv.mkDerivation {
-  name = "coq-${version}";
-
-  inherit coq-version;
-  inherit ocaml camlp5;
-
-  src = fetchurl {
-    url = "https://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
-    sha256 = "1mpbj4yf36kpjg2v2sln12i8dzqn8rag6fd07hslj2lpm4qs4h55";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
-
-  patches = [ ./configure.patch ];
-
-  postPatch = ''
-    UNAME=$(type -tp uname)
-    RM=$(type -tp rm)
-    substituteInPlace configure --replace "/bin/uname" "$UNAME"
-    substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
-    ${csdpPatch}
-  '';
-
-  preConfigure = ''
-    configureFlagsArray=(
-      -opt
-      -camldir ${ocaml}/bin
-      -camlp5dir $(ocamlfind query camlp5)
-      ${ideFlags}
-    )
-  '';
-
-  prefixKey = "-prefix ";
-
-  buildFlags = "revision coq coqide";
-
-  setupHook = writeText "setupHook.sh" ''
-    addCoqPath () {
-      if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then
-        export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/"
-      fi
-    }
-
-    addEnvHooks "$targetOffset" addCoqPath
-  '';
-
-  passthru = {
-    inherit findlib;
-    emacsBufferSetup = pkgs: ''
-      ; Propagate coq paths to children
-      (inherit-local-permanent coq-prog-name "${self}/bin/coqtop")
-      (inherit-local-permanent coq-dependency-analyzer "${self}/bin/coqdep")
-      (inherit-local-permanent coq-compiler "${self}/bin/coqc")
-      ; If the coq-library path was already set, re-set it based on our current coq
-      (when (fboundp 'get-coq-library-directory)
-        (inherit-local-permanent coq-library-directory (get-coq-library-directory))
-        (coq-prog-args))
-      (mapc (lambda (arg)
-        (when (file-directory-p (concat arg "/lib/coq/${coq-version}/user-contrib"))
-          (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${stdenv.lib.concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)}))
-    '';
-  };
-
-  meta = with stdenv.lib; {
-    description = "Formal proof management system";
-    longDescription = ''
-      Coq is a formal proof management system.  It provides a formal language
-      to write mathematical definitions, executable algorithms and theorems
-      together with an environment for semi-interactive development of
-      machine-checked proofs.
-    '';
-    homepage = http://coq.inria.fr;
-    license = licenses.lgpl21;
-    branch = coq-version;
-    maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
-    platforms = platforms.unix;
-  };
-}; in self
diff --git a/pkgs/applications/science/logic/coq/configure.patch b/pkgs/applications/science/logic/coq/configure.patch
deleted file mode 100644
index aa38ce06e92..00000000000
--- a/pkgs/applications/science/logic/coq/configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar coq-8.3pl3-orig/configure coq-8.3pl3/configure
---- coq-8.3pl3-orig/configure	2011-12-19 22:57:30.000000000 +0100
-+++ coq-8.3pl3/configure	2012-03-17 16:38:16.000000000 +0100
-@@ -395,7 +395,6 @@
- 	 ocamlyaccexec=$CAMLBIN/ocamlyacc
- 	 ocamlmktopexec=$CAMLBIN/ocamlmktop
- 	 ocamlmklibexec=$CAMLBIN/ocamlmklib
--	 camlp4oexec=$CAMLBIN/camlp4o
- esac
- 
- if test ! -f "$CAMLC" ; then
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5127ad2421c..f98bf64fdf7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21364,7 +21364,7 @@ with pkgs;
                        ocamlPackages_4_05
     ;
   }) mkCoqPackages
-    coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8
+    coq_8_5 coq_8_6 coq_8_7 coq_8_8
     coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8
     coqPackages coq
   ;
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 75e9506ac04..a4f44b6fc6f 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -56,9 +56,6 @@ in rec {
     let self = mkCoqPackages' self coq; in
     filterCoqPackages coq self;
 
-  coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix {
-    inherit (ocamlPackages_4_02) ocaml findlib lablgtk camlp5;
-  };
   coq_8_5 = callPackage ../applications/science/logic/coq {
     ocamlPackages = ocamlPackages_4_05;
     version = "8.5pl3";
-- 
GitLab


From 1f7fc09176dc9b0260b8e2778f1e6c3139eae6a9 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 30 Oct 2018 14:27:28 +0100
Subject: [PATCH 0677/1065] make-derivation: use a more descriptive assert
 message

As suggested by @Profpatsch
---
 pkgs/stdenv/generic/make-derivation.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 2ff7db947fe..cb3731da193 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -86,7 +86,8 @@ rec {
     assert lib.assertMsg
       (lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"]
         -> lib.strings.hasSuffix "${attrs.pname}-${attrs.version}" attrs.name)
-      "mkDerivation: `name` must be consistent with `pname-version`";
+      ("mkDerivation: `name` (\"${attrs.name}\") must be consistent " +
+       "with `pname-version` \"${attrs.pname}-${attrs.version}\"");
 
     let
       # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
-- 
GitLab


From c3a7194843a6423bd5875756ba9c1e05e5c9b79a Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 30 Oct 2018 15:24:08 +0100
Subject: [PATCH 0678/1065] pkgs.nixos: Add example to inline documentation

---
 pkgs/top-level/all-packages.nix | 79 ++++++++++++++++++++-------------
 1 file changed, 47 insertions(+), 32 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 130a3495c6d..84b3adf7297 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22097,38 +22097,53 @@ with pkgs;
 
   nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { };
 
-  /*
-   * Evaluate a NixOS configuration using this evaluation of Nixpkgs.
-   *
-   * With this function you can write, for example, a package that
-   * depends on a custom virtual machine image.
-   *
-   * Parameter: A module, path or list of those that represent the
-   *            configuration of the NixOS system to be constructed.
-   *
-   * Result:    An attribute set containing packages produced by this
-   *            evaluation of NixOS, such as toplevel, kernel and
-   *            initialRamdisk.
-   *            The result can be extended in the modules by defining
-   *            extra options in system.build.
-   *
-   * Unlike in plain NixOS, the nixpkgs.config, nixpkgs.overlays and
-   * nixpkgs.system options will be ignored by default. Instead,
-   * nixpkgs.pkgs will have the default value of pkgs as it was
-   * constructed right after invoking the nixpkgs function (e.g. the
-   * value of import <nixpkgs> { overlays = [./my-overlay.nix]; }
-   * but not the value of (import <nixpkgs> {} // { extra = ...; }).
-   *
-   * If you do want to use the config.nixpkgs options, you are
-   * probably better off by calling nixos/lib/eval-config.nix
-   * directly, even though it is possible to set config.nixpkgs.pkgs.
-   *
-   * For more information about writing NixOS modules, see
-   * https://nixos.org/nixos/manual/index.html#sec-writing-modules
-   *
-   * Note that you will need to have called Nixpkgs with the system
-   * parameter set to the right value for your deployment target.
-   */
+  /* Evaluate a NixOS configuration using this evaluation of Nixpkgs.
+
+     With this function you can write, for example, a package that
+     depends on a custom virtual machine image.
+
+     Parameter: A module, path or list of those that represent the
+                configuration of the NixOS system to be constructed.
+
+     Result:    An attribute set containing packages produced by this
+                evaluation of NixOS, such as toplevel, kernel and
+                initialRamdisk.
+                The result can be extended in the modules by defining
+                extra attributes in system.build.
+
+     Example:
+
+         let
+           myOS = pkgs.nixos ({ lib, pkgs, config, ... }: {
+
+             config.services.nginx = {
+               enable = true;
+               # ...
+             };
+
+             # This exports a runner for nginx
+             config.system.build.run-nginx = config.systemd.services.nginx.runner;
+           });
+         in
+           myOS.run-nginx
+
+     Unlike in plain NixOS, the nixpkgs.config, nixpkgs.overlays and
+     nixpkgs.system options will be ignored by default. Instead,
+     nixpkgs.pkgs will have the default value of pkgs as it was
+     constructed right after invoking the nixpkgs function (e.g. the
+     value of import <nixpkgs> { overlays = [./my-overlay.nix]; }
+     but not the value of (import <nixpkgs> {} // { extra = ...; }).
+
+     If you do want to use the config.nixpkgs options, you are
+     probably better off by calling nixos/lib/eval-config.nix
+     directly, even though it is possible to set config.nixpkgs.pkgs.
+
+     For more information about writing NixOS modules, see
+     https://nixos.org/nixos/manual/index.html#sec-writing-modules
+
+     Note that you will need to have called Nixpkgs with the system
+     parameter set to the right value for your deployment target.
+  */
   nixos = configuration:
     (import (self.path + "/nixos/lib/eval-config.nix") {
       inherit (pkgs.stdenv.hostPlatform) system;
-- 
GitLab


From c6c7d55790b603db68ee43a55c20e503281eeda4 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 23 Oct 2018 17:22:14 +0100
Subject: [PATCH 0679/1065] postgresql*: use underscores in version numbers

---
 .../administration/declarative-containers.xml    |  2 +-
 nixos/doc/manual/configuration/config-file.xml   |  2 +-
 nixos/modules/services/databases/postgresql.nix  | 10 +++++-----
 nixos/modules/services/databases/postgresql.xml  |  8 ++++----
 nixos/modules/virtualisation/containers.nix      |  2 +-
 nixos/release.nix                                |  2 +-
 nixos/tests/postgis.nix                          |  2 +-
 pkgs/development/libraries/postgis/default.nix   |  2 +-
 pkgs/servers/sql/postgresql/default.nix          | 10 +++++-----
 pkgs/top-level/aliases.nix                       |  6 +++++-
 pkgs/top-level/all-packages.nix                  | 16 ++++++++--------
 11 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml
index 2a98fb12623..d03dbc4d705 100644
--- a/nixos/doc/manual/administration/declarative-containers.xml
+++ b/nixos/doc/manual/administration/declarative-containers.xml
@@ -15,7 +15,7 @@ containers.database =
   { config =
       { config, pkgs, ... }:
       { <xref linkend="opt-services.postgresql.enable"/> = true;
-      <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql96;
+      <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_9_6;
       };
   };
 </programlisting>
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index 2c9d4215173..c77cfe137ba 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -197,7 +197,7 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
     pkgs.emacs
   ];
 
-<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql10;
+<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_10;
 </programlisting>
       The latter option definition changes the default PostgreSQL package used
       by NixOS’s PostgreSQL service to 10.x. For more information on packages,
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index de2a757196a..6edb1503c23 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -55,7 +55,7 @@ in
 
       package = mkOption {
         type = types.package;
-        example = literalExample "pkgs.postgresql96";
+        example = literalExample "pkgs.postgresql_9_6";
         description = ''
           PostgreSQL package to use.
         '';
@@ -118,7 +118,7 @@ in
       extraPlugins = mkOption {
         type = types.listOf types.path;
         default = [];
-        example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }) ]";
+        example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_4; }) ]";
         description = ''
           When this list contains elements a new store path is created.
           PostgreSQL and the elements are symlinked into it. Then pg_config,
@@ -167,9 +167,9 @@ in
       # Note: when changing the default, make it conditional on
       # ‘system.stateVersion’ to maintain compatibility with existing
       # systems!
-      mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql96
-            else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95
-            else pkgs.postgresql94);
+      mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
+            else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5
+            else pkgs.postgresql_9_4);
 
     services.postgresql.dataDir =
       mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"
diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml
index f89f0d65316..14f4d4909bc 100644
--- a/nixos/modules/services/databases/postgresql.xml
+++ b/nixos/modules/services/databases/postgresql.xml
@@ -27,12 +27,12 @@
    <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-services.postgresql.enable"/> = true;
-<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql94;
+<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_9_4;
 </programlisting>
    Note that you are required to specify the desired version of PostgreSQL
-   (e.g. <literal>pkgs.postgresql94</literal>). Since upgrading your PostgreSQL
-   version requires a database dump and reload (see below), NixOS cannot
-   provide a default value for
+   (e.g. <literal>pkgs.postgresql_9_4</literal>). Since upgrading your
+   PostgreSQL version requires a database dump and reload (see below), NixOS
+   cannot provide a default value for
    <xref linkend="opt-services.postgresql.package"/> such as the most recent
    release of PostgreSQL.
   </para>
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 8fe59badd33..572092a2ba9 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -606,7 +606,7 @@ in
               { config =
                   { config, pkgs, ... }:
                   { services.postgresql.enable = true;
-                    services.postgresql.package = pkgs.postgresql96;
+                    services.postgresql.package = pkgs.postgresql_9_6;
 
                     system.stateVersion = "17.03";
                   };
diff --git a/nixos/release.nix b/nixos/release.nix
index 46dbe4aa77b..51505d6aab9 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -468,7 +468,7 @@ in rec {
       { services.httpd.enable = true;
         services.httpd.adminAddr = "foo@example.org";
         services.postgresql.enable = true;
-        services.postgresql.package = pkgs.postgresql93;
+        services.postgresql.package = pkgs.postgresql_9_3;
         environment.systemPackages = [ pkgs.php ];
       });
   };
diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix
index 0ff880e7aa5..2a9b477bf23 100644
--- a/nixos/tests/postgis.nix
+++ b/nixos/tests/postgis.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       { pkgs, ... }:
 
       {
-        services.postgresql = let mypg = pkgs.postgresql10; in {
+        services.postgresql = let mypg = pkgs.postgresql_10; in {
             enable = true;
             package = mypg;
             extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ];
diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix
index 04fdeea1fa0..37cf29c8658 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -16,7 +16,7 @@
   ### NixOS - usage:
   ==================
 
-    services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }) ];
+    services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_5; }) ];
 
 
   ### important Postgis implementation details:
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 6ca17240420..423583bfe87 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -99,31 +99,31 @@ let
 
 in {
 
-  postgresql93 = common {
+  postgresql_9_3 = common {
     version = "9.3.24";
     psqlSchema = "9.3";
     sha256 = "1a8dnv16n2rxnbwhqw7c0kjpj3xqvkpwk50kvimj4d917cxaf542";
   };
 
-  postgresql94 = common {
+  postgresql_9_4 = common {
     version = "9.4.19";
     psqlSchema = "9.4";
     sha256 = "12qn9h47rkn4k41gdbxkkvg0pff43k1113jmhc83f19adc1nnxq3";
   };
 
-  postgresql95 = common {
+  postgresql_9_5 = common {
     version = "9.5.14";
     psqlSchema = "9.5";
     sha256 = "0k8s62h6qd9p3xlx315j5irniskqsnx1nz4ir5r1yhqp07mdab1y";
   };
 
-  postgresql96 = common {
+  postgresql_9_6 = common {
     version = "9.6.10";
     psqlSchema = "9.6";
     sha256 = "09l4zqs74fqnazdsyln9x657mq3wsbgng9wpvq71yh26cv2sq5c6";
   };
 
-  postgresql10 = common {
+  postgresql_10 = common {
     version = "10.5";
     psqlSchema = "10.0";
     sha256 = "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eb4f891b45a..c0d322b89d8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -225,7 +225,11 @@ mapAliases ({
   piwik = matomo; # added 2018-01-16
   pltScheme = racket; # just to be sure
   poppler_qt5 = libsForQt5.poppler;  # added 2015-12-19
-  postgresql100 = throw "deprecated 2018-10-21: use postgresql10 instead";
+  postgresql93 = postgresql_9_3;
+  postgresql94 = postgresql_9_4;
+  postgresql95 = postgresql_9_5;
+  postgresql96 = postgresql_9_6;
+  postgresql100 = throw "deprecated 2018-10-21: use postgresql_10 instead";
   procps-ng = procps; # added 2018-06-08
   prometheus-statsd-bridge = prometheus-statsd-exporter;  # added 2017-08-27
   pulseaudioLight = pulseaudio; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 502f7907b1a..a282be8e614 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13595,22 +13595,22 @@ with pkgs;
 
   pgbouncer = callPackage ../servers/sql/pgbouncer { };
 
-  pgpool93 = pgpool.override { postgresql = postgresql93; };
-  pgpool94 = pgpool.override { postgresql = postgresql94; };
+  pgpool93 = pgpool.override { postgresql = postgresql_9_3; };
+  pgpool94 = pgpool.override { postgresql = postgresql_9_4; };
 
   pgpool = callPackage ../servers/sql/pgpool {
     pam = if stdenv.isLinux then pam else null;
     libmemcached = null; # Detection is broken upstream
   };
 
-  postgresql = postgresql96;
+  postgresql = postgresql_9_6;
 
   inherit (callPackages ../servers/sql/postgresql { })
-    postgresql93
-    postgresql94
-    postgresql95
-    postgresql96
-    postgresql10;
+    postgresql_9_3
+    postgresql_9_4
+    postgresql_9_5
+    postgresql_9_6
+    postgresql_10;
 
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
-- 
GitLab


From 91c746cacc3db360f960132ffda7fe1351a3b33d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 18 Oct 2018 14:52:29 +0100
Subject: [PATCH 0680/1065] postgresql_11: init at 11.0

---
 nixos/tests/postgis.nix                 | 2 +-
 pkgs/servers/sql/postgresql/default.nix | 6 ++++++
 pkgs/top-level/all-packages.nix         | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix
index 2a9b477bf23..49be0672a8e 100644
--- a/nixos/tests/postgis.nix
+++ b/nixos/tests/postgis.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       { pkgs, ... }:
 
       {
-        services.postgresql = let mypg = pkgs.postgresql_10; in {
+        services.postgresql = let mypg = pkgs.postgresql_11; in {
             enable = true;
             package = mypg;
             extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ];
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 423583bfe87..b81b4340d76 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -129,4 +129,10 @@ in {
     sha256 = "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc";
   };
 
+  postgresql_11 = common {
+    version = "11.0";
+    psqlSchema = "11.0";
+    sha256 = "0szk9ssfych1wlpyqxz3z6dllg1l6m5labpii8c2r463s01vm6xz";
+  };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a282be8e614..e2593b6394b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13610,7 +13610,8 @@ with pkgs;
     postgresql_9_4
     postgresql_9_5
     postgresql_9_6
-    postgresql_10;
+    postgresql_10
+    postgresql_11;
 
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
-- 
GitLab


From 5bde0f600264b3e94267e31befe0fd550adc869c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 30 Oct 2018 12:37:33 +0000
Subject: [PATCH 0681/1065] release notes: update for postgres rename

---
 nixos/doc/manual/release-notes/rl-1903.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 7d04d009a06..9c07184613e 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -145,6 +145,13 @@
      format.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The versioned <varname>postgresql</varname> have been renamed to use
+     underscore number seperators. For example, <varname>postgresql96</varname>
+     has been renamed to <varname>postgresql_9_6</varname>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
-- 
GitLab


From 334dd6f96463e09760b1854cb0fab8d6a1230538 Mon Sep 17 00:00:00 2001
From: Lassulus <github@lassul.us>
Date: Tue, 30 Oct 2018 15:37:41 +0100
Subject: [PATCH 0682/1065] nixos/bitlbee: use purple-2 as purple_plugin_path
 (#49440)

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

diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
index 46e3b745761..274b3617160 100644
--- a/nixos/modules/services/networking/bitlbee.nix
+++ b/nixos/modules/services/networking/bitlbee.nix
@@ -33,7 +33,7 @@ let
 
   purple_plugin_path =
     lib.concatMapStringsSep ":"
-      (plugin: "${plugin}/lib/pidgin/")
+      (plugin: "${plugin}/lib/pidgin/:${plugin}/lib/purple-2/")
       cfg.libpurple_plugins
     ;
 
-- 
GitLab


From 3358e256b1291ccc07a28d2f1dd0609ffce0cca0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 30 Oct 2018 10:58:24 -0400
Subject: [PATCH 0683/1065] bamf: 0.5.3 -> 2018-02-07, fix build

Technically this is 0.5.4 but it's unreleased
---
 pkgs/development/libraries/bamf/default.nix | 46 +++++++++++++--------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index 0a2badea7cb..3fcdbca34f5 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -1,54 +1,66 @@
-{ stdenv, fetchurl, libgtop, libwnck3, glib, vala, pkgconfig
-, libstartup_notification, gobjectIntrospection, gtk-doc
+{ stdenv, autoconf, automake, libtool, gnome3, which, fetchgit, libgtop, libwnck3, glib, vala, pkgconfig
+, libstartup_notification, gobjectIntrospection, gtk-doc, docbook_xsl
 , xorgserver, dbus, python2 }:
 
 stdenv.mkDerivation rec {
-  pname = "bamf";
-  version = "0.5.3";
-  name = "${pname}-${version}";
+  name = "bamf-2018-02-07";
 
   outputs = [ "out" "dev" "devdoc" ];
 
-  src = fetchurl {
-    url = "https://launchpad.net/${pname}/0.5/${version}/+download/${name}.tar.gz";
-    sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l";
+  src = fetchgit {
+    url = https://git.launchpad.net/~unity-team/bamf;
+    rev = "0.5.3+18.04.20180207.2-0ubuntu1";
+    sha256 = "0hvbgzi0mzzzvcamd9mi1ykbk2l6zxffspyk5fpik8bij56nhzym";
   };
 
   nativeBuildInputs = [
-    pkgconfig
-    gtk-doc
+    autoconf
+    automake
+    docbook_xsl
+    gnome3.gnome-common
     gobjectIntrospection
+    gtk-doc
+    libtool
+    pkgconfig
     vala
+    which
     # Tests
-    xorgserver
+    python2
+    python2.pkgs.libxslt
+    python2.pkgs.libxml2
     dbus
-    (python2.withPackages (pkgs: with pkgs; [ libxslt libxml2 ]))
+    xorgserver
   ];
 
   buildInputs = [
+    glib
     libgtop
-    libwnck3
     libstartup_notification
-    glib
+    libwnck3
   ];
 
   # Fix hard-coded path
   # https://bugs.launchpad.net/bamf/+bug/1780557
   postPatch = ''
-    substituteInPlace data/Makefile.in \
+    substituteInPlace data/Makefile.am \
       --replace '/usr/lib/systemd/user' '@prefix@/lib/systemd/user'
   '';
 
   configureFlags = [
     "--enable-headless-tests"
+    "--enable-gtk-doc"
   ];
 
   # fix paths
   makeFlags = [
-    "INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0/"
-    "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
+    "INTROSPECTION_GIRDIR=${placeholder ''dev''}/share/gir-1.0/"
+    "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
   ];
 
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
   # TODO: Requires /etc/machine-id
   doCheck = false;
 
-- 
GitLab


From 0385cb33c623d000052875b1c47f129e5850378f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 29 Oct 2018 12:49:13 +0100
Subject: [PATCH 0684/1065] libeditline: Use multiple outputs

Also disable static build by default per Nixpkgs policy. (Really
static libraries should be moved to the 'dev' output, in which case it
wouldn't be a problem to enable them by default.)
---
 pkgs/development/libraries/editline/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix
index dc44c7d8705..90e3ee9af5b 100644
--- a/pkgs/development/libraries/editline/default.nix
+++ b/pkgs/development/libraries/editline/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  dontDisableStatic = true;
+  outputs = [ "out" "dev" "man" "doc" ];
 
   meta = with stdenv.lib; {
     homepage = http://troglobit.com/editline.html;
-- 
GitLab


From 81b2bfaf36582d5e2cd4c823aaadf03139314f74 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 30 Oct 2018 16:01:16 +0100
Subject: [PATCH 0685/1065] nixUnstable: 2.2pre6520_18b4c53f ->
 2.2pre6526_9f99d624

---
 pkgs/tools/package-management/nix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 030571d6a91..ea03570bb3e 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -160,12 +160,12 @@ in rec {
 
   nixUnstable = (lib.lowPrio (common rec {
     name = "nix-2.2${suffix}";
-    suffix = "pre6520_18b4c53f";
+    suffix = "pre6526_9f99d624";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "18b4c53f71dfc626f5f5ffa0282afd1b9faad6a4";
-      sha256 = "1hn7bjrf6x7024nald7nk1c9m8fyddkzhazl7pwf6ssmiv12apxh";
+      rev = "9f99d62480cf7c58c0a110b180f2096b7d25adab";
+      sha256 = "0fkmx7gmgg0yij9kw52fkyvib88hj1jsj90vbpy13ccfwknh1044";
     };
     fromGit = true;
   })) // { perl-bindings = perl-bindings {
-- 
GitLab


From 88155c643af06bcffae7023a2e0f667108555a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 30 Oct 2018 16:03:29 +0100
Subject: [PATCH 0686/1065] getmail: 5.6 -> 5.7

---
 pkgs/tools/networking/getmail/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index ac69fd99265..56b7320a1b2 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  version = "5.6";
-  name = "getmail-${version}";
-  namePrefix = "";
+  pname = "getmail";
+  version = "5.7";
 
   src = fetchurl {
-    url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
-    sha256 = "16nmvj80szr6yvcxxgmxn2lxqpjqqj4xg5a0b66zhvck6j42q3a6";
+    url = "http://pyropus.ca/software/getmail/old-versions/${pname}-${version}.tar.gz";
+    sha256 = "1ygv78ihjyrh60657bl8pc17a5dqawdkfh32h8hrd4kwwxlsd5r4";
   };
 
   doCheck = false;
-- 
GitLab


From efd3f8b57ff81f263a961c740396b4eb205aa955 Mon Sep 17 00:00:00 2001
From: markuskowa <markus.kowalewski@gmail.com>
Date: Tue, 30 Oct 2018 16:15:53 +0100
Subject: [PATCH 0687/1065] virtualgl-lib: fix broken startup script (#49185)

Replace /bin/sh with bash in vglrun.
'exec' fails with /bin/sh
---
 pkgs/tools/X11/virtualgl/lib.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index 4c911e75633..b3495b189a6 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postPatch = ''
+    # script calls exec, which fails with plain sh
+    substituteInPlace ./server/vglrun.in \
+      --replace '#!/bin/sh' '#!/usr/bin/env bash'
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://www.virtualgl.org/;
     description = "X11 GL rendering in a remote computer with full 3D hw acceleration";
-- 
GitLab


From 3a2336798f9547b2b74d889f03b3e137d7670eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@github.danieldk.eu>
Date: Tue, 30 Oct 2018 16:36:21 +0100
Subject: [PATCH 0688/1065] pyo3-pack: init at 0.3.8 (#46754)

---
 .../tools/rust/pyo3-pack/default.nix          | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/tools/rust/pyo3-pack/default.nix

diff --git a/pkgs/development/tools/rust/pyo3-pack/default.nix b/pkgs/development/tools/rust/pyo3-pack/default.nix
new file mode 100644
index 00000000000..05c57e46b89
--- /dev/null
+++ b/pkgs/development/tools/rust/pyo3-pack/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkgconfig
+, darwin }:
+
+let
+  inherit (darwin.apple_sdk.frameworks) Security;
+in rustPlatform.buildRustPackage rec {
+  name = "pyo3-pack-${version}";
+  version = "0.3.8";
+
+  src = fetchFromGitHub {
+    owner = "PyO3";
+    repo = "pyo3-pack";
+    rev = "v${version}";
+    sha256 = "14343209w7wphkqh7pnw08pah09spjbwhk6l548g9ivra057gwaz";
+  };
+
+  cargoSha256 = "0n7z9p3v92ijqc2ix60wi74as5rql61k5qbqi8b1b02b71xmsp7j";
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ gmp openssl ]
+    ++ stdenv.lib.optional stdenv.isDarwin Security
+    ++ stdenv.lib.optional stdenv.isLinux dbus;
+
+  # Requires network access, fails in sandbox.
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Build and publish crates with pyo3 bindings as python packages";
+    homepage = https://github.com/PyO3/pyo3-pack;
+    license = licenses.mit;
+    maintainers = [ maintainers.danieldk ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1b290afd1f..c0dd1f8b4d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7382,6 +7382,7 @@ with pkgs;
   cargo-asm = callPackage ../development/tools/rust/cargo-asm { };
   cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
 
+  pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { };
   rainicorn = callPackage ../development/tools/rust/rainicorn { };
   rustfmt = callPackage ../development/tools/rust/rustfmt { };
   rustracer = callPackage ../development/tools/rust/racer { };
-- 
GitLab


From 95c66dac70e367fd8663523557c13f58ae609a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 30 Oct 2018 16:42:37 +0100
Subject: [PATCH 0689/1065] python.pkgs.datadog: 0.20.0 -> 0.23.0

---
 .../development/python-modules/datadog/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index 47c206fda5e..7b15d412610 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -1,18 +1,14 @@
-{ lib, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchPypi
 , decorator, requests, simplejson
 , nose, mock }:
 
 buildPythonPackage rec {
   pname = "datadog";
-  version = "0.20.0";
+  version = "0.23.0";
 
-  # no tests in PyPI tarball
-  # https://github.com/DataDog/datadogpy/pull/259
-  src = fetchFromGitHub {
-    owner = "DataDog";
-    repo = "datadogpy";
-    rev = "v${version}";
-    sha256 = "1p4p14853yrsl8py4ca7za7a12qzw0xwgz64f5kzx8a6vpv3p3md";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6ed9aec2b3a26722b74465c2ed36d2efdb9c9fac1a07a84d81fa2fc0cfa66ae4";
   };
 
   propagatedBuildInputs = [ decorator requests simplejson ];
-- 
GitLab


From 698197d38a9cb83c558aa579c1fb52cf072a3b0d Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Tue, 30 Oct 2018 10:54:54 -0500
Subject: [PATCH 0690/1065] gmime3: 3.2.0 -> 3.2.1, enable tests, now uses
 libidn2 (#49390)

NEWS:

https://raw.githubusercontent.com/jstedfast/gmime/87405143bb870a6977b7170706a04d747341b425/NEWS
---
 pkgs/development/libraries/gmime/3.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 65c99610a5c..63d00f1dd1a 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.0";
+  version = "3.2.1";
   name = "gmime-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz";
-    sha256 = "1q6palbpf6lh6bvy9ly26q5apl5k0z0r4mvl6zzqh90rz4rn1v3m";
+    sha256 = "0q65nalxzpyjg37gdlpj9v6028wp0qx47z96q0ff6znw217nzzjn";
   };
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ gobjectIntrospection zlib gpgme libidn ];
+  buildInputs = [ gobjectIntrospection zlib gpgme libidn2 libunistring ];
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ glib ];
   configureFlags = [ "--enable-introspection=yes" ];
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
 
   checkInputs = [ gnupg ];
 
+  doCheck = true;
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-- 
GitLab


From 888034f6cac0e63ca72ef495ce9a77fb33939ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Wed, 31 Oct 2018 01:05:35 +0900
Subject: [PATCH 0691/1065] dhparams module: add self as maintainer

---
 nixos/modules/security/dhparams.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index e2b84c3e3b3..62a499ea624 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -170,4 +170,6 @@ in {
       '';
     }) cfg.params;
   };
+
+  meta.maintainers = with lib.maintainers; [ ekleog ];
 }
-- 
GitLab


From 9b34f47b7cd6b53f7e65d73f7d9f6a9923f46eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Wed, 31 Oct 2018 01:05:49 +0900
Subject: [PATCH 0692/1065] clamsmtp module: add self as maintainer

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

diff --git a/nixos/modules/services/mail/clamsmtp.nix b/nixos/modules/services/mail/clamsmtp.nix
index 8f4f39aa728..fc1267c5d28 100644
--- a/nixos/modules/services/mail/clamsmtp.nix
+++ b/nixos/modules/services/mail/clamsmtp.nix
@@ -176,4 +176,6 @@ in
         }
       ) cfg.instances);
     };
+
+  meta.maintainers = with lib.maintainers; [ ekleog ];
 }
-- 
GitLab


From 930bcbda83c8c2042f956712a60a1ebc16af55f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Wed, 31 Oct 2018 01:06:04 +0900
Subject: [PATCH 0693/1065] dkimproxy-out module: add self as maintainer

---
 nixos/modules/services/mail/dkimproxy-out.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/mail/dkimproxy-out.nix b/nixos/modules/services/mail/dkimproxy-out.nix
index 894b88e25c1..f4ac9e47007 100644
--- a/nixos/modules/services/mail/dkimproxy-out.nix
+++ b/nixos/modules/services/mail/dkimproxy-out.nix
@@ -115,4 +115,6 @@ in
         };
       };
     };
+
+  meta.maintainers = with lib.maintainers; [ ekleog ];
 }
-- 
GitLab


From b9faae955c75d62a4aab28a5a34a1f7b606432aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Wed, 31 Oct 2018 01:06:14 +0900
Subject: [PATCH 0694/1065] redsocks module: add self as maintainer

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

diff --git a/nixos/modules/services/networking/redsocks.nix b/nixos/modules/services/networking/redsocks.nix
index a47a78f1005..8481f9debf3 100644
--- a/nixos/modules/services/networking/redsocks.nix
+++ b/nixos/modules/services/networking/redsocks.nix
@@ -267,4 +267,6 @@ in
             "ip46tables -t nat -D OUTPUT -p tcp ${redCond block} -j ${chain} 2>/dev/null || true"
         ) cfg.redsocks;
     };
+
+  meta.maintainers = with lib.maintainers; [ ekleog ];
 }
-- 
GitLab


From e54079133e27567262349a648852ec8f8aa2a0fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Wed, 31 Oct 2018 01:06:27 +0900
Subject: [PATCH 0695/1065] global-platform-pro: add self as maintainer

---
 pkgs/development/tools/global-platform-pro/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix
index ab32216de80..9841e7900cd 100644
--- a/pkgs/development/tools/global-platform-pro/default.nix
+++ b/pkgs/development/tools/global-platform-pro/default.nix
@@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/martinpaljak/GlobalPlatformPro;
     license = with licenses; [ lgpl3 ];
+    maintainers = with maintainers; [ ekleog ];
     platforms = platforms.all;
   };
 }
-- 
GitLab


From 1873e39acfdde68249314e757de6e35c0667812f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 30 Oct 2018 09:07:48 -0700
Subject: [PATCH 0696/1065] python36Packages.cassandra-driver: 3.6.0 -> 3.15.1
 (#49018)

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-cassandra-driver/versions
---
 pkgs/development/python-modules/cassandra-driver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix
index 110cd1e0bd5..c445c21478b 100644
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -20,11 +20,11 @@
 
 buildPythonPackage rec {
   pname = "cassandra-driver";
-  version = "3.6.0";
+  version = "3.15.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1aqmy3psn12lxgp659d0zsxkirxzy5lnbnzxf9xjq1a93s3qm704";
+    sha256 = "1xcirbvlj00id8269akhk8gy2sv0mlnbgy3nagi32648jwsrcadg";
   };
 
   buildInputs = [ pkgs.libev cython ];
-- 
GitLab


From 39662cf61c42a6c89ee8dc5b95bbf89c33f8bcdc Mon Sep 17 00:00:00 2001
From: Lizard <tmplt@dragons.rocks>
Date: Tue, 30 Oct 2018 17:33:59 +0100
Subject: [PATCH 0697/1065] pbpst: init at unstable-2018-01-11 (#49459)

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

diff --git a/pkgs/applications/misc/pbpst/default.nix b/pkgs/applications/misc/pbpst/default.nix
new file mode 100644
index 00000000000..fcf88200133
--- /dev/null
+++ b/pkgs/applications/misc/pbpst/default.nix
@@ -0,0 +1,49 @@
+{ llvmPackages, stdenv, fetchFromGitHub
+, python36Packages, which, pkgconfig, curl, git, gettext, jansson
+
+# Optional overrides
+, maxFileSize ? 64 # in MB
+, provider ? "https://ptpb.pw/"
+}:
+
+llvmPackages.stdenv.mkDerivation rec {
+  version = "unstable-2018-01-11";
+  name = "pbpst-${version}";
+
+  src = fetchFromGitHub {
+    owner = "HalosGhost";
+    repo = "pbpst";
+    rev = "ecbe08a0b72a6e4212f09fc6cf52a73506992346";
+    sha256 = "0dwhmw1dg4hg75nlvk5kmvv3slz2n3b9x65q4ig16agwqfsp4mdm";
+  };
+
+  nativeBuildInputs = [
+    python36Packages.sphinx
+    which
+    pkgconfig
+    curl
+    git
+    gettext
+  ];
+  buildInputs = [ curl jansson ];
+
+  patchPhase = ''
+    patchShebangs ./configure
+
+    # Remove hardcoded check for libs in /usr/lib/
+    sed -e '64,67d' -i ./configure
+  '';
+
+  configureFlags = [
+    "--file-max=${toString (maxFileSize * 1024 * 1024)}" # convert to bytes
+    "--provider=${provider}"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A command-line libcurl C client for pb deployments";
+    inherit (src.meta) homepage;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ tmplt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0dd1f8b4d0..955258c9871 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1529,6 +1529,8 @@ with pkgs;
 
   patdiff = callPackage ../tools/misc/patdiff { };
 
+  pbpst = callPackage ../applications/misc/pbpst { };
+
   pbzx = callPackage ../tools/compression/pbzx { };
 
   pev = callPackage ../development/tools/analysis/pev { };
-- 
GitLab


From f129ed25a04090e5427efd3200101ca47c1b002d Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 30 Oct 2018 18:27:52 +0100
Subject: [PATCH 0698/1065] khal: fix build

Upgrading icalendar to 4.0.3 broke the pinned dateutil version.
Luckily khal 0.9.10 now works with dateutil 2.7, so we no longer need to
override it.  However now one test in khal fails (the string output
changed from icalendar 4.0.2 to 4.0.3)...
---
 pkgs/applications/misc/khal/default.nix | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index b94d067dd18..bc2c8978a67 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -1,22 +1,6 @@
 { stdenv, pkgs, python3 }:
 
-let
-  python = python3.override {
-    packageOverrides = self: super: {
-
-      # https://github.com/pimutils/khal/issues/780
-      python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec {
-        version = "2.6.1";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca";
-        };
-      });
-
-    };
-  };
-
-in with python.pkgs; buildPythonApplication rec {
+with python3.pkgs; buildPythonApplication rec {
   pname = "khal";
   version = "0.9.10";
 
@@ -50,6 +34,9 @@ in with python.pkgs; buildPythonApplication rec {
     install -D misc/__khal $out/share/zsh/site-functions/__khal
   '';
 
+  # One test fails as of 0.9.10 due to the upgrade to icalendar 4.0.3
+  doCheck = false;
+
   checkPhase = ''
     py.test
   '';
@@ -58,6 +45,6 @@ in with python.pkgs; buildPythonApplication rec {
     homepage = http://lostpackets.de/khal/;
     description = "CLI calendar application";
     license = licenses.mit;
-    maintainers = with maintainers; [ jgeerds ];
+    maintainers = with maintainers; [ jgeerds gebner ];
   };
 }
-- 
GitLab


From 0cf2c6fcfe2055a255b0f20eb122ebecc68dbf4a Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 18:13:07 -0400
Subject: [PATCH 0699/1065] pythonPackages.numericalunits: init at 1.16

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

diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix
new file mode 100644
index 00000000000..1212bf0039c
--- /dev/null
+++ b/pkgs/development/python-modules/numericalunits/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  version = "1.16";
+  pname = "numericalunits";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "71ae8e236c7a223bccefffb670dca68be476dd63b7b9009641fc64099455da25";
+  };
+
+  # no tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://pypi.python.org/pypi/numericalunits;
+    description = "A package that lets you define quantities with unit";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b2cff4940c1..c292c06fc3a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -428,6 +428,8 @@ in {
 
   nvchecker = callPackage ../development/python-modules/nvchecker { };
 
+  numericalunits = callPackage ../development/python-modules/numericalunits { };
+
   oauthenticator = callPackage ../development/python-modules/oauthenticator { };
 
   ordered-set = callPackage ../development/python-modules/ordered-set { };
-- 
GitLab


From 7dd7190a576bdb8c5f504370f0ea0c3160562e59 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 18:13:36 -0400
Subject: [PATCH 0700/1065] pythonPackages.DataModelDict: init at 0.9.4

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

diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix
new file mode 100644
index 00000000000..9aac803ccae
--- /dev/null
+++ b/pkgs/development/python-modules/datamodeldict/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, xmltodict
+}:
+
+buildPythonPackage rec {
+  version = "0.9.4";
+  pname = "DataModelDict";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "97d8e999e000cf69c48e57b1a72eb45a27d83576a38c6cd8550c230b018be7af";
+  };
+
+  propagatedBuildInputs = [ xmltodict ];
+
+  # no tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/usnistgov/DataModelDict/;
+    description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c292c06fc3a..dcddc42d177 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -284,6 +284,8 @@ in {
 
   btchip = callPackage ../development/python-modules/btchip { };
 
+  datamodeldict = callPackage ../development/python-modules/datamodeldict { };
+
   dbf = callPackage ../development/python-modules/dbf { };
 
   dbfread = callPackage ../development/python-modules/dbfread { };
-- 
GitLab


From 1ac9d8ea407dc7262cdb5acdf290bd3a26f536c8 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 18:13:56 -0400
Subject: [PATCH 0701/1065] pythonPackages.atomman: init at 1.2.3

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

diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix
new file mode 100644
index 00000000000..ce4408b8441
--- /dev/null
+++ b/pkgs/development/python-modules/atomman/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, xmltodict
+, datamodeldict
+, numpy
+, matplotlib
+, scipy
+, pandas
+, cython
+, numericalunits
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "1.2.3";
+  pname = "atomman";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9eb6acc5497263cfa89be8d0f383a9a69f0726b4ac6798c1b1d96f26705ec09c";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ xmltodict datamodeldict numpy matplotlib scipy pandas cython numericalunits ];
+
+  # tests not included with Pypi release
+  doCheck = false;
+
+  checkPhase = ''
+    py.test tests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/usnistgov/atomman/;
+    description = "Atomistic Manipulation Toolkit";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dcddc42d177..70335098c2e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -212,6 +212,8 @@ in {
 
   aws-adfs = callPackage ../development/python-modules/aws-adfs { };
 
+  atomman = callPackage ../development/python-modules/atomman { };
+
   # packages defined elsewhere
 
   amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { };
-- 
GitLab


From 4cfeb9da53cc667f1463aab5da173f2a06e6d244 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 30 Oct 2018 19:02:36 +0100
Subject: [PATCH 0702/1065] cudatoolkit, cudnn: many updates

cudatoolkit_9_1: 9.1.85.1 -> 9.1.85.3
cudatoolkit_9_2: init at 9.2.148.1
cudatoolkit_9: 9.1.85.1 -> 9.2.148.1
cudatoolkit_10, cudatoolkit_10_0: init at 10.0.130

cudnn_cudatoolkit_9_0: 7.0.5 -> 7.3.0
cudnn_cudatoolkit_9_1: init at 7.1.3
cudnn_cudatoolkit_9_2: init at 7.2.1
cudnn_cudatoolkit_9: 7.0.5 (9.1) -> 7.3.1 (9.2)
cudnn_cudatoolkit_10, cudnn_cudatoolkit_10_0: init at 7.3.1
---
 .../compilers/cudatoolkit/default.nix         | 40 ++++++++++++++++---
 .../libraries/science/math/cudnn/default.nix  | 40 +++++++++++++------
 pkgs/top-level/all-packages.nix               | 12 +++++-
 3 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index e44c21abe94..7a062a55215 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -149,8 +149,7 @@ let
       };
     };
 
-in {
-
+in rec {
   cudatoolkit_6 = common {
     version = "6.0.37";
     url = "http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run";
@@ -199,8 +198,8 @@ in {
     gcc = gcc6;
   };
 
-  cudatoolkit_9 = common {
-    version = "9.1.85.1";
+  cudatoolkit_9_1 = common {
+    version = "9.1.85.3";
     url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux";
     sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4";
     runPatches = [
@@ -208,9 +207,40 @@ in {
         url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux";
         sha256 = "1f53ij5nb7g0vb5pcpaqvkaj1x4mfq3l0mhkfnqbk8sfrvby775g";
       })
+      (fetchurl {
+        url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/2/cuda_9.1.85.2_linux";
+        sha256 = "16g0w09h3bqmas4hy1m0y6j5ffyharslw52fn25gql57bfihg7ym";
+      })
+      (fetchurl {
+        url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/3/cuda_9.1.85.3_linux";
+        sha256 = "12mcv6f8z33z8y41ja8bv5p5iqhv2vx91mv3b5z6fcj7iqv98422";
+      })
     ];
     gcc = gcc6;
   };
 
-}
+  cudatoolkit_9_2 = common {
+    version = "9.2.148.1";
+    url = "https://developer.nvidia.com/compute/cuda/9.2/Prod2/local_installers/cuda_9.2.148_396.37_linux";
+    sha256 = "04c6v9b50l4awsf9w9zj5vnxvmc0hk0ypcfjksbh4vnzrz14wigm";
+    runPatches = [
+      (fetchurl {
+        url = "https://developer.nvidia.com/compute/cuda/9.2/Prod2/patches/1/cuda_9.2.148.1_linux";
+        sha256 = "1kx6l4yzsamk6q1f4vllcpywhbfr2j5wfl4h5zx8v6dgfpsjm2lw";
+      })
+    ];
+    gcc = gcc6;
+  };
+
+  cudatoolkit_9 = cudatoolkit_9_2;
+
+  cudatoolkit_10_0 = common {
+    version = "10.0.130";
+    url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux";
+    sha256 = "16p3bv1lwmyqpxil8r951h385sy9asc578afrc7lssa68c71ydcj";
 
+    gcc = gcc6;
+  };
+
+  cudatoolkit_10 = cudatoolkit_10_0;
+}
diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix
index c89e9e4296c..b41469c215e 100644
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/default.nix
@@ -1,13 +1,11 @@
-{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9 }:
+{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0 }:
 
 let
   generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
     inherit (args) cudatoolkit;
   };
 
-in
-
-{
+in rec {
   cudnn_cudatoolkit_7 = generic rec {
     # Old URL is v4 instead of v4.0 for some reason...
     version = "4";
@@ -38,16 +36,34 @@ in
   };
 
   cudnn_cudatoolkit_9_0 = generic rec {
-    version = "7.0.5";
+    version = "7.3.0";
     cudatoolkit = cudatoolkit_9_0;
-    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
-    sha256 = "03mbv4m5lhwnc181xz8li067pjzzhxqbxgnrfc68dffm8xj0fghs";
+    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.3.0.29.tgz";
+    sha256 = "16z4vgbcmbayk4hppz0xshgs3g07blkp4j25cxcjqyrczx1r0gs0";
   };
 
-  cudnn_cudatoolkit_9 = generic rec {
-    version = "7.0.5";
-    cudatoolkit = cudatoolkit_9;
-    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
-    sha256 = "1rfmdd2v47p83fm3sfyvik31gci0q17qs6kjng6mvcsd6akmvb8y";
+  cudnn_cudatoolkit_9_1 = generic rec {
+    version = "7.1.3";
+    cudatoolkit = cudatoolkit_9_1;
+    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.1.tgz";
+    sha256 = "0a0237gpr0p63s92njai0xvxmkbailzgfsvh7n9fnz0njhvnsqfx";
   };
+
+  cudnn_cudatoolkit_9_2 = generic rec {
+    version = "7.2.1";
+    cudatoolkit = cudatoolkit_9_2;
+    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.2.1.38.tgz";
+    sha256 = "1sf215wm6zgr17gs6sxfhw61b7a0qmcxiwhgy1b4nqdyxpqgay1y";
+  };
+
+  cudnn_cudatoolkit_9 = cudnn_cudatoolkit_9_2;
+
+  cudnn_cudatoolkit_10_0 = generic rec {
+    version = "7.3.1";
+    cudatoolkit = cudatoolkit_10_0;
+    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.3.1.20.tgz";
+    sha256 = "1yp35mng4ym40g5rqp63dcpa6jg4q1pnjkspnhlakzzdy8is65af";
+  };
+
+  cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_0;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f98bf64fdf7..ccb910a7c97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2058,8 +2058,12 @@ with pkgs;
     cudatoolkit_7
     cudatoolkit_7_5
     cudatoolkit_8
+    cudatoolkit_9
     cudatoolkit_9_0
-    cudatoolkit_9;
+    cudatoolkit_9_1
+    cudatoolkit_9_2
+    cudatoolkit_10
+    cudatoolkit_10_0;
 
   cudatoolkit = cudatoolkit_9;
 
@@ -2069,7 +2073,11 @@ with pkgs;
     cudnn6_cudatoolkit_8
     cudnn_cudatoolkit_8
     cudnn_cudatoolkit_9
-    cudnn_cudatoolkit_9_0;
+    cudnn_cudatoolkit_9_0
+    cudnn_cudatoolkit_9_1
+    cudnn_cudatoolkit_9_2
+    cudnn_cudatoolkit_10
+    cudnn_cudatoolkit_10_0;
 
   cudnn = cudnn_cudatoolkit_9;
 
-- 
GitLab


From 032a2b3907fe3db59d7d7839c395a01140d1a478 Mon Sep 17 00:00:00 2001
From: Patrick Elliott <patrick.d.elliott@gmail.com>
Date: Tue, 30 Oct 2018 19:26:54 +0100
Subject: [PATCH 0703/1065] nodePackages.git-ssb: add node-gyp-build dependency

---
 pkgs/development/node-packages/default-v8.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
index 020992c8684..be9aafe4741 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@@ -49,6 +49,10 @@ nodePackages // {
     buildInputs = [ pkgs.phantomjs2 ];
   };
 
+  git-ssb = nodePackages.git-ssb.override {
+    buildInputs = [ nodePackages.node-gyp-build ];
+  };
+
   node-inspector = nodePackages.node-inspector.override {
     buildInputs = [ nodePackages.node-pre-gyp ];
   };
-- 
GitLab


From aa4707fc3449192b961bfd2dfc16b9042df0d7f3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 12 Oct 2018 15:21:26 -0500
Subject: [PATCH 0704/1065] treewide: use gnu toolchain for avr/arm-embedded

These packages should in theory work with our GCC toolchains, but
there are some definite breakages that need to be tracked down.
Comparing output of these to old gcc-arm-embedded is important.

Affected packages include:

- axolooti
- avrdudess
- opentx
- microscheme
- betaflight
- inav
- blackmagic
- simavr
- gnuk
---
 pkgs/applications/audio/axoloti/default.nix   |  5 +--
 pkgs/applications/misc/avrdudess/default.nix  |  4 +--
 pkgs/applications/misc/opentx/default.nix     |  8 +++--
 .../compilers/microscheme/default.nix         |  7 +----
 pkgs/development/misc/newlib/default.nix      |  5 +--
 .../misc/stm32/betaflight/default.nix         |  7 ++---
 pkgs/development/misc/stm32/inav/default.nix  |  7 ++---
 .../tools/misc/blackmagic/default.nix         |  7 +++--
 pkgs/development/tools/simavr/default.nix     | 14 +++------
 pkgs/misc/gnuk/generic.nix                    |  4 +--
 pkgs/top-level/all-packages.nix               | 31 +++++++++++++++----
 11 files changed, 57 insertions(+), 42 deletions(-)

diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix
index 274233167bd..ece03668701 100644
--- a/pkgs/applications/audio/axoloti/default.nix
+++ b/pkgs/applications/audio/axoloti/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip
-, gnumake, gcc-arm-embedded, dfu-util-axoloti, jdk, ant, libfaketime }:
+, gnumake, gcc-arm-embedded, binutils-arm-embedded
+, dfu-util-axoloti, jdk, ant, libfaketime }:
 
 stdenv.mkDerivation rec {
   version = "1.0.12-2";
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
     sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj";
   };
 
-  buildInputs = [ makeWrapper unzip gcc-arm-embedded dfu-util-axoloti jdk ant libfaketime ];
+  buildInputs = [ makeWrapper unzip gcc-arm-embedded binutils-arm-embedded dfu-util-axoloti jdk ant libfaketime ];
 
   patchPhase = ''
     unzip ${chibios}
diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix
index c803eb37ad6..1144d515284 100644
--- a/pkgs/applications/misc/avrdudess/default.nix
+++ b/pkgs/applications/misc/avrdudess/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, mono, avrbinutils, avrgcc, avrdude, gtk2, xdg_utils }:
+{ stdenv, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }:
 
 stdenv.mkDerivation rec {
   name = "avrdudess-2.2.20140102";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}"
     # We need PATH from user env for xdg-open to find its tools, which
     # typically depend on the currently running desktop environment.
-    export PATH="${stdenv.lib.makeBinPath [ avrgcc avrbinutils avrdude xdg_utils ]}:\$PATH"
+    export PATH="${stdenv.lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH"
 
     # avrdudess must have its resource files in its current working directory
     cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@"
diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index 8a941a719f2..0aecc43d1e5 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, cmake, gcc-arm-embedded, python
+, cmake, gcc-arm-embedded, binutils-arm-embedded, python
 , qt5, SDL, gmock
 , dfu-util, avrdude
 }:
@@ -21,10 +21,12 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    gcc-arm-embedded binutils-arm-embedded
+  ];
 
   buildInputs = with qt5; [
-    gcc-arm-embedded
     python python.pkgs.pyqt4
     qtbase qtmultimedia qttranslations
     SDL gmock
diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix
index cfee1b0d863..f15a7624327 100644
--- a/pkgs/development/compilers/microscheme/default.nix
+++ b/pkgs/development/compilers/microscheme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, vim, avrdude, avrbinutils, avrgcc, avrlibc, makeWrapper }:
+{ stdenv, fetchzip, vim, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "microscheme-${version}";
@@ -10,15 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976";
   };
 
-  # Just a guess
-  propagatedBuildInputs = [ avrlibc ];
   buildInputs = [ makeWrapper vim ];
 
   installPhase = ''
     make install PREFIX=$out
-
-    wrapProgram $out/bin/microscheme \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ avrdude avrgcc avrbinutils ]}"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix
index e26f0f78f21..693cfa093b0 100644
--- a/pkgs/development/misc/newlib/default.nix
+++ b/pkgs/development/misc/newlib/default.nix
@@ -23,12 +23,13 @@ in stdenv.mkDerivation {
     "--disable-nls"
     "--enable-newlib-io-long-long"
     "--enable-newlib-register-fini"
+    "--enable-newlib-retargetable-locking"
   ];
 
   dontDisableStatic = true;
 
   passthru = {
-    incdir = "/${stdenv.hostPlatform.config}/include";
-    libdir = "/${stdenv.hostPlatform.config}/lib";
+    incdir = "/${stdenv.targetPlatform.config}/include";
+    libdir = "/${stdenv.targetPlatform.config}/lib";
   };
 }
diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix
index 0c601c7773c..21230464e74 100644
--- a/pkgs/development/misc/stm32/betaflight/default.nix
+++ b/pkgs/development/misc/stm32/betaflight/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, gcc-arm-embedded, python2
+, gcc-arm-embedded, binutils-arm-embedded, python2
 , skipTargets ? [
   # These targets do not build, for the reasons listed, along with the last version checked.
   # Probably all of the issues with these targets need to be addressed upstream.
@@ -24,8 +24,8 @@ in stdenv.mkDerivation rec {
     sha256 = "1wyp23p876xbfi9z6gm4xn1nwss3myvrjjjq9pd3s0vf5gkclkg5";
   };
 
-  buildInputs = [
-    gcc-arm-embedded
+  nativeBuildInputs = [
+    gcc-arm-embedded binutils-arm-embedded
     python2
   ];
 
@@ -58,7 +58,6 @@ in stdenv.mkDerivation rec {
     homepage = https://github.com/betaflight/betaflight;
     license = licenses.gpl3;
     maintainers = with maintainers; [ elitak ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 
 }
diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix
index cb9cc80d325..9c35ac2ffce 100644
--- a/pkgs/development/misc/stm32/inav/default.nix
+++ b/pkgs/development/misc/stm32/inav/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, gcc-arm-embedded, ruby
+, gcc-arm-embedded, binutils-arm-embedded, ruby
 }:
 
 let
@@ -17,8 +17,8 @@ in stdenv.mkDerivation rec {
     sha256 = "15zai8qf43b06fmws1sbkmdgip51zp7gkfj7pp9b6gi8giarzq3y";
   };
 
-  buildInputs = [
-    gcc-arm-embedded
+  nativeBuildInputs = [
+    gcc-arm-embedded binutils-arm-embedded
     ruby
   ];
 
@@ -50,7 +50,6 @@ in stdenv.mkDerivation rec {
     homepage = https://inavflight.github.io;
     license = licenses.gpl3;
     maintainers = with maintainers; [ elitak ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 
 }
diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix
index 2974c653acd..28146352835 100644
--- a/pkgs/development/tools/misc/blackmagic/default.nix
+++ b/pkgs/development/tools/misc/blackmagic/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub
-, gcc-arm-embedded, libftdi
+, gcc-arm-embedded, binutils-arm-embedded, libftdi
 , python, pythonPackages
 }:
 
@@ -17,8 +17,11 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  nativeBuildInputs = [
+    gcc-arm-embedded binutils-arm-embedded
+  ];
+
   buildInputs = [
-    gcc-arm-embedded
     libftdi
     python
     pythonPackages.intelhex
diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix
index b009d5ed601..e28aad40ef4 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/pkgs/development/tools/simavr/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, avrbinutils, avrgcc, avrlibc, libelf, which, git, pkgconfig, freeglut
+{ stdenv, fetchFromGitHub, libelf, which, git, pkgconfig, freeglut
+, avrbinutils, avrgcc, avrlibc
 , libGLU_combined }:
 
 stdenv.mkDerivation rec {
@@ -15,14 +16,10 @@ stdenv.mkDerivation rec {
   # ld: cannot find -lsimavr
   enableParallelBuilding = false;
 
-  preConfigure = ''
-    substituteInPlace Makefile.common --replace "-I../simavr/sim/avr -I../../simavr/sim/avr" \
-    "-I${avrlibc}/avr/include -L${avrlibc}/avr/lib/avr5  -B${avrlibc}/avr/lib -I../simavr/sim/avr -I../../simavr/sim/avr"
-  '';
   buildFlags = "AVR_ROOT=${avrlibc}/avr SIMAVR_VERSION=${version}";
   installFlags = buildFlags + " DESTDIR=$(out)";
 
-  
+
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
 
@@ -31,8 +28,8 @@ stdenv.mkDerivation rec {
     patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target"
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ which git avrbinutils avrgcc avrlibc libelf freeglut libGLU_combined ];
+  nativeBuildInputs = [ which git pkgconfig avrgcc avrbinutils ];
+  buildInputs = [ libelf freeglut libGLU_combined ];
 
   meta = with stdenv.lib; {
     description = "A lean and mean Atmel AVR simulator";
@@ -43,4 +40,3 @@ stdenv.mkDerivation rec {
   };
 
 }
-
diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix
index 22aaa2d1cb5..80a4518f3f7 100644
--- a/pkgs/misc/gnuk/generic.nix
+++ b/pkgs/misc/gnuk/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, gcc-arm-embedded, makeWrapper
+{ stdenv, gcc-arm-embedded, binutils-arm-embedded, makeWrapper
 , python, pythonPackages
 
 # Extra options
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   inherit src;
 
-  nativeBuildInputs = [ gcc-arm-embedded makeWrapper ];
+  nativeBuildInputs = [ gcc-arm-embedded binutils-arm-embedded makeWrapper ];
   buildInputs = [ python ] ++ (with pythonPackages; [ pyusb colorama ]);
 
   configurePhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15f50090576..cd83ad728b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -830,7 +830,10 @@ with pkgs;
     libssl = openssl;
   };
 
-  axoloti = callPackage ../applications/audio/axoloti { };
+  axoloti = callPackage ../applications/audio/axoloti {
+    gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
+    binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
+  };
   dfu-util-axoloti = callPackage ../applications/audio/axoloti/dfu-util.nix { };
   libusb1-axoloti = callPackage ../applications/audio/axoloti/libusb1.nix {
     inherit (darwin) libobjc;
@@ -7998,7 +8001,10 @@ with pkgs;
 
   avr8burnomat = callPackage ../development/misc/avr8-burn-omat { };
 
-  betaflight = callPackage ../development/misc/stm32/betaflight { };
+  betaflight = callPackage ../development/misc/stm32/betaflight {
+    gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
+    binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
+  };
 
   sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {};
 
@@ -8034,7 +8040,10 @@ with pkgs;
     guile = guile_2_0;
   };
 
-  inav = callPackage ../development/misc/stm32/inav { };
+  inav = callPackage ../development/misc/stm32/inav {
+    gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
+    binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
+  };
 
   pharo-vms = callPackage ../development/pharo/vm { };
   pharo = pharo-vms.multi-vm-wrapper;
@@ -8192,6 +8201,8 @@ with pkgs;
 
   blackmagic = callPackage ../development/tools/misc/blackmagic {
     stdenv = overrideCC stdenv gcc6;
+    gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
+    binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
   };
 
   bloaty = callPackage ../development/tools/bloaty { };
@@ -12206,7 +12217,11 @@ with pkgs;
 
   graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {};
 
-  simavr = callPackage ../development/tools/simavr { };
+  simavr = callPackage ../development/tools/simavr {
+    avrgcc = pkgsCross.avr.buildPackages.gcc;
+    avrbinutils = pkgsCross.avr.buildPackages.binutils;
+    avrlibc = pkgsCross.avr.libcCross;
+  };
 
   simgear = callPackage ../development/libraries/simgear { };
 
@@ -18301,7 +18316,10 @@ with pkgs;
 
   opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};
 
-  opentx = callPackage ../applications/misc/opentx { };
+  opentx = callPackage ../applications/misc/opentx {
+    gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
+    binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
+  };
 
   opera = callPackage ../applications/networking/browsers/opera {};
 
@@ -21982,7 +22000,8 @@ with pkgs;
   gnome-breeze = callPackage ../misc/themes/gnome-breeze { };
 
   gnuk = callPackage ../misc/gnuk {
-    gcc-arm-embedded = gcc-arm-embedded-4_9;
+    gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
+    binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
   };
 
   greybird = callPackage ../misc/themes/greybird { };
-- 
GitLab


From c327df544ae0875ce71b0a82ae7a650a8e34a268 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 19 Oct 2018 11:53:23 -0500
Subject: [PATCH 0705/1065] gcc-arm-embedded: remove

replace with:

- pkgsCross.arm-embedded.buildPackages.gcc
- pkgsCross.arm-embedded.buildPackages.binutils
---
 .../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 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc-arm-embedded/6/default.nix
 delete mode 100644 pkgs/development/compilers/gcc-arm-embedded/7/default.nix
 delete 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
deleted file mode 100644
index 945649b2978..00000000000
--- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ 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
deleted file mode 100644
index c22683dae03..00000000000
--- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ 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
deleted file mode 100644
index 039b5a9ce36..00000000000
--- a/pkgs/development/compilers/gcc-arm-embedded/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ 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 cd83ad728b8..f130c470513 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6839,36 +6839,6 @@ with pkgs;
 
   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 {};
-- 
GitLab


From dcdf00f18bcdd5938deb7023ebaee45665f6eda2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 19 Oct 2018 11:55:07 -0500
Subject: [PATCH 0706/1065] mentorToolchains: remove

mentorToolchains.armLinuxGnuEabi is replaced with:

- pkgsCross.pogoplug4.buildPackages.gcc
- pkgsCross.pogoplug4.buildPackages.binutils

and mentorToolchains.armEabi is replaced with:

- pkgsCross.arm-embedded.buildPackages.gcc
- pkgsCross.arm-embedded.buildPackages.binutils

Fixes #39087
---
 pkgs/development/compilers/mentor/default.nix | 80 -------------------
 pkgs/top-level/all-packages.nix               |  4 -
 2 files changed, 84 deletions(-)
 delete mode 100644 pkgs/development/compilers/mentor/default.nix

diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix
deleted file mode 100644
index 4f09df7f2ea..00000000000
--- a/pkgs/development/compilers/mentor/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-# Sourcery CodeBench Lite toolchain(s) (GCC) from Mentor Graphics
-
-{ stdenv, fetchurl, patchelf, ncurses }:
-
-let
-
-  buildToolchain =
-    { name, src, description }:
-
-    stdenv.mkDerivation rec {
-      inherit name src;
-
-      nativeBuildInputs = [ patchelf ];
-
-      buildCommand = ''
-        # Unpack tarball
-        mkdir -p "$out"
-        tar --strip-components=1 -xjf "$src" -C "$out"
-
-        # Patch binaries
-        interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
-        for file in "$out"/bin/* "$out"/libexec/gcc/*/*/* "$out"/*/bin/*; do
-            # Skip non-executable files
-            case "$file" in
-              *README.txt) echo "skipping $file"; continue;;
-              *liblto_plugin.so*) echo "skipping $file"; continue;;
-            esac
-
-            # Skip directories
-            test -d "$file" && continue
-
-            echo "patchelf'ing $file"
-            patchelf --set-interpreter "$interpreter" "$file"
-
-            # GDB needs ncurses
-            case "$file" in
-              *gdb) patchelf --set-rpath "${ncurses.out}/lib" "$file";;
-            esac
-        done
-
-        # Manpages
-        mkdir -p "$out/share/man"
-        ln -s "$out"/share/doc/*/man/man1 "$out/share/man/man1"
-        ln -s "$out"/share/doc/*/man/man7 "$out/share/man/man7"
-      '';
-
-      meta = with stdenv.lib; {
-        inherit description;
-        homepage = https://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/;
-        license = licenses.gpl3;
-        platforms = platforms.linux;
-        maintainers = [ maintainers.bjornfor ];
-      };
-    };
-
-in
-
-{
-
-  armLinuxGnuEabi = let version = "2013.05-24"; in buildToolchain rec {
-    name = "sourcery-codebench-lite-arm-linux-gnueabi-${version}";
-    description = "Sourcery CodeBench Lite toolchain (GCC) for ARM GNU/Linux, from Mentor Graphics";
-    src = fetchurl {
-      url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${version}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2";
-      sha256 = "1xb075ia61c59cya2jl8zp4fvqpfnwkkc5330shvgdlg9981qprr";
-    };
-  };
-
-  armEabi = let version = "2013.05-23"; in buildToolchain rec {
-    name = "sourcery-codebench-lite-arm-eabi-${version}";
-    description = "Sourcery CodeBench Lite toolchain (GCC) for ARM EABI, from Mentor Graphics";
-    src = fetchurl {
-      url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-${version}-arm-none-eabi-i686-pc-linux-gnu.tar.bz2";
-      sha256 = "0nbvdwj3kcv9scx808gniqp0ncdiy2i7afmdvribgkz1lsfin923";
-    };
-  };
-
-  # TODO: Sourcery CodeBench is also available for MIPS, Power, SuperH,
-  # ColdFire (and more).
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f130c470513..18850ea49cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7178,10 +7178,6 @@ with pkgs;
 
   manticore = callPackage ../development/compilers/manticore { };
 
-  mentorToolchains = recurseIntoAttrs (
-    pkgsi686Linux.callPackage ../development/compilers/mentor {}
-  );
-
   mercury = callPackage ../development/compilers/mercury { };
 
   microscheme = callPackage ../development/compilers/microscheme { };
-- 
GitLab


From a33d122be67fd393ef5871e94ea0bbcddea4309a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 19 Oct 2018 11:57:43 -0500
Subject: [PATCH 0707/1065] qmk_firmware: init at 0.6.144

A convenient way to test embedded projects
---
 .../development/misc/qmk_firmware/default.nix | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  7 +++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/misc/qmk_firmware/default.nix

diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix
new file mode 100644
index 00000000000..0a7b4fd9d9a
--- /dev/null
+++ b/pkgs/development/misc/qmk_firmware/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub
+, avrgcc, avrbinutils
+, gcc-arm-embedded, binutils-arm-embedded
+, teensy-loader-cli, dfu-programmer, dfu-util }:
+
+let version = "0.6.144";
+
+in stdenv.mkDerivation {
+  name = "qmk_firmware-${version}";
+  src = fetchFromGitHub {
+    owner = "qmk";
+    repo = "qmk_firmware";
+    rev = version;
+    sha256 = "0m71f9w32ksqjkrwhqwhr74q5v3pr38bihjyb9ks0k5id0inhrjn";
+    fetchSubmodules = true;
+  };
+  buildFlags = "all:default";
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+  nativeBuildInputs = [
+    avrgcc
+    avrbinutils
+    gcc-arm-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 18850ea49cf..138e2f5e44a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22817,6 +22817,13 @@ with pkgs;
 
   tsung = callPackage ../applications/networking/tsung {};
 
+  qmk_firmware = callPackage ../development/misc/qmk_firmware {
+    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;
+  };
+
   newlib = callPackage ../development/misc/newlib { };
   newlibCross = callPackage ../development/misc/newlib {
     stdenv = crossLibcStdenv;
-- 
GitLab


From 991e51a1f65bfe48f0b41784bd0c8c5a9f3bd9e6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 20 Oct 2018 15:36:50 -0500
Subject: [PATCH 0708/1065] teensy-loader-cli: build on macos

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

diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
index d6c5256ca84..91f2a5c58fc 100644
--- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix
+++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "1a663bv3lvm7bsf2wcaj2c0vpmniak7w5hwix5qgz608bvm2v781";
   };
 
-  buildInputs = [ unzip libusb ];
+  buildInputs = [ libusb ];
 
   installPhase = ''
     install -Dm755 teensy_loader_cli $out/bin/teensy-loader-cli
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
     description = "Firmware uploader for the Teensy microcontroller boards";
     homepage = https://www.pjrc.com/teensy/;
     maintainers = with maintainers; [ the-kenny ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From 7a03d2d65f5fcb06ef693a442b806a34ab0803c7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 29 Oct 2018 14:38:11 -0500
Subject: [PATCH 0709/1065] axoloti: use nativeBuildInputs correctly

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

diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix
index ece03668701..3c3198e1734 100644
--- a/pkgs/applications/audio/axoloti/default.nix
+++ b/pkgs/applications/audio/axoloti/default.nix
@@ -21,7 +21,15 @@ stdenv.mkDerivation rec {
     sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj";
   };
 
-  buildInputs = [ makeWrapper unzip gcc-arm-embedded binutils-arm-embedded dfu-util-axoloti jdk ant libfaketime ];
+  nativeBuildInputs = [
+    makeWrapper
+    unzip
+    gcc-arm-embedded
+    binutils-arm-embedded
+    dfu-util-axoloti
+    ant
+  ];
+  buildInputs = [jdk libfaketime ];
 
   patchPhase = ''
     unzip ${chibios}
-- 
GitLab


From 22c7bc1e0f4337c1873d4d1dd18424b649e87c2b Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 30 Oct 2018 18:32:58 +0000
Subject: [PATCH 0710/1065] firefox-devedition-bin: 64.0b3 -> 64.0b5

---
 .../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 5cbc37fbe5b..d79bf3fed7e 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.0b3";
+  version = "64.0b5";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ach/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ach/firefox-64.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "39642bce504c68c2ebbc7c5ae42664f1b7b0da218e58a7340d28abf639d8c034b33603146070006c914a19beb9e2659fcc3e2023018db36fc51cd7405620756e";
+      sha512 = "81aac1100191780e1cf6b7ac8dd1fd12493b67fd73c41c79be165dc2f998b4d9efa299f005e982707cf347493bec984924f31ed96717205e12365b33a242e09f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/af/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/af/firefox-64.0b5.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "8a8f1335e91a510f3e884fc19e2babfbc279135392d4d527dcd634cc3f08a7c914b13ca8439dd3f9a7fedb021b13b4a79355b89c12c38280c09c78e11aaba64c";
+      sha512 = "f68851efcfd8cf4cc4828cf94fa97f9aaac4af8087ee21d7b7c3c5bb01ce471122488eff26747022e73a5c0421a40d8ca0b815dc5cce21e68f7e5c36ba3f414e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/an/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/an/firefox-64.0b5.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "f8589a2bbe767c61387239218feafc622c786521d6435c7a25e587e81dec365bfbf8381a46345a5c96ca3ffb3e27eb5085ce3305a95f76c7d1a05a4fbec50600";
+      sha512 = "73ffee783d5d3dbdb42169a4bedc1c50f38e34062ee418670d3b9dc10a6c7f9c34752cf885e35e2591d1affecd7fe5e0dc4f3659b76354f932d3e00c856d71ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ar/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ar/firefox-64.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "3ce0f917a1dd3c8aa624b1868acc213e45cc0208e5020beb4264d288b017d573f634bf0a98fe9ea9023aec42a3a468fe13876c1a8b5ad17295a17063b38e3623";
+      sha512 = "717a711d20d36b0983f80e662f1ec25d29c92af6ea5d7a8f03c63a94f60637495e6a9e6c170de8ba3b26473dd79cb4a1d5580effdda024d58af78445a2ff3a3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/as/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/as/firefox-64.0b5.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "5fe875648ba0ded96cc065751e23d687c22da8cf708283ebe96836afaebaa74c38e275dcbfdbb3a9b0959071a682d21714fe313e3d458864d0d6e22414014e8a";
+      sha512 = "60bf2b47020e3e78a6e2e00a30c6d56039b81c973366076ad615890b4fced04bd967947abc75c80cf79a808b86859a1874bc8dd4bb7c6b55989e27a34f10f3dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ast/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ast/firefox-64.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "0b39ba80b1d60a34e762b89ab0639dacd0785af151c11b38666706f4a3e2a9e902b5c7917e31275a93818453dbd32557ffcb71160a9acde09bfe01ff507aa212";
+      sha512 = "f16f083788c4893715c8151d9ad5725a23bf4105d43e3728dc9b60cdd2eb50695c1393da8ebac5d45e5c5f0d9cdcec333569868a6d46b108a503c94ae7c9b100";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/az/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/az/firefox-64.0b5.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "f02866a3a0881eb2f63677346ab45b6e8b9d7f1d3d15d2e2ee088017bab77ec6632cb73a1983fe17b5ce9e5376d43f836087abd8e277f53baea609872c907245";
+      sha512 = "8ee0f0f58a7b16b70e4843f71b9852935e665a670659915e27069d5c2fa33d8e9e10ffe0f47b255eba0d0e184ea22ee6ec5d0c0f05e9a74af280ac36b37eea6a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/be/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/be/firefox-64.0b5.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "c33b9825759f0375bc65d3139b00adcdde6c89fbdc1e2f38b552374042c455a1512d377ff60bcd294848f85ea03631fa0b5cb2278ad5c07dd83be8760d53f09a";
+      sha512 = "82806e493c7d9177f514a043b4ab96530da971c2193040bc12fddd33bad71fa53b3c67acdcdf4484afb00eac7d878fd6ca5ef772e710b4e6694354cac8dbaacc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bg/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/bg/firefox-64.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "90977c309a39b065425c93005717a97cfabf78734a20c8146e763ea7af49de4a51d49a7b20b061681130d19a911f4d4f9ddbde24f3cbc546b14014a4550619d3";
+      sha512 = "68ea491b58296bc2039f583cf8f0a2d04b7558b4588d39cf42863258ba5178e9f9732b6584c18f4833273e341dfc21eeae6dd6073e0d9bb4c407705f89e147f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bn-BD/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/bn-BD/firefox-64.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "25d6703e8c02bf65e3f6aabf6a5a6f31cb375cd22c299ada483e9a0dd075eb57798d40ae4b1bbfe72f6f4fc78989b9849d1c98d540fe5f7de235343ba1e3231f";
+      sha512 = "56a8c627416c1f5a42223e5ffa0f6f14f838a75f26e71bbe9d0a7b3286dfa93edb29d5c099bf7f0e8a9f840ef86dca0d900831f82bb7fdf0672e69d8427f26c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bn-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/bn-IN/firefox-64.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "b89cb442136dd3a28cb30cff95f31e24ca43af11ebcb23e16a7e3fec1d2e9f6ddddab9c7a14304a52b52a68a520d0bd6c7ccc34b4835953d2428de84c2cfb3c3";
+      sha512 = "34f490a5395a1cfcbed9f2858f21bf17792147ff12a1baa1ab4d0febbc98bc3137bdb54ae037d3f641963923a9cd52ca9e83fb728e93b807f3077541522d5923";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/br/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/br/firefox-64.0b5.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "f848cd20d0c550896a5a791ab0746ed7a0f52f065563d42e0fe4489982978cda1ed0be5a1425166e61445dc605db3aa8f052099434d91f81d489c5c3bca6d5b5";
+      sha512 = "521560eb7055f55aca2461cb445478ab3f17c91ac5304bc9f3cb3d85d22d742e403937e87fb58ec7d9e7c55647451510d043ce5696603dab76bb142d736c8059";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bs/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/bs/firefox-64.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "338e2e595929b2a08e055a268357cb7a3d869c94bb7a2050375a24baea19bad6c0f381564f2c43cbd16091630b8c701987484633682ffd6875adcac480fa5ba0";
+      sha512 = "ff43a09e4b19f0ebfa89b607f84e24ad1c633fbbff34b92f87afc73d85da28acf1db2b3f05af053117ff31c6a4f2f7293b8cc68fe77baaaae52d9d079b4f108c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ca/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ca/firefox-64.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "778e3ab1556e929cd8b3e842024d2f59558066dbb8970516017068139ce8c703f151d2ff735b091492e26e21effa18bc02dd8479819504b679f2ac9a8ee2f657";
+      sha512 = "d6b55dfcf3199a138b0292f93a83e3fd12512a37d786ab4aff422dee36db26209da62c42ced0d2f13679c2bb4e33d2c3062d2b08f1efc5b9c3c55ef86f54485d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/cak/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/cak/firefox-64.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "a3d19ffbb0e4319623de006b97c9d7988cfb3d00ccbb996c3cb12e527fde0c6d39480f00e67c27939935ac44bb8422ca8dca4d91b87a349fdb7e6165062fe3d5";
+      sha512 = "2bf7d817fa93b47db181da82cd2f4ff35c279d3403dd147e0eedd7c64919b5bae9495fe3cc683829707bbc659403a38502ff769074e0c87405ba857b2750c4c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/cs/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/cs/firefox-64.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "259e511ad5c253c9015b44e0c0d014f2b618b4c821eb5e5c1d8dac4fcaaef00255c80c401705815a1283cface8209a41550aee0a2d5c17b020a8630be2819d19";
+      sha512 = "a62f39843b5b9af972951e63c4e5ae9daf827483575a566099e1fd1a9a297534cbb8ad2d1c7681c1bbd69062a511705ad7be6fb8c7e1458bee63b142070cacec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/cy/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/cy/firefox-64.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "70fe96e7d36afa26e49bc2e2cce52e30bc41f4e56cda5942364a9cc4a37a4caf8fbda4915cb1857432624826633bd35ebcb732e2db1f07629b8854b59e06fa62";
+      sha512 = "7a333ac0514b9cf910bfaebd1d0e7a1056ee231a36fb67746dea83fa78d7e32a14f2b6e7bf5a051fbbd41be0c2378a46f29faa54cb25ea897ac31792071e2570";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/da/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/da/firefox-64.0b5.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "017e6d0f9ae0ef68cc6ffe5fc9f572c5d7fa9c950ba5f337e992800e703d381e854a0b7379fc89ffd837a1fc2e731dff7feeb078b58cf39481a7d8730db8c4a5";
+      sha512 = "3a46329e0ad1ce8c46318198f684d7291bd1caafee4ca959cba9b4826234527472a4ad3bd3c720792c02cb7f48be78d456c4d027d318807d6433c5f715d16a01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/de/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/de/firefox-64.0b5.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "9f5116f3e1d6cd87d245b0afb95b8c7d8de55603294f8cd3dc7e841ae74a6cc54cf39200fd0f1765a8e74e7d95b5de975365c26eeb728e90c2797183e26a5bca";
+      sha512 = "635b85102d95d50ec0445d98d5356ef71da7cc8d010e9756c9fc33af36ca0c6f86a9bc1a4d8f6d74d9aec2586290471195eeb565f9161a265b2fae28d558249b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/dsb/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/dsb/firefox-64.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "0399dfaa14e453c22ca1ad133ba61358c5a88b79e36262d91e1fc2d7981dfd2f0a37266fcc8c737f4cbe84429e6ba0682551c453370f8f40167c4fc1e27921ec";
+      sha512 = "76703c4354dc9c504e6f07655a449aa080626e0dfd345196baee1eaa63245b7c4967fe539955c8e4e5322fbfc8fa68f2384f0925e8a9183113f61b872df67ca4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/el/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/el/firefox-64.0b5.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "b5960880be96730ed01b1ad5da7625dd42d44bc9d2256d3daba5c4d8bdc52eb97fa123ab187a88c3e3d17e5affdc302e869793a30cad55080755d330ce8961c7";
+      sha512 = "7b2b3592d9c7834cf1dee91c49aa8dee48451d4eda0408c7f7eb27f975a8db8f5ba632dcd2ec65081da5357225c4a6af8031dc723a4d266972484a0724968a23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-CA/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/en-CA/firefox-64.0b5.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "ea19403c07d0371a36dc0611a79589807f44eb1f2e238c86de21412dbdc0c29bf99f3df88ae9c5be356c263d5b021e888a786b24d0c11e13bed8ec27e6bf4a72";
+      sha512 = "ed9c05783a0f226487f56afaf501bb682a4b442a58d06ca344b79e358f70bc506a6960b29c8ab66571a3e53d97ab8aac8dbf2ec3acabe37ddad47ceb25146378";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-GB/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/en-GB/firefox-64.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "e6ec9b351c0e130ced1fb4caf131fa8b547ac46255b1a63b135b370b8d5b6c855bae8b2ef349a6ee67d77ce69043ca374d40277e6b2befd89e94f7ac404c072a";
+      sha512 = "3f72d87dc2c800c3f64a754dd6bd1ff598896c15eb63e1ac7ff48481c3609b34ea12a2a425c417ba1573de0b01e10d4c55ab046224edb6fb40cbac6db3a2586f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-US/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/en-US/firefox-64.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "0304a7916ea7daa22756e484ebee602c6ae7bcd68b853b46f36189dfa1e0ef81ce4293a04dd0694d9c6b2fd3b3ee5ea1199776943d8db54fe0ad2ff6cc1355e9";
+      sha512 = "ad422fad714e3ee5cc673fcf4c74b2ba3ae57f5009aa6d3a8bdeba830adbfef2c1f744f7e258b8d17ffd351af1e917ec09662f02a765839016a724d37744f5c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-ZA/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/en-ZA/firefox-64.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "931901f6dbc21cc2dc35a99aea6789a4567c98184e0d79bdaf03087155723e9a0046398ce611a290c554e2f7a832f4423549ed451ae6ebb4e7b21abd1880a076";
+      sha512 = "eec901b5dc89ac13c2238a61f0d59038abb8f5f1a565e1d056cc43fc541de35a129f0d97ab9edaf3e2c0ea3f229d99ee0e870eda3f755d3bfb3d8d80785e649b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/eo/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/eo/firefox-64.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "dd6c54b9bbd2817537efbdf0ee1396fd92fc0682c6a864b759664b438afc8b9021b6ef3f602ff7132d5ea1ce2e03135dc708f768496387e219c102076f13b5d7";
+      sha512 = "1b78a67706055353c3c8291e222431923d1016cf91748c4b220bf4e116d8bf177201fa3468775ff0fb478282ea3947e270c8b6840671210f01391e2a4afd5cd0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-AR/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/es-AR/firefox-64.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "ff8843659cf29e667d2e2f79e58bf8bb24a766de624c2e99e9ac809357c537527110af39790596689ad8eef0455229e40e5ecd5ed51f41a68c28aae47a9db076";
+      sha512 = "826504e926041cc0edc18b17e32c41cc6ce7ac9f5a1abab4be57806004054f97ce5fd6de7002e5b693b81ef92a1589344d29a4f1a7ba813d6e36f8789bd6799d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-CL/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/es-CL/firefox-64.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "5971ea9c0e8cb49e57fc26b744ccf3e0726dc60575dcf53c63599ab20de6ff84825ebee5a8c37eafc1d442559d92e7e4aad770222991dc34c17fbb4a6c58ec44";
+      sha512 = "015110f3098fd8f47a9df5ff33b16f52a2fc5279de442002276d0782ad65baeaa6e48d742c8dc91b7da2485bfac10917b1f7441e8f0436843c046dfd313b2a4f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-ES/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/es-ES/firefox-64.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "ce13162b414694992bbe2d49ed66d9b6c2a7c80121a057ba12a473e14a7d5efdcf867e864a0809c219e9c0bbe3995320873162b028510cfb10f0459d9c223315";
+      sha512 = "1a101456683823886d045621515f85e1e7099acba790cbf429d094e4e61c7778797fc921657c60865a382c34ee3505b5be13da726308ec95a844ec4ce829e1a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-MX/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/es-MX/firefox-64.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "25a771fa0f7d36214a5e641bd5f13a8ab5459bdc516fc37541b42e27fb66ba00889001ada3a89c9199ae53293126dd5df86533bc7a9f5760e20ed60db954cd09";
+      sha512 = "56424f6281e7b9bc1cc7e9f7a56ac16d4cb655a6371a90253087634ce183dbc3e9292e64e73755ae59c2b258b3fa549926ba75fb6e986bb615e27e4a874bc1ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/et/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/et/firefox-64.0b5.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "dcfbfb270fd8265a9e6deeea0f2645d224385e860034568fe38d49547159920bf2d954e4f2c64c9530f8a8468ef7b1a7b626b1702c4fcafbe186d887d826503a";
+      sha512 = "24a86e5dfbcff7d42e30483da3c72ddb1e85ffaa2cfef3dbafb5e6a8a5d65a80c1a5a41764dfdf46cd3ca2481e00e3a8c2977c3b7dd2cfc3e55f97b482c75263";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/eu/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/eu/firefox-64.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "d58ece9f65f1279930b3860582fe4f430c8dd7cfed2a2b85b7447af6d86935948e6e0d1c3f067c67e9561853149b2807c011317a9d78cc07c619aa6deb21a43a";
+      sha512 = "98133db0edc236c0699e7d436d31f9ff88759d93f08c2271889b45e33ad8d81cc92d8c72c1d406c099690d6814be95bf2cc5a72f8f95b2ed1d8157cc8d192373";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fa/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/fa/firefox-64.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "d0d06deb139f57539631cc44544a773abfa305bacbc81bb4e89a90fade0e9dabd4977934356e00a0cef4117b27d8d66aef8d6b34049759fb911cda580da98fd5";
+      sha512 = "973d5194c5cb15f8260fc9f035abd405faf2a511ac89c1dc2b87061c49c01c33a87f3b37e5ead26675a197408106f7db4486372cc4e667564f6f4a4c1448948e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ff/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ff/firefox-64.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "602c9e6044cc0aa16cf80ff015fdf03ce48312321fd8a52445db871dfc1c475b05a2cccc36355f5c1681d540fca94e3e1c566b6153b2ed4038a6b69a3356d222";
+      sha512 = "4036608d60ca101474ab1e417241f596ab2736683e6bd0e382a4f32eeeee0bf5ee46132bcf72f71316dca480b97afb1623b823d0afd55c3f387580974e81aa48";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fi/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/fi/firefox-64.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "bcca1c3cc30f78712fea324b6bf4f3c6020b47dcf95abe5013eb0e2f588a7ca5c80261707922443a35e4d355f5f0cdeeea9a094f1c3c00a695a42692f6519cd1";
+      sha512 = "42b4729cac15f33040a7501a1310522e2536e8ffae8b181c1013f6342b1d3c802639945676a022a8bb599d3829f063ccc47a5e37bf445016201a0786962711bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/fr/firefox-64.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "14ba146eef2148b5f4617a9ba73499bd783cf030683d87dc9ea75feb31cdec3b52636d8df3ef36001b5304237b39fda42d76d0f70e56283211d49abfa7b2fc8c";
+      sha512 = "68982aa52660936221db6d8c2c752de00ca627d010d3c33bcf905693a5fe8f2faae0fa81e09e04adabf4b0542b415543453357f721cf31c5be6e06a24c921a9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fy-NL/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/fy-NL/firefox-64.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "70711c19244e034ebd8ab944e71c9604b26704c87e114db8a0daed9048a8ad54c1931c33b7dfac152f737f543cc58fa65262ad7f3d7af20321e3600437826467";
+      sha512 = "19bf324234da4bc6de2eceb4a7a44af8fa72e37deae31168575376499746934679e311d8a17bb766fbc3203ae8245706e0ccf7b484ad4ef38fbc9f12ab8ef289";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ga-IE/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ga-IE/firefox-64.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "3633ae56e5a9d84e81fa5ad6110c5804a56681ab9ec526750aca51f11296b82a6f3f6531c3a2b83d6e86d414df47e6087937fe4ef08eaca36f77afe7d5d3591b";
+      sha512 = "55ec4531c0b99d3de20f7089cb898f4b5cebd91a9dac8117999c3c17156f7b719a00cc0c393c5454d194247f7117a4fc6b8d724be353c58085241ab5b1081b28";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gd/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/gd/firefox-64.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "7d6bf6919815935dbe77ed44832d8fb5b22bc96beb5f3d061ada46d6b4840fa1bd248f1bae7c7c3296e5e10dbf78216a427c1f0c9d76e6f1d9396288ef2b8823";
+      sha512 = "b1555a090268b93f569bd2f370863821f8d83db5a02f06b44f672753521832cb5653ad586331c90a75a285eb60c5d4d7b785be68e970fdff959e39372ac2865f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/gl/firefox-64.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "eba1485f5942820a30c5d0c176ff6fba83a2af8020c4d83c00242d1266abca53046d2dea6920e38390a2044f25cc8868319c0f94453631140ab91ac68aaf0be7";
+      sha512 = "f4291ac9f59fc4b577abc890aa5be7d8a39107f60e8b20c0d2376999d530c34ceb41dc06232ca0edbbe6b6ad4babf0140e2de037bf8a17e867161cfba612add4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gn/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/gn/firefox-64.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "e0fd4b5235ae9120f32bee6e2a1a04abae9576e7222f201006ba56f66e48f5c7ea98a1b01a777316252a21f807744a7a9393dace8195b96375233c72f31c381a";
+      sha512 = "92c18a333e131bd331dbaa032f901ffa73cca2feef7399498e73576d3224675c0199339d2ac20074ee2d9e202df7f6cca81c2f0a39f562816a7e05ce474f03ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gu-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/gu-IN/firefox-64.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "be52a2122ff012ecd2990ef7ef03de4e84ca675ceca9c81d4f8f1fbfc82e911c65d36f83a20d372e765ac3b741924df85043e4585309c8e37ea84dea5e89f192";
+      sha512 = "1a3934233439dde03be043c1e07b8391319076e4033cd5b70830aab2a33c3ae935ed87d807e867e0c7f1b5c9bd220f04a1d5f1e9eab5744b1f7bcfe24ae29f3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/he/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/he/firefox-64.0b5.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "8c66a38eeab2c15a532bd0170ec70f7a22cdbe49cccf0d0d1baedd30f6e708b1c67eab3c4db2a42826b9e05a7252bb57d5c5a67bc8adfd6c0235c5a4a410c981";
+      sha512 = "9316abe49f3766dad4083e02c170e4f631986f727d937f67e0b8e680c8338166e0a7cf89b6b244b3dd1723576a664ac4d3eea6bbba59cd12aea574c53bf1757f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hi-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hi-IN/firefox-64.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "03d51782a0c80240b84c2240aebe3940c6fec5972e1a39d875717c9d4ef9496cb43dcba5a5009319c4b174dd85d3ba2753d71d60bb64c030f07604e63499f4e2";
+      sha512 = "97f51fa99e99227d6463e43a265757d33a7201dd9f48bfe6c315d788d06d20016e673c52545fc1fda2e96056457d77d5e1aa3f97066ce1fd9f6bbc39dca6504f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hr/firefox-64.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "af26fe8a3bc9523e50425aecdb735f6b6dbb4f1285d0eeb97f91e0da6148012c608e33c683d800ab2062bb7fec21045263ccd1263f07dba0ef96323db30668c4";
+      sha512 = "61ea25d4257d72c8ed07f4b65be21feaa8b0fe26808eeb2f98e8ef5f3a85a44820c368541a4c19417d4d3190f5a198c92c5b5c1d1cbf5cd6c2157cf14a5794d5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hsb/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hsb/firefox-64.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "7437f1108ca22f77ef0b61346e5a18042981d268ebae2465dd7f3699e7ecd99dbc782302e48f8a7a16d4db17ba2c4f6167a6f137f711a713bced7c7ccb3fb19a";
+      sha512 = "cb609d6635be14f53d89cc19396842a2aa389decd48b817ad4788e5fef629f9bf336ca63a513b4e876b15e8c283679b77ebd5dbc0cf4309b9d8d50177d5bb3c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hu/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hu/firefox-64.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "1a430eba889ec39be81a19b747a43be86fc6751281a24cadd421fd2677e0b7b28f5338847213fd9e548c8451a44a5d181b6efa19bd1cd200cba3405f8a1969df";
+      sha512 = "2bedb1c0d7d7b76738d112fa731d8c92dc7d9408c4936d408950b026f6b70b8de288a8a74ed6fab8f331c793ecce10fd267e21580a814aa604ae62677d57db4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hy-AM/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hy-AM/firefox-64.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "00ae1aa437e4f145ce89e9081d2c01498201cfe39e48466521c29a678708bd48a3f9931dc7c039d9c313129b851afbfa7b24658087bbfe7e0c0e9bfb37ebc90c";
+      sha512 = "158e04e00fab8ef62f375395d4a8c969c4b41fd583fe26046d1989a784f42b821daf341ceada29fdc2dfb61703df071578ba8bd33d074a5f15c7840a9127f5db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ia/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ia/firefox-64.0b5.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "97b1555eeae73c0b84141f6be1f6555bd91543f6f8fb89b09c3d25bbff5067476ff67a08a6c9e433e6d0059a8ccbdef8ede224ad7eda6e7805e3f15a13279235";
+      sha512 = "88b7cc2f451439c909cf965daa653524c15b38d121076d7cfad551806138a1974fd3d5383b511b57c942682ef307db9cb59b0dadc246de515c58d00a5edc630e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/id/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/id/firefox-64.0b5.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "14f56d956644d22f58b882bb6cfb941031716ea651009c72ab08e0501ca05ea5ed60658763a19ece7d6ef28a77afb2898fb998a17ef4620690cd527340c5d994";
+      sha512 = "73462dd62170339ceede8adbf13dc067f3dd253fdbb4bef1321506782797821c49126b0a876159861827876f5a9c2f674db53fa79081ea1b5b8ab07a676faff1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/is/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/is/firefox-64.0b5.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "000f64b07f9be1b56fa47ef0b2222ef9669355a1c415da73e6b11dfc9efc89a4ae07ca7de6c2367d9f2c19c91dfb3cdfa484e1dfd25fbbce759d4d3bdf09b0ef";
+      sha512 = "e94a7270bb4221fda6c525c0eb0e15ec6b5480baded71ce03f17288e5c0523e3d0043ff3b278259ba4ceb76b9580d99e5234668d2d05a61e1532b23cd8c78267";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/it/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/it/firefox-64.0b5.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "6d1a2184869f746ff413b71bfc0f356ecb00a7f9bf996054a5ce3142482ded733ea3bae76a0e19d07ed2dea8edf3d16f346ceb1f09c4b3477491c8ac428979b3";
+      sha512 = "ab4a5c6e16d0c8275b8d319916911c504ddd642ce0f523113620491a3e415727700d8636406c3a870fc491f55e9e96c516a32b564689656647f72345a384e704";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ja/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ja/firefox-64.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "1bcaf9dbbffb01cab2f4c84bfde1b98238344d6a44ecb209b61caf9f30ef6a6629c3c702951a4f2405efc72272612edcce98b0979e09131f930995adf94ec60b";
+      sha512 = "612c52a9405d5a8c1bfcbc0e14f2e9d5ea30318276b2c5042df6eee15f0ef6adf724d3f8e82effa5bdd1ce352399c4316dacee89e275fbf71a88224d747cb8e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ka/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ka/firefox-64.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "0137e1f0148f641748e98ed10554b3c6db319ed2b7e8e382fd80c6fb425a588951d7c78047afa9daacdf0d401790a441cd95bd055a4862e3f3991846499b313d";
+      sha512 = "45a6f17197b801cf7d0d69fac67876d0d51af25e3da044ca85304116fea4a440be2256d33fa6b83a6612f564a7846ba74094226f56df5dcb06586912b7051126";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/kab/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/kab/firefox-64.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "75343d0c3ba1dcb04b87571a376a0d223d38b32b939111d6d3fc3e2ac416980b8e6d0023c07daa6ac1484336a1268ffd6cb47c1d7dddb294257106146ae53ec1";
+      sha512 = "588c4ac270443ff1f06ba6df52ef0deb97718c0b1e889d16324e50c5bcf40b05178f41777a91d228d3eb2055cd527407dd00f613abfa3e45f56dda11e5ab506f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/kk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/kk/firefox-64.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "caba86f7350e41b996c5c8e2c3cd5e7b227ac8714aea82eb74ca114c588eed5184f023caf1b4b6586c21c2eba66d3c53070aa6bfefa072113cd2a4a74110fdfb";
+      sha512 = "a7b19b76d0d1d029d4779957c5b35dccaa41eb5adf4ae0a5546c5194e6e69466aacdc4c257f85998260b13ebbbd7a53f697245590fa71834a46598b950177121";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/km/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/km/firefox-64.0b5.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "572222b72b9853e2d71662f4ecd62af748d872c18f01dba6c0168dee69d383d4c54cbcc2786a66ea09b6c79014923fd9be34d9505c06bcaa4660ea071a9f9a33";
+      sha512 = "4989c898cde62b09d953e91efd9746d0070fa8cf9a18b00928f2b03f4737541ddd8d50ecdf01b82357618065c2ae1b08b35c5b049abd30b1532034e0789b8ba0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/kn/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/kn/firefox-64.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "57208fa78265ca4ce0b19a53b455cfaa8d048423f3f1d5626601aba89ff272c3a008a37682e1f706b7e499361cf4f8fe3fab42f43fbc0fd362d4a461b3578e9f";
+      sha512 = "a8af1cd9b9668bf22bf42fde6fba750f9e7e8786d7e05cfa0d37e79e37daa8529e0acde655ae23f45c2b6e4c46716d90fba2053a51d84bbb58b760f541dbf552";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ko/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ko/firefox-64.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "78f372aeb663752c5981ce15a955480317ee40ae29a83e55c53328d51a76ea1800e74fa64a35ac10d94297418a50de1da16f9b2352159ed0d08579a1de46c5ce";
+      sha512 = "03c7d8711f7a847144a38bf4303ad492994b6e1ad86f1c6758e048c89b5c28dea2507eb33819b2f577fa708fee66f489df9319cc99a5f1c497fd405dfd459343";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/lij/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/lij/firefox-64.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "6f3355264ab1599122f5e9ecf3112d069184ee2b4208d7e6fba6dd97a358bbf4beda43ccacca63fed9837632d5d8f979403e5404aa3513ea21487eaefb4fc519";
+      sha512 = "d157eb6b3cbc3d540ea8bc290694ed651c3be2f582bd662b0ae1c052759685ecaa2a4cfbd6814677c048dc273ae95e4c12b2e199a5c4a202885511c65c59b3ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/lt/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/lt/firefox-64.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "145963b3e8d88b6cac78d25aa6d34b3991e7432bfdb11e53df86e1cfc6ac5d88a43b535ce64a4225174c41c9aa48065f766c49cb70828a22bfb6791aab83f68d";
+      sha512 = "0ef3d34d04d3897b3adeb7d5bca3959ad2681c5c1986c542c04b584c16c052471bd2b6c5c35ef772f7033d5806f3528a263b79d88566815696a1f7bb7d823989";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/lv/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/lv/firefox-64.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "8fd53f1f2fef7bca7a75a8e18a4268d9e2bff0f550b23c8a817b51f9791b2e31061a612dcd8f72a61e5f8dd51b973b6e8d4b86481ef07f973335cd1e7d8af42e";
+      sha512 = "ea88b2cad9411a347aea0da17f3cd97c8375488b699f1bea608440f604c0dda4199fd341bcedd721eeb06e701c8b05baadf4b4ed1c437acb11cb2945bb8fef43";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/mai/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/mai/firefox-64.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "ab9910b231e6d395bd9142f6a2d7ac5d565317abe5cc977e602055d5eea83f5520918ff17372e6fedcaebce4509d30dbd0c9a1d89bcc5ec3728c2406ac62bc8f";
+      sha512 = "35b468bed701d8d961aae420ae674a3cd249d8ecdb8038f1e89b6538a1a6bc118940df150d0c9bb372da180a14f0ae24cdbb18ba562b73cd9fff57e595c56228";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/mk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/mk/firefox-64.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "a84ff39f063a0aa11490f6d059a2112a1e0e2ae931dd8b3a576ffe2253c4f0a2600c221d9cefa2bdac8c3af87b4aa6bc571caeffeda10d78b7dcea7bab694a1e";
+      sha512 = "ccd010af8e7e0fe1eb399e7bc239c9fab4a162f49a482db7e75f2ef60f35335d0afb0ef4a7abc7896f0cf702a42e045099725898bc687a50c6aa039ea354e929";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ml/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ml/firefox-64.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "46db7c4284ad4441877c8a72560c560bd4e46d0669ab4144a5296f1f25c796943253dfb1e55882e9443f1f4bd2f083f83e00dca597e20a35f241e8bd54cf5727";
+      sha512 = "e9cefba5184026b288e73d6b94a35e6c3624ddf40645ca74d769136bd92b24ba50c4add4cc9141cd237ca87a5b5caa0f6a3c487aa4f559676045df533398b4c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/mr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/mr/firefox-64.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "5182c8648adc51b04354ef1dc4848b4245800dc57a80d54dd605c56c9a792cc9b3d57085c0c125e27453fbdb0f55523c555c91b84b7f8462df365b7d47d7c1f5";
+      sha512 = "ef5f47c810c5758c7d8e03cfa3e856b219fe9856f811f72b566a0726ba0a2932324ec342f2135908f894f7c0359d153690d0cde864111d1717c303821bee8a04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ms/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ms/firefox-64.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "599f460adbb94ab3adac29bdfa7849dc0e44c975fb2b8d4cca4ba25980bbd36085eecfde7a23dd26c223b0d9917a6800de230ccab738fc4e23f7863dbec21fc8";
+      sha512 = "f88bc8b0f709d6f3388bfc634581c2e47dcdea8d63346efa9a939ff9db2b828c0f1e6e78178c89bdb821233eefbd8c504856f8af3d88819392be720c498e49c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/my/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/my/firefox-64.0b5.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "86f01c39b760489c33d81b18507af2e365d2269ee33b8149d66447b57d35d41316f65e187d81faa24e5d1f9f045c69beb6e7ccf660f89793bb7d68263c451416";
+      sha512 = "fd84eff8586f1db62baed0fa483fac26b8473a16b1caccda4c6340f7a3098560afe1c3696c7aceae84fd3091527a727a2d256e7840a61b7a1142211e80c3f697";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/nb-NO/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/nb-NO/firefox-64.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "717096bac06b4dc090dfd751352f1dc081f0df04e52e09cc8cc4645c9bf7f95f4e6170e2871bfd86516c24b5feb125a0fb6c6f798f0eaa806299bc225abc0d97";
+      sha512 = "9f83bc551ccfb669bacfb59e90c9c239fd00615752b83358f4ac1110329df95678517cdedeadc6e6a3c96f8c41473ff2e60bef23043c56f384452bcefb2252f8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ne-NP/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ne-NP/firefox-64.0b5.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "487cc658fd62dc09ee3b58372dbfc94d8ceab4c2455018ead3eb7cceb2912740d2a63b3d9f2ffbd92de14c538511641028b50e41b03e27b4a741cbdba6b63a80";
+      sha512 = "0bba062f46bf1d52381dfa6de465b98815c8c727222caba8e7e9038473f9758d2d94ebf74027342ead58f91324be246b39c27b735a92f5034c8d4a3e270fc7a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/nl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/nl/firefox-64.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "094fe47b6f3da6b807f951664c4172766281f8b359fbb461a1ae724197931a259a02dc24f6bb47643ad4a14bd6a415e74f3ad4ca12ee66aa6ab0ba727479195b";
+      sha512 = "a218656ce7057e636678a4636256530c3121ca57a21ab2caf1abd468399bd0049deb3a583c0622df54b4245263ccf2f6b50f83b3ba5b941f8d2c4cc3e913f84f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/nn-NO/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/nn-NO/firefox-64.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "298fabc34d153c384502b2a218f147c64734f0b5d2db810ad711ae09cea45aedc8d2dc70065845925bc7c79bf6567beee1977786be035f3e3c8955affb412a1c";
+      sha512 = "7681f80d70b68e4db99df44fdcae41f0d7c53d057c5a4604d2e5e5685e1dbbc35b456113ef56e619dea9c157951d9e2404125b75c99f76d1dddee484f886d948";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/oc/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/oc/firefox-64.0b5.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "05775a6cf16a7afade486ea6475e5d0de668ed474ff35d22a97dcf7b732fcbc718ce2d83673cf6257e2304e649c1d4535483e88b1c448f1eb8a667a75432e74a";
+      sha512 = "97f71a8f5d6b2595e49a72de736804afd59bc937b4a082dd9d2b6e0376e1da42ad702f4121294515fd399eebe73fdf67befe2e3a32e1518970156d2fb1acf160";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/or/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/or/firefox-64.0b5.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "e748661be43563316b621243d5643e1e0d4ef4784dcc0bb6781e2d656d50476f8985826fbf169808793cf0354f206a3192f8d4976a21d3ea9175617682e4a8d5";
+      sha512 = "6313389e0b4c05e2002c74bc233365cad1e8d2ac1fa381096a93e3aa1eab6e7f4b3aa5f793f373f8da88ff47d951adef16ac1d31b9bd1553b945eb71bb73e0e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pa-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/pa-IN/firefox-64.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "c1f497bbba045b5f416c3c471954592e5932300a941b9df27cdbd4c488d2690fa3a4f6f97f566b3dcda9ed21c1f7ac4bef7ea487adbf36f88a6245ac885cb5e8";
+      sha512 = "99a81b88fc9a4962406f929b052cf324275b2b236b60f71eaaa4faceeaddc107b10ce51cb22c4b29d58107c582735f17de3bd6f3ed858812036f53151fe4ce27";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/pl/firefox-64.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "2333b1e05501918abe9a47efd061ae946eddb7f6c0ed687cbb6a9e2816af31f956482dfa916c4cee23c61d2a98be21d43c866daa4bc84ce5a1b9b01f4138c742";
+      sha512 = "4121b5dc0fb3f150ab985d2a792c59666d76054968e8cd657c58cd6e7c9d8419a64dac04d5c7d6b6989c9c111ce4ee98a5e96f5565e56be28c0f11ce6db9866a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pt-BR/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/pt-BR/firefox-64.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "f5b63931cb71e6d9a0c483e2b73cae04b38bcd78492082cb56bbe42b95732d450d7956f39edff29d33eeca24678d8db7e85c18cd3b8530123917cae58b685a73";
+      sha512 = "32c9e49b4a51fdcc2d982b21783d8c5b9eb790c506e57d916722396d2bbab82e0b08d0e97d95bbc994639ebcf65a70fa8179067db5589ef4cb5c1fba8956c348";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pt-PT/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/pt-PT/firefox-64.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "691b48471848e11fc30388904cf20150eff3ce0cf60de319523153afc13a28179309861957abe0222bd96fa15bdf27f2051f353b9e89c47e4706f2ed8e08181e";
+      sha512 = "c55470dc75d2fc41194a38edf686f1ea1e35919dfc2853553a3e6399770173eca7f7f8ddcf79ddeb346b73454dc21f1c31bb4e4438b157dafe4ea50671073676";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/rm/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/rm/firefox-64.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "854ae30ccae7a822ca2e33671d3bc900f9f86734fdd625097b6c4c5e4dd83369ce420244395451a5d740032d7024437cf4fc3a492921044a030cdcbc389db620";
+      sha512 = "8a794da90bdca6c8103d86a46eea907cb83050b15aee851bf9c7589e736a008b0d302dd7b33a1db1fbf4ffd09916e5babb5f01bb2ba7f237217c26272d681965";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ro/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ro/firefox-64.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "b2ba3286621fcbc43809dfaa029f5dc7f5a1b7fb7603e570698ee2a9666797e4fbdef147c3a437064502ec7612b951cdb7420a325f1e2eb102ddacc37596c771";
+      sha512 = "29da12673c2d2f44f287fdf09e3196ede2bb0c16c2316478cb544f050e1bbb9b917e305478470fd3220632ffbcdb3943030f2e3575dc8ddfb0322dd0ba9ff0ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ru/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ru/firefox-64.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "c248bc397970040678d3ae715e6519a2707553417aa1afad5ca2261b1cdd6bafbf01ad21a5209b7ddd0676cf432bbfed2e4ae52302c2df7bb9562f98803934f4";
+      sha512 = "b29fe978b1ea5bbf8d433fd0970727c792476798f67973e05893e871f636bc74d2bdfb9aa0a10446378df3d5b07a31aa7e34e71852c855ecb13f7703dc7fd3db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/si/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/si/firefox-64.0b5.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "09ddc10e60db630c40e449c7cf7c85eaf843eed2305361a50de001fced23bc622d6a754dee8a7f5086d570eeabee318da0141c92ba04f242afa172346f54494f";
+      sha512 = "342a9a25b0deb04237ba01126187227d6983ff98984af727ab8767687993c9ab433da715f7955f2e9450f82b1da97be17eae5803509381b9f415b319cec822cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sk/firefox-64.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "fbdd72fe546d00bb5bbb5879d85107b29286100edcb57f00ceac36a22729e7c33b648af7a064d79287a87bede24077fefee589865ce0e36e34e281391ee2deda";
+      sha512 = "90628c0c8b7ac0b7618f9d0c3fe9f12ef44fed90c59869666ea0c086e41a337ac4d94797fac0cd5caadc50fa3d4770d1c071dace976c9ac14b60fb3cd0fc573c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sl/firefox-64.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "725e1d1d1d551be26298224bb1d28ad868a0ff6f186417af95e6687eacd2a43c750c69b7156559019691b43bc71d71b9624cc541f87ed967af2645040c135169";
+      sha512 = "21b134325122455c9f3b9e3b7abf30dd0ff1480c617e077c978d06d4be657811697c237d8ea5974439af01a0df2e19258116289184229d765d403a753ff045f8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/son/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/son/firefox-64.0b5.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "5366370c753b5879186bf1bcb288a8bf54e1d6c7615176f90e4bcdb75210472b05b20c5253972dc89d517523f02859c57387ef5dda5c3cdd6ca1feaf087bcfbe";
+      sha512 = "1b41c4604b7e4614a578278cdc17d176e68197c1560fc662a41c3081804de6932fd57b8c6fc5b9848e5efdc0de42634507e3859baccd957d1fc14f23ee46741e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sq/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sq/firefox-64.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "33e85039f5a57c4e3c18777cf42096e8025aede9e40286533d3bea42635829d91065ba9d96e3270aaf0347425fafe726f220c3ca2a68ffb8d07f6e97fc38b489";
+      sha512 = "9d1fdf818948d9ec89b6b6ca084c34b85038fb502e455be8db93635f96dfe4cd51d29396190c7a75b36bed7fd52555370b340e54967258df9e2b4c1271e68a0e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sr/firefox-64.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "0f2effc9cab91295e5e715853a3d632b42c0236d07438187581a93acf4c5206625f11072828f552988708d6a093bdb165ef95030a2ca42f70613237c4a121d21";
+      sha512 = "5f8875e395f7df78bcfffacd0bacfcbd6c963a4781bc20b6c58d047f2021313401dc05216a15cf94ab9ac4d765c03061299f6da174b0410a99c4f42b42a3b507";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sv-SE/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sv-SE/firefox-64.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "273be614a7da8eeea5b88b12d8e5dae30782af8d70b0fb6eaef0c6f0f32863bf7b36e2b4f6597c67580077e4e0a57361c7016598f421dcf295e2bea3789bac15";
+      sha512 = "45b59535abc9c339bc2ad6b574801af30bf1d923d1a92f75084c695263868adf5f7a686a6cb35e7ee0d6a0df44072dbacdf5877981ee3d2bfc7c06553504df98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ta/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ta/firefox-64.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "9573f6bb941dc4d82ecc257ca31b5c5112c1a5c8fa489ff4b588ae66eda36963c614f4ed526f863f65f6aa0c4d0d1884a4300ae69359c3a35144b4b6abcd9d2f";
+      sha512 = "1b903da600a61ebe4c0b310fb99c61b59100e21226e6c61cce85b1618ddaf672cf595dc4371948c8baeef47ebf5f068c192ba963bbfe5b77f70ee0ce5be1c72a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/te/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/te/firefox-64.0b5.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "2280629fa2611033c1c3c614af54ae2ebf76fdb0576670a4e8d8fd5ba3a288ad56cedf6486883c7bf26194910944c73c0e15d14514b91c179510b555cd8b369a";
+      sha512 = "ac37414b90ea357475a63b02c26a9a332809201cd29dce2e145db8690cdb6501476f00820bae2db2cf018a4b7a5fe71e7733453403344c8575cd5cb73a269ad2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/th/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/th/firefox-64.0b5.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "4b0b6a910e66bdeba240a5b6580ea7f00e8da8a4aaa932448a8c6050bc2f5e0d2eeb6c87a8c7c093a2060faee2d3f94be7de4934bc4774a7beb3b9cf147444f6";
+      sha512 = "502f9fd0d17f08ea7391cfbdd826ab934efd2a6f5e21a3271d5983d9d3db5be467d69832ae3bf510f5718eae81918bdedd820369021d4c716f826c9b5ae86095";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/tr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/tr/firefox-64.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "a9c5aea78fe892e7351e2fa98afd3ed14a5ebec3011ff015389842f5a42bb791f0a9f52a07cf09c62a3861c918dbaf87b5c571adf4c06e73814e4d070b4f1be4";
+      sha512 = "d9c49b713c718f8519dc9cfe2931e5211cf3a797695d2734c5ba7c1c14ab0b088b1bfaee383e149830d452470b9eaf7e8889a9efbc0e044c26258bddc830dd16";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/uk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/uk/firefox-64.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "1ee682f1b801e181f6c12380b6a7ca0008893adaaa31b74cde539a316169e96fa67d2c74205d65fdfe1ecc246c3a60265c898ac931b6a153fe991f8669bdf02b";
+      sha512 = "358ee397b2729111502c00c14e463dda4669a5ce071293a9f5ebadd5f6c444602ec5859a6c92c5ae9f8755c2e4857b969d63074934b0be4e4fbd4ace539456d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ur/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ur/firefox-64.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "0e80e4691add90b17185e8499ec764ce490e6a80e21c0fc1f551073e8809de1ea25ec15ee23fd5b7e4821f35b83c7b9abb6ae7a8592ab575c5cd3b851966bc6d";
+      sha512 = "b39c6063620457365790e836c2e52818d63241d38911fda2df920fe0fcab520b982ab84683a1d42f74a8ccec37355abc50fcd528a6f51bfa80d5fa5742bf0e9d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/uz/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/uz/firefox-64.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "1bbd37542b7afd25d767512f55b5444b0d3b464da5219d7983f3c816e9dd31bfe3546e51087fa939a92e96dbe89c5edd5e2a01222ab86bfb48cad4b87f71fa14";
+      sha512 = "e0a80be5432e22b3f445e1cdff70dce8b4622ffde42bb77dda8d1cbb12b539edaf249ed57400ccf8d9e147d5dff5ebf61336756d1d2c57f6f419461dc575f3cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/vi/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/vi/firefox-64.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "8445821da59233ed45571d1378348208c23d0738f4a3361e880f174601a64190d32ba859299e340a906d81da08131ce74cf7aa7e083b66fe117009e97bb1a0f1";
+      sha512 = "1d566481abc9c246cde2153c02e45edf0b03d9c8e4eed9680df76532ef5c39d0d900778bb6be8cdd48633168935df318154e4fe9cca056f0ba696d9019225905";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/xh/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/xh/firefox-64.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "46bcd715cd6656a64acfcccb73a04c60f358c64fd227ca6a973e52d285733ab7af81633a931f15b847b4791f42aa6fa4629ca269d71d31c1f51d6f52a6c06e7a";
+      sha512 = "0e3e520084603e8aeeb67e2f5a9206b7a7fc15b13d4abdd0dac1f6bd7f6234b0044f6656e0457b4012ec7c4efae8f7ed9dc8999dbb43131794dd2d53b7f8ba74";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/zh-CN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/zh-CN/firefox-64.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "498c416d53a7d75657b13ffd98b6f15d7654a59bfe7326bc6ed69137fc4b124bbb8ba746da6b71a5486c802afbee54f291457ce67cb073496a688c815d03d6c9";
+      sha512 = "ab4ff188c7917944924cf29fddc78946b15905eed83dab45daa5efe87f834a292b8fde892d870490f954eee74f8503b82ff2259d1398d5e16c71b483d39f13be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/zh-TW/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/zh-TW/firefox-64.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "dcf126fe240e0eeeb52d402dacb6750a80e2d4b2342da71e7869875d92e0bc1ae60e6204ee7c68b78ad116d5029ba1c0f841dfb9908ba18361df85ce9d2bd8b3";
+      sha512 = "9a37f5fc55a328b032d21088bb1989994fc2e63495e765822e93275ddfa99739113fd4724d26751840bcaf56bece59e77ff3f7574e97e946794cc475c11bb4ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ach/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ach/firefox-64.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "a3db29314db1fdd166bf452bdc2f9633a1aacddfe825220b1c3952190201c407a116d90cfaf356b27039db2c313261ffd8bb450b15f7d5b03a3cfed1002254c1";
+      sha512 = "1147ab94d780c868e5c2bb45f0739a9cd1f69a03b4ade4a4e06f301a576247e73e4aec1422d4de4711d0134a1a1f3774ce9fec54ac91b88fad353f8b9054926c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/af/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/af/firefox-64.0b5.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "fec2646759f8ab2dc3485c907da2e94cbeb452ecc49863172ba4cbcaaf1efd7d29753a70aded63ba7431bb6d1042bd17ffcece5b47aa1e8caa9ebf9ca836c47e";
+      sha512 = "22330ec29ca5486905e36a7e59a077d33d8239f3f462a3bb49fb38a407dd5ba15ea5979b032d76dc8eac427cc9305a1a207de6f147a528d1e68d69973bcc94f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/an/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/an/firefox-64.0b5.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "38570642baff4a9e3430e39204c2a06c090127a41465b217bbf33a6b8e131ae649cdb746bc2a7f7af89c8dc3fd6f52c39dff8b88428d35a105e47f82bbbb592d";
+      sha512 = "ec0aa858937a3683b496e0569433bfb6d080de6f03fd8b281cd920afa58aa0cff7212b077c1581b0cedd7ff47b4a0523a361c2fbdac14b8281bdbc48422cffb3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ar/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ar/firefox-64.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "472925b60b35d42953b8cfe381de13f6080dd4f378870c27899c53419aa8341be7f713816539477eba34281a2b08b233529305f187f851372ea02e6369ff4d77";
+      sha512 = "7a64016633b1b8b4a505a387d0f565b6f42ee6b0fe729d0f76465db0231c14e00dfc263bf96c646aab09b40edf9ac6009055b87acc64eb087cb621d3620375eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/as/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/as/firefox-64.0b5.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "271091d9e6f28849a9d58f5760cc35f1789cd651fef30ff1d9cfcae66c84653e4ec8ef30889a6379ed5427e9abc84433684ced99bb314e380302253afda047fa";
+      sha512 = "41b51269a45f2250e100fdee3bc0ea3fc1714f9ed104d36a51eaa1b26fe852eafd586ee95f34f1690f5b1fd88b56f3667dbb155374536daa2637225fd8f7a3f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ast/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ast/firefox-64.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "c4ff0474f6233bf7c93cf031edb629103adeba462c2f28eda3075b41c1ab690ca13adc0875a97bc65ff1c7e3c1102d601a62cc3804fc89262afcf898684977f4";
+      sha512 = "055e6b6d874cdf10a80c9d3ae64cad9a298e0c7d1dc15dd175c9060f71187a7e212386e09334e7345172bbc8f1ced771cd67e46ed7ec0f3320d57f675c007091";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/az/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/az/firefox-64.0b5.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "4a8454e339dbaa80024debf6e7c852195dc4be476da263613dc1bc086301f780ab12cdcfff5720d655b0f8d6731efe28f1afd0c0be4cf9ac2698914835cc9988";
+      sha512 = "1b3d7db566b9ccfb1623a812c6bec619bdce2cd0c5e16e1fa1861e9a599f84a4f4e13f436a5559d29c1058022c43aebe7aa913efa2d2fac382ea2e477fdbed2a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/be/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/be/firefox-64.0b5.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "2c1fd73725b6a776ca6dcdf1b6a3b7c0493c70ca01e2c90790d963fb7edf6f6a5b826e032cb9378de7b1b86ad08610b683214d8b02d8217df6a3a44676f68afe";
+      sha512 = "63247e5984ecaf234bb2ef53335c992b9630936ca2a13d7fa00e263edbb365a2da49ed5125c3a75e92a0a7a9f53c6c5590c9097cd3adec252da2516fbbdafad1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bg/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/bg/firefox-64.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "88d6cd39c2531b32c57ed2fef3ca0bb2e949be1abdc7b8e1b67411f8a7437bd7d8bcc0f2f6f366122ca08069390d3cf58e1b188cae6ea9be498385e0c03c37e0";
+      sha512 = "d81c639ee1dc900760c44c8751dd63985eec2196306215568adc0b988fe973a9f10115b4b8c2d24f75713450161281cf4aea03f83720ef2fc27a5bc2108c6dc8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bn-BD/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/bn-BD/firefox-64.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "426c76c24a0cb7ad7fe8854e4ade3d4b965f44b02e61c1bd83943ea53b68a863c278d751549f84b5aaa8aa2403398d68ecc665e855adc1e898c83a2e47bde3b2";
+      sha512 = "96e7842e71f4bf4f3430d2e13a814420b7433b0933d697313103d062f4b3da55a62f6f7538e84d8b53c6e627487f41b916c27b0aae6b5e537f31c1a6444228ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bn-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/bn-IN/firefox-64.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "9d368244d95642c5ae5059fbce23eef91b91913910f2df69cd0f9133aef194f94307b3db1bc8b54a8c9c74128e0478053380e7c80835ffc0c63b930032f61ccb";
+      sha512 = "9274209f21853a03c5fc6617cee96be8267cec053717f74dba21fe8042b0e22b04b22096b91c26d8b887dea92b74dc113e4c4a1889ec01a78669fa79a1a2c02b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/br/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/br/firefox-64.0b5.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "ff4a92180da0afcb9b4819d4548fe999ce855db2a7ad23b9bbf63028f48a91e734782b5f72637546c318739006b72e97da4957186989a5565499ab406b66dc9f";
+      sha512 = "709924f55418bbce8d5d4cc903dc6f8f9e0e1e6047744658f8ccc8aecb13fabd475b1e1dbbb99c6f4d8c95d0745ed940e8c259420b9f4c941879199ce970eee2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bs/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/bs/firefox-64.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "752d225d3a02bc576d586126cbb855a104eb31ded32b878ca48dd75a33497fde68e02625d65155df103dc3e09f52e86e94532f0654c5cc278f543a2f52c2665d";
+      sha512 = "083071a5927c89a233e203e34655e8d094fde5cb3d2644bdf7b713005c88f61d17750daff6076cd01858d7c51fb7265c7af9c20a11d2050568ee601e83127d45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ca/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ca/firefox-64.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "cec7cc4b77318726fb2ceb348bbb888c2b06d43d991ab05f0b55b60a50ddd1878b6518c70cadb0846b722fad9faf753be3efe7130c5ada1b22bc339169418ce3";
+      sha512 = "5ec1b606b3ff9df57963a4519ee42cf39d6a0d3bfcc87e4767cf853ab0b5b412a8b790bfcb552f8637c0f2ae63e4b4e6c6c896ff307612678aa2cfcc5d465b45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/cak/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/cak/firefox-64.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "46c5ef10eababc1478ac40cbb94911061bd75e7b74e3dbcae6a42ca8afaa6f0ce4a60e1fd9cab4739b4862938c8330880e966160cb87c59006df2087a3208e8d";
+      sha512 = "fa3f55f8515f54190bbb0607e26e907253b13bdaae18ac732da96750fd206aab2b4930d45f615f9aa095c972655c8c64d19961fc6549d17ad607fb7d81236042";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/cs/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/cs/firefox-64.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "77fe4977710da8503a9df99e9e2969baea734ccc5634c9d3bf250e336018d99779317569840dfae21445131a534e1817cd7de199266bb144498fc0d361f6e63a";
+      sha512 = "476a0a9a68e659f9894cc55d697522f323bffa7f432feab90b67a2160b6518b1f3ae1f7e8e14aed0ca630e2cde0571b206146cc3cfed4b43462cec2408dc1c58";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/cy/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/cy/firefox-64.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "b8e56afce6df77270c3f33ffacf219b6ddfc78a42396caf98fdb88662cc84d477c6cb367d7118b9ec628f498943ab0d3e3711d076c3f01c4c226b8379f85f4f7";
+      sha512 = "b3d6e2c250c64e22c58050a266e95ef3cf5fbb49bb0993a4c471ec50be1d7c1a35183b80fe147d67ee53035e4ee203a4e26d5a8efee6985e8d0cf5a41e513a1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/da/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/da/firefox-64.0b5.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "f733b6a7a470b63d450bf842d20ffda14f2e77a8a4da6ed327b0406d1d1627898ee592491a9d3f2b30e6f5ee14616251e31e14bca995459545a69f2629b5059e";
+      sha512 = "786207343d449e5c3b2fdf5f2926dcb84d11dc9b7903af050fae4aab84b63fe6da3ccf2a8679745a7937620aa1267f06eed4ed8e284a203e665036c37293378b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/de/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/de/firefox-64.0b5.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "85d7c8320e815a8462a0bab7931edd439a726618839501e5201cfc526d6fffa401ee696a0cb3dcb6b07b303d1cca96a87805ab593b6d02a9eadc0b8e9dbf4afb";
+      sha512 = "2d69bf8217fba68ee5ef386c34ddbcf5eb7a7be7e13b5a975c99817a0ee4d9b297ec7a9bd1c2a660c14b8734f909660bd7f8af65812f78aafb73630c7927e727";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/dsb/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/dsb/firefox-64.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "9aad72f2f479cb00ed2f862797efe7ee1d0b478aa0fa0c26c22b37c0da1553e62cf16786a7fd285a67fde183a8b01142bf8e80f16ed69ee11162568575aa8a5e";
+      sha512 = "b59664f5b599d719b9748de8dea1f4a70d4f2d37f22a7dbc8f2ea09ca0f56fd130c25d44b8bdecbcdbb93d5f531bf91afc06842734de5ecdf03b4ba670d542cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/el/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/el/firefox-64.0b5.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "60c271b8d83b4ced29b608b6ae16fa1acaf16c63c6fcc0c779e5fcacf1943e86a12acc9d5ec1cb2b3675d85b633c9a809e244d1172bb9666a80af997b4cd5075";
+      sha512 = "18a3069d101488c682f134be7797877e5bc80817073e26d7d1693c3b161224aa90105f6aba84bb2a8841a8859b7b72b19e2260ba36924baee3c8c8a83898121b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-CA/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/en-CA/firefox-64.0b5.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "ad63eb42001b165bdb453ac5a0e090ad1e42bb6350c8f600d0a50528fa56ed32c5aa96112f79480e68e9c6cf36965986ec322175ef9f36b6265eba75eab37c73";
+      sha512 = "945df8ffb124f39b592e70adc94b79fab92704e1fa02e15316a6e8a765a93d660dd6aaba6f5d3359fbb2cbfc61f256da5d17091d77762969fe6de873201a1228";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-GB/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/en-GB/firefox-64.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "9ad916313359aa3a31407ee0a31d49c3f80a5fb3aaf5167d55e0f01fda49cb85769a8cb70632d82040823ccecf03bccc3d5b1765d96bc3755eb2da785fec0577";
+      sha512 = "c06dc5969ed6a3663e2b865579ac69300a654300f01bddc384bf6528105077c2899a625bb304673f94d4243152fad34254493a992d880740f556fc6b538898c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-US/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/en-US/firefox-64.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "4a6e9eae976726c2f3f7652ef82b7787a7d2e173c2894e49317f5d2de8cb546a1ed1f3e9d75c0a610e85883f9009dd2e77045383758565205a3d3d27c05e1e5f";
+      sha512 = "d9e9ee4bebdd16886eaa6a3c2d31b0efd31b72058c6616d0a3dbf3b7b15987ada3479584ae626c31543a1ce1fb5aaf8a557fe095e5d3a753eec28b617b339e77";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-ZA/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/en-ZA/firefox-64.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "abc7464bdb8da37f436ae8dc3d32beabfff657b52a257ef934f61b885f876d06f67a35515aab702dce9bf5cac2d10c192c4ea367c77eaed53acee84e1ab0d52e";
+      sha512 = "a9d0795bc6486c694b0b8c01025112d94fa6eea436bbaf4fe31877b090346ed87ab9708453e2543c6f85bf92399326a182d5b2d3fc619a51bd9ce15fe11e1f7d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/eo/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/eo/firefox-64.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "5f0d1732271245a380ee0dcd7e0cbb6dcdd7a428796d7421683708ed10962d3706e7e95047753c1d081239aec0d3319dade644e2ed70474f88621ac8e35a5e51";
+      sha512 = "6fc6c26e0b95660c14d55b60c42f60421a8c534efbf2a2427814783aecd2580709cac4224766212afbf224011d60c7c1a6d4e62e8811640c0709124a5417763a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-AR/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/es-AR/firefox-64.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "5cdf81fc39ae3ea414f9ca4b85f273c79001395cc309ff5dbc0e55d29033c476395b1fa952206757c40b8d3189c69ae97a0a4d909a3eda39669bdae5983f5f31";
+      sha512 = "13053c9b91cfe8aefdf5ddff59fda4056522c1c5ba2da0a6ca9f0de561395191b67b62603588aee3b79a1c3ddfb8a71b1f0a84f8e6dbc8f4373d91ac63b54cda";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-CL/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/es-CL/firefox-64.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "22d5bc6c5ffb9753d27dd5384b38f06abb85e2903b768dc322e449c9281a850b90de4a281a86dd197cddc57ab0f4f2eadf5cdb5a603d1a2848d8e83cace0554f";
+      sha512 = "e6be34e40dfea1424e4a164f7d1c61fb4f4c358e9e5f8fdbe7debb554178b46e8e7cefa4815819693afd5c0756762802f3952303df5d38159a0c302bbaca77f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-ES/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/es-ES/firefox-64.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "2983df2889567e630c0d8b5657e93bfd2898a97a6bc8507f1279c845e5b98bf2993c807009ec6dc8b1870d55810ca0cd1ffce7bcbd3e7eaae17a9bf8948320ba";
+      sha512 = "5b086e89b6fabd55f11dd4a3e8ddbe935418e28c5bf14a24039f43abe5c2816099d8ecc018a7b555ffb70e8b5d88aff847e700521ab357cde56aad569758f687";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-MX/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/es-MX/firefox-64.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "43297a1ce9fb0a4cce569706563ba7921be9729a732597991bd67a995c89ae40c65b2a8c9849f1a8f7671ad85c424c763462761c8fb7d11ca25c3b8385e96d7a";
+      sha512 = "1e224d5ed0f709576468db21c0ec82e15099a90392529dd5229af5f6efba52748ae17dd11a46abd0637b3e063962322ca2684a866b3fd73358f72a8440f302ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/et/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/et/firefox-64.0b5.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "02bbea64ddb822000542412c20f351e4c7debb690ba06d9fd22215ad866eeb0e170b0a109b51c7e4e23741cf87177b75c3ff62cc356b4d2fc58847423ff6d3e5";
+      sha512 = "a7b74f1a940fd945d42e4ba670d0ba2c4b33470ced5e1bdb71eafa7caa580ebe9b19a44455f5b7ac2b74a994318eb0b3ab038c9f3246a1f6979dbe225fdbf0fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/eu/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/eu/firefox-64.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "424bb950eb0393079654ef652ed5366029567fbad87ef0afa127a26ffd863ba01709ecc037d3e09c59fceac27957c8d88211a17434cfacec6fb4f178db8eb912";
+      sha512 = "3ab39e8011d7996582318daa9fc3eb89c3cb099f344bf1af7e045e1cb82d063e547029939c6afa3c212add6944e05687557063a34d1ae1675615f96734c0ebc9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fa/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/fa/firefox-64.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "06b05c63f63e3316b3dcee41f5f3296cc88052137cf9bccefd0f1dd51202613c61d9d4e43d5131174a91c38bbeb28450c92aa9e183cbed74ec283ec9c48a72b7";
+      sha512 = "e7325bedf5f0bcdaf6710ed4a46333321f3493c1dd7c6ba5d10a5b978bd5bfc4745872d817555e2767758f861429872c0628d9158bdc9923b5eb09f497b4d85f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ff/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ff/firefox-64.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "226f1e5ad28ae5e43e6475f9fc3deb7d7a602097df2d587919490d6e584b6aeaddc632186180f9d63ab75ecde0afb203cba89ee8749724466a85e7a259813fcf";
+      sha512 = "20c7f71ec371ae8e3798a46ca3b7b0fe8f449d761c033f4e731283652027193a636b01a37cb9020180e423ccb7a6b888f9c42e415be84117c9e18666b8476434";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fi/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/fi/firefox-64.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "484d9c73ef78217ec3f72146507286002eb798a1a3a7089a927969b48c2dbef1804930758c87b116324f5f348efa3d1b1dc3416e55bac7e30da7315c778cfad2";
+      sha512 = "2085656a737f129f0db8e8479a818138e516f378c93cd3ac2af0005907f3e5b969a4c76b2a94cadfd3bcde062c9496910a81f2866987876d60a9393132e4567d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/fr/firefox-64.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "e4d3ee3716acbda8e132cf7f41160c376560bb2c31219014d1e6ded0c330cba43b7c5fa1ff41591a3c2c9e0ddbb0d9d9894b5dadb42e49af4b992440929e3e9d";
+      sha512 = "be8b9b06dfa34ddb73cb7a7903f9b010ce133c531839f10be360e3826077143600b9ff0b4ddb9e48bcca72a3ad5a299ef12751701113073e2f0b4765b5d56a6d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fy-NL/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/fy-NL/firefox-64.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "37ce8e65248aeaa25768eb49aeaf0c0d697c6cc32601090525a7aa9879b631e70587c2059148689de358817926e0937ff056796db4381303ee87c2cd72f9dab7";
+      sha512 = "fe0bfc1fb17d83c3636860acd2cbdf0281902de1e272f0fd2f6ee9c16e4972e697e219a5e94609919dd070171bf935955097a8332846ccf8f6ff605297c735e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ga-IE/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ga-IE/firefox-64.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "f7037a0fff6948e10a3f45c90f115845e7b5d2e6e7db973db361a70ed000e62482eb89f91cad12a939e5df81588f06116b64bdeb72ee247725b042243c53062f";
+      sha512 = "673dc827b03735844db037f8a40e82b14c7947cfdc8a3a0a7baa206c1c5a16a7984459dadfb94a9b86b8d5737aea5f904e0db1bee7b2041b55eba3b6144b7002";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gd/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/gd/firefox-64.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "e3ebec821362effab4eabf1c14a912a3b40e30ca1392cae5c3cf5df844cb5a0b675f046924117c9b414ed7315acd0c23a7259b19fd480d38801c61d45885db7e";
+      sha512 = "a5f3ed796ccd1b28b1a383372815e9ee31589de60095a010199348051310651abe0a1d54a38daa76409a6c23fc82bfe52330287d1996413d919786a4852123ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/gl/firefox-64.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "2681686a797d128b9715835f05fbb9a266150594da19d4c5a4d5135e3301974db8e8db3da2ff27091339e3e6144b81e1726337f6d1fb7abdf2fbf9f567143103";
+      sha512 = "2a43984e243576915335df43bc8dfae37ea5243d31e8a8a60ffe74bccd58919bb0c544a89d7b7cbec72aebb378d64db5d9da3a8a237ed490f6c1efaaf2a926de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gn/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/gn/firefox-64.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "21d2c731ffba1abc9929c312852b856b5875261899867d27633024e0d185525b958d6261bfdb12e986bbc3d3ea5d73cf3200386a760858fadacd410898a255c6";
+      sha512 = "b95c3518c71bbba3d60dc90187b0255619776f85c326d1349cd9d08ebb16139c2e21944c4c581044e8550fb2ca35643ed109abce0f2428db56d36514ab3482ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gu-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/gu-IN/firefox-64.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "cae83ee0284af96069c96841097ec33eece0a9f2cb5f084ae9356f50af03dbb38df156eeb876164281c69553d46f2c0a6f11036faf58e78d49c297748c1b25fc";
+      sha512 = "2352149bc1d680b86576f95faa26efde328132f37a8f5dd6fbde24b339439548d263c0e84995260b25a785456424ac424aabb78378d2c341e2d66ab06579e720";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/he/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/he/firefox-64.0b5.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "2b22318e0b591b4d959a8365dbff5471e8fe4667a8a1f0eeb6810f1f61734edd88f656f36c36bdc56e71667313cafd017a26ccd9b11cdd4d1bd6c7599c1e5013";
+      sha512 = "2de0df8440195e085f11ebdc8ba0cd55983045227fb0c9af15b7edbeb2f8a912970ec392ab4773753b5489c37e7fdf580899e5886679c7ca11301fc56e6a283f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hi-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hi-IN/firefox-64.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "5a297a9898c04d3566e9841f67eb62fc3eb01bce2d4d643d10d9c1dfb09c55281a67810581f2391e29a9cdc41e7c9488d965c7f6202e5aadc3c6001d12f5a2d5";
+      sha512 = "a35c8fca1a0e9e17f4445478700e0e04d6ef46e528c6b1a9bf7f5cb97f5b0d2344a1b93c8871726a592225835b85506aa1e02598515a02d077e403b0a4d817e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hr/firefox-64.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "90a98b1f6cca47dee81c4970586a0d791720ccbcc11e1146143324b4afe019aca700824feaa228b773bb5786ce3b173f6675f47ab63127480e8b832601026300";
+      sha512 = "7db8e1304ff41616ff152d87850968339e8699720d4dca156acb9d15af72d4e947d36e0363fc258197ff2b6e3c11651b0b75e6404bbef65d673289a407cc11ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hsb/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hsb/firefox-64.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "fb1ff2cad69462b6eb5e6b017af7b9f97c99a7267b7c0d5708d876b3443e3eaf588b7154c19cf0e7afc1ad68b16434812904c5ca0989aad56cbaf47b76ba4bee";
+      sha512 = "d171281af80764d6b9d7f1a31836ce5136a1f75cbd299e02801937d8eace6bf4d452cecae0a0010582c39920e4592a499ec856d2b208fba61bf3b8c169e22389";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hu/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hu/firefox-64.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "6c4cd05567597aaacce7903b149778cc55163a64625dd70ea83432b841299c8c46afacf643be84a2322ddc4d5331c0fc2a578e94a1b89cbc53bc5d65c5d1521d";
+      sha512 = "f49d7703230f981b821d504395158ec3ee291614070d6aed0215c096eef8fba7aa44ee74c8342e75b80f1bf701699d9a4f17a34d5f0e7d846b7cb126de32a4e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hy-AM/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hy-AM/firefox-64.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "ab3d4dc4b723e425739ade0263a43367b15ab84cce796afdfb392a60aef1789a27a5153632a9c9efc5e2a4c732f300d86b5e35b07790fa83792f6b70c5bdb232";
+      sha512 = "a4363b39fdf2932c618a56f14405963d9240e331ec2a26e72c47cb7cf12a510b03b078cbcc73f5376d8e5be0e64444de2f9bea954806bddc9559da86dcce37d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ia/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ia/firefox-64.0b5.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "5e5306c35a3d6834f3beb5e9d102d014cfafe1c2ce9b7da4939af347166c3fb78db1ebafb5699ef206df62fbf99d7b220f5ac205cc50c626c304584145a5e022";
+      sha512 = "65c5e07098ee6016f81d3ef9666aafcf2e6ae0fa16acc1f0d2d58b07f0da84189b9b297667e352d9a4dab06d0b9ee2ec6778151d2e4d320bfb7291e9004b27dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/id/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/id/firefox-64.0b5.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "1377eeb88eca23bdf50925b1e6ba606205994c9bdd55776a8d41bbe99a9f57f4a213a4766005af1daa44c0a20a1f053fdd54195e586536dfdf658daa4e55be48";
+      sha512 = "145a31f95c54186dd52ccdde90ad24a12246a3949411756ae8c7b86fa20e3919dd6a6a32cd16f23ea607f2245ceabbe6588bb7345ce056a45e123bf2300a244c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/is/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/is/firefox-64.0b5.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "b92211a08e555606e2b38d400e89a941920eedcb0da593bc3daf4ec37e93a8d796145bc088b4a1f6a3f93c0568c281790db025eb2e21a85e4a72b2bfb9e6f5fa";
+      sha512 = "e9ca61c38b46819b79ff1f3c4c333f3ca7939de2f029bfafcdae6c154f209ac65f9407f3e0945ce6e49ba415b2d53c8c03f4eb81b735501e4349557b5558871e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/it/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/it/firefox-64.0b5.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "4faa4d802e59c7cbe684ae07ed499275200dc77f16ef0e262d0fff72ed3b8435e05a9aa710a3640ce94f5f8331c7044d449ec303d301de393ad1defe171e677c";
+      sha512 = "6496ca8078d7e7137caa8274df1f51765178d0f39d7cdcc1667193b0cce3f9c514d00183b15a0c278f7cd4c32ac9933b6e11b2bf5e806aa0ef5cb88487b3e4e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ja/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ja/firefox-64.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "9532bc0b84dacd779df9ee323e1c2a9f62f178b2972a1cc3936ee6ca4bbb867d217e2d11aaf9a79fbe4f18f9d53dcbfd91f2cb27aa7b45321d44ca6de72fd9fc";
+      sha512 = "9271078fd3eaa61538659f3e7bb068c87acbac807b14424c5b56085801593e77dafd15340f814f3674c644f76cb42c9289f9d464d7dc596d58a656a2e8d871e1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ka/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ka/firefox-64.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "062eb5cd16d0ca7890bad1e250836314758ff8dc5c56d426d24f72f23258af357f4eaee9f58b7991712b60dcf8969863abb9b2f49b7fda3317c48d612a26d0e6";
+      sha512 = "8b7ea0b40195ec541acf60cf4fa5d89c62d4afb04d3f2e569acf8920bf89b89b4cf30f9af45c3faabd76f7aae89a09d9530f16108e66fc2748c934ea459aff63";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/kab/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/kab/firefox-64.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "ed1802bd61889dc1627db1bc410713f498fdc3155e8c32b7f210226bef04ad6d6b34555a5578384d427acd092c48ab15f282f870df69f60a9dbe9ea65382c83d";
+      sha512 = "ec41baa1cb3a4b543a5a961f6c54c6ed62e16888b0073a93bead75baa4cb836eb05aa90b02ee09911f31c9b106945bc62051edc3f681ad6d8dce33dca918b8bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/kk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/kk/firefox-64.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "83c3cb82272b5e078de1ab71e936ab91e4a386f4ff94c690d62bf546f1d0794daeed53d7b7fdb2334ea378608655cedcd105d90bbcab9a5c9092ab1927a7b534";
+      sha512 = "9b2b6c3b6ebd7b43e86ac000d7ef0c5b9f1225b01f41bd17fb3293b7a89df8f34858bea5aa4370c25b0d15757acd701b1844c3ecf7ea6b38ac28fe701cdc5866";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/km/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/km/firefox-64.0b5.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "7968176245c32c729884550b7c8b2677b7856a086c06683c8808f29f1517872310daf54ad5618630fd3284e9e1eeb88dba14d629487906b696f87feaaf056e40";
+      sha512 = "9afddbc1e372b7f41790ff84f43770c6a48d23165ee56d540f0ae624fd563b0a9bfe18872ff668113a7c2ef66314c6bfe36ecddce45ba7411817c4d574fcdde9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/kn/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/kn/firefox-64.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "93926d6ff2e6b466f21386643f045f65a819fde5b1276ab889d9fc6d7bfbc7b0d979f9da15744c59e1ecc565c4960c7f1e96657db2e4fdd9e04b9a3b46378925";
+      sha512 = "fdd56e2934767f5656027bf7995d91293bd1be5bc6d5948538cabbd3976dec220d4d54fcb94bc9b6246d1e10c50015c7ba20846010aa9767fd120645a37c0887";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ko/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ko/firefox-64.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "09c829a2de1727c6b26ccb8810bf2cae48fc2db84011337bbd3afcf6d64e9ddfad7d982816d2acea227ffe6ba94c387f8a8cedf45c390199c078eb8ff42a0886";
+      sha512 = "9b59b35cc8bdf6eb3980c3ca9bd313ba7584e6c24eec4521d2ac3a4acaafd2b1f7aab1bdeea4c2219bb9c45e04c56de1d669245649a309fb422903db0f73d266";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/lij/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/lij/firefox-64.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "3b2b39b158059f223c476635bbf4fc2f8ec352c45a76a750391c425d996bda699d6e7a72aa7abef5ca13d6e62bd2577533b916902775567bb2838b88d975bed5";
+      sha512 = "e49c4440031487d74406f62d8028202839f0ae314a6264beecf86db736589cc6f0a9c3afa73644325f5a2befcb6403719b5bfdbd94d46489f06b45a2e20336d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/lt/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/lt/firefox-64.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "048ab9de33176583c324428366e2f950de38eb29ae8d72309ab5559768818f6094cb47e6f4092fd05973a5dc21c1ca554e86dfaa254930802dcbb05e895067bb";
+      sha512 = "029492263010205a78b17652dd3c668acca99bc15ba9f420bf5f8a3109a1f7b6fc654c9be866a16ecfb95c612c3161e019d6924f1737a180f670bf32f9888d94";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/lv/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/lv/firefox-64.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "6887e5286c28fa4e26b3b0323533dd3fd6850da62aa2180520200fcc24c7a3ba1ed1fe818f61144b522a268ebf38755650e8bb6f4bdb406418897a2ac978609b";
+      sha512 = "8d376091e155bb9675a83cb828f07f7e6b6d778a10937f83bdd4109b1e61b89fdc28dc5742a006515a8d8830a5bdcee070abacb9b857e8c084cef6a26312f8e2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/mai/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/mai/firefox-64.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "51a4ed003b8bae2971a8f6f58d1c0a2f738e225a7f5bb53f3e0d6f2dc3028cfe4e6b7deb40dd65d67f4cd57b85e0943e495000a47aeab991f7ff08bb211c79d8";
+      sha512 = "891093ad33a07775b91d3a62eeb10be4b83771fcd44076588aa6c5821135ae14ac4577d5f1b9c26b5c7e1803c50d642cd473ad7676f935895392f2956b724ec9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/mk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/mk/firefox-64.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "4e430913b1a6bc6206bd2e4fef04c235e2b3ba4bd672692e3d2c37d7dc56fa902bcdfc58a16e6a66c40999fd94c80169c129cdc4618f6dc1f73b2f094a36801a";
+      sha512 = "a6e21d9ecbc563830afa618bb24201b13da61b028aa35c594ff387bfab5931b4d907076fad2c9dd70211dbd19c4f8aceaefbab5e9f4fd32188ec1f0231cdb427";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ml/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ml/firefox-64.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "992693c9e20d6f08815b636c711c8f27bf616133365f2204d78e93c37b2c0f88454af1b562b2aa7879b7ce94621980e90451636cd0db8493e054b69519406895";
+      sha512 = "c7e1e410264837aff25f994cc1642ee7f3c5a45a4ae6f6c353b6506fe982abbb6eea2d6407337d83c9d0126d9debb78e08d8a7d2740a52cda1dd47e4a62be0fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/mr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/mr/firefox-64.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "92f040a94ecfbdef4f48813b21050a767ec7dbf71613630b9afaabd6d4bd6821b7baf8b445d2456c29e5f708a0c6d3858b8cd8e3143bdd3abfa5a43dba4e6484";
+      sha512 = "4615e472d4acf1e3af2dc2a4cbfb289ca7a369adb47db898be8aa12bbcd2eda39d627c729314172c10da938113148be271a4c77a9f5c95a771f32ca7a107b78b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ms/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ms/firefox-64.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "2c6bbf0a52b1ae0c9a63480768ece2bc43ca147c38d8288f0845068b29dcd995bc4b8744215258bfae4e2b90cdcd27d64860d9125330ed43fbe9cd3f823af73d";
+      sha512 = "93a19678ae8699493e9500bc2d2398beb6a10b725a127098a5754dda592cb6484988ab34bef7b2f4b62a12abcae9a3d58d50f47926533cf8bcd080aee6a82464";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/my/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/my/firefox-64.0b5.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "a8dc48cac66e89b7e2f8044f1091cc0e57fa791acd7f9af2dfdf4225e4c9c3b738c88f7a6e5f5683ddfe016b6158d87ead62f0fcf33e5bee48cb69eabe444921";
+      sha512 = "6a866798a4a90883010bf62ef153f192b8a83af0e4ddca34d06d1dbe5f7111b042a02993c2d18a2a34f54a66d944130b4a7f9a3d37a28794653cb794ee106af3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/nb-NO/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/nb-NO/firefox-64.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "d05467ca3e2f4839419fe463a090ec3fd5fa80dda6d2e6b51ace3ea3df793332a1071b1cdc1b1187d73fda996ee59c97f6c2448cd29142fb8b27d4338fa24e4b";
+      sha512 = "0afb2a0652fad855227235e40edeaf78046a47cb18033bedd895baf0c7766ef3837cc3273e92298814b8cf02240298a08ac489cdf3867a07a3b6c40ef826fb8a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ne-NP/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ne-NP/firefox-64.0b5.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "6d2da614f0afe7e40edebdd823f25233050108301cf0dde1df62a336bdd97449fd2d4635e1ec9b9bcc33a9103633995ab92b4a1c691939b5486bf7d49bfc5cd5";
+      sha512 = "802a49e37f62924a20076e0a24357d6f695ebbd75b82d7e292d91cf01436ae644b08dea289a344499238183d0a70ecf0407c37f89369c2f4cbf75f015584fc7b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/nl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/nl/firefox-64.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "b1acb0a977be5af4a539839b01a871aae8cdcd709a3fcef8f8793eb9e56a52fcf39e7459e915ae109387041f8a6c65c55c234bc088823fc790b1c56e68acdbfa";
+      sha512 = "eb689a073634f18ff9397bf2d43b870a314fb630304f76758d8683a5e16670877f87c2b56ff35c2534904744fa546b70eecc1ec88b2ebd6e3f577ecdebedaec0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/nn-NO/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/nn-NO/firefox-64.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "5d72d260044921cd9108264991fb1158397d2bad147baa15472f4aa7722349694dccde1c60fe7ae593141100bf26d5f09031f36a893e49e902cb3b40c076c76b";
+      sha512 = "91d00cba89b26c0d3d9cc5670d3a876194cdf545c9fe96b6afd1087296f1c9b9840dd020b39384a0de7135069ca473001d85c51b6c5ec12d5d0719d116d28e87";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/oc/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/oc/firefox-64.0b5.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "1c66a63a4ba36dd1ec7883c1cc41db9665b5b141a607ded2dade770461365aac2f8430d7039dfec4de3d1baa5d12fe3fc4b36e7ecf08c706544d443fd7ffca73";
+      sha512 = "48c3b0658763328c6ad16097a1eae37117dcca6e2484a42eb3e4b6fa1f3ff687ecf820c64cde0ec7bc4e2e860a7574ed5066422ce894fe538b1788e4827d7927";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/or/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/or/firefox-64.0b5.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "e2f24ed7e4ae2e2601700f02b7abeca63546c82fbb4c67ece0815474ef13421e6c06b4a14c3886813c28f722a2e7f3b421358bba089d67356448b0a00655a6ca";
+      sha512 = "0470149a2f1ac7125069fdd537e89b81761b61a3de8b5392e85c9a8e57a7aec9bec65d5c58f3087dd54fffee09a52de6ba59a5c52d41d33c333c9bb577169614";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pa-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/pa-IN/firefox-64.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "536d1a61b2849950a44d3a3b4cba9d468876c038cfc109449b9f7f3c24ca7ed1c50ff28e48658f3b90a6b7833c9a1b337ebe1cb63bdf7f8dc7b9c11f03a5885b";
+      sha512 = "b1fd71af6a370750ea69ab1468bfdd15fa5735c767ed46365e3ab786ebda0cdb8475bbf1e46328cf26123f191ee428298fd609e1b848df7f0ef2625f8dc5755f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/pl/firefox-64.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "9c3c2bd596ab937e9757f2c6204f3866e0a6432802dec1019c9878c83f1a85a863df6f3759e992f0641af5135fe917ad9ee5988eed83407a94aaa2b7b24d140b";
+      sha512 = "5f06388ba94f7dc497c97870bdb48be8873b4623f95f858ddcfd3160e7476cf04f15b7226822429031b4c31bffb52e807f9f3fbe5d3edeff4cb82ed3384002a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pt-BR/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/pt-BR/firefox-64.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "0a854b735af9ef1a72d90d5508209098d70bec03d93e1590e04ef3e1d0e1ea9577d617c0acba8aaa490090daaa2b9281b6bfd1c8e3af964146c8e7cc182bfcb0";
+      sha512 = "ce6e73c840210560cc1bb6006ba69031daddc59f0cc89a652fbda7dad4cf39165f474e9b4601baafa1e6622e78a1fb37411f611e21221c7f7e059e42bfbcc4fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pt-PT/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/pt-PT/firefox-64.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "e7510b5ba67d92be489098e9b79a39ebece92f54ac8d2420629b44d80d9cd3045bb46989ac84b57c6297ace41503ff7cf6738b6aae0e00e6ff16f9478566848b";
+      sha512 = "3c906e720fd30682cfe17cafc668e2e058cd42c2a76dde01bfd7162afca4dd777d108099a79c16dd46f35818c4c6a3f5bbcfec2c1ff8efc374ca9b2036b22a63";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/rm/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/rm/firefox-64.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "cc05bcdcb8e0f796b3007132657980f8e61ea392a79b4a06bb0cdce3ac35cfec7b96f0e49bcf0517dd2e74309e58a67db69718a7f003093026bca1126ce1c399";
+      sha512 = "f166737666fde11631a28d521ecfdc6b159694a88c59f78f87d5b304a5a6b83c614dab05357520f6cd92a33a8d390dbc86d15f7f980c6a81646f6fba7e0e9cd1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ro/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ro/firefox-64.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "158fd225dece07d6820609846ca1bd12e046dce97f8c20bf7386aa57f4c3f22db7611ec845bf48922f1fcb995d8218970a09b7c6a750f3a056c22a5a9266e3df";
+      sha512 = "eea5028452c79c93334a43596a145422df3371b8aae90af7f6e65f013c845398a780367d1a3a8e9c2709d506b9f0349fd42ccc93d3e24ab44fcb4677be68be65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ru/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ru/firefox-64.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "271455f7bbeb694e932d09e32b9c2c3b898a83178bd38f9880acb087dfff33b7e9cf8558977167be0dd9022e18df0919472e3d5c665a9f107424074c8e4df85f";
+      sha512 = "a81cfed25b0c89f33419b7ad6aeef1dab4896deb9e04293bd4224c6c8fa6a9ac3e1c5aea027d2785a6cb537f5d18077a436afbf95ae79c3843744a219d49f017";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/si/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/si/firefox-64.0b5.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "7c8b690c348a06c9be6179befd0d7a2700e8aa78a9d1c33c4c10c82553b738339f8cdf1be52c5e4fcf5eb980a6ca4074bde18f1ac3a20e0614cdb9d474b371c8";
+      sha512 = "e19b775d7bdcfbcb7bbcc43235dbaf6401628fdf6c008cfcec34b3095ebe5a71912645301034d7f941146b298fdb57262a9cdf7e28208302c82909e4665aa210";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sk/firefox-64.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "096084ca8f060031fda50d698e264127309911da0adea44c55c2e64a29fce2fa0553ced2198c65e47c851a99f9a95d07373dbabc13fa05bb5df3552910fe2c5a";
+      sha512 = "a183a3a9fcb3611f3f07ef2f5051c50f8ca32b41c629afc9f0176ebd18b88155b2cf3e67fe201aba02efb11ffab24fc8fba603de619a0a8f2815605eba1b2e83";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sl/firefox-64.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "0d7cd746877b8e275a6c17c7723c43831716ed48c28d0e2498a5ff483324e31926b5e69f4b14aaadac3e3eb126fd369e8ed334f1e1f38ab7e399edf5cbdad4ee";
+      sha512 = "f3dd8256b8a71fcac09b776b43496c7a4c862a5a86612235012c9b70e0b1a80001aaea187c45a6e1e43ed2b6a445311b7f3d52b579a048e4e122b24dc30a760a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/son/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/son/firefox-64.0b5.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "31f13990de570121e4124ae53e450344a8c52e98547eed09434ef716446953bd27466bf550dda4be88b59ba22d0300087a741112fc2cc649bd9d8b97d21a1a52";
+      sha512 = "0c45580a4029119cc5e7318a83f04de4275add2d105acc360ae8045ce0b0042204f6b07389a6300571bd9cccef3eac782eefee6b8af06e7c8b10a5551c4ac97a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sq/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sq/firefox-64.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "07aa225a0f257fa277a932ea3c069ee13b29d2baa79c376ca73a44e04c3e409fe9ae2d65116bc7c3ffacd77685ee111dc68cfeab16432103044025d2a77707d4";
+      sha512 = "f2ac8a3440456f0daccec3f4a4f45119bdcb6fad29e931bef8a69f6fb864ecca0e77d3f6bee10600688e9cab3ae2bae91a9dee51d8c398df5d102e56e4e15722";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sr/firefox-64.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "99f8dc070613334eac983c5da8ec9f3b36cbee42dacb68d3c9b3d9c2f4f0df0652fb1ee1350c08c2376e0000539a3ab64b8ab742cccc4da72868e8cc323b49ab";
+      sha512 = "82ecb371e5b612638d4bfcf0fc42454a7a1a01bc6a291fca06a96ae3e28c70b2a37b2504cd340941f74fb7ab44a7a8d11219d313b78dc9a4923128b9fc4e8060";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sv-SE/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sv-SE/firefox-64.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "6b11e0b66177ec6bcd30f3c30f9a2d3be0f9b2edfccd1ba1374b12e04f450bba4dbe03760650e596b9bd56c9a21cbd2c4b73140d84cdcdef528fceca5db7464a";
+      sha512 = "6e04d05d8c7fdbe6c118f71b1ec1cb7eee698b980c70832885541cc89f9b794c2d8d273f2b9c55bd4b57f7fed53390c0dec6bcfc0545d60541ada4ca52c879b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ta/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ta/firefox-64.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "1e5f31e988489825a56ad6ef94d1c1b4df5206cd4548bb7b4d624f9472d591c88ab10dc9233f34b81a1fb421638de33905dc825e73f7df1a2378c87091a157f0";
+      sha512 = "10cd65336a77f30b04ea9f9b12e48ed103b66edb187909ad7ae7636b7f8f4cf86aaa96838fc60bb24731ea4ce539a8de1787c3d3f24325c7a93c8269a7045e83";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/te/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/te/firefox-64.0b5.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "de45851b5a4b0c748405354542273d9489cd852e40dc8c23dddfbed2b5ffe8c988ee9090f098001ff4da9e446384bb65165c7a8f9445adaa8287c57786a34ac8";
+      sha512 = "c56b853b0256ffeb75595755cd0c71e847958cd3e7c753231399e89739b90396effa6ab80016143b18fb49940945ee724ba7f6da2a891c06e26854c02ea7b25e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/th/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/th/firefox-64.0b5.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "b0f06d7e3bfbd2d06c2b95cc9afeb1b24f46368daa3f8bf93c9eb5b3d939a5cb20a1ec65310f15a554fbc3640c7495ccd6333e202d01d72b4af667c91da45526";
+      sha512 = "2248c67eadfea27633b2fa60506964adf965c4be82948476bc89c4f7665bbd174bc157e925502fb7ff95e15f6a51e732620a7323f2c498e20c918382c6befde4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/tr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/tr/firefox-64.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "e05572dca0d8c7539f433a72c4958a270d7e81bf74c9eb01b7838d0f52b00d0e3a2f399d69ccebc5fcf7041f9993b2ca18c8e078ba1b84b693dfd013460e4e5e";
+      sha512 = "4a33814d0c9cc3be0b589ba4a6755b640804d3bece452acc2d482d4896197822066be77c2eee9cd7cc5d58f00df9d2a97b47db05e4b1c2e1695a02d20ead593f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/uk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/uk/firefox-64.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "67b3484136deee0c48c99177e7efd8f9287f278b750da94483df9f0eea80e5abba6bfff021f6a5713df86e74032d29ffe9c712a0d5df874a9dcd554a18938aa4";
+      sha512 = "49361995ba6358733fb9c51780ed1d31e921ed0e3ed27c8e777575c93e723702aa0e47f6ed80ef282b28d5588029ce850a3dd9118a047867466acbc661f6fb1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ur/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ur/firefox-64.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "9bcf8b221de817429b00d9aa229b49d99a67bab1b39a265adad6f54b543e07d98d715038ad2f17abb4b4c408fc741094f2a05dae3ad77006d683af5b67793854";
+      sha512 = "74b6a3ba8c19acb2dfd2c9f2590dbcebd832f8f1fc06fb805bc7c9ab008e0cf8bbb4a829ce87d807193d8be124c04cf6bfcbd786fa7af1e6d86e20aa8e81f8c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/uz/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/uz/firefox-64.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "46a22299c91c7924ec3020221556ba213accf7459c01b9ed42241f92e18e410943bc26a3cbee0e01e268285d30affa240e690b18c9347557dde3924e2c9c0fd5";
+      sha512 = "08ae1db8130aa6112df406e622c27b96758b825e55e988c81e0dbb746691ce69cea4305a88851399a8c988d386702ed968a512d2f763e3452c7ec48c8d832c7f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/vi/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/vi/firefox-64.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "9fd932091d7e24f64cf6f275b28a02c90d2ba5d1fecf81f2d029b3b3891eb7e22da03932d8b96929c229d46bc28e8905147f4cbc7be0676b2caa85bb57ad5ad6";
+      sha512 = "20bcb0b9986d0360868b8fd8ab3925e2ea031814944255938bb81f57a21881fccfb0f4648bbe689b8828fa8283c7d56c028533770dfe66a4fc11a7d0240afe2d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/xh/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/xh/firefox-64.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "bb06b8a88a6b4086f3efb5a310c8e87e61d549ad5a0b3f192015676c15b720333011d4ed7829a5165c2703d4a49d3454512f18dfcd27496aaee2580283f78d00";
+      sha512 = "ebb6f05a771b155e43a88b8dcd25d1a77d254900b7eeab8d9a7284a616268f9c7718c4fb6febdf5cbe697407842f3c4d820a057b66d7b6ff7977f66385360004";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/zh-CN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/zh-CN/firefox-64.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "65a328cd8f87ac7ff2561ea7ce105e1faa33bdd727edc05488a4a5c75f456506373de5fa5d393c5050d7a2a1d600fcf754b80ecf56144f64248e491fed45a194";
+      sha512 = "16c75f1d64ed123752d7c28fd637749fb74f533a809f9b07d4f64dac3dbd1b2cc4141e4639f6f0b57d4e639c5214647ec68c759f2811a2613b54491d83ef0eb2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/zh-TW/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/zh-TW/firefox-64.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "4cc0ec59a111a22a81047bbf68c364629bd2376763bac9c361faf33db781c3dfa5a22b896a0cd3b36baaeb935bdf4340d64357496fe12c01c0256e3bdb95751f";
+      sha512 = "99b91025c160cd024b0954249efa7f1f17f8f327185ae77930bb5ecdae741487532e2a3b8a3e34ae3117e3f9c00faab0d3fd29e9f62c94e1d4e48bde6fbe8894";
     }
     ];
 }
-- 
GitLab


From 1756b0fb75f71e5a0e49d81649af9d4529a339d8 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 30 Oct 2018 18:33:04 +0000
Subject: [PATCH 0711/1065] firefox-beta-bin: 64.0b3 -> 64.0b5

---
 .../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 8c3d7dc7a4a..2089b1c5e22 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.0b3";
+  version = "64.0b5";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ach/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ach/firefox-64.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "6780c222879e7199a430102865afeb7959a98ff05d5dd0b153fb545d0870bbc3fbd51fb51d6a88e18d57ab71e157dc15d2631754437dc8b4d4826d4c57b5ac6a";
+      sha512 = "d57da255abe658e1b5fdb2156fe737d3ecd996320a554d67dc9de038cc6065a9798009de94c0d3530f6cadda044578772d13a6a2647d71e4e52507d4b4ff0b8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/af/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/af/firefox-64.0b5.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "e209850c490e90d64e715b0725bee788d3e10a727253dfdd344ff100893f3e407b10c684a4783be369f35d96c632d0f4809c353370d093daf855dbf7b0486fc6";
+      sha512 = "09f84b78c77d888724c5b66c69d4ca266568b70f861e858a978ebadf592c0fd341f338792ec13a95ac0a8518442ef8db6eb1e3cf34154c9473c739367c2b3c83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/an/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/an/firefox-64.0b5.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "b79953646a31876e4db9636ff5a87eef3e84722b33bab3c146a68b64c4e04f02d2b0b58b4c51f5480573d77cfa859415e1b8257d5082c7c01ca8380715a44bec";
+      sha512 = "809d1de6ad2e9b488b8e327ec0e76ba412f63a52c7959ed6770b724cfd295f1d2abb0f2e3a30ad688b3c35b7c67aa7b3bb17c22c55219c136172fdac46bb0a88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ar/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ar/firefox-64.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "fa511dec672dd61a10d57963da29b83847a5b791b37f386675ef6e7bf86ac7c57aa74114c8b67421650f743d4b0bd44cc9be9ab5bd0cb5fa90403c60eeac00db";
+      sha512 = "2d712f71aa187e378ebe7a19288e9ace821485e49787c5c52c9e7bba5d363f026625762e3a3cefea3edee519afb8854068ada726961f1c3722f2dc8dc1fb4a28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/as/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/as/firefox-64.0b5.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "f42e5366a7dedf5a113911f1dcfcf8736ff1a0b037059b47f4b0e6021e4a3dd3dfbf1f3afd9873382bdaa1cd8cc535b07a97d5e34eaa3838a98a8bb57f8e8279";
+      sha512 = "fa664a245fa86dff7a49bd03514568373b571681efa6a04a6c45d2168aa50700f0c9a5c0616ac05063cdfc015326d88c703799e2f267db0d62a565a4c6963630";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ast/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ast/firefox-64.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "0bf6c6fc480a1d7bf71f2eefeddcfe1fd8ae2c6b40b369e42e18487075f3744b98dadf61a94a10989b9b606256292bf4d016acc2089014ac71ae160028351df0";
+      sha512 = "922e914bf58ee148e7c2abe9390389306b8ca9414f1dd6eed1615b4ef76cb2e872432a81103b3f4ae9a89dae5341d079c7d7ab511af0377a5bfd62405a379957";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/az/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/az/firefox-64.0b5.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "a287d058701dad9c8f9dcd7b2e9a473471126fab1e1cc0c64eab5dd34025a4d10d74c63d1894f04ce55513c26c1effc3b8078b3d59fd85cb3be9a2b78fe76ae7";
+      sha512 = "fd7a9089521c2fc3a94b026e7ddf795b48020b97acc5b2b0e3a20c0cdacabb51b5711a9ac784a43c506c477ae6fd0e2628774f4239dc8d190cf6f4f555f08076";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/be/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/be/firefox-64.0b5.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "84c511d0fb20709cbb32a51c2e488102899a73f6c7bf17a8367ceda6dcb838a3052c3e6c92f6cb86b5f881c83398e23ff21aeb4abc6e658ad855809dde1fd5e1";
+      sha512 = "d199ed2918061c39a2cbbd18277812b15b08090aea8e87d740617b46fbd5dcae172bf8fd4b1ef71695171f530db73df05c8eab0f9c60691318d10217dafd8d4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bg/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/bg/firefox-64.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "2905bfc56034a2f6329e8247cdaebe212cec97be86806d95f22eb0fa07e4a3ac94652b52a1e0dae4e725d9941a008f7f923dffd5679bf747ddbd645724100286";
+      sha512 = "c5c36e85090df048fdf18dec0374371139b1948a532c9b5e71109d517ad44bd91c150efcbd9e8a7588a8e4cbcff38f9e67640d4f812aae694720510aad19397e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bn-BD/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/bn-BD/firefox-64.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "917f7821a7ba71a8dde46e53468b4e3a9d4a5315c9b4ae9af2ae0bdce56b5a0333c12ba44604dd7159c4ecb61a7d5087fe60d83a3c8e7734cd1a90c4aa29b259";
+      sha512 = "6fa41190dcd2fe25c494e7b259aeca89d9482162221d2244883c945a95a035872810deb0b14acc3fe0f0b29ec1eb6d809e2bf58bec72787d67cfa2722ea6916a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bn-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/bn-IN/firefox-64.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "12b515b616cb55dae73bbda075a141dbc96a38a1b2d2ad50b56a48fa58bc3c802251098c61a08105f00affcfc79b71615f18c11d57da92d78d66eb737f8a3c46";
+      sha512 = "3c32deb94bab358c04f09106410c7191f42727fb7414ed64f835c28ad69f7f09cbdb2c040f1cd2c5cd15ed3ba704d1454ae11947bc1e6bff5f6123ed7b0783a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/br/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/br/firefox-64.0b5.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "c6fadf68795b0ceaa5e162ab145da5eb26006e481a9e85923bcb37ef3ea6e6d83a0333d76954f4865c4900b015806a3a3c350839eaca5d6ce56ebb3f5170d97b";
+      sha512 = "d8c21bd0b7c6317dd565f0015e5749cfe668b586b0b05ae8a9e7cec9a9dd8ca0396c610ac4ae864d1e5a06d92c313bdd6b538eb1d8665a5e2982259b62f8ac29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bs/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/bs/firefox-64.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "05f3ec07875e53afae59ca9ddbf9873529f2350f1a19a2adf29f205c165afcf13a54a54f2420944665a702aa9d8f738c22519ff9172720d09de6e720dd2db0e7";
+      sha512 = "a09f1a588086f043e3cf2efc3fdcd871e4423602138b7dc5340e02fc628c5b6cefa914d5b892712687b406a8590590dd9c74b3eb3509f2b228b2ca6e5dc7cadd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ca/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ca/firefox-64.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "696d279a802ee758eda15bda7b0b10b11a6f65f5ab5b8068df294a986552211c27437ee825ba7533650b5174a4525510b96cdc39fe244008de0c8c757a95744e";
+      sha512 = "ecd98bae1ef23c69055c8bad7bd4dba9d495679417f260dcf57e201341f418e1596927a9ea0f80ee04c4148442d911c4602769a5fd15e36f17497954c4610f29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/cak/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/cak/firefox-64.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "828f577737e9c767b349c0413e9fb9db6a271a97121fa1960da885592c29bed060e15cf53ab29f9c181b220a4682814879b2848ff6ccae7d5ecad5626884475b";
+      sha512 = "2843e23ab8023a3d407de510f47f8c4ee2d1b0450672c81ebd01b262965bd26d9deb0b108762d5057ce4519d3f18af82b7b3f9184cad57a94c37134848d04963";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/cs/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/cs/firefox-64.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "61503f4dc11c4d8026939cb5808a2a9ff6d74e2aa8cc474425f6704608dfcf5f8794885bfab2bb9e4aa589ca8c7ba327040f0668ec3436a0be39cee60db9cc71";
+      sha512 = "e1df39ee230751c1cea28a9bd0935ac5c0ae5517774db76a9ad338f79fd5edecc20fdcfd868e90644af898d5a008ced4b4a63367966ae11280b891d50d3c4d6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/cy/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/cy/firefox-64.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "45cb13ac3ecd45144d898d501a3bd29dd3bbe2de22edc9bc15453321a787b594b1b3a10bd5c4c1586998dbb0b6dbb60916673c062eaefd2224c035ff23f8c9c4";
+      sha512 = "d16f5d66184ae187e146f79771275b143c783d01e89b0ff12253dd4820f740c76e0310941d7fb3c3a54b3be70dedb67f627b17cb569c23560edef2cd05186d8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/da/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/da/firefox-64.0b5.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "0e5ab638cea0ee3203215777c92c519f04290a29a9b893c527ba5b8562776f252cca57ae6618267427a70e08c832ce017f2c2f25cfbac2575779fa1a946e4c5e";
+      sha512 = "81b9ab64c69aed8d7a28c37e02064ec274d8e11228d950ab82f53add745ec8bd628e1c9ee18157399460a93e737f4c96fb2552fffa24517e58221c9d0d13d0dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/de/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/de/firefox-64.0b5.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "eacbbd4eb3c962c54eb892b156d60cd4911367788c3ef8d142037ba1c9603f3f2dce63482c614a1547414fb5a2b19fbc0027c64ecd78f4661c52096a033d1b23";
+      sha512 = "34352a5aec883dde7f263778722f59bb72c28b2381f3b81a68bd0e1062e8cc4a595a890085358b48a56ed76c38cd3b12c2f76c01a00c23cd0b98afc9f00a259e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/dsb/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/dsb/firefox-64.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "36aa46f73092120b7581b894bcfec8f5ebb53a0169a5136e6758db452f5be174056a61c0c367e9701575c63477249dcb65c0666ce9b97b86d36b2287220cdf05";
+      sha512 = "edcc41a36f620a631ddf6c2aa926b85e1b977994f60883495089155e987288ef9d861634b7d559b304f38f7dd624e9557c6c998152062b4b2e671b4bafad5103";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/el/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/el/firefox-64.0b5.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "b9ed6e9f45f97df8347b708ec0ddc41fdf684da431b7d97956aa8464010ea9d4cb83ed81f2f97b71d32224bd0b8f2d6dd02bee0b74fe6c7251b8c6749f852299";
+      sha512 = "10c06c9b11753787f6433c736fd68280892ff038154e0a62b4bc409dd5d35eba2fc0fd02c8ead4214d668bf30b3507b3fcae498d5f56d24941177b743fdaa156";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-CA/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/en-CA/firefox-64.0b5.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "4a608528c847cb4a9e37cece45fca3f88b4367a835c49bacc646b06ab89f13498f7f5d8eed2d1bab12da7e9dd416e231aa664c44ef85c0519028283a7c8d1908";
+      sha512 = "60755157a2726db341fc0c2daa9babea85507e0744845c1b0d6457b8b6fca7343ad68e8240d46a17c2292d0041e0054a1a404713902207f5dbe6ca7341d521d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-GB/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/en-GB/firefox-64.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "bbd2b19f8b9a1df28af1afccb1e115e89be0d8bc3686c23dad6c0792c647de93f896e13e87110c91006aa6dc5fd84ffd4583d3fbdd4a4abb1bb13220ab6f14b7";
+      sha512 = "ad87069011210e8362b36451666a69df663b565ae6bd7382fab6e84b25e924965d1fbbc1187b0456fe79ec096df65c12b147a2eb80fcf5f3d192b5df738ae53e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-US/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/en-US/firefox-64.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "77f3ed6ba0b07b38fb46b79913040cc37225d56909afbdda49e227fefffad70a783db16dd4f23d89f68d4c7ddb7531298e36f97d18cbbeb5288497d054409ebc";
+      sha512 = "4244650468d15ae708ad32b5a6f2165ebb29879207e3689404194be772ba0eb93354a48938d39017db873e902aa4ff30f6f39d4224e8e4423035c7d938b18df0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-ZA/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/en-ZA/firefox-64.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "df6ded2a54a5df53df36fe1e81289d26ddc958ecf6a8a40a14b00d5a4c1383e7bdc77658a410eb4d906a69b926d2f30be4e60b30eee384194c5641b37d29ba89";
+      sha512 = "91525be6b8f404a8a062c2dc8ed63f89e29b44bbf5d899e5b3d5f71f912f98f3df504b48c1a932e6e140a36dbef9fc00d28b7a229e3f833699e5af1c08a62732";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/eo/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/eo/firefox-64.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "cf2c73fd2dc14e38ea9add2f5438fb03bf5380bd8fd49ed0ac9dbd50855bf01579e9473d4ae1b116b7069d7d58e67c61bec2b4eed53f583ba9557b318f3ca126";
+      sha512 = "1bf1eebd0e31587ab0675f11cdd1e4b36995e4adc7bb5c53c7a45e76453fef4b89b03a00c48c00f896c6fdfed54fa8f3f9ad06843ede961130c8667fd4fa2e2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-AR/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/es-AR/firefox-64.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "f9e6cf029b1d883aab0c3550dad4f94b63afc35eafa68e0f426fba1a7e555ee4419845e7c1f1d6811586201d13c81c51a9f1dc79ff33aba41660229497abe9d3";
+      sha512 = "74d99d3c19cca9bf6b4e3dd3cbd7d95d04519e4493fd17a0c29dd9fc38f110f05dfdd33a266cd5803095461103bbf026e88b2ee2fe734442ed41a3da61562798";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-CL/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/es-CL/firefox-64.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "49674a7c3aff83eb3b667ccfd9d0e58522d9732534cec334db7595a58c44dd916127e36fce51d356e12c2ecec4dd635bafa1b3b015f6f21569d0041556ce7289";
+      sha512 = "809eb23b5a1ba49fc7c646daf3775072303be1d9f184845b424a63e3a13425df395afbbe44b00e808837581e7fb5e81a557b6e0589339e776de009add9c0b578";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-ES/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/es-ES/firefox-64.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "1cc2f6e9c0cd7b4a4f5df8ee18b4b7e70875d3ee39e8c865f445fbbf085e63111239f56dee645f03fa0c26dc096c0cd2d955aa2c2b7fcb0f7be4c3a20863b5c2";
+      sha512 = "05dca4924b2c2f546b550a74b9c70d9b6fa38970f26bc4bb19ee498bff1355d323584f8b1fa3f240aba857a3568fb951978e706fe501a45c2d9289b85b3354ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-MX/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/es-MX/firefox-64.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "621dc1088af68c755bec9bedbc9ca8bc31fb8bc3278faf082389e3eb367461d02619ac78900eaf9809c1025b6fb9316d2b65f3d789789c6862fc6d5a7c91680e";
+      sha512 = "fb0cd125bfb46aa056e37a7930d8a75b92f94a3359033d126c475ae1c62dbf0263b46de19dc2dc37c710e2d8bb40d990b9c0b9682721ca88c5383722618a16f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/et/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/et/firefox-64.0b5.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "dc7f53c0344dcd02736555447750e31fd95c89142e3a2f0ee9c462adc417a2578d22bca743ed4ef73f2f1432c3a7a4c42a6e3d22fe815b05a6bf1f2005de8ff1";
+      sha512 = "a96f9d351e82e4b418ae0e05ec983eb81fc405238ecc5605d771333dbcb6a2f067c8b37953fced024abf9605457217a5726766e7a23e05d0f24dda8fa6fbb9ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/eu/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/eu/firefox-64.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "da7da58bd15cb3ea17c972977c609fcdcd959fd33d28fce3bb1d78e1510ba613203b48cb549532aceee6b3c2a7e2724be355e9347801e32e789ce27c544bf2b0";
+      sha512 = "74e40c64a7105a373194905ff6610396258f49ecb6a7785d4f166181e6230632bf1afa441a59e2491cb30cf289237f1c6d5f13c6e6780a0d0e74e165729f6bcd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fa/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/fa/firefox-64.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "28e7343dca8bdfe8b6e91095eb3de6efa6a8c573a2482e2ecc60e2ddecafe1a96bc0aac555bb7b7eaca681bdc28a24a04ffe6033b99910ff4169811338d87bd6";
+      sha512 = "1a4276b4154ef450aaf751bf37421a7504b8ff5f62e0f6f93bb550936c0833e4f271c8fd288ab8dbc5a6e0f07de36baeb86ce2531bde0d3202414efd73907610";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ff/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ff/firefox-64.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "cf7ff3db94d78802ac6dfee4ab9fc07283d7da3a87ff46d14aec26c4a50ab66ad6fda68a867c17c23094396aaa302a3736ac416de5418c139a69422f03abe3a5";
+      sha512 = "c9f55ea688d3ab90b29d9b4b4cca07d9b9f01afdc69c2be3c88f8bcc98928a9696d956a560d1df2f7dbd834814a75b254e6e1927e28d97c465956be6f6cb43fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fi/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/fi/firefox-64.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "68806d9504c1abf1174dce455910d9e7b06cba0b9531bbe703faa38334531a1194447cb57254e71008696a3a056d575a3280752d3317cf99ab620e8bbb9de976";
+      sha512 = "8f798f71a5914ae5db3f3e1fde8025f09a08f6f77548f8d40bc05591ec3ae890cb7a61f6ba53c6e29af945aca178ace8e51079c5c47ae520935157f02e2043b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/fr/firefox-64.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "6d08c8b11f7baee9895b81fc44fcce77f9ad71f45b96e268dd112735a267ee0ba2cc3a3624e66c95fc675aa01e4fb1b0b6cdfc6e67956206d14168c67adf9a9e";
+      sha512 = "802d7fd021acf040e85ea4e54b7bbd907c3b9c42b98fa026034430344b521fee7e20f8f7d3aff87d2b28d8b2df811ee29fdae323df8cea2c672dfb8a03217c05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fy-NL/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/fy-NL/firefox-64.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "25d5e8f252c3c8d4068f6bf73a083ca19679debb1019c797c075f0a7d56ed50056a66c6da23a2ffa164b13043c1e8ea4fe8c569968f2d4b1dd471d6b8710d158";
+      sha512 = "6b9345cb60dc071071a7ec6b16d09938456d4838f7a274e3de7a3a4fde868a5594e4801e10ce2f534f4977af63db8d05f932dea978d2ba88282a18fc5cc1c618";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ga-IE/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ga-IE/firefox-64.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "f3d93d6606404befcdd8cda5c979c9ec22a0de3ed089574f902ef906622e19a88fd27200c8a2e8574336fefed1df6c656c557a29d81f9c4a25b88f3765a18f77";
+      sha512 = "a85726d6d2bfd4088de935151b7e27763b6146c9c437ba357aebd1f4c199ff353c777e24ed4fa2515715b707904cb745eceeff2fc4e24064b7b01b5be68ad269";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gd/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/gd/firefox-64.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "a781c22454cc205e33c4b3632cbcac4494676b92676889dec2cfb4b3f9a39f7d805694ed4fabde77b20d1851f6931c4fcae145941fa0a433d1d373ae264ee501";
+      sha512 = "84c7b922984470ea266bbea749887228d0056bc16bc48aac6061c0d129a0928e71bfd01d2618f9484950197d8603cfb5fff3652eca53d5dcaeed9d7bbbbe7c87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/gl/firefox-64.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "ec991b1c98d6250635440c659ffffa04365cae760576b60d7bd8600915fdce8ecb58598edf676f4736e55c0025e236121f9e8f0e9d02b2051cc636555bcb9d49";
+      sha512 = "04ed397b017446b58ebabe5fe93dc9eedcebde75076cbe3c379383495124338567715190d781646338ddffadf00799f82cff8db2d211e17387a6eadfcfea7f32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gn/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/gn/firefox-64.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "a86ce563657c7870df74aa8ab176f6bc0526355f1fd3237126cd5444edc934524b008052f5df78a24f35a4220ac074a425effb586b29a00fb25989c145677191";
+      sha512 = "6d99ce21e7bb661490d4fe9b4bce4efc4af4021878935c4b7459e03984cda148c60ae74ec8bd9e509997b4ce85941a99cd99f11112eec5c6957efd4fb50e5ed1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gu-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/gu-IN/firefox-64.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "6b30fa7cb8d6cc5e91ff936aa323874551fc5736f991d49d790e2934d9c75d2edd91a427abf269878f6d9aa1153215195ba30442bb9f19030f22ddb669cb1a88";
+      sha512 = "4898d1c4d84c7e04c54ba5417eca8e15053ec6e8fcde8239d4bc1e720a0b1a4ff2e6cc72e2036e44d1e4309110ebf9415650d6218944ad3cda8b02829c173519";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/he/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/he/firefox-64.0b5.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "eea36cec7a878a26fef05de7d8a8e45836478d889da001f3393b8a6c1f9e6a961a980c4f6794eaf190a89d28b56a8fb7ccfa76f810e8526cb8ff2b70d07a2aa6";
+      sha512 = "71b93f0a720444220a10c57219957f465d85be5f9dfccba5b7f00a33f2068ad40e5176dcb46b54f77bf3b20db3b013814f0c030730d5f3c35626c8d83d455bbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hi-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hi-IN/firefox-64.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "732f1317aa98ce67a809952071d0a03b7c195aa327072a33a5976b64b2d6ba1695b1ae5a6ec9d7def16402f8f198c12a8cc313c99455a1c23c019dc492c776d6";
+      sha512 = "fe603ff5cf3c7a5d666b85ec1610c6485194c5a79d4bb17cc79bebbf1d9c9642b0d677431b32d9514db261e08228b0d81c01ecc4dcbc6fb652f243c8ff7625cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hr/firefox-64.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "ed11cec198299d11af3d58209cb43eea08c4d16ccce56a6e938f57a998ddedbf37267251b05e983bd929cb72649d60f724c60c1c1eef45d993ddd41c57e49886";
+      sha512 = "6f1504c49cf285b4897935a506b0db89c0339cc0f422abf514b7c16eba4c26a606726603437b5eadcff18a7e4678882206376055fad295dca22daf6c0453965b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hsb/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hsb/firefox-64.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "1ee3ad7982470d337865782a00528f2edde41c62f693ca667cc6ff0a1bc72601b4a4e289398c2235ac14d1ed3a82bf2ed2ee0d532a0415c2bb76a1419a0159d2";
+      sha512 = "009df3d9e38256939448299175ef805f34c81d1a4c21cf5c0a8b7652487fa5fd0c8b58cfb5810eebfaceca6cb9dfb2eef5dc74c828d109834d194e7bd8993379";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hu/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hu/firefox-64.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "9b159bb5b48838baeef8fd623e19eb2e801c952dd825f838e2e9c70aa9045c69bc7814763127380d77535e9dfb2256a3f0aac5f8d34b287bc90ecb9aa258a91f";
+      sha512 = "2fb92d1e50edf38c2f75d3b799c29b198ff04016b2d1118db8a32aca95e4f96d8445f6b8e0de745c225d6e6cbc724b1e11da000a7e37c71a6a8f79e38d2460f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hy-AM/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hy-AM/firefox-64.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "c2e76476e2e5e555f706f9fafbcc034675754eb2c46da5243ad142bac1f71b3e0a116c74aa8582f7c3ee346ce936fda5d6e0f274acb485736bbec1b7e00b9e2b";
+      sha512 = "dafaaf7b86b5e851b25fdc350f2fe2841782f79161a4a53f347df8daf70977a4a61768c749df90ee11d2d140e00ce347b9c5e16ad007538ee2709dfd67bb5263";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ia/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ia/firefox-64.0b5.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "06c5903dde7b5a2c0290002fab190654d262f3d6c582cd60834b767dfd5987ab7c3f74c07b4b0527615cd689692b0c1e33ac4e726e6f5512c318ac229cc8dce1";
+      sha512 = "ab86f804a8115c01163b04e70ec284a97250982d868515c574e20133897077b2f8d9f0c5302f0da7907d4fa9db923519a1331581ff0dae9455c4a0d6c3ff4a6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/id/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/id/firefox-64.0b5.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "31579b18b37b183f5f26e60e391b9255bd4a2d7c573351a54e07aac89f91d81aed13f9998332ecbc746bd2abf40ca98e10c28845b0b9ede004ec24d488f48505";
+      sha512 = "d67a83b733c62d9666d2ef75088ea8cba79a4be1de9dd05fe2a846aa832970c0cae4695563ba79d221741edd9a8cf50ada41b5435c41545a41c712190ab910e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/is/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/is/firefox-64.0b5.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "f22dc2c3fd59768eeb538b85f0a7843a1dfc974cff5f31d0589a0ffacedd227da6c249507de38c41ab9c51a3b03c37ec110344e5423c7e5b7e4709916558def3";
+      sha512 = "e5d7fbdd9934e958c9a3f5c2a19e8fff875ce5267520511ff806522976fe5fd727a58bebfaae3bdba0acbd365f65eecc55b7a23898b7b5e8217a92eddf30d160";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/it/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/it/firefox-64.0b5.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "35aef32e732264f1489db1cd031f672b91aff12c02ac7ea4ecd5c8583a27c8e30b6a18a572177dbef466b7c2b6fefbaaa064b8b3206d5d6df25d54391544a7e1";
+      sha512 = "b34640443cc069a0d37038a93d8badfca4107a6261e39829430be3c8e52fdfd34f2e9d3229432aa51a120dcfbf3c184bc439f88e58002a6cf10acfb49dcfeb06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ja/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ja/firefox-64.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "d00a6a1dfe229e137e84a7becb1743e2189319052867fadbc62ab5808c8873dc3a72fbcef47f236929a6e1a2c131332dae206dff006ceb7f502073a209a09ae9";
+      sha512 = "b53fe7353a363283b043d4c55be0c9ad61d8ff988d931ab366219fc7b375ac23bd7acd13395f127246f54c1eea208d8588d0d4b8d3cdf653cba1415ea96297a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ka/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ka/firefox-64.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "8c4f89cbb4a5cb026c633da5f2a562b5f43bb9e0e3144d22cc56d7828fcd186031566bf7f0bb48f233c34dd92296f9059731cc92373c0d42fa296ea2294b672f";
+      sha512 = "33c8a35c0f1b61a3079df8d0fea33b2d294bf43348eb00c085aa79e0ba65e24ac0e6ae615fc07de75f77dfd3dbb83f66e11f343026c114f9e82d19c68883d89e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/kab/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/kab/firefox-64.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "1de0080e0cdbd54f066d213d6a09bf1e727b410b71bcd789bd192815f88d0749e1abae41e82b6bba65759004d5f30a8c34da96d1b54a6878fedd7abb098cd703";
+      sha512 = "be47c88150653b5f28d4c5f5a5d8c9eb76f768e860376b31323b789d7a6d20a34f375bebb5561174f06ba56c5697dd23e204cc5f93a50a3249de5a08a24c718d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/kk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/kk/firefox-64.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "2936b54d148ab79f45ba11606632c607ee0d0a9dedc4b48d4ae0db97cb88f6c6167e0547fdb4f67dfc89894c4d4ec4cf53d3b71176dac7e48793e762d4f7aef7";
+      sha512 = "7e26b2625447956ef54aad34f0708d537e0c8d42e1875e4a01547b3ff1cb646effeb5090421204a7eca0b228ba04ee41cca43888b8a9df8f8461066c7266ecaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/km/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/km/firefox-64.0b5.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "71d3e28b8698debb941ccfa4e046124c2d80fa8e0b8293b3a710bc35612fd1cd49c5b63ea656421901bad7875c7bfc980a9a9b9f0b0e4f1d6c9277d4bb60768f";
+      sha512 = "9dc85b4151744f1e086274cd0fbd41fa7425365c3df2659f5ccc3e18ae0a6c70c2680a0e52a56ffc6d7e7b129ed3e83e0df47a6282cf043bbb75cdc07d823068";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/kn/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/kn/firefox-64.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "43e5d3080e96fd95823400c8ae274a168c3b4e5103bedbe2359264f22ec2308ddbced05fa91ae2fdfd68c22ea0c1fa0cb7e5d4cc39d38f47d3834e4e024bb414";
+      sha512 = "d2758645fbb9f5029465c90e86453956f2069f19050a14695ee46a0686ccb0ed2e1cf935c0f009a14ece4f9f78aeed9dd73ace4997afa6702182c23fb746ebb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ko/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ko/firefox-64.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "3b824a6b06b1ca896ddbe640b7664beaa5ec1a2eeaa17d34e0f516a1b5aaaaf6f633c34f563eebd9065ebcb0d740dc58dc262217472b8b0c91b113ab55dd6983";
+      sha512 = "5c60753d92d0748f47a7b1a88f863735912bbc9a25a424cf79d756ccb31c0172bcaedee99d59dc5fa40d6575b8225c623722ff3c7409e685cfe04e4f88846c9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/lij/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/lij/firefox-64.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "c311738217edd99ffb79ddf7a75c6295972116d7e7feba29a221c256705cb9e280c7d590fb1bad0ff0b9dc8fe098b1bb8c4ce653e70d170d90cc350bc83c3378";
+      sha512 = "c4863cf712f4ed5753365f272cc37c92bade71b5bdbbd5de50c1ed68a56c8ba908034f506c571e76ff70b3b32ffa64624104f96e2555c5401baf5ed8b2a58719";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/lt/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/lt/firefox-64.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "ff7823346bd78ef5ca874c43d62c19ab1fb99398507ab9784f7bf6485acaf90e794bb878ea2801de2a5b07806bb8b4b3e96fc4acb2e73f9d99607f43ada1d987";
+      sha512 = "c4a28cfa188d07fac8ef2d0573f7c205a51578e520196b7625ef80e67c33570b3d545bcd7926d5f5edf10944cd33fa3a0cd64362002b7772f2a1e63b7ed0a5cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/lv/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/lv/firefox-64.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "652ccc4cffdfa2f9e3dc13162647c96aed6af18d40380e8f9fd484ef80244716d5052718d49f4e0b806d8f953d30f7732b06cdf4055ec2c37d1a99e9c68cf3f9";
+      sha512 = "9a3f4142dd48c6fbc7bf7e8e3a617e3cf7d48cf7d72dcf1661af4c91934a8b8a1de3b0306405ed6cd3d4f479d51c960faf8725a7bd345a6573e2d8338ac1a8c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/mai/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/mai/firefox-64.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "673b77ffc28ec487aa87ac8c6d1940d0804ad47d8cb9a74e32b0068304456dad2c0ed814d126fdfd8433090c843e901de5e0ed0dcdd8161644a3802c4f9576f5";
+      sha512 = "fac26f3a82c6f246d9de452d789ae51ced2d94aaecd130a43daedabe2c599c8a083753955eed7855d2215eff2a131ad89e0ef9e9c089900bd2ad39ca3c93ac1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/mk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/mk/firefox-64.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "52fcafde72f01cc41bbc1de6985b044dfc66a421aef6c2fe09f89c10d8d1472b69208c2a7b9c4b9dc8fe091dd337bca89577d5bd32198d1867d794985c952340";
+      sha512 = "806f287f3f833560bde872e5e2dc6d1efa3d2c58086c514f20700bd71a0d1c374b621906f16404de4c0cb9e25f35b7c499f432f605c9bf27a3b932e4f71f2eab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ml/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ml/firefox-64.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "b8592d02931efc5c1a2e1a8c0df73353051a69e94b5205c620893b9ceace0730f63466d9cacae9e8b451e79ae2f7e73334fc5ae35133e2df99d7ff3f227fadbc";
+      sha512 = "30df070ac612ea6f20cc6a0ea377e6ba7285400fc4b6929ae6ea053eecdb536ed2ecd40c0b7ec734499704509eb4428505e9ac3652d6f1721c268b2c82b693ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/mr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/mr/firefox-64.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "d4a831c25b20d6ea93938003d68366e34e52b01b87d5e740f89a20ec70b142be52d624345e1779244c9c254d66557b7299edcb3ea24867b12e6fd8d47eb90138";
+      sha512 = "21c8502322dd6b4deea09bef88d24463d72cc039d1e52fe80994f117839e6a6c789c75b98f5b1fe72822aabd00e0d722c27b58214d527a207e6a37c6a8fbef52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ms/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ms/firefox-64.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "a71249aa2fdc1d22a1e223f58d004fd18e0436e7578d2d01a82480b53212059653babeee0fe1620c2a455d854ca3e68a98e8e9a211862f599d1b3f50323ca230";
+      sha512 = "d98695178522e2b33117405d98a4c2a9bf3dfeeb51cf57f86cf44e95329a31c51e79b409514f8fda2c0ca1bb45f3b3761b857f656e737633d84b9d967e0b8d94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/my/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/my/firefox-64.0b5.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "175f5dcbf66405e9f80c9f62de3e2b972ac9ecacafc82fbbc1409e0bc26e87838ab8a193f6c50a497742ce2c334be24f200a6085e8a256838920087ef2ba873a";
+      sha512 = "c828786fb800dfc9ea0eb1ca45c051a193f0581da8e5b4ea99f8f1108c022b58dfeae8aff1f6defd3ad5eb9e3268c3a5a4322b928d6186006fc6f0856a20d69a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/nb-NO/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/nb-NO/firefox-64.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "e2e16db2580e030239018fa34a3c50695fe8f6c94e8017193d6a9e2127567ecbcfa1d87040550619e894edf3ed698e9789fd506a0f386352fddcd31314b0a9f9";
+      sha512 = "ac59dcd1cd8ce4f4586325a41c646f81189a3b57c96c2171cecbbb8828de36a8c8afcd3de2ac20f174ff5fccb806e8026574726b71b1405abd42c5639936f09f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ne-NP/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ne-NP/firefox-64.0b5.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "e659cdbd3a9cc2f9bf8ee18a5a952e30cf1216097d4f016d86d3dc1a0adae29189d52ecc3acad78333ae213216f5b6a4f76dc407ab53364271e3e7b570050da2";
+      sha512 = "ddc92703adc687aefc2517911a8a86dd68cc14f05095ec7335c127fb3a2b2d9ef4ae9e043730b797e802e2a4ec840376578b68c5f37af367a78d59304f434e88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/nl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/nl/firefox-64.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "bc58308f98f8bd3290103db79bb37f3a15ed9c1133c6da59648ea6fb587235d2b79ee7374968064dfabb1dc88827e27fa7a8cae39e43c5429bf43c096f0e081f";
+      sha512 = "0c9b9d5defc6ad1641a155ff9ac5ca632ca2c3ef8b63f5fa34ba9315eab827b806c42d51f0349827a20c02d554ff6dbd615293ff4eb3a990ee75813cca2caf14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/nn-NO/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/nn-NO/firefox-64.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "c3fe7d0ea818c1dae682fa9c35899ddcc7b878e2b12625cabb76a001ac0808875315752fa8bae0a83d455c902a88a86e44acafea26cd4d85cb531a5cc8aad8f3";
+      sha512 = "e8136709280a870f2417400696683171cff81df1d67861aa0c7d5cf454415e84939e73ccf056f7154a786e1ce8cc45e9d996f2bc082e80113fb9168c1b2246df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/oc/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/oc/firefox-64.0b5.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "35bb0b6f5a5a3f6d217dc215cfb737eb2366b12399884d1f1998e4418ea951ffd7d39d5fc6970dbee883b8440c4b965e013e361fefef3b298bbba303c1ee3481";
+      sha512 = "52c4cdc1eeaf28bd7f6e77d88c18aaa4797f3e6764378d4d4fd91655609f868ca6c01a535cb4103a7cf1e00b785d46eca279f3ad41247c2aec40b912b5684781";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/or/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/or/firefox-64.0b5.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "f0e4befffe8ca8ea9a420d891d9dbbab4ebc8eb538158d621576e46e6b05a47c2aca815af06c2b44036fdb2f5db3d0cb0d8afad964a8beb809ff1d9c1b6d5c05";
+      sha512 = "0f898ed4c94cb7c1e52704a6c5c4afbc3c8c8699213120125da8bc191936eee7582bb8362bc257fa6738c18f1dca0acdbb6c8a098c8f0d2001afb820c133797c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pa-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/pa-IN/firefox-64.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "bac1a1d713f34aecf4565c937ebb90a8f226aaf6cd12c1682560634ea6bbc53462832ffb08fa5fe65215014b9efd52eaf5608dd47f30dd13e5bf56beb00a51c1";
+      sha512 = "c92975d160b4c8baa3537e4b19f4369bd8bf4376824f33b4495fbc6f1b226b99419f9c1c389e43b72dd82176ea994c13b764f45e0b9ab848ce347f10f897f39f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/pl/firefox-64.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "5b08de1128c10a5408d699d68512f72e54124ccb6b43b3e6ffa49bab90e47c823fe6044b85b58c7880c942b23bdab1ee24d8219ca54d9fdeee6772b546a825c9";
+      sha512 = "96bae56aca7aa199b18eb85fdb9ba0fc9ebd67b673b23df8e2a44a2c59671d90b53a6d54a66a504ab0f85cf94cecf981d7dc4b6aab12ac480b50edeba9e5c287";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pt-BR/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/pt-BR/firefox-64.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "f4cfd768a38c12e3ed45a36835ec2ea9674b726553cae8755e45e8a0ad20d46b55463de8fdff493068895983b7a816b5213977638d61bb5e57f4acddbf1c2ee7";
+      sha512 = "74bde3c282ffd1d3c72b8515b2b30fd8646d384127df7dfa5b3130f4521731b201e297a03e328418b11d697243c59e9e53ab184c546b1afd7479ed21fd3e723a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pt-PT/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/pt-PT/firefox-64.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "3dad284cba4bd414c88d96e1ad5e8a62ff985f1a5dd4408462fef3c9f08fe5855c85298dfe1105d99fd812b6193200444f15dc217d62b300e052018cdae213fc";
+      sha512 = "4b28d362b63176ee1b848e3d7c46405bba1aa6c1eb1c92097bc5c88b1d1c9cdef21d288a79eeb4141d6b25146509995dc5dd439f851af3a0048b80526422c66f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/rm/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/rm/firefox-64.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "c2c783cb59688602c7788cd17dd5b04901806bf341280f7368aff672005f1bf1e2cbdb81f22fdc02f4eb41cbe9d4b76c47bbdc5585fc97caee4b5119ca5c0dfc";
+      sha512 = "a372bc9f43aa1aebba674f561ac2f1c4cf7037ce14ae0d3d607e762589a473169d2e3c9b134c4b9152022d29c01a100ccc019d78417ce39d971070f582debbad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ro/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ro/firefox-64.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "68d8225e5873d7328c0d368c0d03a8b3a219ba40c80d74f724e50ac3a1f513842576d14a2af44f10cfc209d782aca94ed17114f97e9c7c495b61a2d239a6ab93";
+      sha512 = "8be0dce6982e28bcf095dbeeaaaa45e248fb8a3f9fce583893aa93e454a62f88a1b86afa74aa4619c2294eeeffef6525fd9d534dca7f9d42f48b601b29f229c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ru/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ru/firefox-64.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "91119b5aa441e79969eea5438295e2c9565f96512c834787976d29a2bd8c619d243a500ac065ea64073bfda845382e20e8fb117972ffb9167c927db232343849";
+      sha512 = "3eac71492680bb6f1ded25df753052eabd7829f18b1e1174011211e20a9886c6f8dce71e546a8c1b728469c97f602a0545d900ebb309207f6eea1da1dc53f765";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/si/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/si/firefox-64.0b5.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "5c4404793e0df7286eb529f6a1e110708dfd2eaa0cdc08bd0166dbc8b7cd467e708a6fe4c2ebca03facf5d18f4d6ecf0d0113e7f9745a77b46cb8cebed4aa5aa";
+      sha512 = "4f87f0e20af18718d2e9eb28e3a619bf8954ae76f88109f3a55e8b45effeea53e697aa236c5f5d987a34abf8b4ef3ba63ccf6cd04a3757ce52e225892ebaaecb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sk/firefox-64.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "c4b3f9ace0755c3b19edabfce85a2bc281797cba9d00d5bea3151f40d196615b2d6e978b77071fbccbca1841632d149f946a486e02b8552811fa339375ee1ea2";
+      sha512 = "eb274af0f67456af13ac7ad51c7b927488e4c2e79d4227520d3077b5a07e2590e49e0266f91930b0fa17011506fbbd4af8ca5d4f264d6d2a4ec480d2d5dd3883";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sl/firefox-64.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "2a1b4dc094025c95ac5f817f7915b5bde481e7d0d98a68af7a232725ffd0cdfe6f999b601d94d09ce85de3f0c60f9f9282fd9ecbd873996dfe77801ae3b5decd";
+      sha512 = "150e3506c32d076791495d5eea723321ceed71b0bbaccbb69521dd7357602e1c07abe6573d969fcaf22b2513b12d8382347e31d3ed0830f301c53fab442ae217";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/son/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/son/firefox-64.0b5.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "24b5fd14fdcfcd1ef1388d9630985c09b42e633eff9a2201e5b07f8d5d95a0845d09323d52d9596d23a3e3f54696a1c33a038445522a3c96d333df7c57a0eb9c";
+      sha512 = "0c49ee53876fd170bafe3ed9b301abbaaf09e8848e7eae3be7b46a009773aab80ac559d66211dea09e9c74fb988d64124b51838b44d594cac8a9d50938c9bbeb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sq/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sq/firefox-64.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "260978083ead7ce3e07ab02b324ff1437850a327ad0a270b3f905c975516e676e949f616fe3ea4ce324de2d33e14b6cf442bf7d22611ca4e29cf1226f5c2bbeb";
+      sha512 = "3902c30bbdc02c2a9c6ddb60e5dfaae52c74f8218cbfe3410b929f1ee9ddc5309888a8a8bb2aee172c4101eb4b700f395df00a98cc1a1d32c0efc1f73a0a1f66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sr/firefox-64.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "bbaa90b245f24cba9a829adec7e057458cf830fe29879ef5be31b44be602eb4899eccae2b8b7fd32ed58bbef371440747ac9777803c806ddcaa1723c314882ad";
+      sha512 = "42af1d5ab70d574eb6b9ebd175e9fec08474a82e300cf2a01ab14b5e07d1491241b973f749992fcf01a1d7c7718da0c0bb4cdb0728c937f2a0a73ed70202e8ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sv-SE/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sv-SE/firefox-64.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "8a143bc41243c7a79c6001d1f9fed8890226ee111433a6fbd1d96170b8e31ee09b589eb36e6eb4a2895b94b020fbbedce01fdde68a1cdcd849911fe5b176423e";
+      sha512 = "801a919a8d1ff558df160caba43606d96ebfcf32f7af1d5a2b5d456565d1b0b31495795d0e7ad3c048cbfbf6f6a4ab76b6546cf4c8912e05851374ea48c0fd14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ta/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ta/firefox-64.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "aaaab23021c7ceedcd6aa5b2f8ff43c0ba1ac8bc998c632554de0022536d42ed6c99759706ecdcb0660657a79c1f640e9474da4fadb74735c7af09da8eb9b8dc";
+      sha512 = "9a241eb75506db710d7a4869fb110a33063a8f37e583812b34ba51368e3b59e68602c017e364331eccb5366b652e204af4b98e1b3bd4f66ef60004e64cce1549";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/te/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/te/firefox-64.0b5.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "4ae162266445d1a7d573368ef4f4bbd8ad87487ad1c0a94ed22430b5eee6a9e190b93ee9789fad6b91470fa575e248a9f4da2152a80145c4c1810a36a588f473";
+      sha512 = "014afc1ad2111451a775864be7ebad47efa48241cf9709689ba5ed275bb7099b173c421bf606031fac4d9a350f0d868f5d0d27c9ef964bb1bbaf3867f69c2e05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/th/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/th/firefox-64.0b5.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "3c4cbaf05a942e8afe7b1c95cb0a049f6aed502cbe6e1fa537aeb4835ec9d06032f9e473a15af83dead5a6a143686796f6d98c1458d33f227eac8feda696e011";
+      sha512 = "7eca51ff64032688e11e7917ff6d672bd220f961b891354d0fd13c9a88872a183e8558beab2ffcc98f8ff58ef5a38474abf3846b7b8239cda93816933faf541a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/tr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/tr/firefox-64.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "10d0437d731eb6afcc857a957c194e74b892bfca0502527b19fbf7eeec4ee34d45024eba3911ef1ff66575d6c48bba00e42e057558a1e085385e574d37e9ab3c";
+      sha512 = "66ae7cc41c2c9a8d0386a702c6954ab7dd31ff5d7cc77416a62e0d9d48d658586c63125241f8d92aea9e0975ab7f5e12cfd6caafe732aef781de3abd3efd1f4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/uk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/uk/firefox-64.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "49f10d817d5bbcbcafde66b341bffd230d4dc63e1a0addbf12785e1a0526880fba6d371247eb51e224cb58039276c05a698a8b348ceea2cd5be4c63e9ae29931";
+      sha512 = "93c1662dcac61e23f8773a03d6f5e6918ead687d40a8aba509657284e543205e6971f88333a093e18549c95fedea0468b3f1bd8fcea80104f778b23eae0a1910";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ur/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ur/firefox-64.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "4c2b3ecfc85526a754cfc8ea3be9efd13b4cac14e4ed66c3b35c353862c2f2b4df17c9c2a00d1f670d0aec382e4132dcfdbe71d65734f2b34ec964f8d5623ee6";
+      sha512 = "5ce6575434ba4b54278c1363cca97f9dfa82382604d462e554a0139a108cf2b685436ac140f79253fc4f8c9947e662a077edab7de681060c4374b4994d26cdc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/uz/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/uz/firefox-64.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "7546c56c5e1a20c2e0b9d615cb8a8b084036a6522510a97882c2e6464b7265c4852f813961a821a6fa5eff244db7cdbda8ff49fbdc91c7a8928e20f969b7f351";
+      sha512 = "6c61ea82705d13b8c8aafdbf5c14c8eba79dc73425678a6b8f87c9f6f1868a7d38107d4cdd54f94c8131e395e591c0a2f6eceff9a66c938c4929fc6524428a63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/vi/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/vi/firefox-64.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "a0a4fa36cc1804f786463e681bb1474f94921611d277d8f24cc2cf20e98b24244d897f7db59e81e645ea35c7dcdbc57efe12c78ef14242c99b9fb5cde0b05989";
+      sha512 = "338f7bb15004c4f820aeb0cacf8cd3cf7155f787c2546f9d95203035603d001b4c85a60f61415926f0b9a5342bfd41db9b9b865cde343130165ee1ab36d7dc5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/xh/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/xh/firefox-64.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "eff49b74691e348768d489e5913adb8916bec7533d28623181983972f77844384819eacaa4d8e6083001c693b180a95957854a0a547d5b41517c4fd392bec9e2";
+      sha512 = "e9b9924c45ca63b749c13a7aba4786c9f5eb75f0a2dabdc040fabdbde53bdef75fa5d93cc10130473e2d11c884ec7b5a643de9cf38ca1860e2769ef8af1eef05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/zh-CN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/zh-CN/firefox-64.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "64acdd41eb15cf6d25f09c21f1059ce42effed27e09907439397e8da27c9ef123901c9185651f2ac89e6b4c026e6a7ac08c4a8c363766b49a5a44132275b975b";
+      sha512 = "a19374823fdc429971d35c2fb3828304d0dd46a15dd87d866c524526fe6f17a0bea65ebfa87f0c90eb2d9cca3e0acf1d54ad2fc99dca3a48c112b7a19708c167";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/zh-TW/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/zh-TW/firefox-64.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "e0181679697f610f5af5f096e6872b9ca4c4f814e1dac6f045913a83be681376d5019988c721ca0bb57b86d288cf7bf1e19847b4179a1781f957891ce452ae49";
+      sha512 = "e8f73af598dd5ece70c1576d4a8ebde107f2eb00f4d24800698fa2f4ad81c2cfc2db07874cd412482369ad50029837f43e9a91f9c39a75a1214a7068227770cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ach/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ach/firefox-64.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "f64e8886f5adc2e40d0325bc45f86b81b475cc29fcde180e07bd0343ce88e199adcce00bfdc661f185afbc3f3b40d4518abc0f6787a446fd189abc27991728ba";
+      sha512 = "bd145ee016bfaaf90679c0e2fda92746b05f106055c0792b3f2ecbc00177815e5f13285db7c2ca218d9d5e396c6626d46f30f5c3356ab345fc5c2819d1c11b73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/af/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/af/firefox-64.0b5.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "1f260f205c63558d31a4de81e51428b93c389d374d8591f2152c301bac623d27fa1fa56a10754e54b372b6d389c24c04805dafd99f1508210662b71024349d8c";
+      sha512 = "7e64a10c565f9f29385cebfd6cd182cfde4ed4d6c7c13794ed2c43468f9d0de640035769184f69e7e3da864955188d825c3bdeb2ceacb7b7dc75b25288edff71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/an/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/an/firefox-64.0b5.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "58d824350995bfdd4152d5f1080f4d0fb99b0976c717dde29cce6b3830f1ad1a1ff7631946febd7ab56ece00dbb4b6e6f73751503d64e7c600b63fe6ecc85d1b";
+      sha512 = "23bac5ad0c847580e48c2dda4beb71597d7601ce9e4931084dd7bd5f68ede83ac0e80876733e4178a4a53a6cdc2bb7782e9324c6efcdef76ab80cc50327696f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ar/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ar/firefox-64.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "9e27cc3e2a55c1f03e019f26f8dac0400a86b81993260fedcf612d0e731d721c3d4b0a152d81e0499efa14007fd6b6823f3c28fc97aaa07c3a7db11dbeed2c45";
+      sha512 = "1984c8e75011137af33f914327581c81454cb8e251895d6dae8682b191490e2c663e5f397e80bf046f430ad62222ea7b0bd9eb971a222b465cf35fa17274eb07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/as/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/as/firefox-64.0b5.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "ffbe4274423cfbd1fc4bcd44548d83c92556fc358475c1057fd16ac2e693a344f910aa4190eb8edceb05768fb634e3ed3838be40745100a66bfc8ed0322b9046";
+      sha512 = "ec3b21771ae42ed00fd0d514d12ecada5d777e561db150ee72264f0e4e6a4a0c4730f1103efb93782575c5221d4de36e6a00c467ad5f5efe8538059d90950665";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ast/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ast/firefox-64.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "af21bba6a92856bc028cdfc4c2ea8e6225e73f5c3311bc4c20db8f0a84f93e84dfa6b4c24d5155d0e43dd664241047654353761e7c46cb659315b63c60ae43e1";
+      sha512 = "03fbfd04e90ed448fc7660f74ff525ddf8a70f1c575fcab9d5a17c84fbd709d14a7ad6c255b70a4988a4357e9139f29ee6cb9cc0fd4f2e4d08d7acf60d850018";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/az/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/az/firefox-64.0b5.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "01a2c32b5fe56d81157020fb1c48808f29bab23a8782f69e5f06e530f92b2a33d3ec1e4130df9ba8ab0fe61ef9f13f6d6cf30540af40b5ce104fa488168afb1d";
+      sha512 = "cc1d86f175a7faf7643d46ac348b23ca7f83027c2ba6f7b8355333914fe60f324f0b458b69df1f950aee3bde31c6f2acbf5d72461be2502d4011494906b02517";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/be/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/be/firefox-64.0b5.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "c921b35e3f6c6419dc1b8a1168caef3e466e7f5937c10ba8c3eb2568423b6bf358c61b97b9500fc9422e566404bfa9d4897b8dfd040a081b2e2921aef468036a";
+      sha512 = "2e3fddf652a879f2c379fd59e31070cd5845555fcec8742df886383bf669d9d0656c535332aee097f64a8fac30a9421ece567f91327aa494dea4fbb34df62631";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bg/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/bg/firefox-64.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "89bac25afc4458983ccbdf3fd13052fc014be74815e943d1c5c3b30bcdd30cf81acaf63025a6dd8ec0daa9bcb5009826df516fbf65a4245e94b4bb746f1dc10c";
+      sha512 = "38918ec4067e0ac6511b57c787765aaaa31b5e26a9f1d406c2eb6f6f7ea67aba79780bef67fdcc995659703d17509d95aef7c4d86795fd1aa6e18833e7f3345a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bn-BD/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/bn-BD/firefox-64.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "79a8dc595dfa333f98e3fb33b1a1534f535876808469ce4534b27a68a804e61e120afb40e171c6a5874f3aa46abbb38278008eb453daee0fd1d1d8f17d076b44";
+      sha512 = "dd4cfce4d9454ef2f679970ff9146978c99672f8afddd81e5f854225c1347dc28180f850b30bb4bfb6425e333bc29a42efa7213f6aeec2da306e259e416cd33c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bn-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/bn-IN/firefox-64.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "4e20c698168c888863445abb7f3cbc1b57b69a1a80b5fcafcc5cb8efa2a7a3dcdfad6dce2969ddc1ba62beec2ad3aeb784132ab8ef79e41505af733615a8a19c";
+      sha512 = "d7de9b468c03310cd5083ce097b2f45b9d5aff2dbc8938f6c549eb86ecbdfac585cd4c52ca45b83809be1a6113a8dca2b7875a4f3639c63b748680629f8ca45d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/br/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/br/firefox-64.0b5.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "8e973f0694a10f1330d2652339d1acf1e6853939596eca8ba87f337f9ae3bcc1bf34f24771b73cef634eb3ad62e68471d818c55140fcfa90be61ec445df735db";
+      sha512 = "d7290566ee3014debda6df43688df7d5fbab4d9988901cdea0be89c83abc2f2967742e8641992262794372f2da6bd4c67dbcfb147fe55a4ce27a481b36de403e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bs/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/bs/firefox-64.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "ac017ee280d1167771878aabed612a42a58390339f954351d9972594203a966eedd10a17699b0f04a6651a0ff3996f5407a341f3643d99dca8cdfbf9f47781c3";
+      sha512 = "38978da54270aed6230529cd054846479d4e6bad90edeefb93632702660a6dcdf486a1ab530f803d1421a32244a97d8df093a9f216caf98698ece7b78bf15cea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ca/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ca/firefox-64.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "03ee3a07f0efb6c6adbc1224c9b1872f68b2099e51852028302f5a6904c264033cb0642d530fa6368e15b8b108af49346ea82a46b4376c7adffb2890a353cddb";
+      sha512 = "dbbbcf8704be715d04780a0c8c75c0efdcd587d5c2554e1bafbd45c6a9775d2884fbe9df3c8d3c2a70cb8fffa1a20459b3df10710ac203b0456f3ada3a1b04b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/cak/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/cak/firefox-64.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "ad7a6cd81affa6d5009468ca1e301b05396b335346833225948e2f64a32993f7360f190a13aca4bcea8889658c56ce7fe1f84d9b9af7eebb7c2b79769a159742";
+      sha512 = "95e0cc1ec760dd5cdc6a0cb0d5fa796d109e1a449585b52b1bab153ff8a6177b3c87bd1408dad15b6e193beceac6b7ee05366c48cae63eb73d361616434a45d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/cs/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/cs/firefox-64.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "14780191d373277f51e6ce9c06327df17c4bd324e5c12b4760a43de38bb3d36f733d92b5f83f01bc4633f11ce7a51b0bc8babb1214fe36d61c7611ea7b50d516";
+      sha512 = "3e7aa8df3f4d03a941e275ec317f8a60620f4b5d2e85800800f1b9449cd4ef268654f036e1a5fa4e9200e876877b25d39028268e0a2eaa41af79b9625584fa11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/cy/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/cy/firefox-64.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "8bf6c014c6710e3a096238bb76eb862b579dff7a798c2a4aa8a3232a93efe92741330580769bd16e17366746fc1dfafd24152260f996851a45f9cd684c848d93";
+      sha512 = "5ae01651524bf28fdf9fb8117aad4a1eafcd20ab39f16428052f09db09e7023b7558145cb866bde022daf61d021963b043d972cf031c648ccd88bec19176561b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/da/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/da/firefox-64.0b5.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "e1719cbcf4c532ab484c5aaf3a766d27e4a409aa38d9ceaf2dd52bd183beaca2954e392e8faa66a747e02e21813a4b8e3f9a5c6d7bd81ce321df7811fd529842";
+      sha512 = "59d2ecdfbcf4ef0c8c87e919585e989b4283917d002ccb6d4b31044e45c0fa54a508b4ca99baec1daf74dea5c068d2784014b51f10588b84024a41855ab24fb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/de/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/de/firefox-64.0b5.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "1f9ef9906988924c254a44c796a935ce5ea8cc40dc033bcaf28b50dcec8e90451ae09f039586d1ecc72b5e839f1cf42517a01d0c9e8e9b7c81f365597a8d6dce";
+      sha512 = "d328908f23da7d14588fa3b95c5aad10fa897031b115df309d9f441ff9d560c39c4bfbca7772d7e65b8167bc41aeee0df5e930918a17b089427017a5f1cd7ea6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/dsb/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/dsb/firefox-64.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "946334d8ddd8f7c82226db0d7cf838e2b6208cdcceba251beebcb9b625b6f3f684c6b9479c23e743a7a1eafefbb54eb4e63685256f0ef5d482e76fff55691e32";
+      sha512 = "72f63d66e3215bdb224f21671f4ce6dd14742a5e84be35e889e30251cdc13d05a9aa2c4a8081eb4a7bcc231e6a62e5228d17e261d33dab0897391c90aac2d4a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/el/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/el/firefox-64.0b5.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "f8664b184607f5a655a96b60bc2a97f641c15dd299448d94cc8b630ccec7009d7c51b5e0d4245b1c0eec4477f2217ad54c1453ed516dfdf9fb1b519169c313a8";
+      sha512 = "6b7ae7e07540e3ca2a394043b95c75b34a87d15b1f584fa17ab63d81372ff49a4a490029cf3a393ec001864d6dd9263b09c953857f83680e65d133aa3d5c3d87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-CA/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/en-CA/firefox-64.0b5.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "67339f09f046a4f72bd5a2e79dd5b53876521f5761eb7e9963a1af0acdda507ecc372fdf8e7ccfea96c3ef5324fc06faeb5510060d3840467db03d1f229c07ff";
+      sha512 = "036e90d7673b745a68b94881da966f0f1b076eb9dc50cd17c0b47dd130467e27f68a7f1e5b15b960a1776c97e4d7ecd2424a96a5c5cc7ac7d6ebfb4ba6e09445";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-GB/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/en-GB/firefox-64.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "1138722e998c0d09b5e6bc404833e652302e7f4774ae024238679f22fcfc4a7acaf6e3bb88c5b04f331c457ef18b70451e485eda79377acab668ad2369ec0e76";
+      sha512 = "28fd4cf0573d0038cc3721f65588a4ed397b5c76006e822d4e7d49f2ed4295f8ebef912bf47a8e511f394fc05514c9e14f39b17497a1c2d942592075b072b020";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-US/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/en-US/firefox-64.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "eda0706887013a73e7e310268cfc327be64efab22764357dde8ca8c7ccb26c388a20cc18fcd4f5de284f76541894f2b67454e188d30958fa7f2cc541af14917d";
+      sha512 = "452a7447c706dcaecb3149b4e7f93de8b01ea378e55d21975bf3d630102b5b67d39d8ab9aac4eb650e369599b95e5e10e028c0ad8120e5e2934c6fcb0f8e411c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-ZA/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/en-ZA/firefox-64.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "8da5ef93bbf2f7d51b11276b8d3fbde8cbe4b02e9db5f95d5158c0aee0a20438dfcc3e36485c61410011eab6ad119729c6ec4e4aa3565176255d39e71434741d";
+      sha512 = "2c105a1537ada5586bb30daf464001093b631925c09b7023638b8426d5f65a1e39bcf67d15c1c0d03860b39a924a42bbfa0a5e7c102f1552d4e24e7046e24d7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/eo/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/eo/firefox-64.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "b375d409c35829aada3e66b6e610f4bc2fa0e3907416dbb18f924dab4eeaf40db65d9d5c470cc63c84b9e73f901e15fea0160f0e63b6b2cb469152519e50e863";
+      sha512 = "382bfcad799aafe18d295a0753e8958b2820a38387925702aa948125d71ff0bed8c87893060726c4650c2b4b4888da6f4fa248c1ad93db6f601c5b888128c8d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-AR/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/es-AR/firefox-64.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "68bd243d3bd388f4556bb66595a2323d5ca1b4c8045121734d40bac6250dc3e83c40cffbcf28f3af439c0b43d082a8e90ff3b680dff4bee1f3ddf6e3bd59ffb7";
+      sha512 = "5219f022880ab50e3ea6c80cb987486e08842c00a80cf3d4454328628264be4acf71673b0116a845ef1573a908001de4e8ca4d99e9f68407fbccce010eeea483";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-CL/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/es-CL/firefox-64.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "7b8c047120da9174585d8ecacebf155d02a3e6bf560b3ff87ed32e718f253a566bcc73439560ed3d922e410fcbb094e5c34d766d8a665ac1da8251a2e836c83c";
+      sha512 = "c0c1c23f182ecbabc8eea283a28ac563814be8cc3dd27d06bc852c2cac93594aa40574e3cd56227d626430d3593a555affd033d148501054bf60c7ced2c45a53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-ES/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/es-ES/firefox-64.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "c2d1f066d5b65049961d8c9ee9e12b8f0ddad1e76f83b2a13f670c56763db4b7e06a5dc7712e457e5c08d135113a3ef97b90efa8ca377a66eb9ddd2c3515a670";
+      sha512 = "a53fdde333e885574e4998f64b3cff4c436c86683cfbb918e9d50d3b093c8278d7b509cfdbcb0db4bb1c515fc5aa90432ee0beaef4f3d6dc660f275ae218ce44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-MX/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/es-MX/firefox-64.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "fc54a4647c81fab54f6c28d59d51b9303eeec2cc7c78bb20a76f1b9fbdfcca10a51a42735a93600b390dfd5592121edb8a10bf359fcf90190c93470f5393bd6e";
+      sha512 = "91407fe8eba1299c6d0e9c2296b8f5cfd357a87064ba5507f1eb03665d7e6f98b5a23a2cde806863eaa0a23fa856b8e11010771d946e49dc5b38535881fd2029";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/et/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/et/firefox-64.0b5.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "45dc3b8b87cc6b2fbeca18a685e3e07d676af25d2d9e2987b92040b0f055bb29388fec3689e670b6764e7df0c6945f331af9555898179119f4b3c0516f0fd773";
+      sha512 = "ae9ccc474b949d47b6c7f72f7b7ebafcc9501539af7515e9cc974b89bedf868e3adf86148863ea8cd6d363596adb9a7e696ff4ce8d94b25518d89720f2812edc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/eu/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/eu/firefox-64.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "e7b955cd2b6cfb30aad321af5d0bfad7740abfc0f7935800f3fcb780d107c15976526a25cf3e1a6d567b18dd360af09362f89e87cbcc94982c3b46a93e57291c";
+      sha512 = "2884ff249b65f92c98cf9776f218ba8d0b20129cf449af7e73db7612e98f74b147145a0aa47cded112c8ba45693e99d037d127fd6dc7de452bd1ac283be79d3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fa/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/fa/firefox-64.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "d302e756531cb2cb9116d3266c4a7ddca9875c7d8e92f10d94046059805f8babc18e50d68156f4a4a9b637af4a06ef80d351a70e46781fea7eac3cecec537d34";
+      sha512 = "9d3ac6f5db153d1b22e1731fe4c73cb0eb3a2a83451832f923041ce2a531996b92af866cbe098e46561b4b755758179b6984df90c21b94ec3ec194e321135672";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ff/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ff/firefox-64.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "354f803dce5f9565c582f11357c2436b4ad2fc795ede74aea5d38c9f7a3d446876b4a71467fcabf1808fef488ad391cc3b063506cc696539c4af61aa70b00dff";
+      sha512 = "f190b04223a2ba85293239dcf375bb9cc2238b7f2ddab612502cfe6f3f040d33e83fa7f0d73b588c222d80b765cab28a8f8d4f52bf602e1421268e941a8f3c67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fi/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/fi/firefox-64.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "4f18d88beab0208a85da71d4812fdd01bb3006d9230c1dbceca2756ea0b27242ea97a76f12b3c99daa51af03b1fd3866351b0cab621a4bec369c16ee8bb87ecb";
+      sha512 = "d91ba417ca86f04dbbfd1eb4ab953ec36d4d8ecfea8e55e514e5fedc4b08b1f634b1e426d61e5a0f92665113923358019f5b8babfe24b0a1796f36cab0ac532c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/fr/firefox-64.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "04268d69d544b5bb4d5ec48b8debfd09a83f3a0faab08da16b6b1c643c1451c89e8c67c3f02a05100d21319cbc27feb09531dc87ec3a1e5cc7ed2a7ec8e77aa1";
+      sha512 = "122be20f884eaf3d5074918adf69b26486189d458a6eb57c9d3e53757bf41e5142afefd7c18d6c6a9652f417fa6d649e2c02f7eaab3aecf2831c3c145518fee2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fy-NL/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/fy-NL/firefox-64.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "76dd116eabbe4aa6c7d0b4e0dfbc45f4b057f86a06d95e56cfb9000ea38fe1d88b55d2b2fd885a88027083d930195fd8917fd20da2f54d7461dae707ddcae6bf";
+      sha512 = "fbc0870001eebcac762354d70c1645e2115b01f74792ba877b4206ea803ba33319d1625f210e19e89271291ff582e025ad732ba8e52d431e443ecec6be4f5527";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ga-IE/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ga-IE/firefox-64.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "6a9e40802e1574175fe1b062205bacdd0e3ebddd04987ff690d8991178911d74ac7d638f19857bb2180545689d8ca641f073458df7dc83311499c176b1102f7e";
+      sha512 = "c701506d4e54123e979ee202f56d55f4a7498e15b26e2240c3e95e56e30322c27fe46c52f4034220cde80f8454c4361341c7ef61a6be8041b7f917da367f6d93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gd/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/gd/firefox-64.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "58fd25bf8319cd2ca6b46ccb3f6aa8e5e9416a6cb229755f111a8e7304a806aa2aac3789bb666ab4ea2d63658eab79a50c3c11431e87f2e105ea3de584de9fcb";
+      sha512 = "89cb078ea4355a43f16049a322b13dfb6ca0e8ca469af76dbea2099bb77b0ae861f587f8b6e8ae64d3b478d22157e164ab1b38a8a3cf318abc232d747571f993";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/gl/firefox-64.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "781d7c01208190351350fa601424132eac394c6e6ba0f0a55e799b59a91d4e743dec4bae8a973e384977b76d3e064b62a2162b6b0a025b05b7635cbd424b18a2";
+      sha512 = "6f7bc8f489fcfa7405677a31819c3f37e75c663204e1e99cc09d5fbbc1e5eca95013985f6eaa2af5d749868b7d371e71e16b310c19457c02eafc830017c1172a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gn/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/gn/firefox-64.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "a3287a85a1549015c8f1c5c125bb3296da2da07505a961425ea0b5c755f6c6709c26a384109f700992f4d50746b441d4470c39dee9c78be1255f031d63dd73f1";
+      sha512 = "efdc85111d772d9440d0fc8e7a875ded44af7558c55e39e1c7feed7dec7d81947a0cd16f2b783dc53ed988acc5ee34f0649c7d73575e96ce1a86d904a1a601c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gu-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/gu-IN/firefox-64.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "033e88246db1c1f1768e032d58c8b24f30ffa541a86e1922e9cfe0cac8706da67da3951d596844f1ae6eb9d0ba8de4e6d787c1d1e918c38a0c57989c48327d48";
+      sha512 = "624196eb8805d240194358eb5c3fbee121399edde5382305aefba0c09cd1c8a9828d24b738f2ca75cfda1e19efdb021e10e8fcf6fac580c6df236eb02f033c3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/he/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/he/firefox-64.0b5.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "436cdbe1d1da1f54e3e48b5f439b73014aca425984e4ceac7834ec22754d07b3d3f1449df640cfaad75c09d658df5b209e77fe830411c0be560abe74e00b6148";
+      sha512 = "6bdab654255347b3ac854654f61388ccb9a4ca33c7b284023cea92442ecce0bce5bfb0cd9b10fee55ee874514dc0a503a55ef5316bffb00367c7ac222ef0cf04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hi-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hi-IN/firefox-64.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "f6a50c0b04f7ecaec138947a2cc6f942230482ed7f3ffe353cb4a5298f4161042aa0a99b1445ae7dffcaea1807d0705f93949748ffa8342778d8a8bba8319b48";
+      sha512 = "7a328b816bb746ed737680d99ccf5a6d1e961e6787b12eba6401b8a1b11735878839434a63a3e4bcc314ffa2722c7b42cba598f88f4b9a490a7fdd74ce1e81d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hr/firefox-64.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "bcc4d9fb87d255aab901d322ef3f05242d3899c7146a34cb36e9f7e49091ed48cf81f7a1388ffe2a3ff55465121932b9bd3fbecc9eb1a032c9dbf535b95ed236";
+      sha512 = "f2f4bda42831825281652422cd557b9d60781b0eb3056827a71a5d71636df8640f2e4a84297e711f4cb52e82a006f0db5d195f6005600a50c21efd7b82595868";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hsb/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hsb/firefox-64.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "7e3ac04497b122a18e78f144423bb7244c91cfe3cb0c1bfef98885f779d6032e1f71ac9a36eaff66889e043c8b28e51c2a47117ca573e426abe15815b3e068e9";
+      sha512 = "3abb7347382ff3b8bf4b137696e14e1524cc4a97aa1e3547178459ef48505587c98be5301cf758db1cfaba23ddd6ed095ced6e53a0896cc899aff53e9799f128";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hu/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hu/firefox-64.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "383e4442f5f78e8e5e0d4d4dcdc302d92dc8e95957393ae77eb88a93278cd68c0df61fefa1255f75bbaa53ac47fbb336dcce6aea455750b50c210b8919c24686";
+      sha512 = "1dd180859c257d0b53a48e024f9092480b821cf8a518665ab88407c3332b95699dc26ba8aad9370aa7bf9324b2ff31dd61ace472be6c753c9779410568612af4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hy-AM/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hy-AM/firefox-64.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "50e3b0c10c6b9c02e58649c29844f78c202de2de0bbbaa8ec3d7df9a802f365fa01d9ff99c3baf5ad58f64f0388ca9cbe8c49d4443f2971697e6eda10bdd054e";
+      sha512 = "075a16457c3da3b567554707f925b6705934538c6dba870d3a9557a8a729540ae4358ec21cf1e56b33f89d24c4e37315c926b48caeb99f74247f2598f5fc7ac7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ia/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ia/firefox-64.0b5.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "6b213d33cc2f66f6e40dc12aeedaf5fc2b102a810324abb0053dbef3af230b5241ac76edc0048b01b29f108bfc7c40e77f6317b0b3dcbadf6eb3cacfdb7d9709";
+      sha512 = "f27afaea7a1862620f6660446f6d633756bdfb309294532ed9a7c482f52a004e87a0aca5267174210dd34c10337b76162cf9febda409d09568ff8834a1df71ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/id/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/id/firefox-64.0b5.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "f4111d085f8fd354e8c85b6e92987bfdcd71f778282b7bfa8c6d74f59786a3f2bd7a9bcb9c358c5fc905702d94800ace03d2126c964b8cd2fd2f421713935c93";
+      sha512 = "67e16e18912fe5267a5a20490efd95e5cd3dddc3c2e6e408d274b545e091b8b40aae9dceb117bbb6ce76a7cec6325dd573f1a1fb4dfcf52032b3e7f6c5e59de0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/is/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/is/firefox-64.0b5.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "0af27d25809a5e28100d0b65b66964edda6fbb7799b7d7c5954b513d0ef58d4800965459a8740908c6b184a6c70493f8adbc8f258e9c5a1b5ae6c38c0d56d71a";
+      sha512 = "cf310a886f9195094ac5b0ad8b67efc8e56e2bdd0463f31d718a194a1b34551290e2fdc18670978309b38961f3be3ce68130b67ddea803e8463a2c9232863290";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/it/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/it/firefox-64.0b5.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "1ecf18b33ed2ea28828882a0a6a876c0489555e1f6430625a56a81f76a81be96c1b3ace5f3c4a55cf1555e9d3e0c3a0e76f680f0f08605302c9a4125401eeea5";
+      sha512 = "b02edafa763f97cfa299e0be00212c68862ba9877f62eeb175772b6ef66cfc97ebf2e0fec67e364ecbf577b560b5592b7e3a578dfa30e01e4e144a279ad7d7ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ja/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ja/firefox-64.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "1eac9b077a7f121631d4378cf00fe9c131ace2fe7eee7b864c32bda99ccd07b415401a14470cc00d466f5c280ebe430ed1d3bc46fe2130ff4d5819124855d137";
+      sha512 = "2a95d7f61f9a00a7f5118caeb30e0ff301604d144cb13e36dfc67eeb69e307477c51398d066413830fc4c3e9c0b2a504a2934d8acd1ce9ee1edf3ec5511efe61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ka/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ka/firefox-64.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "c5386dc11f5e5fa756e0b13d5e2dbcbb2dc8d99494586494932c3b6ed8ab920cf56ddc1062b18106e58a83013108851b64704756b8c3a5d9f4a04ba1fa279a4f";
+      sha512 = "33bc459e16ab626ffaeea3b8c82982d5c72fa712b6e37053a3c75470fecd3886b314d67f6473f64c3e64842c02f4907dab1b88fc665bfc42c3b55f1bed93c8ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/kab/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/kab/firefox-64.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "0c77ff888ce71d4da366f552d5e6a586e73a31eee53054b9c25663c8602c353cdbfc09f0b4a0c0b9a91b042eae5a31a8bbae0227efd5d6b1bffa200c515ff6f0";
+      sha512 = "64c7caa01480359e84e8fa2f45820afe4848186b09ccbdae837d535592c07e719136c39c62b34f14a3f9e280f1321de76d18423f2e7b8842029d36b723b1fbc3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/kk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/kk/firefox-64.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "52ce683a996853aca8d0a503b1407b88daaeee86fdff15da2f67bf0b7040768916f92eec1afcbe306ad1966e1a0f126207a5db9a0fbef2b3883c5d809cf105f1";
+      sha512 = "71a3a7ef3b709d56e0e7113be2a56431b479bf33eea3ed82dbc6988eea34d9e7089e2e26a942f1a768776cdf5f887341abdb6d08da459de70635d7850c621cf5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/km/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/km/firefox-64.0b5.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "d1055d1018ee47db02d85eaa72c1106d2d87bfa05f424b1ce01b9d59b30705835eb41a256548039728063427ddfaf7afbc82bc0b6881d1c4b594ecf03b79568f";
+      sha512 = "289314e3af8d59cbd06321e3d4ff2059809bdd3b8612d857b46ffbed9ef4130acfa6efa5c64fae362b81853502312cb2825fe7a68941d14fe80d586351e950fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/kn/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/kn/firefox-64.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "893a073304d6efbd5c1827a95f64e8b2f55987ea22c598c68f75dc4d30ba71d056270cd83cb35545994c084d6766f9fd6b02bf5c377e7aaa4f8eb14a08e3bfb2";
+      sha512 = "b1b6a68d8928535dc2108a8fc8d695f719c000800961525b7e95e26a0e17618c79595459fa3c841776bd004209272a928907b646ea09a004d2594d7786d39ec3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ko/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ko/firefox-64.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "0d17f3d3c482f434f848e91dd0e0fca1073245187ce736d6518c709ff9193f37a9c8febc3d03ae770775d3f39838d25d6ac8070cb3421c86b42a280b0c650276";
+      sha512 = "d9062cb3dcf8189359774ffabdb36244790a27e9bf17cffb7dfd35552c79c75a1e583aa054a77809e519befb4190475130a7dcc13f1fc996cce67775d204717e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/lij/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/lij/firefox-64.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "b19010fcb1f5c0bc078e662299a06a75c7a99076cd7d4100bb3c313a452e4b96ed3c795dfb46bf33182c59030c28d9f3eb75c031f0349431d559e7720da9904e";
+      sha512 = "fe22b18e8d7a2e795ebbda404980a920aff14f8262c2d8af61948ed032950b8e204fd817845b6a732a7d2cd98fb77871c4945d0dc9cd15048287b248fcb6daac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/lt/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/lt/firefox-64.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "35e3599b5264895d470c546a3a91dc416bf1707dbb6f7d4b1b1c13ce98864ab432136b768eb273edf606085e026f3de1bb7b2348c1c908a197febaee8a9d2682";
+      sha512 = "63840ea6a185ddc9764bd014e6566895639ec5cba587c77e8053b9da840be82a90deecf94661ca18bf651a20a9134f1a431b0a4d0f0cf3fa5390a8bb8ecaaacc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/lv/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/lv/firefox-64.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "b67447ee34562d2f0b6d1c6b5f5eaa10b22797acf29ac0c5d55799511db34a2d1ef24130c7a0ab7dd846cf0eabc2cf5838b21afbdf5ca0689ad012e52e97a4cd";
+      sha512 = "916feac0fef268f00917160aae79384b171581135858ea223b95d589bfec75ca7db5480a4fae9badd97dd224f2e7d973094c755c759bbf9e94dc78826729b16c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/mai/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/mai/firefox-64.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "10c8c19b45550d2c6b7129afc72988cd803308433fdeb6f97d36cafe31cdbd69989caae92f14353de6dedb56ac0b78529c8859cfe12651677213ca9fa5780ad7";
+      sha512 = "7db5b29729632bfafc1a7709965b3decc8675e5b8aed5a0d24bc60c857ef8f6a6040363a697c66bb1503e8f5cea3b3a86e039a2ac0818d4f4381a11db53730f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/mk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/mk/firefox-64.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "7da68387e0b8451dd97c8565b9728249bd05ca162bc8da52f3ba8cc7d5bff944b7da7ea2fe5a15d13a38180708a510d3f8011ece96bdcbeafbd14713953de437";
+      sha512 = "67b4fabf8237910a12d9aa23579584abd9a521259933ff4e6888176cce2cffb723298e2e7bdf6d8697f527fa3af522b4bf26e7dcd105aeebee9d3e211639dca7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ml/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ml/firefox-64.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "0fcd853afefceb8cc81f32187f8bcc81e499ffca12b33eaf5f6dacc1c4f3e1af7ade7880431da60606eb382f7ba85a6721e1f29691d77c3880fd216d8f2cf545";
+      sha512 = "2ab762d30b3552dbdc04826517d2d819e65b4e3b8f312c6167a267afa4b7724ce107e13eecf1e99faf42bf14a7a0986d8bffab3aedeca8b441f0c5141f3c283e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/mr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/mr/firefox-64.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "27ae7b43d97ae119ab383e85d95b325897542dfc207b868fad098cd98a0a61cf55020801f6a64bc72086ad685a204dc058f77bbcdc821cdb823552beecd30474";
+      sha512 = "6342afca1160a2180bc40ffa85edca960634baae4aeb219b68cceaf73e509809ae0bacfc9902727da0805f26ade9e59a4a206a70109c5a48c6807e5be3c2e59d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ms/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ms/firefox-64.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "690e5c12da34c29a39289f2c863d0f1e36da16f730c832f09d7b52fabcbb940077f906981d2ee1ce854fccba708e23badc13ccebcecf36fa72ab17c56cbc011a";
+      sha512 = "51748833b7fd69ed1e09afd3341218d190f9ec0752b74475e17c205085733cbc77f95326ec0d401f66bc83a14f40e8b9fe7f351796f83639ffb0cce86cb7f289";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/my/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/my/firefox-64.0b5.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "60bd5d1489326bc6cee765a34acce16206b111abc400677d8cc25a5000422fead636ec71f4848752713e861726ab80a53f9310b8148f834b6c2a839fcd48eb8c";
+      sha512 = "992b5e33e02eb32f08a00e7f3ee451aecf489cb55651ec9e60672e7a63cb6da6c511e08245c1f8a070bd29f40a510cebbfe9f5d869c6a7217ecf0d859cca8a67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/nb-NO/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/nb-NO/firefox-64.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "4168ce2d6dc32fb8f013a4fde2924dcf26ea7aa3c06ba40a90356715f55d2201e78a7b04295c328972070af26d2f2fac856de5b8f613f483d0ac4cbb86e9849b";
+      sha512 = "7d4a491c7c91a48bc19de9402eed14322136639a9a3c47322bc9b601d09e6c254b5a5ca674c46ce65f8fa2aeba55fe8cdb6427da84dedb14c6003fb49e060547";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ne-NP/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ne-NP/firefox-64.0b5.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "00ac6ab02669dbe2792fd8b75756b1a1436b8282fd7c0b5ff8ad4d64108b516003bfe893033e4c862c5f2071f9a580abd18b17fe9f100ab8b75d3829880d860c";
+      sha512 = "3713e66cda2fc45544da1f8224722069814d2149d83eeb6091ea4d5373ee06e5cfb1d4f8965bdf001b297a9e112c3b94a31d64afa68b0c1194d85a6f7c5ae998";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/nl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/nl/firefox-64.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "ed7299ad0b5717aa4cc1c3e615ef66bfcfa20a2c5e840b1055ca40b39643a37aef624f68c3cfcde2d3fb8ceacbfb18be771970e669dddd755a877a16bd09bbc4";
+      sha512 = "610374a1c75e8124edf7bb9564543f791018ea42d565832e1362654d3e7648db6f0b635bbe5d9acc16fab0604facbf3beb2c4c47f07ab848d0ec24832648f78b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/nn-NO/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/nn-NO/firefox-64.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "34438a89adb22ad924771fff06bd4440f7ea35d7c34bca1366104739d8fff1f1c00e5de2b4ba29004b3ef946a747a2a60787e8af2b35c20c5cef36c908a45136";
+      sha512 = "f8dd4ab9b08f5581572f8a67e8f421e0949aff84f74e7cd4455631f09d42f725ba53b2cceb883f51e5849d66d564b565da4611ed889301495bdd76eabd7bc4a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/oc/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/oc/firefox-64.0b5.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "c7aaf7265f7322d5648eeaea7a58bb6dc89f09b2b0fce5d03f3996c01792642941e6b3116f1deba5d300874a44af06a3b1eb062857ffc85f5a6d87a983cbee74";
+      sha512 = "7b30a8ed226d8944b78bf6fcc034c16a3bee70d32d8bc8282bee5f64208eee64263575da6dbcaa22f543a19b5eb53ae5e7d6c5acc213465a27630f355cef4b09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/or/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/or/firefox-64.0b5.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "d1024ae51c997c8da657a94556e130955e0a133f41ae6d81b34626646781134c9024d03f6be5ef6d53233c0fbfd00fe9fb3aba25b7aee0edf7f583a8f01a66fd";
+      sha512 = "36fca8e986e42a9507c9b7637761d8b06dcb4a79c09eed04441ad82585e893e531623b61cbd46cd37f8a6d6911d87336ca7ce8a8f758637102d8b263eacd9f65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pa-IN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/pa-IN/firefox-64.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "44b00d71bc8330cdb028cd00c8bf33957353e4f728fb7d36d27bc7685f963a047d39c2fe42d2817fc8094e00696cfdf65140324a53a7b867a11bcf4ceeebdba5";
+      sha512 = "0482145dbe53eb5550cef1d9edcfc17caa0160555e2e72203161eccb84a924bb8dfcfd0fe0433ce29f29621a54054a290d908c533b9e814e60545468f14515b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/pl/firefox-64.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "39406db62c4c94bb2f4b9a5ce594c93846aaf3110af3ed754a2b90d4f357444235686560e6bf413edb5c7c65d008d66a00c4f8d03f8477014899bc25f1c28176";
+      sha512 = "1854eefdd42fe0de827627063e0f05499b1d0d7efe2a6de3880dd25ca7a665abc45f25db34c3e27f52839bc8bd9702cae38c49c7c2e7f1aa2dc5dc35258d5c1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pt-BR/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/pt-BR/firefox-64.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "ff4b51f5213ae9f861602536db0118bea6ae7f2a7bd9ffb997e22993b09420ef3c1598f489eac28f126d3c270bbf1b7af62f30dec9b30ac93d889e887ea15fad";
+      sha512 = "c2b9a6be638e77a691f583f513800d4363921516f30f5fcaff71524e06429501d5d9a076fe77acc1bed3d51628e9dc91425667b1a754a846e56ffc1c26d3356d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pt-PT/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/pt-PT/firefox-64.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "2a90179db419253b37c1d46c65f86dfe06ff2c226daf7f1a889e9b8de705d705de18fa63966305841ecd28b81c1a5b7d39a7a7451c325e3b79f0e376fe5a0664";
+      sha512 = "d1af23df24607dbb394ca3e606b512195d049cfe73aab57f694198fc72b088dc8cdff671be218b5f2254c2427f36020a2c2ca69afd8f6fcdf5293de769de7579";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/rm/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/rm/firefox-64.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "5822fe796a8f790919ef2d7435426b75e755989ae5f99dc765ce018898fb7f3ce3ab8c26b76db8d6eca5358936748dd46c1d74073246389c9b3101f03d5f9c61";
+      sha512 = "f555ddf60b72835b34eb0628b723c8570a671f39a335c02130238922f908e013c04c54fa9edab94aaea81df4e62b38cbd9d0f487cd2eebdc32f465bf332db340";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ro/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ro/firefox-64.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "f58ddfec45aeca8af38f539e3a5dce572b3fd7347d7221b964cdc15882ee8a6d2df17d4673639c126b9b7d4db823e5f8e2c12ddd3bdb5f1ad07de37e407e738a";
+      sha512 = "8e3192d2460671337f3b790b42d5e81cd223214915e6d357a0b3054a241d08c7d0d55346f72b2a314ae724f491cf1aba72e4398a316ca576956eee684c075439";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ru/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ru/firefox-64.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "87a098da5a149af265424a6f43d8f992269c92caf2beec002077c0a0a51487ef7cfc1e766b0f4b50c3955d9a47530df51dbf7fca6983c103092e58c035a2f97d";
+      sha512 = "f9d7ef1de1d7f83102d69c1d86945389dff84bda2d956b9493e13b33e33f359d5aa058cbb162e8d636da77358da5d3ccc5a401e1eb4ba60b7f77595feb6d9405";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/si/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/si/firefox-64.0b5.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "b9f742a394ccdee8c5bd1c4e9ad9e78719a27a4296f7ce8e634e9a8d2123a6d8f36b4aba3b4a1d812740bdf19cc93d08b89623e3566543f8da392b124a53ee89";
+      sha512 = "31c792bdb9a2ac4887313108bd9c1f58dd98841842e991e682168062a6b497d91cfe5079a26e9b2cda520a8a20659320f0e1a93c29b90cb5c7d5ca47fb4e8953";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sk/firefox-64.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "1f6a53e855aaae8eba829915de95aac53fa43d5ad3058c41e099a87c233dceee3ec8f730ae0b7fd0d8c06ef6539cd7bb82890e202c6a5a13a46da3d95f3f361a";
+      sha512 = "247b35c137ef636ad44198c3be9cefc0669a35303d338c7a99eab68dd4e45ca7701c614dcf91fe7ae3aa915deae880dc32c459740ecd4d8faa91ee360794d7ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sl/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sl/firefox-64.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "08113daa78aab30e470a3b388a9756e794277aa10d5ff8b91842122b76506d2b5a72e87b32462ac84c7286723dfc997b9768eeea3395ee38db7afc9c99a66795";
+      sha512 = "46e44ffe2408ebfef01a5a09a15ec03645f1110363c9c155e8ae36e68c3859bc1caaf5ae38b55ed9d2c0931bc03dd285d07b5203693ef5aacc5089ca4cf5322b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/son/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/son/firefox-64.0b5.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "834f193d8fb2a4552bb95e8d2e6aa0e6713f2f5450f19f28a247c544cf86e7d3490b405e1355a956d33611e2d387020a16d040f127e401f57b5cefcafec054c6";
+      sha512 = "284dd43ed39ff77a1acc08e68036a61c966ff8bad1d8911eb2348b7db190b32f07e7252152d2e063045a181eb3d3951d2108646502118292cf077a45d60290e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sq/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sq/firefox-64.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "313fe1fa9118476fcc417da6191706657c4aa1c2bd8a9058c0b8a908dd99093bd340516aecc400a485abc098ef8b6af4768875bf2901ac7d7c56cd140bc023db";
+      sha512 = "fe47640bce1457f417c8c90070a608a6c480c247e172b496b6d1e614927cbd9bffebf149588db273e906dca1cb7c1c0ca3a5c61e4c91e549177902184ed27832";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sr/firefox-64.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "297b6f0c048c3c7c5754ce0be1f2e166818480b3d3c3c50f568f18e1416b7df5039b726060a11973adfd21c7fb1402dbc82599c2daa177207982e5529ce4031e";
+      sha512 = "eddde48d778a97a5a9b566badbe3e1a8affbced8b8d2c498328bf0f0692ebb878ab80f6be0b6aace380c477ccd928f84a10a0620caabe18341d4fb44b4af73f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sv-SE/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sv-SE/firefox-64.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "08855eb50d2db6753b42085fa948cc146df27404ce98b33d529066d37c7f6e74e14deaf05a654360d0e47bf78927d3a40df57b8839f0503c18ee93d71d45e971";
+      sha512 = "16afea960446a746ca9d68749b2b474eca804912f238aec81a271705b3374e06165bda0f5ff60cb48ff5533263042b97770caa58b46c01f28ec6c544c7a99cd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ta/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ta/firefox-64.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "bb8a13b790d97c321a1d8ba17e89ecba580c0a170226ee1c3a9181ede94ab9b974fd4b10f63627c4a0cea854aefa99d6288678a2d0685e39d806bc3ac4d11e69";
+      sha512 = "bdc9325d3e374a26a95ae4cdad850ee21232fe750f20caa435bf5a05aa55db84e75efc5992ba417088f2f89265b04a84dce83c8f1a7f4d4b8c37b8025ab7a601";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/te/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/te/firefox-64.0b5.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "ae66f62349163cd5a506117e6e823b75ccc55d80cb3227284d5d42a76e7b190b6057a693b98751f5ec7897afca220795e4a74711363173b92c389ca7f4132dd8";
+      sha512 = "00a0714da1b005bc731315b1a66dfd73be3b8bb17b2c02916ee2ab74d5b16ba93c37f95c79626f7bdb254dc9510786463d38264a37fd1e5ecefa01f1daf09d7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/th/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/th/firefox-64.0b5.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "4d652e220438babe1695ff144008eab854dfb529c7fdf6ac2381411dbbe3a926801d0919ceaac50ce30b5141835edebab846ffb2bd44ecb0c735a386bc49adab";
+      sha512 = "bec60214a51569fe579013169f89c428c11e8848de93187ff35405fba581b3dfe57dae7cea740a8173640295fd5f85944366c3ef607af17c396e85f26fa29860";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/tr/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/tr/firefox-64.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "65fc1a5e20e0fcf0c2440df4627e0a79600380fc8aa3638922a7ad10e6d3e0a50bd60d99ec69b4d3040fdb37869cb2141594bef5e052949ae01330166bc8b901";
+      sha512 = "ccc79057928f70cb1d499efb3acea41869d79d8cd6984735bd753f9f138a5b628be9965251b880fda3d107d511404953d954694e16cd53106a243561f2d1bc8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/uk/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/uk/firefox-64.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "38702b51bbde6c4d73c78991eff55a3228db540fd3e6f524a1bdfaa7c8092012ebb9cc7621d933dd4fa0bf054edbceca2e7b642bec8e223c8f8dc611f26257b2";
+      sha512 = "05e66edc75c37fc2cd29ce5ad307a999deabfc1efcd4ef2e9f1914efed86cbe2a9c52dbc6ca850547e3accfb70e942a5c7efe5de6753bf3641813a08576abf97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ur/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ur/firefox-64.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "ba13c463bc1b966d7b3d12f1c18eec4fbc6dc9d17a618f5b973afa116950f324c9c224f4807c36e79e5bf27428b47c886ae9c0e86ec57c8f6e48846c51ee9ecf";
+      sha512 = "51ec1522897092a2d91a748d5f684776aa8b7b1ac1cf4f84a36ab955a2ebed17959695877d65185584247c19af4d581004e707ed67d8eeccbd8f7f946173038e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/uz/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/uz/firefox-64.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "8458f27bef11639229dace0403d3750fbeccd8c7232b42aefd0aac5a9bbe8fb9541523072c6274795637210f889e9b1f86dacb94c3622e62d890a27c4b24e8d1";
+      sha512 = "51570ce758165616e6931f89384d1262622ae8788f39717a8af291b2a0cefda6e6c9d694c04c703eca545d3ad4680c1ecbc84c68e60b28c7cf741eff66e8a8a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/vi/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/vi/firefox-64.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "54dd9d15abbdf9ff1d0f48cc1a3dcf4d977e044471066d8bd1dabe953dd150b16b132a5c09378defc1dc179aebb43cd1eed8fee8130ffd1f92fb686c8d78389c";
+      sha512 = "c51b1eada1aee0e985e7eba9040a6b87b36c76e83df53b69d032c7dc3e6bebde23735a8a817a9e267606bc9528dc341ed4675158d222b3507ceec65f0152c202";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/xh/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/xh/firefox-64.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "7c52cc72839ed80704e89a0cf6b35c090c18bfe0bd5f55e5a562bf13163f2f6920cc3d4aa6bfd218c7d264d5b44bdb400570e98747592cedf0e191ad0fd00660";
+      sha512 = "36bc39b2a9fbadc5cb30d7896df384d87c3005b6bb57041c1af681ec6b66af9dcf0b17d6be4aedcfd2aa031b3813ef6d3c4345484321d11339fc3178ec93e6e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/zh-CN/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/zh-CN/firefox-64.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "9caf08219db7531732250cd1584d8c914965af4697363c722398e815e1f1fb9c666bb9983d8581b10f84cf03ea7bb215d2560bad653edf1d285a4cb9da29692c";
+      sha512 = "d55e96e8c235f74df987ab589d6921d31faf3527e1eafae75192a26b9fee79bc9d4778a1012341e4be119b314d553703b4105d2bdd2481917218fd3d530100c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/zh-TW/firefox-64.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/zh-TW/firefox-64.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "a4224c57508466f4d23248e607d53f5b06b5f498a828d7e6bf81b4aa60a74e91237c53343bcf9c6b12c33df23633d85efd4a65fb5fd8b8fd1d624a335f06e17d";
+      sha512 = "26c3ddf916c45d0f364b23bd113be300e6094d3b29d32df24543690ff53e16168a51979e8bbff262614fbe40ad6d0ddd249f64a63ed8bb03285eb5209818630e";
     }
     ];
 }
-- 
GitLab


From 46f5debb9446d20bf0b478853f34482a36beff77 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 30 Oct 2018 19:33:57 +0100
Subject: [PATCH 0712/1065] signal-desktop: 1.17.1 -> 1.17.2

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

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index f123770197f..3c2109f14c5 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.17.1";
+  version = "1.17.2";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1cvgjllnbdsr61pz6r4dkbbz58cf69k7p8wriyp1vpzkdi7k5bpl";
+    sha256 = "1ibci07w4dh7r0dkwb3nbqm470rgak2a98rlqf8390rxrinfli3p";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
-- 
GitLab


From 2634d376175d300c1c2572defe8c6d348ad61e20 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 30 Oct 2018 13:46:01 -0500
Subject: [PATCH 0713/1065] systems/examples: add i686 & x86-64 embedded

Fixes #28160
---
 lib/systems/examples.nix         | 10 ++++++++++
 lib/systems/parse.nix            |  2 ++
 pkgs/top-level/release-cross.nix |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 2bfa9700ccd..a40c3892424 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -118,6 +118,16 @@ rec {
     libc = "newlib";
   };
 
+  i686-embedded = {
+    config = "i686-elf";
+    libc = "newlib";
+  };
+
+  x86_64-embedded = {
+    config = "x86_64-elf";
+    libc = "newlib";
+  };
+
   #
   # Darwin
   #
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index a390a098c60..db97a5c4b33 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -267,6 +267,8 @@ rec {
         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   { cpu = elemAt l 0;                      kernel = elemAt l 1;                   };
     "3" = # Awkwards hacks, beware!
       if elemAt l 1 == "apple"
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 3dec10ad0db..75529726462 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -144,6 +144,8 @@ in
   arm-embedded = mapTestOnCross lib.systems.examples.arm-embedded embedded;
   powerpc-embedded = mapTestOnCross lib.systems.examples.powerpc-embedded embedded;
   aarch64-embedded = mapTestOnCross lib.systems.examples.aarch64-embedded embedded;
+  i686-embedded = mapTestOnCross lib.systems.examples.i686-embedded embedded;
+  x86_64-embedded = mapTestOnCross lib.systems.examples.x86_64-embedded embedded;
 
   /* Cross-built bootstrap tools for every supported platform */
   bootstrapTools = let
-- 
GitLab


From c34f5176f1173ac2cdaeed4512a61389d98f9d9f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 30 Oct 2018 14:20:24 -0400
Subject: [PATCH 0714/1065] haskell-lib: Factor out shell completion scripts
 helper

---
 pkgs/development/haskell-modules/lib.nix | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix          | 10 +++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 8dae7c8d72c..10edf69478b 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -407,4 +407,19 @@ rec {
 
       in
         builtins.listToAttrs (map toKeyVal haskellPaths);
+
+  # Modify a Haskell package to add completion scripts for the given executable
+  # produced by it. These completion scripts will be picked up automatically if
+  # the resulting derivation is installed, e.g. by `nix-env -i`.
+  addOptparseApplicativeCompletionScripts = exeName: pkg: overrideCabal pkg (drv: {
+    postInstall = (drv.postInstall or "") + ''
+      bashCompDir="$out/share/bash-completion/completions"
+      zshCompDir="$out/share/zsh/vendor-completions"
+      fishCompDir="$out/share/fish/vendor_completions.d"
+      mkdir -p "$bashCompDir" "$zshCompDir" "$fishCompDir"
+      "$out/bin/${exeName}" --bash-completion-script "$out/bin/${exeName}" >"$bashCompDir/${exeName}"
+      "$out/bin/${exeName}" --zsh-completion-script "$out/bin/${exeName}" >"$zshCompDir/_${exeName}"
+      "$out/bin/${exeName}" --fish-completion-script "$out/bin/${exeName}" >"$fishCompDir/${exeName}.fish"
+    '';
+  });
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2152113ae5..abd7db6263d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1001,10 +1001,10 @@ with pkgs;
 
   cue2pops = callPackage ../tools/cd-dvd/cue2pops { };
 
-  cabal2nix = haskell.lib.overrideCabal haskellPackages.cabal2nix (drv: {
+  cabal2nix = haskell.lib.overrideCabal (haskell.lib.addOptparseApplicativeCompletionScripts "cabal2nix" haskellPackages.cabal2nix) (drv: {
     isLibrary = false;
     enableSharedExecutables = false;
-    executableToolDepends = [ makeWrapper ];
+    executableToolDepends = (drv.executableToolDepends or []) ++ [ makeWrapper ];
     postInstall = ''
       exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname}
       install -D $out/bin/${drv.pname} $exe
@@ -1012,11 +1012,7 @@ with pkgs;
       makeWrapper $exe $out/bin/${drv.pname} \
         --prefix PATH ":" "${nix}/bin" \
         --prefix PATH ":" "${nix-prefetch-scripts}/bin"
-      mkdir -p $out/share/{bash-completion/completions,zsh/vendor-completions,fish/completions}
-      $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${drv.pname}
-      $exe --zsh-completion-script $exe >$out/share/zsh/vendor-completions/_${drv.pname}
-      $exe --fish-completion-script $exe >$out/share/fish/completions/${drv.pname}.fish
-    '';
+    '' + (drv.postInstall or "");
   });
 
   stack2nix = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.stack2nix) (drv: {
-- 
GitLab


From 111d4eb090cdd71b227701842dc67f3bc6dc5f44 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 23 Oct 2018 23:43:53 +0200
Subject: [PATCH 0715/1065] nixos/slurm: run ctld as user and fix spool dir

* run as user 'slurm' per default instead of root
* add user/group slurm to ids.nix
* fix default location for the state dir of slurmctld:
  (/var/spool -> /var/spool/slurmctld)
* Update release notes with the above changes
---
 nixos/doc/manual/release-notes/rl-1903.xml    | 14 +++++++
 nixos/modules/misc/ids.nix                    |  2 +
 .../services/computing/slurm/slurm.nix        | 38 +++++++++++++++++++
 3 files changed, 54 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 9c07184613e..4f3e632c377 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -152,6 +152,20 @@
      has been renamed to <varname>postgresql_9_6</varname>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      Slurm introduces the new option
+      <literal>services.slurm.stateSaveLocation</literal>,
+      which is now set to <literal>/var/spool/slurm</literal> by default
+      (instead of <literal>/var/spool</literal>).
+      Make sure to move all files to the new directory or to set the option accordingly.
+    </para>
+    <para>
+      The slurmctld now runs as user <literal>slurm</literal> instead of <literal>root</literal>.
+      If you want to keep slurmctld running as <literal>root</literal>, set
+      <literal>services.slurm.user = root</literal>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 5c30e512a1b..a32e4fe3f7c 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -331,6 +331,7 @@
       zeronet = 304;
       lirc = 305;
       lidarr = 306;
+      slurm = 307;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -622,6 +623,7 @@
       zeronet = 304;
       lirc = 305;
       lidarr = 306;
+      slurm = 307;
 
       # 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/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 09174ed39f5..9dbb6a4d0d9 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -6,9 +6,14 @@ let
 
   cfg = config.services.slurm;
   # configuration file can be generated by http://slurm.schedmd.com/configurator.html
+
+  defaultUser = "slurm";
+
   configFile = pkgs.writeTextDir "slurm.conf"
     ''
       ClusterName=${cfg.clusterName}
+      StateSaveLocation=${cfg.stateSaveLocation}
+      SlurmUser=${cfg.user}
       ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''}
       ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''}
       ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''}
@@ -159,6 +164,25 @@ in
         '';
       };
 
+      stateSaveLocation = mkOption {
+        type = types.str;
+        default = "/var/spool/slurmctld";
+        description = ''
+          Directory into which the Slurm controller, slurmctld, saves its state.
+        '';
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = defaultUser;
+        description = ''
+          Set this option when you want to run the slurmctld daemon
+          as something else than the default slurm user "slurm".
+          Note that the UID of this user needs to be the same
+          on all nodes.
+        '';
+      };
+
       extraConfig = mkOption {
         default = "";
         type = types.lines;
@@ -226,6 +250,15 @@ in
 
     services.munge.enable = mkDefault true;
 
+    # use a static uid as default to ensure it is the same on all nodes
+    users.users.slurm = mkIf (cfg.user == defaultUser) {
+      name = defaultUser;
+      group = "slurm";
+      uid = config.ids.uids.slurm;
+    };
+
+    users.groups.slurm.gid = config.ids.uids.slurm;
+
     systemd.services.slurmd = mkIf (cfg.client.enable) {
       path = with pkgs; [ wrappedSlurm coreutils ]
         ++ lib.optional cfg.enableSrunX11 slurm-spank-x11;
@@ -261,6 +294,11 @@ in
         PIDFile = "/run/slurmctld.pid";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       };
+
+      preStart = ''
+        mkdir -p ${cfg.stateSaveLocation}
+        chown -R ${cfg.user}:slurm ${cfg.stateSaveLocation}
+      '';
     };
 
   };
-- 
GitLab


From 79c9dbfb40d5123f18ed64485265d8bc19209091 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 15 Sep 2018 13:09:36 +0200
Subject: [PATCH 0716/1065] nixos/slurm: add slurmdbd to module

* New options "services.slurm.dbdserver.[enable,config]"
* Add slurmdbd to test slurm.nix
---
 .../services/computing/slurm/slurm.nix        | 55 ++++++++++++++++++-
 nixos/tests/slurm.nix                         | 51 +++++++++++++++--
 2 files changed, 99 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 9dbb6a4d0d9..77b9c40577a 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -29,12 +29,19 @@ let
       ${cfg.extraPlugstackConfig}
     '';
 
-
   cgroupConfig = pkgs.writeTextDir "cgroup.conf"
    ''
      ${cfg.extraCgroupConfig}
    '';
 
+  slurmdbdConf = pkgs.writeTextDir "slurmdbd.conf"
+   ''
+     DbdHost=${cfg.dbdserver.dbdHost}
+     SlurmUser=${cfg.user}
+     StorageType=accounting_storage/mysql
+     ${cfg.dbdserver.extraConfig}
+   '';
+
   # slurm expects some additional config files to be
   # in the same directory as slurm.conf
   etcSlurm = pkgs.symlinkJoin {
@@ -65,6 +72,27 @@ in
         };
       };
 
+      dbdserver = {
+        enable = mkEnableOption "SlurmDBD service";
+
+        dbdHost = mkOption {
+          type = types.str;
+          default = config.networking.hostName;
+          description = ''
+            Hostname of the machine where <literal>slurmdbd</literal>
+            is running (i.e. name returned by <literal>hostname -s</literal>).
+          '';
+        };
+
+        extraConfig = mkOption {
+          type = types.lines;
+          default = "";
+          description = ''
+            Extra configuration for <literal>slurmdbd.conf</literal>
+          '';
+        };
+      };
+
       client = {
         enable = mkEnableOption "slurm client daemon";
       };
@@ -208,6 +236,8 @@ in
           used when <literal>procTrackType=proctrack/cgroup</literal>.
         '';
       };
+
+
     };
 
   };
@@ -244,7 +274,10 @@ in
         '';
       };
 
-  in mkIf (cfg.enableStools || cfg.client.enable || cfg.server.enable) {
+  in mkIf ( cfg.enableStools ||
+            cfg.client.enable ||
+            cfg.server.enable ||
+            cfg.dbdserver.enable ) {
 
     environment.systemPackages = [ wrappedSlurm ];
 
@@ -301,6 +334,24 @@ in
       '';
     };
 
+    systemd.services.slurmdbd = mkIf (cfg.dbdserver.enable) {
+      path = with pkgs; [ wrappedSlurm munge coreutils ];
+
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" "munged.service" "mysql.service" ];
+      requires = [ "munged.service" "mysql.service" ];
+
+      # slurm strips the last component off the path
+      environment.SLURM_CONF = "${slurmdbdConf}/slurm.conf";
+
+      serviceConfig = {
+        Type = "forking";
+        ExecStart = "${cfg.package}/bin/slurmdbd";
+        PIDFile = "/run/slurmdbd.pid";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+      };
+    };
+
   };
 
 }
diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index 60f44c3c845..54ea1ee7894 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -1,5 +1,7 @@
 import ./make-test.nix ({ ... }:
-let mungekey = "mungeverryweakkeybuteasytointegratoinatest";
+let
+    mungekey = "mungeverryweakkeybuteasytointegratoinatest";
+
     slurmconfig = {
       controlMachine = "control";
       nodeName = ''
@@ -7,6 +9,10 @@ let mungekey = "mungeverryweakkeybuteasytointegratoinatest";
         NodeName=node[1-3] CPUs=1 State=UNKNOWN
       '';
       partitionName = "debug Nodes=node[1-3] Default=YES MaxTime=INFINITE State=UP";
+      extraConfig = ''
+        AccountingStorageHost=dbd
+        AccountingStorageType=accounting_storage/slurmdbd
+      '';
     };
 in {
   name = "slurm";
@@ -16,7 +22,7 @@ in {
     computeNode =
       { ...}:
       {
-        # TODO slrumd port and slurmctld port should be configurations and
+        # TODO slurmd port and slurmctld port should be configurations and
         # automatically allowed by the  firewall.
         networking.firewall.enable = false;
         services.slurm = {
@@ -43,6 +49,24 @@ in {
         } // slurmconfig;
       };
 
+    dbd =
+      { pkgs, ... } :
+      {
+        networking.firewall.enable = false;
+        services.slurm.dbdserver = {
+          enable = true;
+        };
+        services.mysql = {
+          enable = true;
+          package = pkgs.mysql;
+          ensureDatabases = [ "slurm_acct_db" ];
+          ensureUsers = [{
+            ensurePermissions = { "slurm_acct_db.*" = "ALL PRIVILEGES"; };
+            name = "slurm";
+          }];
+        };
+      };
+
     node1 = computeNode;
     node2 = computeNode;
     node3 = computeNode;
@@ -54,7 +78,7 @@ in {
   startAll;
 
   # Set up authentification across the cluster
-  foreach my $node (($submit,$control,$node1,$node2,$node3))
+  foreach my $node (($submit,$control,$dbd,$node1,$node2,$node3))
   {
     $node->waitForUnit("default.target");
 
@@ -63,10 +87,22 @@ in {
     $node->succeed("chmod 0400 /etc/munge/munge.key");
     $node->succeed("chown munge:munge /etc/munge/munge.key");
     $node->succeed("systemctl restart munged");
-  }
+
+    $node->waitForUnit("munged");
+  };
 
   # Restart the services since they have probably failed due to the munge init
   # failure
+  subtest "can_start_slurmdbd", sub {
+    $dbd->succeed("systemctl restart slurmdbd");
+    $dbd->waitForUnit("slurmdbd.service");
+  };
+
+  # there needs to be an entry for the current
+  # cluster in the database before slurmctld is restarted
+  subtest "add_account", sub {
+    $control->succeed("sacctmgr -i add cluster default");
+  };
 
   subtest "can_start_slurmctld", sub {
     $control->succeed("systemctl restart slurmctld");
@@ -81,12 +117,17 @@ in {
     }
   };
 
-  # Test that the cluster work and can distribute jobs;
+  # Test that the cluster works and can distribute jobs;
 
   subtest "run_distributed_command", sub {
     # Run `hostname` on 3 nodes of the partition (so on all the 3 nodes).
     # The output must contain the 3 different names
     $submit->succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq");
   };
+
+  subtest "check_slurm_dbd", sub {
+    # find the srun job from above in the database
+    $submit->succeed("sacct | grep hostname");
+  };
   '';
 })
-- 
GitLab


From f51f7534163ec0159c195657dddd5c10443c54a4 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 24 Oct 2018 00:08:39 +0200
Subject: [PATCH 0717/1065] nixos/slurm: fix obselete string type

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

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 77b9c40577a..d9a201dc7ed 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -183,7 +183,7 @@ in
       };
 
       procTrackType = mkOption {
-        type = types.string;
+        type = types.str;
         default = "proctrack/linuxproc";
         description = ''
           Plugin to be used for process tracking on a job step basis.
-- 
GitLab


From d2799d1835fdfc68e2b621beff1fa951f055ae39 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 20:34:17 +0200
Subject: [PATCH 0718/1065] nixos/slurm: node/partitionName option -> list

Make the node and partitionname options lists.
There can be more than paratition or set of nodes.

Add changes to release notes
---
 nixos/doc/manual/release-notes/rl-1903.xml       |  6 ++++++
 nixos/modules/services/computing/slurm/slurm.nix | 16 ++++++++--------
 nixos/tests/slurm.nix                            |  7 ++-----
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 4f3e632c377..1d9b6ecc0e2 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -165,6 +165,12 @@
       If you want to keep slurmctld running as <literal>root</literal>, set
       <literal>services.slurm.user = root</literal>.
     </para>
+    <para>
+      The options <literal>services.slurm.nodeName</literal> and
+      <literal>services.slurm.partitionName</literal> are now sets of
+      strings to correctly reflect that fact that each of these
+      options can occour more than once in the configuration.
+    </para>
    </listitem>
   </itemizedlist>
  </section>
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index d9a201dc7ed..a3f2367dba4 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -16,8 +16,8 @@ let
       SlurmUser=${cfg.user}
       ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''}
       ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''}
-      ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''}
-      ${optionalString (cfg.partitionName != null) ''partitionName=${cfg.partitionName}''}
+      ${toString (map (x: "NodeName=${x}\n") cfg.nodeName)}
+      ${toString (map (x: "PartitionName=${x}\n") cfg.partitionName)}
       PlugStackConfig=${plugStackConfig}
       ProctrackType=${cfg.procTrackType}
       ${cfg.extraConfig}
@@ -149,9 +149,9 @@ in
       };
 
       nodeName = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        example = "linux[1-32] CPUs=1 State=UNKNOWN";
+        type = types.listOf types.str;
+        default = [];
+        example = literalExample ''[ "linux[1-32] CPUs=1 State=UNKNOWN" ];'';
         description = ''
           Name that SLURM uses to refer to a node (or base partition for BlueGene
           systems). Typically this would be the string that "/bin/hostname -s"
@@ -160,9 +160,9 @@ in
       };
 
       partitionName = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        example = "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP";
+        type = types.listOf types.str;
+        default = [];
+        example = literalExample ''[ "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP" ];'';
         description = ''
           Name by which the partition may be referenced. Note that now you have
           to write the partition's parameters after the name.
diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index 54ea1ee7894..6937a5f0991 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -4,11 +4,8 @@ let
 
     slurmconfig = {
       controlMachine = "control";
-      nodeName = ''
-        control
-        NodeName=node[1-3] CPUs=1 State=UNKNOWN
-      '';
-      partitionName = "debug Nodes=node[1-3] Default=YES MaxTime=INFINITE State=UP";
+      nodeName = [ "node[1-3] CPUs=1 State=UNKNOWN" ];
+      partitionName = [ "debug Nodes=node[1-3] Default=YES MaxTime=INFINITE State=UP" ];
       extraConfig = ''
         AccountingStorageHost=dbd
         AccountingStorageType=accounting_storage/slurmdbd
-- 
GitLab


From b388beeca3a3a2dd79ba2f2737deb294d4d4748b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Oct 2018 21:03:23 +0200
Subject: [PATCH 0719/1065] nixos/slurm: add maintainer to module and test

---
 nixos/modules/services/computing/slurm/slurm.nix | 2 ++
 nixos/tests/slurm.nix                            | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index a3f2367dba4..cd481212db2 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -55,6 +55,8 @@ in
 
   ###### interface
 
+  meta.maintainers = [ maintainers.markuskowa ];
+
   options = {
 
     services.slurm = {
diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index 6937a5f0991..7f9c266cbff 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ ... }:
+import ./make-test.nix ({ lib, ... }:
 let
     mungekey = "mungeverryweakkeybuteasytointegratoinatest";
 
@@ -14,6 +14,8 @@ let
 in {
   name = "slurm";
 
+  meta.maintainers = [ lib.maintainers.markuskowa ];
+
   nodes =
     let
     computeNode =
-- 
GitLab


From d48cef7d5b8516368b15b4430c473cb63549f20f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Th=C3=B6rne?= <notrupertthorne@gmail.com>
Date: Tue, 30 Oct 2018 20:15:33 +0100
Subject: [PATCH 0720/1065] cppclean: init at 2018-05-12 (#49264)

* cppclean: init at 2018-05-12

* Updated according to review comments
---
 pkgs/development/tools/cppclean/default.nix | 31 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/tools/cppclean/default.nix

diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/development/tools/cppclean/default.nix
new file mode 100644
index 00000000000..96fe07a7799
--- /dev/null
+++ b/pkgs/development/tools/cppclean/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, python3Packages }:
+
+with python3Packages;
+
+buildPythonApplication rec {
+  name = "cppclean-unstable-${version}";
+  version = "2018-05-12";
+
+  src = fetchFromGitHub {
+    owner  = "myint";
+    repo   = "cppclean";
+    rev    = "e7da41eca5e1fd2bd1dddd6655e50128bb96dc28";
+    sha256 = "0pymh6r7y19bwcypfkmgwyixrx36pmz338jd83yrjflsbjlriqm4";
+  };
+
+  postUnpack = ''
+    patchShebangs .
+    '';
+
+  checkPhase = ''
+    ./test.bash
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Finds problems in C++ source that slow development of large code bases";
+    homepage    = https://github.com/myint/cppclean;
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ nthorne ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5689301d8be..3f7b6a3ba5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1179,6 +1179,8 @@ with pkgs;
 
   coursier = callPackage ../development/tools/coursier {};
 
+  cppclean = callPackage ../development/tools/cppclean {};
+
   cri-tools = callPackage ../tools/virtualization/cri-tools {};
 
   crip = callPackage ../applications/audio/crip { };
-- 
GitLab


From fe30cce533f38ff44af8f884a4594cc3155d96d4 Mon Sep 17 00:00:00 2001
From: Carlos Morera de la Chica <carlos@codurance.com>
Date: Tue, 30 Oct 2018 19:33:42 +0000
Subject: [PATCH 0721/1065] beancount: fix build

pytest is now a runtime dependency
---
 .../development/python-modules/beancount/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix
index 1a005d9e42d..e023c721b0e 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy3k
 , beautifulsoup4, bottle, chardet, dateutil
 , google_api_python_client, lxml, ply, python_magic
-, nose, requests }:
+, pytest, requests }:
 
 buildPythonPackage rec {
   version = "2.1.3";
@@ -14,13 +14,8 @@ buildPythonPackage rec {
     sha256 = "4b7b0d3633c82ca88d3cb3d31ad2fd2e45a42401cfa94eaa1cb938ffece34f22";
   };
 
-  checkInputs = [ nose ];
-
-  # Automatic tests cannot be run because it needs to import some local modules for tests.
+  # No tests in archive
   doCheck = false;
-  checkPhase = ''
-    nosetests
-  '';
 
   propagatedBuildInputs = [
     beautifulsoup4
@@ -32,6 +27,9 @@ buildPythonPackage rec {
     ply
     python_magic
     requests
+    # pytest really is a runtime dependency
+    # https://bitbucket.org/blais/beancount/commits/554e13057551951e113835196770847c788dd592
+    pytest
   ];
 
   meta = {
-- 
GitLab


From baf070301096f5c6c1765d7e14c05032c4f27df9 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 4 Oct 2018 21:51:46 -0400
Subject: [PATCH 0722/1065] pythonPackages.pythondaemon: rename to
 pythonPackages.python-daemon

This commit renames the pythondaemon module to match its module name, github
name, and pypi name, which makes it easier to find and reference. In order to
avoid breaking any external users, I've left an alias with a deprecated warning.
---
 doc/languages-frameworks/python.section.md              | 2 +-
 pkgs/applications/networking/cluster/luigi/default.nix  | 2 +-
 pkgs/development/python-modules/coilmq/default.nix      | 4 ++--
 pkgs/development/python-modules/libagent/default.nix    | 4 ++--
 pkgs/development/python-modules/salmon-mail/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix                      | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index b52b79c62d9..e6c8ab37d68 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -670,7 +670,7 @@ python3Packages.buildPythonApplication rec {
     sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x";
   };
 
-  propagatedBuildInputs = with python3Packages; [ tornado_4 pythondaemon ];
+  propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ];
 
   meta = with lib; {
     ...
diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix
index ced7b9882b9..35721208a6e 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 pythondaemon ];
+  propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ];
 
   # Requires tox, hadoop, and google cloud
   doCheck = false;
diff --git a/pkgs/development/python-modules/coilmq/default.nix b/pkgs/development/python-modules/coilmq/default.nix
index 11d39e411ce..90eb1edc2cd 100644
--- a/pkgs/development/python-modules/coilmq/default.nix
+++ b/pkgs/development/python-modules/coilmq/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, stompclient, pythondaemon, redis, pid, pytest, six, click, coverage
+, stompclient, python-daemon, redis, pid, pytest, six, click, coverage
 , sqlalchemy }:
 
 buildPythonPackage rec {
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "4cbfeb5ed2459df14902c1380157be6267702b1271682924cd316ccad8a29d1d";
   };
 
-  propagatedBuildInputs = [ stompclient pythondaemon redis pid ];
+  propagatedBuildInputs = [ stompclient python-daemon redis pid ];
   buildInputs = [ pytest six click coverage sqlalchemy ];
 
   # The teste data is not included in the distribution
diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index f70d538bb8d..f9395886040 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa , semver, mnemonic,
   unidecode, mock, pytest , backports-shutil-which, ConfigArgParse,
-  pythondaemon, pymsgbox }:
+  python-daemon, pymsgbox }:
 
 buildPythonPackage rec {
   pname = "libagent";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse
-    pythondaemon pymsgbox ecdsa ed25519 mnemonic semver ];
+    python-daemon pymsgbox ecdsa ed25519 mnemonic semver ];
 
   checkInputs = [ mock pytest ];
 
diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix
index b278d26b5dd..9486899c606 100644
--- a/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi, nose, dnspython
-,  chardet, lmtpd, pythondaemon, six, jinja2, mock }:
+,  chardet, lmtpd, python-daemon, six, jinja2, mock }:
 
 buildPythonPackage rec {
   pname = "salmon-mail";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ nose jinja2 mock ];
-  propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ];
+  propagatedBuildInputs = [ chardet dnspython lmtpd python-daemon six ];
 
   # The tests use salmon executable installed by salmon itself so we need to add
   # that to PATH
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b2cff4940c1..d5cc2785171 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6554,7 +6554,7 @@ in {
       };
     in if isPy3k then py3 else py2;
 
-  pythondaemon = callPackage ../development/python-modules/python-daemon { };
+  python-daemon = callPackage ../development/python-modules/python-daemon { };
 
   sympy = callPackage ../development/python-modules/sympy { };
 
-- 
GitLab


From c3a1c0008baf467886806cd00430de7a9fe89d06 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 24 Oct 2018 02:12:51 -0700
Subject: [PATCH 0723/1065] python36Packages.nbxmpp: 0.6.6 -> 0.6.8

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

diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index 696796740f8..888e1de6aa5 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "nbxmpp";
-  version = "0.6.6";
+  version = "0.6.8";
   name = "${pname}-${version}";
 in buildPythonPackage rec {
   inherit pname version;
@@ -11,7 +11,7 @@ in buildPythonPackage rec {
     name = "${name}.tar.bz2";
     url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?"
         + "ref=${name}";
-    sha256 = "10n7z613p00q15dplsvdrz11s9yq26jy2qack6nd8k7fivfhlcmz";
+    sha256 = "09zrqz01j45kvayfscd66avkrnn237lbjg9li5hjhyw92h6hkkc4";
   };
 
   propagatedBuildInputs = [ pyopenssl ];
-- 
GitLab


From 3f051869844cb24c980a3c495b7886159ff28ce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur+signed@gmail.com>
Date: Tue, 30 Oct 2018 21:22:43 +0100
Subject: [PATCH 0724/1065] Compare to `None` using identity `is` operator

This is a trivial change that replaces `==` operator with `is` operator, following PEP 8 guideline:

> Comparisons to singletons like None should always be done with is or is not, never the equality operators.

https://legacy.python.org/dev/peps/pep-0008/#programming-recommendations
---
 .../templaterpm/nix-template-rpm.py           | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/pkgs/build-support/templaterpm/nix-template-rpm.py b/pkgs/build-support/templaterpm/nix-template-rpm.py
index ec3a619027e..f39595f8977 100755
--- a/pkgs/build-support/templaterpm/nix-template-rpm.py
+++ b/pkgs/build-support/templaterpm/nix-template-rpm.py
@@ -44,14 +44,14 @@ class SPECTemplate(object):
     self.key = self.getSelfKey()
 
     tmpDir = os.path.join(outputDir, self.rewriteName(self.spec.sourceHeader['name']))
-    if self.translateTable != None:
+    if self.translateTable is not None:
       self.relOutputDir = self.translateTable.path(self.key,tmpDir)
     else:
       self.relOutputDir = tmpDir
 
     self.final_output_dir = os.path.normpath( self.relOutputDir )
 
-    if self.repositoryDir != None:
+    if self.repositoryDir is not None:
       self.potential_repository_dir = os.path.normpath( os.path.join(self.repositoryDir,self.relOutputDir) )
 
 
@@ -59,7 +59,7 @@ class SPECTemplate(object):
   def rewriteCommands(self, string):
     string = string.replace('SPACER_DIR_FOR_REMOVAL/','')
     string = string.replace('SPACER_DIR_FOR_REMOVAL','')
-    string = '\n'.join(map(lambda line: ' '.join(map(lambda x: x.replace('SOURCE_DIR_SPACER/',('${./' if (self.buildRootInclude == None) else '${buildRoot}/usr/share/buildroot/SOURCES/'))+('}' if (self.buildRootInclude == None) else '') if x.startswith('SOURCE_DIR_SPACER/') else x, line.split(' '))), string.split('\n')))
+    string = '\n'.join(map(lambda line: ' '.join(map(lambda x: x.replace('SOURCE_DIR_SPACER/',('${./' if (self.buildRootInclude is None) else '${buildRoot}/usr/share/buildroot/SOURCES/'))+('}' if (self.buildRootInclude is None) else '') if x.startswith('SOURCE_DIR_SPACER/') else x, line.split(' '))), string.split('\n')))
     string = string.replace('\n','\n    ')
     string = string.rstrip()
     return string
@@ -82,7 +82,7 @@ class SPECTemplate(object):
     rewrite = lambda l: ''.join(camelcase(filterDoc(filterDevel(l))))
 
     def filterPackageGroup(target):
-      if target == None:
+      if target is None:
         return [ rewrite(x.split('-')) for x in inputs if (not x.split('-')[0] in self.packageGroups) or (len(x.split('-')) == 1) ]
       elif target in self.packageGroups:
         return [ target + '_' + rewrite(x.split('-')[1:]) for x in inputs if (x.split('-')[0] == target) and (len(x.split('-')) > 1)]
@@ -90,7 +90,7 @@ class SPECTemplate(object):
         raise Exception("Unknown target")
         return []
 
-    if target == None:
+    if target is None:
       packages = filterPackageGroup(None)
       packages.sort()
     elif target in self.packageGroups:
@@ -111,7 +111,7 @@ class SPECTemplate(object):
 
   def getBuildInputs(self,target=None):
     inputs = self.rewriteInputs(target,self.spec.sourceHeader['requires'])
-    if self.translateTable != None:
+    if self.translateTable is not None:
       return map(lambda x: self.translateTable.name(x), inputs)
     else:
       return inputs
@@ -125,7 +125,7 @@ class SPECTemplate(object):
     return key
 
   def getSelf(self):
-    if self.translateTable != None:
+    if self.translateTable is not None:
       return self.translateTable.name(self.key)
     else:
       return self.key
@@ -161,7 +161,7 @@ class SPECTemplate(object):
       facts["sha256"].append(sha256)
 
     patches = [source for (source, _, flag) in self.spec.sources if flag==2]
-    if self.buildRootInclude == None:
+    if self.buildRootInclude is None:
       facts["patches"] = map(lambda x: './'+x, patches)
     else:
       facts["patches"] = map(lambda x: '"${buildRoot}/usr/share/buildroot/SOURCES/'+x+'"', reversed(patches))
@@ -292,7 +292,7 @@ class SPECTemplate(object):
     if not os.path.exists(self.final_output_dir):
       os.makedirs(self.final_output_dir)
 
-    if self.inputDir != None:
+    if self.inputDir is not None:
       self.copySources(self.inputDir, self.final_output_dir)
       self.copyPatches(self.inputDir, self.final_output_dir)
 
@@ -334,19 +334,19 @@ class NixTemplate(object):
           url = re.match(r'^\s*url\s*=\s*"?(.*?)"?\s*;\s*$', line)
           sha256 = re.match(r'^\s*sha256\s*=\s*"(.*?)"\s*;\s*$', line)
           patches = re.match(r'^\s*patches\s*=\s*(\[.*?\])\s*;\s*$', line)
-          if name != None and self.original["name"] == None:
+          if name is not None and self.original["name"] is None:
               self.original["name"] = name.group(1)
               self.matchedLines[n] = "name"
-          if version != None and self.original["version"] == None:
+          if version is not None and self.original["version"] is None:
               self.original["version"] = version.group(1)
               self.matchedLines[n] = "version"
-          if url != None and self.original["url"] == None:
+          if url is not None and self.original["url"] is None:
               self.original["url"] = url.group(1)
               self.matchedLines[n] = "url"
-          if sha256 != None and self.original["sha256"] == None:
+          if sha256 is not None and self.original["sha256"] is None:
               self.original["sha256"] = sha256.group(1)
               self.matchedLines[n] = "sha256"
-          if patches != None and self.original["patches"] == None:
+          if patches is not None and self.original["patches"] is None:
               self.original["patches"] = patches.group(1)
               self.matchedLines[n] = "patches"
 
@@ -355,7 +355,7 @@ class NixTemplate(object):
     nixTemplateFile = open(os.path.normpath(self.nixfile),'r')
     nixOutFile = open(os.path.normpath(nixOut),'w')
     for (n,line) in enumerate(nixTemplateFile):
-      if self.matchedLines.has_key(n) and self.update[self.matchedLines[n]] != None:
+      if self.matchedLines.has_key(n) and self.update[self.matchedLines[n]] is not None:
         nixOutFile.write(line.replace(self.original[self.matchedLines[n]], self.update[self.matchedLines[n]], 1))
       else:
         nixOutFile.write(line)
@@ -383,14 +383,14 @@ class TranslationTable(object):
 
   def update(self, key, path, name=None):
     self.tablePath[key] = path
-    if name != None:
+    if name is not None:
       self.tableName[key] = name
 
   def readTable(self, tableFile):
     with file(tableFile, 'r') as infile:
       for line in infile:
         match = re.match(r'^(.+?)\s+(.+?)\s+(.+?)\s*$', line)
-        if match != None:
+        if match is not None:
           if not self.tablePath.has_key(match.group(1)):
             self.tablePath[match.group(1)] = match.group(2)
           if not self.tableName.has_key(match.group(1)):
@@ -449,7 +449,7 @@ if __name__ == "__main__":
     nameMap = {}
 
     newTable = TranslationTable()
-    if args.translate != None:
+    if args.translate is not None:
       table = TranslationTable()
       table.readTable(args.translate)
       newTable.readTable(args.translate)
@@ -461,7 +461,7 @@ if __name__ == "__main__":
         sys.stderr.write("INFO: generate nix file from: %s\n" % specPath)
 
         spec = SPECTemplate(specPath, args.output, args.inputSources, args.buildRoot, table, args.repository, allPackagesDir, args.maintainer)
-        if args.repository != None:
+        if args.repository is not None:
           if os.path.exists(os.path.join(spec.potential_repository_dir,'default.nix')):
             nixTemplate = NixTemplate(os.path.join(spec.potential_repository_dir,'default.nix'))
             nixTemplate.loadUpdate(spec.facts)
@@ -470,12 +470,12 @@ if __name__ == "__main__":
             nixTemplate.generateUpdated(os.path.join(spec.final_output_dir,'default.nix'))
           else:
             sys.stderr.write("WARNING: Repository does not contain template: %s\n" % os.path.join(spec.potential_repository_dir,'default.nix'))
-            if args.buildRoot == None:
+            if args.buildRoot is None:
               spec.generateCombined()
             else:
               buildRootContent[spec.key] = spec.generateSplit()
         else:
-          if args.buildRoot == None:
+          if args.buildRoot is None:
             spec.generateCombined()
           else:
             buildRootContent[spec.key] = spec.generateSplit()
@@ -486,7 +486,7 @@ if __name__ == "__main__":
       except Exception, e:
         sys.stderr.write("ERROR: %s failed with:\n%s\n%s\n" % (specPath,e.message,traceback.format_exc()))
 
-    if args.translateOut != None:
+    if args.translateOut is not None:
       if not os.path.exists(os.path.dirname(os.path.normpath(args.translateOut))):
         os.makedirs(os.path.dirname(os.path.normpath(args.translateOut)))
       newTable.writeTable(args.translateOut)
@@ -502,7 +502,7 @@ if __name__ == "__main__":
     allPackagesFile.write( '\n\n'.join(map(lambda x: x.callPackage(), map(lambda x: nameMap[x], sortedSpecs))) )
     allPackagesFile.close()
 
-    if args.buildRoot != None:
+    if args.buildRoot is not None:
       buildRootFilename = os.path.normpath( args.buildRoot )
       if not os.path.exists(os.path.dirname(buildRootFilename)):
         os.makedirs(os.path.dirname(buildRootFilename))
-- 
GitLab


From 0a24919923ca4d2a6fc995aa06c3c4ee27b2b318 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 4 Oct 2018 16:08:05 +0000
Subject: [PATCH 0725/1065] ocamlPackages_latest.ocaml: 4.07.0 -> 4.07.1

---
 pkgs/development/compilers/ocaml/4.07.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix
index 19b9626f4e8..c1952f30ba6 100644
--- a/pkgs/development/compilers/ocaml/4.07.nix
+++ b/pkgs/development/compilers/ocaml/4.07.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "07";
-  patch_version = "0";
-  sha256 = "03wzkzv6w4rdiiva20g5amz0n4x75swpjl8d80468p6zm8hgfnzl";
+  patch_version = "1";
+  sha256 = "1f07hgj5k45cylj1q3k5mk8yi02cwzx849b1fwnwia8xlcfqpr6z";
 
   # If the executable is stripped it does not work
   dontStrip = true;
-- 
GitLab


From 29080af27f67e461ab589b4358bce6e346968352 Mon Sep 17 00:00:00 2001
From: Ales Huzik <me@aguzik.net>
Date: Wed, 24 Oct 2018 16:53:53 +1100
Subject: [PATCH 0726/1065] perlPackages.Po4a: fix install paths

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c68e15aeb96..37464458791 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12482,7 +12482,8 @@ let
       export PERL_MB_OPT="--install_base=$out --prefix=$out"
       substituteInPlace Po4aBuilder.pm --replace "\$self->install_sets(\$self->installdirs)->{'bindoc'}" "'$out/share/man/man1'"
     '';
-    buildPhase = "perl Build.PL --install_base=$out; ./Build build";
+
+    buildPhase = "perl Build.PL --install_base=$out --install_path=\"lib=$out/${perl.libPrefix}\"; ./Build build";
     installPhase = "./Build install";
     checkPhase = ''
       export SGML_CATALOG_FILES=${pkgs.docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat
-- 
GitLab


From 6d34e36ed7a95cce877bd9ee51e6119bf098a413 Mon Sep 17 00:00:00 2001
From: Ales Huzik <me@aguzik.net>
Date: Wed, 24 Oct 2018 16:54:18 +1100
Subject: [PATCH 0727/1065] modem-manager-gui: init at 0.0.19.1

---
 maintainers/maintainer-list.nix               |  5 ++
 .../networking/modem-manager-gui/default.nix  | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 57 insertions(+)
 create mode 100644 pkgs/applications/networking/modem-manager-gui/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a9116f41176..62c62ac5123 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -143,6 +143,11 @@
     github = "ahmedtd";
     name = "Taahir Ahmed";
   };
+  ahuzik = {
+    email = "ales.guzik@gmail.com";
+    github = "alesguzik";
+    name = "Ales Huzik";
+  };
   aij = {
     email = "aij+git@mrph.org";
     github = "aij";
diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix
new file mode 100644
index 00000000000..ca8a4d0fb0c
--- /dev/null
+++ b/pkgs/applications/networking/modem-manager-gui/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, buildEnv, pkgconfig, python3, fetchhg, gtk3, glib, gdbm, gtkspell3, itstool, libappindicator-gtk3, perlPackages, glibcLocales, meson, ninja }:
+
+stdenv.mkDerivation rec {
+  name = "modem-manager-gui-${version}";
+  version = "0.0.19.1";
+
+  src = fetchhg {
+    url = https://linuxonly@bitbucket.org/linuxonly/modem-manager-gui;
+    rev = "version ${version}";
+    sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd";
+  };
+
+  LC_ALL = "en_US.utf-8";
+
+  nativeBuildInputs = [
+    pkgconfig
+    python3
+    perlPackages.Po4a
+    itstool
+    glibcLocales
+    meson
+    ninja
+  ];
+
+  buildInputs = [
+    gtk3
+    glib
+    gdbm
+    gtkspell3
+    libappindicator-gtk3
+  ];
+
+  postPatch = ''
+    patchShebangs man/manhelper.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An app to send/receive SMS, make USSD requests, control mobile data usage and more";
+    longDescription = ''
+      A simple GTK+ based GUI compatible with Modem manager, Wader and oFono
+      system services able to control EDGE/3G/4G broadband modem specific
+      functions. You can check balance of your SIM card, send or receive SMS
+      messages, control mobile traffic consumption and more.
+    '';
+    homepage = https://linuxonly.ru/page/modem-manager-gui;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ahuzik ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a32f95b1a1..68ce5082521 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4154,6 +4154,8 @@ with pkgs;
 
   modemmanager = callPackage ../tools/networking/modem-manager {};
 
+  modem-manager-gui = callPackage ../applications/networking/modem-manager-gui {};
+
   modsecurity_standalone = callPackage ../tools/security/modsecurity { };
 
   molly-guard = callPackage ../os-specific/linux/molly-guard { };
-- 
GitLab


From f8ef8bf469464391fdf1cd041287fd32d8a210ac Mon Sep 17 00:00:00 2001
From: Edmund Wu <22758444+eadwu@users.noreply.github.com>
Date: Tue, 30 Oct 2018 17:18:05 -0400
Subject: [PATCH 0728/1065] vscode-extensions.ms-vscode.cpptools: use mono 5
 (#49489)

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

diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index 55e126d64a5..539d03d66fe 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript
+{ stdenv, fetchzip, vscode-utils, jq, mono, clang-tools, writeScript
 , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise.
 }:
 
@@ -59,7 +59,7 @@ let
           export PATH=''${PATH}''${PATH:+:}${gdb}/bin
         ''
         else ""}
-    ${mono46}/bin/mono $BIN_DIR/bin/OpenDebugAD7.exe $*
+    ${mono}/bin/mono $BIN_DIR/bin/OpenDebugAD7.exe $*
   '';
 in
 
-- 
GitLab


From 1b4e3103bf5c2f298e72ea19a541c513071c123b Mon Sep 17 00:00:00 2001
From: Eric Wolf <ericwolf42@gmail.com>
Date: Tue, 30 Oct 2018 22:18:59 +0100
Subject: [PATCH 0729/1065] nixos/ddclient: fix #49258

---
 nixos/modules/rename.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index eb74b9bcac1..aa2b5c0b2df 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -28,7 +28,10 @@ with lib;
       (config:
         let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config;
         in if enabled then [ pkgs.gutenprint ] else [ ]))
-    (mkRenamedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ])
+    (mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]
+      (config:
+        let value = getAttrFromPath [ "services" "ddclient" "domain" ] config;
+        in if value != "" then [ value ] else []))
     (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "")
     (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])
-- 
GitLab


From 4c8a198f12ed3131615e725c59349b04b8ed18a3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 30 Oct 2018 22:26:43 +0100
Subject: [PATCH 0730/1065] tests/docs: remove remnants of old allowPing
 default (#49198)

This has been defaulting to true since 16.03, we don't need this code
anymore, also the note in the documentation has been obsolete for quite
a while.
---
 nixos/doc/manual/configuration/firewall.xml   | 9 ---------
 nixos/tests/ceph.nix                          | 7 +++----
 nixos/tests/cjdns.nix                         | 3 ---
 nixos/tests/containers-bridge.nix             | 1 -
 nixos/tests/containers-extra_veth.nix         | 1 -
 nixos/tests/containers-ipv4.nix               | 1 -
 nixos/tests/containers-ipv6.nix               | 1 -
 nixos/tests/containers-portforward.nix        | 1 -
 nixos/tests/containers-restart_networking.nix | 1 -
 nixos/tests/nat.nix                           | 2 --
 nixos/tests/networking.nix                    | 9 ---------
 nixos/tests/quagga.nix                        | 1 -
 12 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml
index b66adcedce6..47a19ac82c0 100644
--- a/nixos/doc/manual/configuration/firewall.xml
+++ b/nixos/doc/manual/configuration/firewall.xml
@@ -34,13 +34,4 @@
   Similarly, UDP port ranges can be opened through
   <xref linkend="opt-networking.firewall.allowedUDPPortRanges"/>.
  </para>
-
- <para>
-  Also of interest is
-<programlisting>
-<xref linkend="opt-networking.firewall.allowPing"/> = true;
-</programlisting>
-  to allow the machine to respond to ping requests. (ICMPv6 pings are always
-  allowed.)
- </para>
 </section>
diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix
index dd45f0157b0..7408029c460 100644
--- a/nixos/tests/ceph.nix
+++ b/nixos/tests/ceph.nix
@@ -10,9 +10,8 @@ import ./make-test.nix ({pkgs, ...}: rec {
         emptyDiskImages = [ 20480 20480 ];
         vlans = [ 1 ];
       };
-      
+
       networking = {
-        firewall.allowPing = true;
         useDHCP = false;
         interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
           { address = "192.168.1.1"; prefixLength = 24; }
@@ -54,7 +53,7 @@ import ./make-test.nix ({pkgs, ...}: rec {
       };
     };
   };
-  
+
   testScript = { ... }: ''
     startAll;
 
@@ -83,7 +82,7 @@ import ./make-test.nix ({pkgs, ...}: rec {
 
     # Can't check ceph status until a mon is up
     $aio->succeed("ceph -s | grep 'mon: 1 daemons'");
-          
+
     # Start the ceph-mgr daemon, it has no deps and hardly any setup
     $aio->mustSucceed(
       "ceph auth get-or-create mgr.aio mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-aio/keyring",
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index ab5f8e0bcf3..e03bb988254 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -13,9 +13,6 @@ let
 
       # CJDNS output is incompatible with the XML log.
       systemd.services.cjdns.serviceConfig.StandardOutput = "null";
-      #networking.firewall.enable = true;
-      networking.firewall.allowPing = true;
-      #networking.firewall.rejectPackets = true;
     };
 
 in
diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix
index bd8bd5dee9c..777cf9a7e7f 100644
--- a/nixos/tests/containers-bridge.nix
+++ b/nixos/tests/containers-bridge.nix
@@ -42,7 +42,6 @@ import ./make-test.nix ({ pkgs, ...} : {
             { services.httpd.enable = true;
               services.httpd.adminAddr = "foo@example.org";
               networking.firewall.allowedTCPPorts = [ 80 ];
-              networking.firewall.allowPing = true;
             };
         };
 
diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix
index 8f874b3585d..b4c48afe48b 100644
--- a/nixos/tests/containers-extra_veth.nix
+++ b/nixos/tests/containers-extra_veth.nix
@@ -43,7 +43,6 @@ import ./make-test.nix ({ pkgs, ...} : {
           config =
             {
               networking.firewall.allowedTCPPorts = [ 80 ];
-              networking.firewall.allowPing = true;
             };
         };
 
diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix
index 4affe3d9d56..5f83a33b107 100644
--- a/nixos/tests/containers-ipv4.nix
+++ b/nixos/tests/containers-ipv4.nix
@@ -20,7 +20,6 @@ import ./make-test.nix ({ pkgs, ...} : {
             { services.httpd.enable = true;
               services.httpd.adminAddr = "foo@example.org";
               networking.firewall.allowedTCPPorts = [ 80 ];
-              networking.firewall.allowPing = true;
               system.stateVersion = "18.03";
             };
         };
diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix
index 7db389a18e7..5866e51b731 100644
--- a/nixos/tests/containers-ipv6.nix
+++ b/nixos/tests/containers-ipv6.nix
@@ -25,7 +25,6 @@ import ./make-test.nix ({ pkgs, ...} : {
             { services.httpd.enable = true;
               services.httpd.adminAddr = "foo@example.org";
               networking.firewall.allowedTCPPorts = [ 80 ];
-              networking.firewall.allowPing = true;
             };
         };
 
diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix
index be83f82445e..d2dda926fc0 100644
--- a/nixos/tests/containers-portforward.nix
+++ b/nixos/tests/containers-portforward.nix
@@ -28,7 +28,6 @@ import ./make-test.nix ({ pkgs, ...} : {
             { services.httpd.enable = true;
               services.httpd.adminAddr = "foo@example.org";
               networking.firewall.allowedTCPPorts = [ 80 ];
-              networking.firewall.allowPing = true;
             };
         };
 
diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix
index aeb0a6e68e2..0fb3b591e9f 100644
--- a/nixos/tests/containers-restart_networking.nix
+++ b/nixos/tests/containers-restart_networking.nix
@@ -10,7 +10,6 @@ let
       hostBridge = "br0";
       config = {
         networking.firewall.enable = false;
-        networking.firewall.allowPing = true;
         networking.interfaces.eth0.ipv4.addresses = [
           { address = "192.168.1.122"; prefixLength = 24; }
         ];
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 9c280fe8b5b..04b4f0f045f 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -11,7 +11,6 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
       lib.mkMerge [
         { virtualisation.vlans = [ 2 1 ];
           networking.firewall.enable = withFirewall;
-          networking.firewall.allowPing = true;
           networking.nat.internalIPs = [ "192.168.1.0/24" ];
           networking.nat.externalInterface = "eth1";
         }
@@ -33,7 +32,6 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
           { pkgs, nodes, ... }:
           lib.mkMerge [
             { virtualisation.vlans = [ 1 ];
-              networking.firewall.allowPing = true;
               networking.defaultGateway =
                 (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address;
             }
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 87a8c4c0e19..d1d4fd41dda 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -17,7 +17,6 @@ let
       networking = {
         useDHCP = false;
         useNetworkd = networkd;
-        firewall.allowPing = true;
         firewall.checkReversePath = true;
         firewall.allowedUDPPorts = [ 547 ];
         interfaces = mkOverride 0 (listToAttrs (flip map vlanIfs (n:
@@ -86,7 +85,6 @@ let
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
-          firewall.allowPing = true;
           useDHCP = false;
           defaultGateway = "192.168.1.1";
           interfaces.eth1.ipv4.addresses = mkOverride 0 [
@@ -139,7 +137,6 @@ let
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
-          firewall.allowPing = true;
           useDHCP = true;
           interfaces.eth1 = {
             ipv4.addresses = mkOverride 0 [ ];
@@ -194,7 +191,6 @@ let
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
-          firewall.allowPing = true;
           useDHCP = false;
           interfaces.eth1 = {
             ipv4.addresses = mkOverride 0 [ ];
@@ -234,7 +230,6 @@ let
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
-          firewall.allowPing = true;
           useDHCP = false;
           bonds.bond = {
             interfaces = [ "eth1" "eth2" ];
@@ -271,7 +266,6 @@ let
         virtualisation.vlans = [ vlan ];
         networking = {
           useNetworkd = networkd;
-          firewall.allowPing = true;
           useDHCP = false;
           interfaces.eth1.ipv4.addresses = mkOverride 0
             [ { inherit address; prefixLength = 24; } ];
@@ -285,7 +279,6 @@ let
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
-          firewall.allowPing = true;
           useDHCP = false;
           bridges.bridge.interfaces = [ "eth1" "eth2" ];
           interfaces.eth1.ipv4.addresses = mkOverride 0 [ ];
@@ -329,7 +322,6 @@ let
           # reverse path filtering rules for the macvlan interface seem
           # to be incorrect, causing the test to fail. Disable temporarily.
           firewall.checkReversePath = false;
-          firewall.allowPing = true;
           useDHCP = true;
           macvlans.macvlan.interface = "eth1";
           interfaces.eth1.ipv4.addresses = mkOverride 0 [ ];
@@ -415,7 +407,6 @@ let
         #virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
-          firewall.allowPing = true;
           useDHCP = false;
           vlans.vlan = {
             id = 1;
diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix
index 0ff14a21584..6aee7ea57f0 100644
--- a/nixos/tests/quagga.nix
+++ b/nixos/tests/quagga.nix
@@ -66,7 +66,6 @@ import ./make-test.nix ({ pkgs, ... }:
             virtualisation.vlans = [ 3 ];
             networking.defaultGateway = ifAddr nodes.router2 "eth1";
             networking.firewall.allowedTCPPorts = [ 80 ];
-            networking.firewall.allowPing = true;
             services.httpd.enable = true;
             services.httpd.adminAddr = "foo@example.com";
           };
-- 
GitLab


From 5e5e57c5728722450091160b2b0dbf53a311b230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= <k.soeholm@gmail.com>
Date: Tue, 30 Oct 2018 22:47:08 +0100
Subject: [PATCH 0731/1065] buildFHSUserEnv: use runScript in env (#49077)

This makes its behaviour conform to what is implied in the
documentation.
---
 pkgs/build-support/build-fhs-userenv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index c733556de45..2bad200efc4 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -28,7 +28,7 @@ in runCommand name {
   passthru = passthru // {
     env = runCommand "${name}-shell-env" {
       shellHook = ''
-        exec ${chrootenv} ${init "bash"} "$(pwd)"
+        exec ${chrootenv} ${init runScript} "$(pwd)"
       '';
     } ''
       echo >&2 ""
-- 
GitLab


From 5d616900ec910afa369f57139c64edb97d99fecd Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 30 Oct 2018 17:11:18 -0500
Subject: [PATCH 0732/1065] thunderbolt: cleanup

---
 .../os-specific/linux/thunderbolt/default.nix | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix
index ac687de8c9a..faf47c96a5e 100644
--- a/pkgs/os-specific/linux/thunderbolt/default.nix
+++ b/pkgs/os-specific/linux/thunderbolt/default.nix
@@ -16,22 +16,13 @@ stdenv.mkDerivation rec {
     sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x";
   };
 
-  buildInputs = [
-    boost
-    cmake
-    pkgconfig
-    txt2tags
-  ];
+  nativeBuildInputs = [ cmake pkgconfig txt2tags ];
+  buildInputs = [ boost ];
 
-  # These can't go in the normal nix cmakeFlags because $out needs to be
-  # expanded by the shell, not by cmake or nix.  $ENV{out} doesn't work right
-  # either; it results in /build/source/build//nix/store/blahblahblahblah/bin/
-  # TODO: use ${placeholder "out"} when possible.
-  #       See https://github.com/NixOS/nixpkgs/pull/37693
-  preConfigure = ''
-    cmakeFlags+=" -DUDEV_BIN_DIR=$out/bin"
-    cmakeFlags+=" -DUDEV_RULES_DIR=$out/etc/udev/rules.d"
-  '';
+  cmakeFlags = [
+    "-DUDEV_BIN_DIR=${placeholder "out"}/bin"
+    "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d"
+  ];
 
   meta = {
     description = "Thunderbolt(TM) user-space components";
-- 
GitLab


From 1c7d246d8189144e3100036571efcd975040342e Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <ignat.loskutov@gmail.com>
Date: Wed, 31 Oct 2018 01:44:55 +0300
Subject: [PATCH 0733/1065] drop the obsolete '--disable-thp' option

---
 pkgs/development/libraries/jemalloc/common.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix
index d8866ae3ff8..593f4411f19 100644
--- a/pkgs/development/libraries/jemalloc/common.nix
+++ b/pkgs/development/libraries/jemalloc/common.nix
@@ -12,11 +12,7 @@ stdenv.mkDerivation (rec {
   # 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="
-                   # jemalloc is unable to correctly detect transparent hugepage support on
-                   # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default
-                   # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support
-                   ++ stdenv.lib.optional stdenv.isAarch32 "--disable-thp";
+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=";
   doCheck = true;
 
   enableParallelBuilding = true;
-- 
GitLab


From bbc3cb31e8328cfbf7ce7f5d8db6cfbd63f9cc79 Mon Sep 17 00:00:00 2001
From: Ali Abrar <aliabrar@gmail.com>
Date: Tue, 30 Oct 2018 18:50:22 -0400
Subject: [PATCH 0734/1065] xfce4-terminal: add missing gsettings schema
 dependency

---
 pkgs/desktops/xfce4-13/xfce4-terminal/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
index 5ee6e338ea4..6bc88ee7661 100644
--- a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, gtk3, libxfce4ui, vte }:
+{ mkXfceDerivation, gtk3, libxfce4ui, wrapGAppsHook, vte }:
 
 mkXfceDerivation rec {
   category = "apps";
@@ -8,6 +8,7 @@ mkXfceDerivation rec {
   sha256 = "1s1dq560icg602jjb2ja58x7hxg4ikp3jrrf74v3qgi0ir950k2y";
 
   buildInputs = [ gtk3 libxfce4ui vte ];
+  nativeBuildInputs = [ wrapGAppsHook ];
 
   meta = {
     description = "A modern terminal emulator";
-- 
GitLab


From a937dbedea73a562101067fe72a4aa0dadea698d Mon Sep 17 00:00:00 2001
From: Lizard <tmplt@dragons.rocks>
Date: Wed, 31 Oct 2018 00:01:00 +0100
Subject: [PATCH 0735/1065] nixos/libvirtd: utilize onShutdown option (#49480)

`services.virtualisation.libvirtd.onShutdown` was previously unused.
While suspending a domain on host shutdown is the default, this commit
makes it so domains can be shut down, also.
---
 nixos/modules/virtualisation/libvirtd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 3e38662f5b0..f4d7af1664a 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -196,6 +196,8 @@ in {
       wantedBy = [ "multi-user.target" ];
       path = with pkgs; [ coreutils libvirt gawk ];
       restartIfChanged = false;
+
+      environment.ON_SHUTDOWN = "${cfg.onShutdown}";
     };
 
     systemd.sockets.virtlogd = {
-- 
GitLab


From fa53671e799f55d5379d3c5815c4888c8b88f56b Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Wed, 31 Oct 2018 01:16:30 +0100
Subject: [PATCH 0736/1065] albert: 0.14.21 -> 0.14.22

---
 pkgs/applications/misc/albert/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index f16144f3bef..b69ef905cfb 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -3,7 +3,7 @@
 
 let
   pname = "albert";
-  version = "0.14.21";
+  version = "0.14.22";
 in
 mkDerivation rec {
   name = "${pname}-${version}";
@@ -12,7 +12,7 @@ mkDerivation rec {
     owner  = "albertlauncher";
     repo   = "albert";
     rev    = "v${version}";
-    sha256 = "16nk9krn1mwr0bh57viig9hizqyp3slna0qg7s5a736nsfxy226w";
+    sha256 = "0i9kss5szirmd0pzw3cm692kl9rhkan1zfywfqrjdf3i3b6914sg";
     fetchSubmodules = true;
   };
 
-- 
GitLab


From cca88cc1340ba323956e6926ed69d8775c2dfee4 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Wed, 31 Oct 2018 01:16:45 +0100
Subject: [PATCH 0737/1065] albert: add myself as maintainer

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

diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index b69ef905cfb..d1a62dad6c9 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -48,7 +48,7 @@ mkDerivation rec {
     homepage    = https://albertlauncher.github.io/;
     description = "Desktop agnostic launcher";
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ericsagnes ];
+    maintainers = with maintainers; [ ericsagnes synthetica ];
     platforms   = platforms.linux;
   };
 }
-- 
GitLab


From 2d0ec8b28873bc6b933b10ed2aa6411237a625f5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 24 Mar 2018 12:11:02 -0500
Subject: [PATCH 0738/1065] stage1 boot: use stdenv.cc.libc

(cherry picked from commit d3ae884c9eeb4a6f66ac4e57764c04db16ea7c71)
---
 nixos/modules/system/boot/stage-1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index f4cf9753c0a..e7167999a6f 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -147,7 +147,7 @@ let
       ${config.boot.initrd.extraUtilsCommands}
 
       # Copy ld manually since it isn't detected correctly
-      cp -pv ${pkgs.glibc.out}/lib/ld*.so.? $out/lib
+      cp -pv ${pkgs.stdenv.cc.libc.out}/lib/ld*.so.? $out/lib
 
       # Copy all of the needed libraries
       find $out/bin $out/lib -type f | while read BIN; do
-- 
GitLab


From 9de0b2883ac4778c7c8fae57f9efeb4d773bdd08 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 24 Mar 2018 15:33:47 -0500
Subject: [PATCH 0739/1065] nixos: use pkgs.getent and stdenv.cc.libc

(cherry picked from commit 52eba9753aeba4f02c8ce0de50f10bd98de1ef1e)
---
 nixos/modules/config/system-path.nix                  | 4 +++-
 nixos/modules/system/activation/activation-script.nix | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index c07e19bd03c..1793dc628ed 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -19,7 +19,9 @@ let
       pkgs.diffutils
       pkgs.findutils
       pkgs.gawk
-      pkgs.glibc # for ldd, getent
+      pkgs.stdenv.cc.libc
+      pkgs.getent
+      pkgs.getconf
       pkgs.gnugrep
       pkgs.gnupatch
       pkgs.gnused
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index b1eaf018956..0ed7c0f53eb 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -21,7 +21,7 @@ let
     [ coreutils
       gnugrep
       findutils
-      glibc # needed for getent
+      getent
       shadow
       nettools # needed for hostname
       utillinux # needed for mount and mountpoint
-- 
GitLab


From afdf16b7148805a9eae44867bc70a02015d6a765 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 24 Mar 2018 20:51:32 -0500
Subject: [PATCH 0740/1065] apparmor-suid: don't force glibc

(cherry picked from commit 131131e58fc66365854f37f4fe2bf6ca01c8aed6)
---
 nixos/modules/security/apparmor-suid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index dfbf5d859ba..498c2f25d1c 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -28,7 +28,7 @@ with lib;
         capability setuid,
         network inet raw,
 
-        ${pkgs.glibc.out}/lib/*.so mr,
+        ${pkgs.stdenv.cc.libc.out}/lib/*.so mr,
         ${pkgs.libcap.lib}/lib/libcap.so* mr,
         ${pkgs.attr.out}/lib/libattr.so* mr,
 
-- 
GitLab


From 2603e3a5e97e5c85f828d52142f25c4a928fe1ad Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Mar 2018 08:46:56 -0500
Subject: [PATCH 0741/1065] gtk: don't hardcode glibc use

(cherry picked from commit 6e6f839093ad080c3a61810e9720165faf103e81)
---
 .../services/x11/display-managers/lightdm-greeters/gtk.nix      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index 013956c0546..d1ee076e918 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -22,7 +22,7 @@ let
       # This wrapper ensures that we actually get themes
       makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
         $out/greeter \
-        --prefix PATH : "${pkgs.glibc.bin}/bin" \
+        --prefix PATH : "${lib.getBin pkgs.stdenv.cc.libc}/bin" \
         --set GDK_PIXBUF_MODULE_FILE "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
         --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \
         --set GTK_EXE_PREFIX "${theme}" \
-- 
GitLab


From 8cc028fd34953e03ee8e91cca141fe1f6294de82 Mon Sep 17 00:00:00 2001
From: Travis Athougies <iammisc@gmail.com>
Date: Mon, 22 Oct 2018 11:11:02 -0700
Subject: [PATCH 0742/1065] nixos/networking.nix: only setup rpc on glibc

(cherry picked from commit 4177dc3f774523fea7d181601d7c3301fda13790)
and
(cherry picked from commit a2f0c95baf57fb735dd47b5db73274f7e75df7c9)
---
 nixos/modules/config/networking.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 1eb6fb43604..627cce67e97 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -228,9 +228,6 @@ in
         # /etc/protocols: IP protocol numbers.
         "protocols".source  = pkgs.iana-etc + "/etc/protocols";
 
-        # /etc/rpc: RPC program numbers.
-        "rpc".source = pkgs.glibc.out + "/etc/rpc";
-
         # /etc/hosts: Hostname-to-IP mappings.
         "hosts".text = let
           oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip};
@@ -268,6 +265,9 @@ in
         "resolv.conf".source = "${pkgs.systemd}/lib/systemd/resolv.conf";
       } // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) {
         "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
+      } // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") {
+        # /etc/rpc: RPC program numbers.
+        "rpc".source = pkgs.glibc.out + "/etc/rpc";
       };
 
       networking.proxy.envVars =
-- 
GitLab


From ea1024e101a0ed75022f00402e14644e8fe07e36 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 30 Oct 2018 22:49:39 -0400
Subject: [PATCH 0743/1065] openscenegraph: 3.6.2 -> 3.6.3

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

diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index cddc2038791..9f5ef3ff68c 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   name = "openscenegraph-${version}";
-  version = "3.6.2";
+  version = "3.6.3";
 
   src = fetchFromGitHub {
     owner = "openscenegraph";
     repo = "OpenSceneGraph";
-    rev = "fb40a0d1db018ff39a08699a7f17f7eb6d949c36";
-    sha256 = "03jk6lclyd4biniaw04w7j0z1spkm69f1c19i37b8v9x3zv1p1id";
+    rev = "d011ca4e8d83549a3688bf6bb8cd468dd9684822";
+    sha256 = "0h32z15sa8sbq276j0iib0n707m8bs4p5ji9z2ah411446paad9q";
   };
 
   nativeBuildInputs = [ pkgconfig cmake doxygen ];
-- 
GitLab


From df51c5ef808d01a72ce3990254c880c389c7f2d4 Mon Sep 17 00:00:00 2001
From: sjau <github.com@sjau.ch>
Date: Sun, 28 Oct 2018 15:13:00 +0100
Subject: [PATCH 0744/1065] easysnap: init at 2018-10-28

---
 maintainers/maintainer-list.nix        |  5 +++++
 pkgs/tools/backup/easysnap/default.nix | 31 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/backup/easysnap/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b6add449b9b..841128affd8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3900,6 +3900,11 @@
     github = "sjagoe";
     name = "Simon Jagoe";
   };
+  sjau = {
+    email = "nixos@sjau.ch";
+    github = "sjau";
+    name = "Stephan Jau";
+  };
   sjmackenzie = {
     email = "setori88@gmail.com";
     github = "sjmackenzie";
diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/tools/backup/easysnap/default.nix
new file mode 100644
index 00000000000..a8c726c9e16
--- /dev/null
+++ b/pkgs/tools/backup/easysnap/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchFromGitHub, zfs }:
+
+stdenv.mkDerivation rec {
+  name = "easysnap-${version}";
+  version = "unstable-2018-10-28";
+
+  src = fetchFromGitHub {
+    owner = "sjau";
+    repo = "easysnap";
+    rev = "aa2768762da7730aa3eb90fdc2190a8359976edc";
+    sha256 = "0csn7capsmlkin4cf1fgl766gvszvqfllqkiyz0g9bvbapxv7nba";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -n easysnap* $out/bin/
+
+    for i in $out/bin/*; do
+      substituteInPlace $i \
+        --replace zfs ${zfs}/bin/zfs
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage    = https://github.com/sjau/easysnap;
+    description = "Customizable ZFS Snapshotting tool with zfs send/recv pulling";
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ sjau ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 740c3111a20..a1120da229c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2335,6 +2335,8 @@ with pkgs;
 
   easyrsa2 = callPackage ../tools/networking/easyrsa/2.x.nix { };
 
+  easysnap = callPackage ../tools/backup/easysnap { };
+
   ebook_tools = callPackage ../tools/text/ebook-tools { };
 
   ecryptfs = callPackage ../tools/security/ecryptfs { };
-- 
GitLab


From beeaebad5ec4c812a6f6aa6bede083ac2ff47c1c Mon Sep 17 00:00:00 2001
From: Stefan Wiehler <me@sephalon.net>
Date: Tue, 9 Oct 2018 21:14:33 +0200
Subject: [PATCH 0745/1065] fstrcmp: init at 0.7

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

diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix
new file mode 100644
index 00000000000..68f3c9d0ee5
--- /dev/null
+++ b/pkgs/development/libraries/fstrcmp/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchzip, libtool, ghostscript, groff }:
+
+stdenv.mkDerivation rec {
+  name = "fstrcmp-${version}";
+  version = "0.7";
+
+  src = fetchzip {
+    url = "https://sourceforge.net/projects/fstrcmp/files/fstrcmp/${version}/fstrcmp-${version}.D001.tar.gz";
+    sha256 = "0yg3y3k0wz50gmhgigfi2dx725w1gc8snb95ih7vpcnj6kabgz9a";
+  };
+
+  outputs = [ "out" "dev" "doc" "man" "devman" ];
+
+  nativeBuildInputs = [ libtool ghostscript groff ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Make fuzzy comparisons of strings and byte arrays";
+    longDescription = ''
+      The fstrcmp project provides a library that is used to make fuzzy
+      comparisons of strings and byte arrays, including multi-byte character
+      strings.
+    '';
+    homepage = http://fstrcmp.sourceforge.net/;
+    downloadPage = https://sourceforge.net/projects/fstrcmp/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.sephalon ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c4b7a5a1eb..db31219cad4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9568,6 +9568,8 @@ with pkgs;
 
   frog = self.languageMachines.frog;
 
+  fstrcmp = callPackage ../development/libraries/fstrcmp { };
+
   fstrm = callPackage ../development/libraries/fstrm { };
 
   cfitsio = callPackage ../development/libraries/cfitsio { };
-- 
GitLab


From b786a47e9ebd8018079b094bdec4abbc7b785076 Mon Sep 17 00:00:00 2001
From: royneary <christian@ulrich.earth>
Date: Wed, 31 Oct 2018 10:37:38 +0100
Subject: [PATCH 0746/1065] nim: move build time dependencies into
 nativeBuildInputs

---
 pkgs/development/compilers/nim/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 3596c17b407..3f067553297 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -27,8 +27,11 @@ stdenv.mkDerivation rec {
   #    used for bootstrapping, but koch insists on moving the nim compiler around
   #    as part of building it, so it cannot be read-only
 
-  buildInputs = [
+  nativeBuildInputs = [
     makeWrapper nodejs-slim-8_x tzdata coreutils
+  ];
+
+  buildInputs = [
     openssl pcre readline boehmgc sfml
   ];
 
-- 
GitLab


From 9dcdf5a54564603ed47c6a8773edd4b08a5b2e8b Mon Sep 17 00:00:00 2001
From: royneary <christian@ulrich.earth>
Date: Wed, 31 Oct 2018 10:38:16 +0100
Subject: [PATCH 0747/1065] nim: update nodejs-slim

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

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 3f067553297..ae36041b33e 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,6 +1,6 @@
 # based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml
 
-{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-8_x, openssl, pcre, readline, boehmgc, sfml, tzdata, coreutils }:
+{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-10_x, openssl, pcre, readline, boehmgc, sfml, tzdata, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "nim-${version}";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   #    as part of building it, so it cannot be read-only
 
   nativeBuildInputs = [
-    makeWrapper nodejs-slim-8_x tzdata coreutils
+    makeWrapper nodejs-slim-10_x tzdata coreutils
   ];
 
   buildInputs = [
-- 
GitLab


From 43f6d9ada488ea66d588756c182ff3a212cf42e0 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Wed, 31 Oct 2018 10:43:00 +0100
Subject: [PATCH 0748/1065] pytorch: remove pre-cuda92 hack

---
 pkgs/top-level/python-packages.nix | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b2cff4940c1..eefc7baa448 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2282,20 +2282,8 @@ in {
 
   grappelli_safe = callPackage ../development/python-modules/grappelli_safe { };
 
-  pytorch = let
-    # Fails with CUDA 9.1 and GCC 6.4:
-    # https://github.com/pytorch/pytorch/issues/5831
-    # https://devtalk.nvidia.com/default/topic/1028112
-    # We should be able to remove this when CUDA 9.2 is released.
-    cudatoolkit_9 = pkgs.cudatoolkit_9.override {
-      gcc6 = pkgs.gcc5;
-    };
-  in callPackage ../development/python-modules/pytorch {
+  pytorch = callPackage ../development/python-modules/pytorch {
     cudaSupport = pkgs.config.cudaSupport or false;
-    cudatoolkit = cudatoolkit_9;
-    cudnn = pkgs.cudnn_cudatoolkit_9.override {
-      inherit cudatoolkit_9;
-    };
   };
 
   pytorchWithCuda = self.pytorch.override {
-- 
GitLab


From 771849af9e9081c11994a3eded6229f2adfe7496 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 28 Oct 2018 17:18:12 +0100
Subject: [PATCH 0749/1065] LTS Haskell 12.16

---
 .../configuration-hackage2nix.yaml            | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b5f5e1f3675..a2b86b22094 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.14
+  # LTS Haskell 12.16
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -180,7 +180,7 @@ default-package-overrides:
   - amazonka-xray ==1.6.0
   - amqp ==0.18.1
   - annotated-wl-pprint ==0.7.0
-  - ansi-terminal ==0.8.1
+  - ansi-terminal ==0.8.2
   - ansi-wl-pprint ==0.6.8.2
   - ANum ==0.2.0.2
   - api-field-json-th ==0.1.0.2
@@ -436,7 +436,7 @@ default-package-overrides:
   - concurrency ==1.6.1.0
   - concurrent-extra ==0.7.0.12
   - concurrent-output ==1.10.7
-  - concurrent-split ==0.0.1
+  - concurrent-split ==0.0.1.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
   - conduit ==1.3.1
@@ -552,7 +552,7 @@ default-package-overrides:
   - data-serializer ==0.3.4
   - datasets ==0.2.5
   - data-textual ==0.3.0.2
-  - data-tree-print ==0.1.0.1
+  - data-tree-print ==0.1.0.2
   - dataurl ==0.1.0.0
   - DAV ==1.3.2
   - dawg-ord ==0.5.1.0
@@ -638,7 +638,7 @@ default-package-overrides:
   - dyre ==0.8.12
   - Earley ==0.12.1.0
   - easy-file ==0.2.2
-  - easytest ==0.2
+  - easytest ==0.2.1
   - Ebnf2ps ==1.0.15
   - echo ==0.1.3
   - ed25519 ==0.0.5.0
@@ -880,6 +880,12 @@ 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
   - groups ==0.4.1.0
   - gtk ==0.14.10
   - gtk2hs-buildtools ==0.13.4.0
@@ -896,7 +902,7 @@ default-package-overrides:
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.6.1
+  - hapistrano ==0.3.7.0
   - happstack-server ==7.5.1.1
   - happy ==1.19.9
   - hasbolt ==0.1.3.0
@@ -1004,8 +1010,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
@@ -1248,7 +1254,7 @@ default-package-overrides:
   - libffi ==0.1
   - libgit ==0.3.1
   - libgraph ==1.14
-  - libmpd ==0.9.0.8
+  - libmpd ==0.9.0.9
   - libxml-sax ==0.7.5
   - LibZip ==1.0.1
   - lifted-async ==0.10.0.3
@@ -1523,7 +1529,7 @@ default-package-overrides:
   - palette ==0.3.0.1
   - pandoc ==2.2.1
   - pandoc-citeproc ==0.14.8
-  - pandoc-types ==1.17.5.2
+  - pandoc-types ==1.17.5.4
   - pango ==0.13.5.0
   - papillon ==0.1.0.6
   - parallel ==3.2.2.0
@@ -1746,7 +1752,7 @@ default-package-overrides:
   - require ==0.2.1
   - req-url-extra ==0.1.0.0
   - reroute ==0.5.0.0
-  - resolv ==0.1.1.1
+  - resolv ==0.1.1.2
   - resource-pool ==0.2.3.2
   - resourcet ==1.2.2
   - rest-stringmap ==0.2.0.7
@@ -1785,8 +1791,8 @@ default-package-overrides:
   - sandman ==0.2.0.1
   - say ==0.1.0.1
   - sbp ==2.3.17
-  - SCalendar ==1.1.0
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1952,7 +1958,7 @@ default-package-overrides:
   - storable-record ==0.0.4
   - storable-tuple ==0.0.3.3
   - storablevector ==0.2.13
-  - store ==0.5.0
+  - store ==0.5.0.1
   - store-core ==0.4.4
   - Strafunski-StrategyLib ==5.0.1.0
   - stratosphere ==0.24.4
@@ -2042,7 +2048,7 @@ default-package-overrides:
   - test-framework-th ==0.2.4
   - testing-feat ==1.1.0.0
   - testing-type-modifiers ==0.1.0.1
-  - texmath ==0.11.1.1
+  - texmath ==0.11.1.2
   - text ==1.2.3.1
   - text-binary ==0.2.1.1
   - text-builder ==0.5.4.3
@@ -2133,7 +2139,7 @@ default-package-overrides:
   - type-level-kv-list ==1.1.0
   - type-level-numbers ==0.1.1.1
   - typelits-witnesses ==0.3.0.3
-  - typenums ==0.1.2
+  - typenums ==0.1.2.1
   - type-of-html ==1.4.0.1
   - type-of-html-static ==0.1.0.2
   - type-operators ==0.1.0.4
-- 
GitLab


From 5d18129ce8af9a69312818ea0a5a0029a04a2255 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 28 Oct 2018 17:20:30 +0100
Subject: [PATCH 0750/1065] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1-2-g57c4f0f from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/b6545b2cd859ea6bc5ece441c647c671c81fe8ac.
---
 .../haskell-modules/hackage-packages.nix      | 1893 ++++++++++++-----
 1 file changed, 1382 insertions(+), 511 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index fe488d0447e..bb6e6da1e0c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -766,6 +766,50 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ abbradar ];
      }) {inherit (pkgs) emacs;};
 
+  "Agda_2_5_4_2" = callPackage
+    ({ mkDerivation, alex, array, async, base, binary, blaze-html
+     , boxes, bytestring, Cabal, containers, data-hash, deepseq
+     , directory, EdisonCore, edit-distance, emacs, equivalence
+     , filemanip, filepath, geniplate-mirror, gitrev, happy, hashable
+     , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process
+     , regex-tdfa, stm, strict, template-haskell, text, time
+     , transformers, unordered-containers, uri-encode, zlib
+     }:
+     mkDerivation {
+       pname = "Agda";
+       version = "2.5.4.2";
+       sha256 = "07wvawpfjhx3gw2w53v27ncv1bl0kkx08wkm6wzxldbslkcasign";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal filemanip filepath process ];
+       libraryHaskellDepends = [
+         array async base binary blaze-html boxes bytestring containers
+         data-hash deepseq directory EdisonCore edit-distance equivalence
+         filepath geniplate-mirror gitrev hashable hashtables haskeline
+         ieee754 mtl murmur-hash pretty process regex-tdfa stm strict
+         template-haskell text time transformers unordered-containers
+         uri-encode zlib
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [ base directory filepath process ];
+       executableToolDepends = [ emacs ];
+       postInstall = ''
+         files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
+         for f in "''${files[@]}" ; do
+           $out/bin/agda $f
+         done
+         for f in "''${files[@]}" ; do
+           $out/bin/agda -c --no-main $f
+         done
+         $out/bin/agda-mode compile
+       '';
+       description = "A dependently typed functional programming language and proof assistant";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ abbradar ];
+     }) {inherit (pkgs) emacs;};
+
   "Agda-executable" = callPackage
     ({ mkDerivation, Agda, base }:
      mkDerivation {
@@ -8951,10 +8995,8 @@ self: {
      }:
      mkDerivation {
        pname = "HaXml";
-       version = "1.25.4";
-       sha256 = "1d8xq37h627im5harybhsn08qjdaf6vskldm03cqbfjmr2w6fx6p";
-       revision = "1";
-       editedCabalFile = "1vnil3xdyhr48f0nxcaljbl1k5ibg5g5gghvrhykg447b0jvp922";
+       version = "1.25.5";
+       sha256 = "0d8jbiv53r3ndg76r3937idqdg34nhmb99vj087i73hjnv21mifb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10226,8 +10268,8 @@ self: {
     ({ mkDerivation, base, mtl, QuickCheck, Stream }:
      mkDerivation {
        pname = "IOSpec";
-       version = "0.3";
-       sha256 = "0dwl2nx8fisl1syggwd3060wa50lj5nl9312x4q7pq153cxjppyy";
+       version = "0.3.1";
+       sha256 = "1xfhsj8r2gf9wynsihls255qqwqj8vrjyn56rk60xvm27ya4f1d3";
        libraryHaskellDepends = [ base mtl QuickCheck Stream ];
        description = "A pure specification of the IO monad";
        license = stdenv.lib.licenses.bsd3;
@@ -12290,6 +12332,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "MissingH_1_4_0_1" = callPackage
+    ({ mkDerivation, array, base, containers, directory
+     , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
+     , old-locale, old-time, parsec, process, QuickCheck, random
+     , regex-compat, testpack, time, unix
+     }:
+     mkDerivation {
+       pname = "MissingH";
+       version = "1.4.0.1";
+       sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8";
+       revision = "1";
+       editedCabalFile = "04syc14nz11fay6fm6nlixyflrfhpg4jiyxx6mnxrl6asd3cl989";
+       libraryHaskellDepends = [
+         array base containers directory filepath hslogger HUnit mtl network
+         old-locale old-time parsec process random regex-compat time unix
+       ];
+       testHaskellDepends = [
+         array base containers directory errorcall-eq-instance filepath
+         hslogger HUnit mtl network old-locale old-time parsec process
+         QuickCheck random regex-compat testpack time unix
+       ];
+       description = "Large utility library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "MissingH" = callPackage
     ({ mkDerivation, array, base, containers, directory
      , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
@@ -15071,12 +15139,12 @@ self: {
      }) {};
 
   "QuickCheck-safe" = callPackage
-    ({ mkDerivation, base, QuickCheck }:
+    ({ mkDerivation, base, containers, QuickCheck }:
      mkDerivation {
        pname = "QuickCheck-safe";
-       version = "0.1.0.4";
-       sha256 = "0ixizi0cshqqczm86rnibas8zygf8i29l3i0jivvb81zi89rscl7";
-       libraryHaskellDepends = [ base QuickCheck ];
+       version = "0.1.0.5";
+       sha256 = "0l8wp2np4mlbybzwcz8g4r9d8c65yljnvizs3g1rvig4b65j283l";
+       libraryHaskellDepends = [ base containers QuickCheck ];
        description = "Safe reimplementation of QuickCheck's core";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -18650,8 +18718,8 @@ self: {
      }:
      mkDerivation {
        pname = "Villefort";
-       version = "0.1.2.16";
-       sha256 = "00ngq1i7f1sqksfl9cg1qzhp4fxv9h6mmjfljj3cahcw50h4al64";
+       version = "0.1.2.17";
+       sha256 = "17ga54kclbcr6vpiy6q5yws9535j9sg6isqggx05kz3hsa7nllbz";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -22167,8 +22235,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-schema";
-       version = "0.4.1.2";
-       sha256 = "1afw0kf39myh4yqkkz8z1a7ji02j2iy7j66ch06pglvp5hzyi9dk";
+       version = "0.4.1.3";
+       sha256 = "17w0hih9l7x9r14s2mxywjzysm00f6bz6rqsgknvv9injakpscn3";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers fail ghc-prim mtl
@@ -26876,8 +26944,8 @@ self: {
        pname = "ansi-pretty";
        version = "0.1.2.1";
        sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h";
-       revision = "5";
-       editedCabalFile = "18vg7p8ymwk3kfhvg8cn8vq574x52n8a2c7ihrg4jg1gdsdrn0vi";
+       revision = "6";
+       editedCabalFile = "1j2iyzf61wmwdrb8i3xynins7shjv89y4028sy13rfywsbqpjg4s";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint array base bytestring containers generics-sop
          nats scientific semigroups tagged text time unordered-containers
@@ -26891,8 +26959,8 @@ self: {
     ({ mkDerivation, base, colour }:
      mkDerivation {
        pname = "ansi-terminal";
-       version = "0.8.1";
-       sha256 = "1fm489l5mnlyb6bidq7vxz5asvhshmxz38f0lijgj0z7yyzqpwwy";
+       version = "0.8.2";
+       sha256 = "147ss9wz03ww6ypbv6yh5vi1wfrfcaqm8r6nxh50vnp7254359wh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base colour ];
@@ -27331,7 +27399,7 @@ self: {
        description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {libaosd = null;};
+     }) {inherit (pkgs) libaosd;};
 
   "ap-reflect" = callPackage
     ({ mkDerivation, base }:
@@ -28961,6 +29029,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "arraylist" = callPackage
+    ({ mkDerivation, base, hashable, initialize, MonadRandom, primitive
+     , smallcheck, tasty, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "arraylist";
+       version = "0.1.0.0";
+       sha256 = "1swvn9k7j2pwcln4znzrszgwgdi4f26q9qlaz2fi8jixc089v91g";
+       libraryHaskellDepends = [ base initialize primitive ];
+       testHaskellDepends = [
+         base hashable MonadRandom primitive smallcheck tasty
+         tasty-smallcheck
+       ];
+       description = "Memory-efficient ArrayList implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "arrow-extras" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -29123,10 +29208,8 @@ self: {
      }:
      mkDerivation {
        pname = "ascii";
-       version = "0.0.5.1";
-       sha256 = "06z63pr5g1wcsyii3pr8svz23cl9n4srspbkvby595pxfcbzkirn";
-       revision = "1";
-       editedCabalFile = "1v8pgvhl47c4sf226pg175wydw5a60lssz0876haqkqm5h7bjm7g";
+       version = "0.0.5.2";
+       sha256 = "1kbf6iml4nvkzf78xqvxy67469vznd05ig8aprq7zx5vr9njliby";
        libraryHaskellDepends = [
          base blaze-builder bytestring case-insensitive hashable semigroups
          text
@@ -29571,8 +29654,8 @@ self: {
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "asset-bundle";
-       version = "0.1.0.0";
-       sha256 = "0fdl3dgnc5q9mv8w5g3qrhyprqhbyp4jrr5gimf9xzd67fwsnf86";
+       version = "0.1.0.1";
+       sha256 = "0wf0xnf4ljihzvbz8pkaiqwhvp00bwnyx0334s4757z6lsc2hsrw";
        libraryHaskellDepends = [ base Cabal directory filepath ];
        description = "A build-time Cabal library that bundles executables with assets";
        license = stdenv.lib.licenses.bsd3;
@@ -30348,16 +30431,16 @@ self: {
 
   "ats-pkg" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib
-     , Cabal, cli-setup, composition-prelude, containers, cpphs
-     , dependency, dhall, directory, file-embed, filemanip, filepath
-     , http-client, http-client-tls, lzma, microlens, mtl
-     , optparse-applicative, parallel-io, process, shake, shake-ats
-     , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib
+     , Cabal, cli-setup, composition-prelude, containers, dependency
+     , dhall, directory, file-embed, filemanip, filepath, http-client
+     , http-client-tls, lzma, microlens, mtl, optparse-applicative
+     , parallel-io, process, shake, shake-ats, shake-c, shake-ext, tar
+     , temporary, text, unix, zip-archive, zlib
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "3.2.2.3";
-       sha256 = "111lwv4461ij5z8z9n0kyvqcrjk0x5yjajfc3wyc3lklgc6ccjva";
+       version = "3.2.3.0";
+       sha256 = "0yirmngvkmkxdbhh3r6b1j9385hhwnqpr6mmw9kf50axd7czx421";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -30368,7 +30451,6 @@ self: {
          microlens mtl parallel-io process shake shake-ats shake-c shake-ext
          tar text unix zip-archive zlib
        ];
-       libraryToolDepends = [ cpphs ];
        executableHaskellDepends = [
          base bytestring cli-setup dependency directory microlens
          optparse-applicative parallel-io shake shake-ats temporary text
@@ -31381,20 +31463,18 @@ self: {
   "avers-server" = callPackage
     ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring
      , bytestring, bytestring-conversion, containers, cookie, cryptonite
-     , http-types, memory, mtl, resource-pool, rethinkdb-client-driver
-     , servant, servant-server, stm, text, time, transformers, wai
-     , wai-websockets, websockets
+     , http-types, memory, mtl, resource-pool, servant, servant-server
+     , stm, text, time, transformers, wai, wai-websockets, websockets
      }:
      mkDerivation {
        pname = "avers-server";
-       version = "0.1.0";
-       sha256 = "0m809p50l1bfhnmbwl3ncav8lz7xh38yakqa35z65afb6k1g900z";
+       version = "0.1.0.1";
+       sha256 = "13jic248m2307r84acv4b4xlh7pvx4kxm6gp0nhvz1ds0bbrdkdy";
        libraryHaskellDepends = [
          aeson avers avers-api base base64-bytestring bytestring
          bytestring-conversion containers cookie cryptonite http-types
-         memory mtl resource-pool rethinkdb-client-driver servant
-         servant-server stm text time transformers wai wai-websockets
-         websockets
+         memory mtl resource-pool servant servant-server stm text time
+         transformers wai wai-websockets websockets
        ];
        description = "Server implementation of the Avers API";
        license = stdenv.lib.licenses.mit;
@@ -32227,25 +32307,22 @@ self: {
      }:
      mkDerivation {
        pname = "axel";
-       version = "0.0.6";
-       sha256 = "17601gv4rjdxmg2qqp2y9b5lk9ia0z1izhympmwf6zs7wkjs6fyh";
-       revision = "2";
-       editedCabalFile = "12m24klalqxpglh9slhr65sxqd4dsqcaz2abmw29cki0cz6x29dp";
+       version = "0.0.8";
+       sha256 = "16fkrc87yirzha3fgdcbidi7k9xkmb5y5w1i4i10rlikhszfr2b9";
        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 text typed-process vector yaml
+         singletons strict template-haskell text typed-process vector yaml
        ];
        executableHaskellDepends = [
          base freer-simple optparse-applicative
        ];
        testHaskellDepends = [
          base bytestring filepath freer-simple hedgehog lens split tasty
-         tasty-discover tasty-golden tasty-hedgehog tasty-hspec
-         template-haskell transformers
+         tasty-discover tasty-golden tasty-hedgehog tasty-hspec transformers
        ];
        testToolDepends = [ tasty-discover ];
        description = "The Axel programming language";
@@ -32404,8 +32481,8 @@ self: {
        pname = "b-tree";
        version = "0.1.3";
        sha256 = "0r1bgcjsykd9qzzr6chxw8bfnmvk32p9663j6h11wmq6nq7nrlkb";
-       revision = "2";
-       editedCabalFile = "04is4fc308f1achbdxvqq9rg4v8c02f1w88wysp318dbhhmwgggh";
+       revision = "3";
+       editedCabalFile = "1i9qadxdq215j6dimyrmdkzl3d95l4gb65d2visf8rq1jfmdz62n";
        libraryHaskellDepends = [
          base binary bytestring containers directory errors exceptions
          filepath lens mmap mtl pipes pipes-interleave transformers vector
@@ -33484,6 +33561,8 @@ self: {
        pname = "basic-sop";
        version = "0.2.0.2";
        sha256 = "0cd5zlv3w3r99ck5cz43kppand0n9vx26g4d4fqqcmvjxk8zwhy7";
+       revision = "1";
+       editedCabalFile = "0rvhcbywgpidnq1vg79a9scq6hraqdyv67j63vyidm0q20ml5mpv";
        libraryHaskellDepends = [
          base deepseq generics-sop QuickCheck text
        ];
@@ -34050,20 +34129,18 @@ self: {
      }) {};
 
   "bed-and-breakfast" = callPackage
-    ({ mkDerivation, array, base, binary, deepseq, QuickCheck
+    ({ mkDerivation, array, base, binary, cpphs, deepseq, QuickCheck
      , template-haskell
      }:
      mkDerivation {
        pname = "bed-and-breakfast";
-       version = "0.4.3";
-       sha256 = "0183770vkb5r9srxqr3fa4s601g10bx07b05hjr3b3nvc0ab9f6z";
-       revision = "1";
-       editedCabalFile = "0kqdmq6y2fgbknx2lsn1jx2g2n7yizdpzn6wvnnvjaqi945yvyry";
+       version = "0.5";
+       sha256 = "0dj1vvb9j55psp6yra72wk0k3k6ggvarmzj7zjgr8z3npv5mqmar";
        libraryHaskellDepends = [
-         array base binary deepseq template-haskell
+         array base binary cpphs deepseq template-haskell
        ];
        testHaskellDepends = [ base QuickCheck ];
-       description = "Efficient Matrix operations in 100% Haskell";
+       description = "Efficient Matrix and Vector operations in 100% Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -34186,8 +34263,8 @@ self: {
      }:
      mkDerivation {
        pname = "bench-show";
-       version = "0.2.1";
-       sha256 = "1afx5vck4b57r6kanr5g46rk5n8hf9vw4vg2sfqgdb3fhc9979g5";
+       version = "0.2.2";
+       sha256 = "12fi59j9a98n4q6gjvjsf0hjc2rsy33b7kzjiqxy5wzh8isciaa4";
        libraryHaskellDepends = [
          ansi-wl-pprint base Chart Chart-diagrams csv directory filepath
          mwc-random split statistics transformers vector
@@ -35247,6 +35324,8 @@ self: {
        pname = "binary-tagged";
        version = "0.1.5.1";
        sha256 = "196msm7v0r41d7gx8aghl0c1gvir60sf0w9sfpcz2dq9akzqzjvh";
+       revision = "1";
+       editedCabalFile = "1z612d3wbrlywcx96lc52svi9b2s6nskdnwnwm3d5mylcqaqckcx";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          generics-sop hashable scientific SHA tagged text time
@@ -37134,6 +37213,8 @@ self: {
        pname = "bitwise";
        version = "1.0.0.1";
        sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn";
+       revision = "1";
+       editedCabalFile = "1h6dbjmznd3pvz7j5f8xwaaxxhx57fxszli2k430wcn65bc9y0zs";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ array base bytestring criterion ];
@@ -37165,13 +37246,15 @@ self: {
      }) {};
 
   "bizzlelude" = callPackage
-    ({ mkDerivation, base-noprelude, containers, directory, text }:
+    ({ mkDerivation, base-noprelude, containers, directory, regexpr
+     , text
+     }:
      mkDerivation {
        pname = "bizzlelude";
-       version = "1.2.0";
-       sha256 = "1yqp46blrllx5irn1vvvx1v2n06pdfdfmhcng8hvs7q43fcsfgcr";
+       version = "1.5.0";
+       sha256 = "1mjy5hlszj85wvxwr7fza5wa004xjcg434kwzxzjmmlcvkgh2ybr";
        libraryHaskellDepends = [
-         base-noprelude containers directory text
+         base-noprelude containers directory regexpr text
        ];
        description = "A lousy Prelude replacement by a lousy dude";
        license = stdenv.lib.licenses.bsd3;
@@ -38777,8 +38860,8 @@ self: {
        pname = "boring";
        version = "0.1";
        sha256 = "0r263cc8bdwsaw33x96fgd8npsma9a2ffv6mfz9z72d7qclhimkk";
-       revision = "1";
-       editedCabalFile = "0hdvr4rkkj2mapqha335rhncfmrw70qzjmfis2w9l4iqx617fv9m";
+       revision = "2";
+       editedCabalFile = "1jxaby4cagbhii194x9x0j75ms1v5bm14sx7d19zz3844mh9qyci";
        libraryHaskellDepends = [
          adjunctions base base-compat constraints fin generics-sop streams
          tagged transformers transformers-compat vec
@@ -39207,6 +39290,8 @@ self: {
        pname = "brick";
        version = "0.41.2";
        sha256 = "04b4gyzb0c66idl19k0v3g9z48bcii728ivbpvm8zjkzq2m2hqix";
+       revision = "1";
+       editedCabalFile = "00z07bkarxqv517aq95gib864z9mrq9j86zh6jdxybf2v4fwh04s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39797,6 +39882,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "btrfs_0_2_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, time, unix }:
+     mkDerivation {
+       pname = "btrfs";
+       version = "0.2.0.0";
+       sha256 = "1h56yb4a3i1c452splxj06c8harrcws2pg86rx7jz6b804ncrzr2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring time unix ];
+       description = "Bindings to the btrfs API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "buchhaltung" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, array, async, base, boxes
      , bytestring, cassava, containers, data-default, Decimal, deepseq
@@ -41402,8 +41501,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.38.1";
-       sha256 = "1sniyy2pappjjhvw1bma593gxdcjlg3j2afx8jgb70h6cbl3769n";
+       version = "4.38.2";
+       sha256 = "1hr2y1jymi835pwm17z4fc0r58fkx3h8vxb03qp4fiadily0lg3s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42016,10 +42115,8 @@ self: {
     ({ mkDerivation, base, Cabal, QuickCheck }:
      mkDerivation {
        pname = "cabal-test-quickcheck";
-       version = "0.1.8.1";
-       sha256 = "0r5fd670a5ch0lzw7wsxp6k06wzi64wvjbiy8zyfl7brmjnbh8gn";
-       revision = "1";
-       editedCabalFile = "1rq6l86sndcv8nb5nl9rki2kmblrarj9cbra0i6kixa5n1wbcmv6";
+       version = "0.1.8.2";
+       sha256 = "04fdfxvgp518x7n6d74l92qh67z94pay4wldy8dv4n51zhkgk8bf";
        libraryHaskellDepends = [ base Cabal QuickCheck ];
        description = "QuickCheck for Cabal";
        license = stdenv.lib.licenses.mit;
@@ -42509,10 +42606,8 @@ self: {
      }:
      mkDerivation {
        pname = "cacophony";
-       version = "0.10.0";
-       sha256 = "1hjxzpbnp5qzbjl9m0hyvlr7yflfgxr5kqbviamhpgc0lj5igizv";
-       revision = "2";
-       editedCabalFile = "0w7nq4c5i89vmslxhvzw8299gig2wrr0ayddqjk5dxghmmly3hdw";
+       version = "0.10.1";
+       sha256 = "1w9v04mdyzvwndqfb8my9a82b51avgwfnl6g7w89xj37ax9ariaj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42968,6 +43063,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "canonical-json" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, parsec
+     , pretty, QuickCheck, tasty, tasty-quickcheck, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "canonical-json";
+       version = "0.5.0.1";
+       sha256 = "1r52f69afsnl6kmn0h2rl6wp21jjain4kz6123a1haacfm2f2hwj";
+       libraryHaskellDepends = [
+         base bytestring containers parsec pretty
+       ];
+       testHaskellDepends = [
+         aeson base bytestring QuickCheck tasty tasty-quickcheck
+         unordered-containers vector
+       ];
+       description = "Canonical JSON for signing and hashing JSON values";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "canteven-config" = callPackage
     ({ mkDerivation, base, unix, yaml }:
      mkDerivation {
@@ -43179,6 +43294,8 @@ self: {
        pname = "capnp";
        version = "0.3.0.0";
        sha256 = "17i7m168bqp57m5lb04sbfh2amc1sicv2jajkl61jb1gsidwdkrz";
+       revision = "1";
+       editedCabalFile = "0faisbw98h1zjsqja57c0xac6hhnhb4sghzh9a3225pp8wxnbjr7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47213,8 +47330,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks";
-       version = "0.24.0.7";
-       sha256 = "1czalrr7y3526jb4cgi8bghxghqwsjwkfhm5vb4q19xzqg3kjqwy";
+       version = "0.24.0.8";
+       sha256 = "1csiak0i3aaz56f64509w49q4j21cb10zlxdx8lyhbm8aikva0n1";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
@@ -47385,8 +47502,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-page";
-       version = "0.4.3.12";
-       sha256 = "0xndx7843laiha1n8xscq13dv6x6fv098v1cdmmzx7qnvfvhhlxj";
+       version = "0.4.3.13";
+       sha256 = "0fkfsi9hv0hv4zbv2znb0v30z5qvifgmz9875868va0830nv3ibh";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          acid-state aeson attoparsec base clckwrks containers directory
@@ -49568,19 +49685,21 @@ self: {
      }) {};
 
   "combinat" = callPackage
-    ({ mkDerivation, array, base, containers, QuickCheck, random
-     , test-framework, test-framework-quickcheck2, transformers
+    ({ mkDerivation, array, base, containers, QuickCheck, random, tasty
+     , tasty-hunit, tasty-quickcheck, test-framework
+     , test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "combinat";
-       version = "0.2.8.2";
-       sha256 = "0i7hk8518ixwxvxgy9xbf9hcyfpvmcfgz5m3wbxzcj5ry4rnnhnh";
+       version = "0.2.9.0";
+       sha256 = "1y617qyhqh2k6d51j94c0xnj54i7b86d87n0j12idxlkaiv4j5sw";
        libraryHaskellDepends = [
          array base containers random transformers
        ];
        testHaskellDepends = [
-         array base containers QuickCheck random test-framework
-         test-framework-quickcheck2 transformers
+         array base containers QuickCheck random tasty tasty-hunit
+         tasty-quickcheck test-framework test-framework-quickcheck2
+         transformers
        ];
        description = "Generate and manipulate various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
@@ -49707,15 +49826,16 @@ self: {
      }) {};
 
   "comfort-array" = callPackage
-    ({ mkDerivation, base, guarded-allocation, QuickCheck, transformers
-     , utility-ht
+    ({ mkDerivation, base, guarded-allocation, primitive, QuickCheck
+     , storable-record, transformers, utility-ht
      }:
      mkDerivation {
        pname = "comfort-array";
-       version = "0.1.1";
-       sha256 = "0kmqb7mcanx3n597nm8p6g76nc4v5smkl5srjmb2757fb3w68xmk";
+       version = "0.1.2";
+       sha256 = "1rc8gfgjid10wajjk5pp1vmm8wc2apr5qcr2w41pwk25m554iyz1";
        libraryHaskellDepends = [
-         base guarded-allocation QuickCheck transformers utility-ht
+         base guarded-allocation primitive QuickCheck storable-record
+         transformers utility-ht
        ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Arrays where the index type is a function of the shape type";
@@ -50267,8 +50387,8 @@ self: {
        pname = "complex-generic";
        version = "0.1.1.1";
        sha256 = "03wb599difj0qm1dpzgxdymq3bql69qmkdk5fspcyc19nnd5qlqz";
-       revision = "2";
-       editedCabalFile = "160lw045p7j5vm4j2sqqfpnfgkxkil2kwjnmi7x6am03gfi9g9kw";
+       revision = "3";
+       editedCabalFile = "0vm0i25bib0bzlw7fw209pqn3963y5hx0vkri049q4v7y0qld8k9";
        libraryHaskellDepends = [ base template-haskell ];
        description = "complex numbers with non-mandatory RealFloat";
        license = stdenv.lib.licenses.bsd3;
@@ -50548,12 +50668,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "composition-prelude_2_0_0_0" = callPackage
+  "composition-prelude_2_0_1_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "2.0.0.0";
-       sha256 = "0kz0jr5pfy6d1pm8sbxzrp0h7bnaljspggmzz382p6xp4npr6pg5";
+       version = "2.0.1.0";
+       sha256 = "027fzappyma8hqqkqka21af937h57fdaq8ni73skxa03pcflwqmc";
        libraryHaskellDepends = [ base ];
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -50790,8 +50910,8 @@ self: {
      }:
      mkDerivation {
        pname = "concraft";
-       version = "0.14.1";
-       sha256 = "0v7han8ps1ysxi929clkbx0c0vjd6dyxxhfp8q5k2jx58blwzxyg";
+       version = "0.14.2";
+       sha256 = "151cp99iah0fd50fkizidcla7f1kvb0jwgl1cj3j6f25j21894dy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50837,8 +50957,8 @@ self: {
      }:
      mkDerivation {
        pname = "concraft-pl";
-       version = "2.1.1";
-       sha256 = "1fznivcsgyjhb62jzk9a3wsv8rmynr7y7473ldbqypkjgy2rmvf2";
+       version = "2.4.0";
+       sha256 = "0gc50aadzryy1a8mj85i4afgip34w6pk4s2kqsn10910634lmy6h";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -51158,8 +51278,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "concurrent-split";
-       version = "0.0.1";
-       sha256 = "1rxq0l513mldz7rlpmpac7n6mipk4lciv58h77h0zypixy73qyb0";
+       version = "0.0.1.1";
+       sha256 = "0i9gak7q3ay8g1kzq7dg0bs36bg88n7kwy3h1r6jrni7mz7jh05f";
        libraryHaskellDepends = [ base ];
        description = "MVars and Channels with distinguished input and output side";
        license = stdenv.lib.licenses.bsd3;
@@ -51818,8 +51938,8 @@ self: {
      }:
      mkDerivation {
        pname = "confcrypt";
-       version = "0.1.0.2";
-       sha256 = "0iw47xz34f2dljsq6hm75046sy7wmzj4ndgfh9h3x4iixs5vidfw";
+       version = "0.1.0.3";
+       sha256 = "0fj40m3yncrwb3z2dznvls17v40xm1kh0i4ig16mpb9qj7ww8chl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52026,6 +52146,8 @@ self: {
        pname = "config-value-getopt";
        version = "0.1.1.0";
        sha256 = "0ypg8wl17vqdqsk1gpaba11v63xmqysfp4cd4ii8zha7pfmlhb4c";
+       revision = "1";
+       editedCabalFile = "1vdm5pgql8cggdkqxhc2z0cg2s7xayghdm51k0m3lx9396f5pxm8";
        libraryHaskellDepends = [ base config-value text ];
        description = "Interface between config-value and System.GetOpt";
        license = stdenv.lib.licenses.mit;
@@ -54857,8 +54979,8 @@ self: {
      }:
      mkDerivation {
        pname = "crf-chain1-constrained";
-       version = "0.5.0";
-       sha256 = "194mcafkf23lifmx2n2hnvsaxl0mfdl9zgl9awigddwxvpxsrmjq";
+       version = "0.6.0";
+       sha256 = "0yzwvzknn0qd8d2b0fqk1lznz8fplv6gx8x5hlmhqmi2f625yav7";
        libraryHaskellDepends = [
          array base binary containers data-lens data-memocombinators
          logfloat monad-codec parallel pedestrian-dag random sgd vector
@@ -54894,8 +55016,8 @@ self: {
      }:
      mkDerivation {
        pname = "crf-chain2-tiers";
-       version = "0.5.0";
-       sha256 = "1gwfkvs9lc7ni68n2mxrqx0haawnc8dwx0b73q7a75ysx538f84x";
+       version = "0.6.0";
+       sha256 = "14vn96vq7ck9xs1gnjmsxi6hr8mlpa6vbr53v2v4lmbav29jqrhr";
        libraryHaskellDepends = [
          array base binary comonad containers data-lens data-memocombinators
          logfloat monad-codec parallel pedestrian-dag sgd vector
@@ -56497,6 +56619,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "cuckoo-filter" = callPackage
+    ({ mkDerivation, aeson, base, cereal, containers, criterion
+     , hashable, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "cuckoo-filter";
+       version = "0.1.0.2";
+       sha256 = "16ql9qvf1qsbnk1wxy3d5iqyk0kyx9w27vq284gr34yqd18dpvk5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ aeson base cereal containers hashable ];
+       executableHaskellDepends = [
+         aeson base cereal containers criterion hashable random
+       ];
+       testHaskellDepends = [
+         aeson base cereal containers hashable QuickCheck tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       description = "Pure and impure Cuckoo Filter";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cuda" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
      , pretty, template-haskell, uuid-types
@@ -57115,8 +57260,8 @@ self: {
     ({ mkDerivation, base, doctest, template-haskell }:
      mkDerivation {
        pname = "d10";
-       version = "0.1.0.0";
-       sha256 = "0ymhfarhsryqw0h6nksz9ki640b3xa1613k40hp85mk4rqir0zjq";
+       version = "0.2.1.0";
+       sha256 = "0dbz1lil7qm0qnn1y5kakh6nyyc3jkv00125vfp9nk2n25yckb9z";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base doctest ];
        description = "Digits 0-9";
@@ -59289,8 +59434,8 @@ self: {
     ({ mkDerivation, base, pretty, syb }:
      mkDerivation {
        pname = "data-tree-print";
-       version = "0.1.0.1";
-       sha256 = "1zh1akyf8vvsqq39vrbn95v5md5in9fvzmz2jz79adh3w5wc5j6f";
+       version = "0.1.0.2";
+       sha256 = "00jh37anim8qsn553467gmfhajcz1c61zrgh1ypkqsll0gc29vy3";
        libraryHaskellDepends = [ base pretty syb ];
        description = "Print Data instances as a nested tree";
        license = stdenv.lib.licenses.bsd3;
@@ -60634,8 +60779,8 @@ self: {
     ({ mkDerivation, base, singletons }:
      mkDerivation {
        pname = "decidable";
-       version = "0.1.2.0";
-       sha256 = "1dgxkwdazqdlnc6pvqwkx531xajl4ygjm5315dz9ilacgbbl2qss";
+       version = "0.1.4.0";
+       sha256 = "07cw2jhvii3prsbczxpmq7g492wc89yxp77ivs01gp3bl7m25cky";
        libraryHaskellDepends = [ base singletons ];
        description = "Combinators for manipulating dependently-typed predicates";
        license = stdenv.lib.licenses.bsd3;
@@ -65978,6 +66123,58 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "docusign-base" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, http-media
+     , lens, servant, servant-client, text
+     }:
+     mkDerivation {
+       pname = "docusign-base";
+       version = "0.0.1";
+       sha256 = "1qh1g8nyj606x0vapv6m07dhm4s3g5z17g1i4wk5bj63vxvms528";
+       libraryHaskellDepends = [
+         aeson base bytestring data-default http-media lens servant
+         servant-client text
+       ];
+       description = "Low-level bindings to the DocuSign API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "docusign-client" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , data-default, docusign-base, exceptions, http-client
+     , http-client-tls, http-types, servant-client, text, uuid
+     }:
+     mkDerivation {
+       pname = "docusign-client";
+       version = "0.0.1";
+       sha256 = "1vyb7n08vqjmc18adbs6ck01q5440a0r99ahb566v427mr9hcydg";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring data-default docusign-base
+         exceptions http-client http-client-tls http-types servant-client
+         text uuid
+       ];
+       description = "Client bindings for the DocuSign API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "docusign-example" = callPackage
+    ({ mkDerivation, base, bytestring, docusign-base, docusign-client
+     , exceptions, filepath, optparse-generic, text, uuid
+     }:
+     mkDerivation {
+       pname = "docusign-example";
+       version = "0.1.0.0";
+       sha256 = "0fhyzmgdjq5rds0p0gifwg6pfsq17yyhj4nwvi6zpgzmww4vya21";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring docusign-base docusign-client exceptions filepath
+         optparse-generic text uuid
+       ];
+       description = "DocuSign examples";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "docvim" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , dlist, filepath, hlint, lens, mtl, optparse-applicative, parsec
@@ -68004,8 +68201,8 @@ self: {
      }:
      mkDerivation {
        pname = "easytest";
-       version = "0.2";
-       sha256 = "1sd9w5p6z9mmvxid6svmnh7h43r32mrcqilb8k7kiy36ln3n8j0b";
+       version = "0.2.1";
+       sha256 = "0gdyawzlw6d15yz7ji599xjgfr0g7l1iq11ffr4aw3j6g3dc6m8i";
        libraryHaskellDepends = [
          async base call-stack containers mtl random stm text transformers
        ];
@@ -68920,8 +69117,8 @@ self: {
        pname = "ekg-core";
        version = "0.1.1.4";
        sha256 = "0dz9iv6viya7b5nx9gxj9g0d1k155pvb7i59azf9272wl369mn36";
-       revision = "2";
-       editedCabalFile = "1jky0jf6ajan5zmb46d6p4lv7293kc5gw1bcq5av733g10cwrbdk";
+       revision = "3";
+       editedCabalFile = "1s3545x9w01rrwzchb4f91ck0n6dc7gf0zwkryqx1b2c95ni5qa8";
        libraryHaskellDepends = [
          base containers ghc-prim text unordered-containers
        ];
@@ -70223,8 +70420,8 @@ self: {
      }:
      mkDerivation {
        pname = "entwine";
-       version = "0.0.1";
-       sha256 = "08yy72lgc8cg12hbz51q06zx7fslhhnk0rjjszba8aj0qbrj8yr4";
+       version = "0.0.2";
+       sha256 = "08y5vxg6q5f7dakclap86i68if18srzl6q3a9hg7qyrrq6jlyv63";
        libraryHaskellDepends = [
          async base containers exceptions monad-loops SafeSemaphore stm text
          time transformers transformers-either
@@ -70259,6 +70456,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "enum-types" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "enum-types";
+       version = "0.1.0.0";
+       sha256 = "18qiq6nnnd1c5lkvjafsqd4ypa4xpmx99diq82dz5wy2h95ci2ri";
+       libraryHaskellDepends = [ base ];
+       description = "small enum types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "enumerable" = callPackage
     ({ mkDerivation, base, control-monad-omega, tagged }:
      mkDerivation {
@@ -70502,6 +70710,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "envstatus" = callPackage
+    ({ mkDerivation, base, ConfigFile, mtl, parsec, process, PyF, tasty
+     , tasty-hspec, unix
+     }:
+     mkDerivation {
+       pname = "envstatus";
+       version = "1.0.2";
+       sha256 = "1wdvhlmqwzwxv0y3n8xhw5yjy158c7xgiyd0p2zhjghws2p1jvp5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base ConfigFile mtl parsec process unix
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base ConfigFile parsec PyF tasty tasty-hspec
+       ];
+       description = "Display efficiently the state of the local environment";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "envy" = callPackage
     ({ mkDerivation, base, bytestring, containers, hspec, mtl
      , QuickCheck, quickcheck-instances, text, time, transformers
@@ -72528,8 +72757,8 @@ self: {
      }:
      mkDerivation {
        pname = "exhaustive";
-       version = "1.1.6";
-       sha256 = "00gdgr9xqzy14sqx31j4afljvfc4ar2jrzmwpp3z6ybfq1saw7vk";
+       version = "1.1.7";
+       sha256 = "02kv3vv7gz8lqwm5iz4nddyzxp17cgsb6j12lc5kf51l481vpb1z";
        libraryHaskellDepends = [
          base generics-sop template-haskell transformers
        ];
@@ -72833,8 +73062,8 @@ self: {
        pname = "exp-extended";
        version = "0.1.1.2";
        sha256 = "0ymfnwq103n1paj6wl2cj6szi5nx2h2j1azy3wy4kkw6sk07m00r";
-       revision = "2";
-       editedCabalFile = "050v0c9l9gi1bxpqbfcl2j9mdiv7xdh1mdfwymxcgpjydv60xwh0";
+       revision = "3";
+       editedCabalFile = "0gd1jwhhj5qjvfysvrm41zywx3cq6n131ym2x94z68cpswdmv0qn";
        libraryHaskellDepends = [ base compensated log-domain ];
        description = "floating point with extended exponent range";
        license = stdenv.lib.licenses.bsd3;
@@ -73318,13 +73547,16 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects-concurrent";
-       version = "0.6.2";
-       sha256 = "11cqk78c0lfsa8mkq7ymxsral0g24p1im4r1ndqsf7rxczjmc37c";
+       version = "0.8";
+       sha256 = "17xag4qcdgv7fihyigmi48kf4mb9f3dbxqlh7a7s1xqdfh9l6mc2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers data-default deepseq directory extensible-effects
          filepath lens logging-effect monad-control mtl parallel process
          QuickCheck random stm tagged time transformers
        ];
+       executableHaskellDepends = [ base extensible-effects ];
        testHaskellDepends = [
          base containers deepseq extensible-effects HUnit lens QuickCheck
          stm tasty tasty-discover tasty-hunit
@@ -77275,21 +77507,21 @@ self: {
 
   "fltkhs" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
-     , mtl, parsec, text
+     , mtl, parsec, pkg-config, text, vector
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.4.5";
-       sha256 = "17iqpnn0zgwifb937kllkfyz8qf37da90z8iyay348gy3siwjxic";
+       version = "0.6.0.0";
+       sha256 = "1cbyp8rq9yzx6jrw68dbprkdyd8pkdqbxx08wajyg7bfks6j39cb";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
-       libraryHaskellDepends = [ base bytestring text ];
-       libraryToolDepends = [ c2hs ];
+       libraryHaskellDepends = [ base bytestring text vector ];
+       libraryToolDepends = [ c2hs pkg-config ];
        executableHaskellDepends = [ base directory filepath mtl parsec ];
        description = "FLTK bindings";
        license = stdenv.lib.licenses.mit;
-     }) {};
+     }) {pkg-config = null;};
 
   "fltkhs-demos" = callPackage
     ({ mkDerivation, base, bytestring, directory, fltkhs, process, stm
@@ -77349,6 +77581,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fltkhs-themes" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, fltkhs, fontconfig
+     , load-font, text, vector
+     }:
+     mkDerivation {
+       pname = "fltkhs-themes";
+       version = "0.1.0.1";
+       sha256 = "03awhraincinrqr1zzb9c64mkb391isw3gb87csa1dkqk846wij6";
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         base bytestring fltkhs load-font text vector
+       ];
+       librarySystemDepends = [ fontconfig ];
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) fontconfig;};
+
   "fluent-logger" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal
      , cereal-conduit, conduit, conduit-extra, containers, criterion
@@ -77540,10 +77790,8 @@ self: {
      }:
      mkDerivation {
        pname = "fmt";
-       version = "0.6";
-       sha256 = "14hk6ra8j1zzw7ibimj207mi1xl5pmln6kyz0y66j4bg1r8invsy";
-       revision = "1";
-       editedCabalFile = "0xmi4qxq12qfj4ry1ifb0za7jdlvj65v16bzdqi8r7p1xrxy5cki";
+       version = "0.6.1";
+       sha256 = "1c6a0nrm90drs13s1hry9xs8j7dx37j21f7kllpx5s240nqy4c6c";
        libraryHaskellDepends = [
          base base64-bytestring bytestring containers formatting microlens
          text time time-locale-compat
@@ -79289,6 +79537,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "freer-simple_1_2_0_0" = callPackage
+    ({ mkDerivation, base, criterion, extensible-effects, free, mtl
+     , natural-transformation, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, transformers-base
+     }:
+     mkDerivation {
+       pname = "freer-simple";
+       version = "1.2.0.0";
+       sha256 = "1z0f0m03szzcy1s6msqdlaj266dq0bkkwlwcr7p28xv7lj6gxgdb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base natural-transformation template-haskell 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "freesect" = callPackage
     ({ mkDerivation, array, base, cpphs, directory, mtl, parallel
      , pretty, random, syb
@@ -80487,6 +80761,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fused-effects" = callPackage
+    ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom, random
+     }:
+     mkDerivation {
+       pname = "fused-effects";
+       version = "0.1.1.0";
+       sha256 = "1wcrixfpz0q93xskb90p8a2jypsghbpgwn4fjy6k1ad4ihxn19hl";
+       libraryHaskellDepends = [ base deepseq MonadRandom random ];
+       testHaskellDepends = [ base doctest hspec ];
+       description = "A fast, flexible, fused effect system";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fusion" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, pipes-safe
      , transformers, void
@@ -80502,6 +80789,62 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "futhark" = callPackage
+    ({ mkDerivation, aeson, alex, ansi-terminal, array, base
+     , bifunctors, binary, blaze-html, bytestring, containers
+     , data-binary-ieee754, directory, directory-tree, dlist, extra
+     , file-embed, filepath, free, gitrev, happy, haskeline, http-client
+     , http-client-tls, http-conduit, HUnit, language-c-quote
+     , mainland-pretty, markdown, megaparsec, mtl, neat-interpolation
+     , parallel, parser-combinators, process, process-extras, QuickCheck
+     , random, raw-strings-qq, regex-tdfa, srcloc, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, temporary, text
+     , th-lift-instances, time, transformers, vector
+     , vector-binary-instances, versions, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "futhark";
+       version = "0.7.4";
+       sha256 = "1qjcza0i0y6qalyim5kclz3x4lj667d4d4y2amk3sn4qbgaibajs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal array base bifunctors binary blaze-html bytestring
+         containers data-binary-ieee754 directory directory-tree dlist extra
+         file-embed filepath free gitrev http-client http-client-tls
+         http-conduit language-c-quote mainland-pretty markdown megaparsec
+         mtl neat-interpolation parallel parser-combinators process
+         process-extras raw-strings-qq regex-tdfa srcloc template-haskell
+         text th-lift-instances time transformers vector
+         vector-binary-instances versions zip-archive zlib
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         aeson ansi-terminal array base bifunctors binary blaze-html
+         bytestring containers data-binary-ieee754 directory directory-tree
+         dlist extra file-embed filepath free gitrev haskeline http-client
+         http-client-tls http-conduit language-c-quote mainland-pretty
+         markdown megaparsec mtl neat-interpolation parallel
+         parser-combinators process process-extras random raw-strings-qq
+         regex-tdfa srcloc template-haskell temporary text th-lift-instances
+         time transformers vector vector-binary-instances versions
+         zip-archive zlib
+       ];
+       testHaskellDepends = [
+         ansi-terminal array base bifunctors binary blaze-html bytestring
+         containers data-binary-ieee754 directory directory-tree dlist extra
+         file-embed filepath free gitrev http-client http-client-tls
+         http-conduit HUnit language-c-quote mainland-pretty markdown
+         megaparsec mtl neat-interpolation parallel parser-combinators
+         process process-extras QuickCheck raw-strings-qq regex-tdfa srcloc
+         tasty tasty-hunit tasty-quickcheck template-haskell text
+         th-lift-instances time transformers vector vector-binary-instances
+         versions zip-archive zlib
+       ];
+       description = "An optimising compiler for a functional, array-oriented language";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "futun" = callPackage
     ({ mkDerivation, base, bytestring, network, unix }:
      mkDerivation {
@@ -81949,14 +82292,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "generics-sop_0_4_0_0" = callPackage
+  "generics-sop_0_4_0_1" = callPackage
     ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core
      , template-haskell
      }:
      mkDerivation {
        pname = "generics-sop";
-       version = "0.4.0.0";
-       sha256 = "0blx09k173qgaghqnsvz6v2r6san1kn62k5c57wilya94l1996ra";
+       version = "0.4.0.1";
+       sha256 = "160knr2phnzh2gldfv954lz029jzc7y8kz5xpmbf4z3vb5ngm6fw";
        libraryHaskellDepends = [
          base ghc-prim sop-core template-haskell
        ];
@@ -81975,8 +82318,8 @@ self: {
        pname = "generics-sop-lens";
        version = "0.1.2.1";
        sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf";
-       revision = "5";
-       editedCabalFile = "1q6953xi46qvbknaq2j8x2zqmk2q1mmf8xczjyib3abxz0rp3608";
+       revision = "6";
+       editedCabalFile = "0j4j3kk2nsl5n5gp0vrzqdc5y9ly31b4nvhq0bpgcpzibvik7ssw";
        libraryHaskellDepends = [ base generics-sop lens ];
        description = "Lenses for types in generics-sop";
        license = stdenv.lib.licenses.bsd3;
@@ -83181,8 +83524,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-events";
-       version = "0.8.0";
-       sha256 = "1wdxap20wh8sdaqnpsk463mihg6v3va786zb1amgzrcjpsv49is5";
+       version = "0.8.0.1";
+       sha256 = "1658lr4av48y8m0p5fs3sjxkkbdkwdf6m02byzw69gqg3xzz1i99";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83265,15 +83608,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-exactprint_0_5_8_1" = callPackage
+  "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
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.5.8.1";
-       sha256 = "1qjl137f4lpadkgdyfjnkkga8vqyw0x27plpyw57aqhc8qmcylhh";
+       version = "0.5.8.2";
+       sha256 = "18wlhvgpbk7ym1vbi8fkdwbjhcplgr7zcqm328yi4v7rilbxw7cn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84904,6 +85247,24 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {};
 
+  "gi-gtk-hs_0_3_6_3" = callPackage
+    ({ mkDerivation, base, base-compat, containers, gi-gdk
+     , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gtk-hs";
+       version = "0.3.6.3";
+       sha256 = "0xnrssnfaz57akrkgpf1cm3d4lg3cmlh0b8yp6w9pdsbp0lld2ay";
+       libraryHaskellDepends = [
+         base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
+         gi-gtk haskell-gi-base mtl text transformers
+       ];
+       description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gi-gtkosxapplication" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
      , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi
@@ -84968,6 +85329,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome3) webkitgtk;};
 
+  "gi-javascriptcore_4_0_16" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
+     , text, transformers, webkitgtk
+     }:
+     mkDerivation {
+       pname = "gi-javascriptcore";
+       version = "4.0.16";
+       sha256 = "0kihq9sp42k2k9j8qrwgja62i5pzwhc1z1yy6h19n56aikddfc2z";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ webkitgtk ];
+       doHaddock = false;
+       description = "JavaScriptCore bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs.gnome3) webkitgtk;};
+
   "gi-notify" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
@@ -85318,18 +85700,19 @@ self: {
      }) {};
 
   "gingersnap" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-types
-     , postgresql-simple, resource-pool, snap-core
+    ({ mkDerivation, aeson, base, bytestring, deepseq, http-types
+     , postgresql-simple, resource-pool, snap-core, text, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "gingersnap";
-       version = "0.1.1.0";
-       sha256 = "0aqb9ikh21q13mnwf6vcg6chv73vphyag62zhkd4mkhbnlpr816i";
+       version = "0.2.2.3";
+       sha256 = "1w1ip80w9bc5gj0ws6cvk37648267b4fqmh81h2khn7qhdah74k7";
        libraryHaskellDepends = [
-         aeson base bytestring http-types postgresql-simple resource-pool
-         snap-core
+         aeson base bytestring deepseq http-types postgresql-simple
+         resource-pool snap-core text transformers unordered-containers
        ];
-       description = "snap-core + aeson + postgresql-simple = delicious";
+       description = "Tools for consistent and safe JSON APIs with snap-core and postgresql-simple";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -90570,8 +90953,8 @@ self: {
     ({ mkDerivation, base, containers, json, text }:
      mkDerivation {
        pname = "graphql-w-persistent";
-       version = "0.1.0.4";
-       sha256 = "1ivdh8l6snb2d3g1f7fb46fd9fz6ib2i94b1596pmp38hryl8in0";
+       version = "0.1.0.7";
+       sha256 = "13fbx5vzg2fq9883hdf8djbc47lyia6n4sshwz3dhg5bjpni7l1x";
        libraryHaskellDepends = [ base containers json text ];
        description = "Haskell GraphQL query parser-interpreter-data processor";
        license = stdenv.lib.licenses.isc;
@@ -91554,8 +91937,8 @@ self: {
      }:
      mkDerivation {
        pname = "gssapi-wai";
-       version = "0.1.2.2";
-       sha256 = "1fkgsdc4nkxwkhnz3b8rz6zx8jq6325mgniy5h5s3cr7k0kwnv0s";
+       version = "0.1.2.3";
+       sha256 = "08c47zwy4wh1cga5l4brg7dm5nkl7xcsq2rvwdzvmzzxyfg3nnr7";
        libraryHaskellDepends = [
          base base64-bytestring bytestring case-insensitive gssapi
          http-types vault wai wai-extra
@@ -93543,8 +93926,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackage-whatsnew";
-       version = "0.1.1";
-       sha256 = "140qsl0aqw2zg246inijifvcddmirba613as0hrg11hkd52f6fhr";
+       version = "0.1.2";
+       sha256 = "19nk01jqfirvr8c3wy6pacq32v5lzxi735r8i6d23d0vwjfmqxnk";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -94005,8 +94388,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.13.0";
-       sha256 = "1z5qaxslshd1adkhqcpx8m8fs8d3dw4vwbwvsqcpm7gis63qhbqg";
+       version = "1.14.0";
+       sha256 = "0cypqvl04fd0gdakl2kf087fjy6qw968isx2hmli5z5gza18hl0b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95403,24 +95786,27 @@ self: {
   "hapistrano" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath
      , formatting, gitrev, hspec, mtl, optparse-applicative, path
-     , path-io, process, stm, temporary, time, transformers, yaml
+     , path-io, process, QuickCheck, stm, temporary, time, transformers
+     , yaml
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.3.6.1";
-       sha256 = "0g0i0n952zjvysjrsp4srhqgrq5fyy7kdinixsxazpccf01f229y";
+       version = "0.3.7.0";
+       sha256 = "16d1y3dwbvj76b1yyghvwi4f7wak1dv6l07ymknrbi42ks0w9041";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base filepath formatting gitrev mtl path process time transformers
+         aeson base filepath formatting gitrev mtl path process time
+         transformers
        ];
        executableHaskellDepends = [
          aeson async base formatting gitrev optparse-applicative path
          path-io stm yaml
        ];
        testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
+         base directory filepath hspec mtl path path-io process QuickCheck
+         temporary
        ];
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
@@ -97937,7 +98323,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp_0_8_0_0" = callPackage
+  "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
@@ -97945,8 +98331,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-lsp";
-       version = "0.8.0.0";
-       sha256 = "04mihj4538pys6v4m3dwijfzcpsv52jizm416rnnwc88gr8q6wkk";
+       version = "0.8.0.1";
+       sha256 = "1lvrqxp6v5xvha88l8r6n86ydvlszzxmi7fazvjxz4bixy9zvw8q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98005,15 +98391,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp-types_0_8_0_0" = callPackage
+  "haskell-lsp-types_0_8_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, filepath
      , hashable, lens, network-uri, scientific, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "haskell-lsp-types";
-       version = "0.8.0.0";
-       sha256 = "11dm7v9rvfig6m40m0np7cs5cfaawwpw67c445dz15vls5pri71n";
+       version = "0.8.0.1";
+       sha256 = "0czh6fqrzzp5xkawwiia5n437pmch41rnkp166lpvglfqg4gx8y8";
        libraryHaskellDepends = [
          aeson base bytestring data-default filepath hashable lens
          network-uri scientific text unordered-containers
@@ -98571,6 +98957,8 @@ self: {
        pname = "haskell-src-meta";
        version = "0.8.0.3";
        sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4";
+       revision = "2";
+       editedCabalFile = "0dp5v0yd0wgijzaggr22glgjswpa65hy84h8awdzd9d78g2fjz6c";
        libraryHaskellDepends = [
          base haskell-src-exts pretty syb template-haskell th-orphans
        ];
@@ -99832,8 +100220,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-node";
-       version = "0.9.2";
-       sha256 = "1aiqhw7fk6h70ps5svbhhhk577ai0rqk6s4bm00ii4yhnbdrdk60";
+       version = "0.9.3";
+       sha256 = "149k9b11c0dj3qqdbinwqnjxy8bxmc4bk65lfxpic2zy26n46k7q";
        libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra data-default hashable
          haskoin-core monad-logger mtl network nqe random resourcet
@@ -99895,31 +100283,34 @@ self: {
      }) {};
 
   "haskoin-store" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cereal, conduit
-     , containers, directory, filepath, haskoin-core, haskoin-node
-     , hspec, http-types, monad-logger, mtl, network, nqe
-     , optparse-applicative, random, rocksdb-haskell, rocksdb-query
-     , scotty, string-conversions, text, time, transformers, unliftio
+    ({ mkDerivation, aeson, base, binary, bytestring, cereal, conduit
+     , containers, data-default, directory, filepath, hashable
+     , haskoin-core, haskoin-node, hspec, http-types, monad-logger, mtl
+     , network, nqe, optparse-applicative, random, rocksdb-haskell
+     , rocksdb-query, scotty, string-conversions, text, time
+     , transformers, unliftio, unordered-containers
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.2.3";
-       sha256 = "0ywfmqdwvw07gx4a413i0ffsgrq2gfjgpw8a6f78h6idiw69shkw";
+       version = "0.4.2";
+       sha256 = "0fjp566icp76dqhivl9jn3s3k2fvxmjysj4rpmrvwfyzb7snlqvp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring cereal conduit containers haskoin-core
-         haskoin-node monad-logger mtl network nqe random rocksdb-haskell
-         rocksdb-query string-conversions text time transformers unliftio
+         aeson base bytestring cereal conduit containers data-default
+         hashable haskoin-core haskoin-node monad-logger mtl network nqe
+         random rocksdb-haskell rocksdb-query string-conversions text time
+         transformers unliftio unordered-containers
        ];
        executableHaskellDepends = [
-         aeson base bytestring conduit directory filepath haskoin-core
-         haskoin-node http-types monad-logger nqe optparse-applicative
-         rocksdb-haskell scotty string-conversions text unliftio
+         aeson base binary bytestring cereal conduit data-default directory
+         filepath haskoin-core haskoin-node http-types monad-logger nqe
+         optparse-applicative rocksdb-haskell scotty string-conversions text
+         transformers unliftio unordered-containers
        ];
        testHaskellDepends = [
-         base haskoin-core haskoin-node hspec monad-logger mtl nqe
-         rocksdb-haskell unliftio
+         base data-default haskoin-core haskoin-node hspec monad-logger mtl
+         nqe rocksdb-haskell transformers unliftio unordered-containers
        ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
        license = stdenv.lib.licenses.publicDomain;
@@ -100165,6 +100556,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasktorch-codegen" = callPackage
+    ({ mkDerivation, base, containers, directory, hashable, hspec
+     , hspec-discover, megaparsec, optparse-applicative, pretty-show
+     , QuickCheck, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hasktorch-codegen";
+       version = "0.0.1.0";
+       sha256 = "0s48myr8k96kb0mwvfcc9h5razp8y5k8dk987hfg101h2nfz5k10";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory hashable megaparsec pretty-show text
+         unordered-containers
+       ];
+       executableHaskellDepends = [
+         base optparse-applicative pretty-show
+       ];
+       testHaskellDepends = [
+         base containers hspec hspec-discover megaparsec pretty-show
+         QuickCheck text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Code generation tools for Hasktorch";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskus-binary" = callPackage
     ({ mkDerivation, base, bytestring, cereal, criterion, haskus-utils
      , mtl, QuickCheck, tasty, tasty-quickcheck
@@ -100213,8 +100631,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskus-utils";
-       version = "1.0";
-       sha256 = "1pfjarir86c2sxjh8l0jc7z5acsz8slcwb7imjdxf3dsdiy8swwd";
+       version = "1.1";
+       sha256 = "1grbj23545b7wxxyc4rra681k9c8xg36swlql3rgcr15m61fm647";
        libraryHaskellDepends = [
          base containers extra file-embed haskus-utils-data
          haskus-utils-types haskus-utils-variant list-t mtl
@@ -100233,8 +100651,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskus-utils-data";
-       version = "1.0";
-       sha256 = "007ykjinkxr9kdrk7hl81zndpan60b5l51m32nlj2xv2pjm326z4";
+       version = "1.1";
+       sha256 = "1001apph6i956rkb6dpfhg8cgk870s44jgaaiv8ccxivkv45y7di";
        libraryHaskellDepends = [
          base containers extra haskus-utils-types mtl recursion-schemes
          transformers
@@ -100247,23 +100665,26 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "haskus-utils-types";
-       version = "1.0";
-       sha256 = "1rxnaw53vfmi3gv8h7j6vw4y4xxnqzwaaasd6x22fm7fzc5q64vf";
+       version = "1.1";
+       sha256 = "1fihf61z5078l73a08fvm5qb67dr3yc32nhgakkldd0fbh7clyrz";
        libraryHaskellDepends = [ base ];
        description = "Haskus utility modules";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "haskus-utils-variant" = callPackage
-    ({ mkDerivation, base, haskus-utils-data, haskus-utils-types }:
+    ({ mkDerivation, base, haskus-utils-data, haskus-utils-types, tasty
+     , tasty-quickcheck, template-haskell
+     }:
      mkDerivation {
        pname = "haskus-utils-variant";
-       version = "1.0";
-       sha256 = "1kkqngvzifxps0hhp49syh2w4an3y4s4nvp3qbh3p00h9dw3hmsn";
+       version = "2.0.1";
+       sha256 = "1rg4m1iq2fnnjxd6vbxsqnv21h8rnqisvxxfhns7hc167aydfwwp";
        libraryHaskellDepends = [
-         base haskus-utils-data haskus-utils-types
+         base haskus-utils-data haskus-utils-types template-haskell
        ];
-       description = "Haskus utility modules";
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
+       description = "Variant and EADT";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -102727,17 +103148,18 @@ self: {
 
   "heist" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder
-     , blaze-html, bytestring, containers, criterion, directory
-     , directory-tree, dlist, filepath, hashable, HUnit, lens
-     , lifted-base, map-syntax, monad-control, mtl, process, QuickCheck
-     , random, statistics, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, transformers
-     , transformers-base, unordered-containers, vector, xmlhtml
+     , blaze-html, bytestring, containers, criterion
+     , criterion-measurement, directory, directory-tree, dlist, filepath
+     , hashable, HUnit, lens, lifted-base, map-syntax, monad-control
+     , mtl, process, QuickCheck, random, statistics, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , transformers, transformers-base, unordered-containers, vector
+     , xmlhtml
      }:
      mkDerivation {
        pname = "heist";
-       version = "1.1";
-       sha256 = "15hdq3i041ph0ry6f9dn6vx2w9hzgkvi9db4p6cy6czwbp53kjbq";
+       version = "1.1.0.1";
+       sha256 = "1j4h9fwny4hl2m5lgsd257lvm9057fb0hmnaqjw8a9k4hyx7hmqq";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist filepath hashable
@@ -102754,10 +103176,11 @@ self: {
        ];
        benchmarkHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
-         containers criterion directory directory-tree dlist filepath
-         hashable HUnit lifted-base map-syntax monad-control mtl process
-         random statistics test-framework test-framework-hunit text time
-         transformers transformers-base unordered-containers vector xmlhtml
+         containers criterion criterion-measurement directory directory-tree
+         dlist filepath hashable HUnit lifted-base map-syntax monad-control
+         mtl process random statistics test-framework test-framework-hunit
+         text time transformers transformers-base unordered-containers
+         vector xmlhtml
        ];
        description = "An Haskell template system supporting both HTML5 and XML";
        license = stdenv.lib.licenses.bsd3;
@@ -103599,8 +104022,8 @@ self: {
      }:
      mkDerivation {
        pname = "hevm";
-       version = "0.17";
-       sha256 = "0xp28mm3wxyj3win37nvrjdywkrfzm4l0j441q88bd35vr25yi2k";
+       version = "0.21";
+       sha256 = "0h3d1b2xdd59d3rl1a9ng1hz2hr3g6n1dpak0a4namjlcfxvwwhd";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -104453,8 +104876,8 @@ self: {
        pname = "hgmp";
        version = "0.1.1";
        sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr";
-       revision = "2";
-       editedCabalFile = "0v318nifmgqq5jg1d5q0jspfgyqp7cfnkz3ikqaz9xjg8inzl8mr";
+       revision = "3";
+       editedCabalFile = "0z2xbqzyrgm9apy3xl353wgwhbnc3hdb1giw2j6fyvv705fmpb62";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell interface to GMP";
@@ -106005,8 +106428,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjugement";
-       version = "2.0.0.20180903";
-       sha256 = "0zvgabj0myn5ssfpj8l50z0jwcrqkfsixdhg1wq916y8ay7yi71n";
+       version = "2.0.0.20181030";
+       sha256 = "063d484ns520prgvb2b1szq33wx569fgbgrzvfrgpfcznra638fi";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
@@ -107470,8 +107893,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoauth2";
-       version = "1.7.2";
-       sha256 = "0klkgr11p8m03ksrad59pqs0czp6hrgmzxynng4zirbmz643plvf";
+       version = "1.8.0";
+       sha256 = "02pirdgq1l638n126qj6sccfkjc6scxl53m584fxq79gfdwarx2q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109144,26 +109567,33 @@ self: {
      }) {};
 
   "hpack-dhall" = callPackage
-    ({ mkDerivation, aeson, base, dhall, dhall-json, hpack, hspec
-     , interpolate, megaparsec, mockery, text, transformers
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal
+     , dhall, dhall-json, Diff, filepath, hpack, megaparsec, microlens
+     , optparse-applicative, prettyprinter, tasty, tasty-golden, text
+     , transformers, utf8-string, yaml
      }:
      mkDerivation {
        pname = "hpack-dhall";
-       version = "0.3.0";
-       sha256 = "0dplb37npz47cxya1c3dnj6bjcnprjph83yifb08a5qf6vnhcjyh";
-       revision = "3";
-       editedCabalFile = "1paz90nmir7hrwp9yf2aair14gyiw8ql7f9vj2ry8r7q00xbpfv2";
-       isLibrary = false;
+       version = "0.4.0";
+       sha256 = "04bjhfc5xqkvp58y28cifsq58l2rbc8xa7ywvzmk9hvw7acbixca";
+       isLibrary = true;
        isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring dhall dhall-json filepath hpack
+         megaparsec microlens prettyprinter text transformers yaml
+       ];
        executableHaskellDepends = [
-         aeson base dhall dhall-json hpack megaparsec text transformers
+         aeson aeson-pretty base bytestring dhall dhall-json filepath hpack
+         megaparsec microlens optparse-applicative prettyprinter text
+         transformers yaml
        ];
        testHaskellDepends = [
-         aeson base dhall dhall-json hpack hspec interpolate megaparsec
-         mockery text transformers
+         aeson aeson-pretty base bytestring Cabal dhall dhall-json Diff
+         filepath hpack megaparsec microlens prettyprinter tasty
+         tasty-golden text transformers utf8-string yaml
        ];
-       description = "Dhall support for Hpack";
-       license = stdenv.lib.licenses.publicDomain;
+       description = "hpack's dhalling";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -110630,18 +111060,17 @@ self: {
 
   "hs2ats" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude
-     , cpphs, criterion, deepseq, haskell-src-exts, hspec
-     , hspec-dirstream, language-ats, microlens, optparse-generic
-     , system-filepath
+     , criterion, deepseq, haskell-src-exts, hspec, hspec-dirstream
+     , language-ats, microlens, optparse-generic, system-filepath
      }:
      mkDerivation {
        pname = "hs2ats";
-       version = "0.3.0.4";
-       sha256 = "1mqm4yblv22368v01xq59ppi4ifjpqlswfirm6n42ckb47xhmy09";
+       version = "0.4.0.0";
+       sha256 = "1564xybdqli5i3096xmccy6z0xgm5yvfmjmz60r9ny3h54ahlj7r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base casing composition-prelude cpphs deepseq
+         ansi-wl-pprint base casing composition-prelude deepseq
          haskell-src-exts language-ats microlens
        ];
        executableHaskellDepends = [ base optparse-generic ];
@@ -110716,6 +111145,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hsPID" = callPackage
+    ({ mkDerivation, base, HUnit, lens }:
+     mkDerivation {
+       pname = "hsPID";
+       version = "0.1";
+       sha256 = "16ks8pvpd0rcw11zinzlldv21i6mbcbrnnq3j9z3vmcjpd25wzim";
+       libraryHaskellDepends = [ base lens ];
+       testHaskellDepends = [ base HUnit lens ];
+       description = "PID control loop";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "hsSqlite3" = callPackage
     ({ mkDerivation, base, bindings-sqlite3, bytestring, mtl
      , utf8-string
@@ -111908,6 +112349,24 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "hsinstall_2_1" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath, heredoc, process
+     }:
+     mkDerivation {
+       pname = "hsinstall";
+       version = "2.1";
+       sha256 = "1azbzkslszq9pw4h91mp1zr6g6ad2haaf3g5146naf1f456z9zjg";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [
+         base Cabal directory filepath heredoc process
+       ];
+       description = "Install Haskell software";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hskeleton" = callPackage
     ({ mkDerivation, base, Cabal }:
      mkDerivation {
@@ -115002,6 +115461,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-client-openssl_0_3_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, HsOpenSSL, hspec, http-client
+     , http-types, network
+     }:
+     mkDerivation {
+       pname = "http-client-openssl";
+       version = "0.3.0.0";
+       sha256 = "0y7d1bp045mj1lnbd74a1v4viv5g5awivdhbycq75hnvqf2n50vl";
+       libraryHaskellDepends = [
+         base bytestring 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-client-request-modifiers" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, http-client
      , http-media, http-types, network, network-uri
@@ -115766,16 +116245,45 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http2_1_6_4" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
+     , case-insensitive, containers, criterion, directory, doctest
+     , filepath, Glob, heaps, hex, hspec, mwc-random, network-byte-order
+     , psqueues, stm, text, unordered-containers, vector, word8
+     }:
+     mkDerivation {
+       pname = "http2";
+       version = "1.6.4";
+       sha256 = "0rhy7z67bmbb15kxq9fmpgvqmc3npsbf1ym04cg07ymq9ihxvjig";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bytestring case-insensitive containers
+         network-byte-order psqueues stm
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty array base bytestring case-insensitive
+         containers directory doctest filepath Glob hex hspec
+         network-byte-order psqueues stm text unordered-containers vector
+         word8
+       ];
+       benchmarkHaskellDepends = [
+         array base bytestring case-insensitive containers criterion heaps
+         mwc-random network-byte-order psqueues stm
+       ];
+       description = "HTTP/2 library including frames, priority queues and HPACK";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http2-client" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , http2, network, stm, time, tls
      }:
      mkDerivation {
        pname = "http2-client";
-       version = "0.8.0.1";
-       sha256 = "055x0cscrd0idfda4ak48dagkmqkgj1zg29mz4yxrdj9vp2n0xd3";
-       revision = "1";
-       editedCabalFile = "190dhnj34b9xnpf6d3lj5a1fr90k2dy1l1i8505mp49lxzdvzkgc";
+       version = "0.8.0.2";
+       sha256 = "16m4amw7xq7psvxix76z7g1dvllkfs9pzpnig5rfhbgfvbf5pydw";
        libraryHaskellDepends = [
          async base bytestring containers deepseq http2 network stm time tls
        ];
@@ -115790,8 +116298,8 @@ self: {
      }:
      mkDerivation {
        pname = "http2-client-exe";
-       version = "0.1.0.0";
-       sha256 = "0i8rnq01dlnj7yzf64b7g7cshzsbxc668m9fhc97x3hbdr7b0iad";
+       version = "0.1.0.1";
+       sha256 = "1z1y52253dybliwplybwd71a1ssmma34zcylv54aj6x7grrj37hm";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -116801,14 +117309,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-ip_0_4_1" = callPackage
+  "hw-ip_0_4_2" = callPackage
     ({ mkDerivation, attoparsec, base, generic-lens, hedgehog, hspec
      , hw-bits, hw-hspec-hedgehog, text
      }:
      mkDerivation {
        pname = "hw-ip";
-       version = "0.4.1";
-       sha256 = "0kql3qvav2r0fsppiqa40s95938gfzkal5bkli3rhjiknj3vhbg7";
+       version = "0.4.2";
+       sha256 = "1jcfj75hlg7szvknw6v13barvcilldzh76jv1rnfyscrfhpdkd2s";
        libraryHaskellDepends = [
          attoparsec base generic-lens hw-bits text
        ];
@@ -117216,6 +117724,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-streams" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+     , ghc-prim, hedgehog, hspec, hw-bits, hw-hspec-hedgehog, hw-prim
+     , mmap, primitive, QuickCheck, semigroups, transformers, vector
+     }:
+     mkDerivation {
+       pname = "hw-streams";
+       version = "0.0.0.4";
+       sha256 = "08dmcbvw3z53plzgq5z3pa9ns9rjj0xs9rx70pyfrqrrc2f98hwi";
+       libraryHaskellDepends = [
+         base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups
+         transformers vector
+       ];
+       testHaskellDepends = [
+         base bytestring directory exceptions ghc-prim hedgehog hspec
+         hw-bits hw-hspec-hedgehog hw-prim mmap primitive QuickCheck
+         semigroups transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion ghc-prim hw-bits hw-prim mmap primitive
+         semigroups transformers vector
+       ];
+       description = "Primitive functions and data types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-string-parse" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
      mkDerivation {
@@ -118992,8 +119526,8 @@ self: {
      }:
      mkDerivation {
        pname = "idris";
-       version = "1.3.0";
-       sha256 = "1w5i2z88li4niykwc6yrgxgfp25ll6ih95cip0ri7d8i7ik03c48";
+       version = "1.3.1";
+       sha256 = "0fn9h58l592j72njwma1ia48h8h87wi2rjqfxs7j2lfmvgfv18fi";
        configureFlags = [ "-fcurses" "-fexeconly" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
@@ -120855,6 +121389,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "initialize" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "initialize";
+       version = "0.1.1.0";
+       sha256 = "0k3bl5adj512bzqysapnggvf6fmi0hs3mvxkymsh9af7gan8y504";
+       libraryHaskellDepends = [ base ];
+       description = "Initialization and Deinitialization of 'Storable' values";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "inj" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -120980,8 +121525,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c-cpp";
-       version = "0.2.2.1";
-       sha256 = "1rk7fmpkmxw9hhwr8df29kadnf0ybnwj64ggdbnsdrpfyhnkisci";
+       version = "0.3.0.1";
+       sha256 = "00q4f2rv6ny5cnfyfdwqvmngw2w40jfs5zb1x7zs574w4l31g701";
        libraryHaskellDepends = [
          base inline-c safe-exceptions template-haskell
        ];
@@ -124566,6 +125111,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jmonkey" = callPackage
+    ({ mkDerivation, base, casing, free, jmacro }:
+     mkDerivation {
+       pname = "jmonkey";
+       version = "0.1.0.1";
+       sha256 = "1yhmhaa8ykjv3xivd7v10q3zw3pvgf45jk5wsbrr95s2p806n5nf";
+       libraryHaskellDepends = [ base casing free jmacro ];
+       testHaskellDepends = [ base casing free jmacro ];
+       description = "Jmonkey is very restricted but handy EDSL for JavaScript";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "jni" = callPackage
     ({ mkDerivation, base, bytestring, choice, constraints, containers
      , cpphs, deepseq, inline-c, jdk, singletons
@@ -125477,8 +126034,8 @@ self: {
        pname = "json-rpc-client";
        version = "0.2.5.0";
        sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak";
-       revision = "8";
-       editedCabalFile = "04dqdn9gdw5xgkm4cnzsph57xcjc01rm1fdfwcfdzg71mbyf8f7y";
+       revision = "9";
+       editedCabalFile = "04b65m8lhk2g2d5x5i637ff3wkgvf4z6dhn5x1pizsj9y3aq35zm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -125523,8 +126080,8 @@ self: {
        pname = "json-rpc-server";
        version = "0.2.6.0";
        sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn";
-       revision = "5";
-       editedCabalFile = "0hvkfbgg3jbgs0d2jp5djhpd2qp3q9hs5cr4ds93bc9nyncymyq9";
+       revision = "6";
+       editedCabalFile = "1rfabr679pk605v141gm0ynbp3l6x87s3ip3wa49lwnpab495mxs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -125571,8 +126128,8 @@ self: {
        pname = "json-sop";
        version = "0.2.0.3";
        sha256 = "0ay2cymy4aar23cixcyqam91bs9x4z0vqiw2k0nvgy9nyqfz2r9h";
-       revision = "1";
-       editedCabalFile = "1bvmfl6fqdr8fklv8zai5jgzlnv1jf9xy8i656lfz1ys95q9yr48";
+       revision = "2";
+       editedCabalFile = "1lclvvcfvicr05v2nf1xkf21qry2g2bqjhd7gfhza89d571aq3gp";
        libraryHaskellDepends = [
          aeson base generics-sop lens-sop tagged text time transformers
          unordered-containers vector
@@ -127791,6 +128348,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "kind-apply" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "kind-apply";
+       version = "0.1.0.0";
+       sha256 = "0n2picf38cxfgsi76372h6d25s5kvc32qw7514b2i4ald6qh8aip";
+       libraryHaskellDepends = [ base ];
+       description = "Utilities to work with lists of types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "kind-generics" = callPackage
+    ({ mkDerivation, base, kind-apply }:
+     mkDerivation {
+       pname = "kind-generics";
+       version = "0.1.0.0";
+       sha256 = "1h6pb14b75lphlxzz7q08ihvg2phh082sx6a2zpdk5gwh8qzihpg";
+       libraryHaskellDepends = [ base kind-apply ];
+       description = "Generic programming in GHC style for arbitrary kinds and GADTs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "kinds" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -128657,8 +129236,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot";
-       version = "5.1.0.2";
-       sha256 = "1nzjlxyzrri8zw67flqn1arz10mgbmyglhvf6pg4r8w78iwg5nk3";
+       version = "5.1.0.4";
+       sha256 = "1pywangzqf85pqhh5sn10vpk0wrd7ff5p29jrsi6sxdz5lyb7svk";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -128682,8 +129261,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-core";
-       version = "5.1.0.2";
-       sha256 = "1n0cqkbiadc169vq7pj5zwvi3yay6db60q8pdk4kci0s9clz4161";
+       version = "5.1.0.4";
+       sha256 = "1cnp0w47fp0s1zlyb0d90xj5ynwfmlnzm5inc5lhbichwgqcwfzk";
        libraryHaskellDepends = [
          base binary bytestring containers dependent-map dependent-sum
          dependent-sum-template directory edit-distance filepath haskeline
@@ -128708,8 +129287,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-haskell-plugins";
-       version = "5.1.0.3";
-       sha256 = "1hka7kb2j5nqzv9jljjyylfyrf5z3hsfp2sfgv95y5qsr2b6g96a";
+       version = "5.1.0.4";
+       sha256 = "19fl14c1j7p9qaf26g1qkmxvmw9r7hvxqmp9jxmmwbp7xlc3664v";
        libraryHaskellDepends = [
          array arrows base bytestring containers data-memocombinators
          directory filepath haskell-src-exts-simple hoogle HTTP IOSpec
@@ -128729,8 +129308,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-irc-plugins";
-       version = "5.1.0.1";
-       sha256 = "1axixb6q5j7vs93q9d3n5v7l57nvnbjpry1ww8vaqlm71m1z4l2f";
+       version = "5.1.0.4";
+       sha256 = "0kscksdqjysk9amxwb1xjh475pbwq22mf9as5kqwn72c8s75ngaf";
        libraryHaskellDepends = [
          base bytestring containers directory filepath lambdabot-core
          lifted-base mtl network SafeSemaphore split time
@@ -128749,8 +129328,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-misc-plugins";
-       version = "5.1.0.1";
-       sha256 = "1bg15z7k21l0dwnkvprxvx5jcvs5igl8fqffg11y7h0r74f4yhks";
+       version = "5.1.0.4";
+       sha256 = "169grwgg5x63qhls16c7xd0p78da38r275mar27il78az7qfgn8d";
        libraryHaskellDepends = [
          base bytestring containers filepath hstatsd lambdabot-core
          lifted-base mtl network network-uri parsec process random random-fu
@@ -128769,8 +129348,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-novelty-plugins";
-       version = "5.1.0.1";
-       sha256 = "1ispnp12i2f8fcs11nay3mww8sa6dwx7lkl6d6gc9cfhzgwih6gi";
+       version = "5.1.0.4";
+       sha256 = "1m6n0asp8pn12wif5jv0nvjipzgh7mzzxa17j4mzd7mdqi4dma7z";
        libraryHaskellDepends = [
          base binary brainfuck bytestring containers dice directory
          lambdabot-core misfortune process random-fu regex-tdfa unlambda
@@ -128786,8 +129365,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-reference-plugins";
-       version = "5.1.0.1";
-       sha256 = "0s5923hsl1pzyayi4954livp4rsgx84slwpnr7mq8nhfsdxm84wp";
+       version = "5.1.0.4";
+       sha256 = "0qavp784p5qdb2plhhgk1idrjxcazzn4a94pg8syymb24fzjvm1w";
        libraryHaskellDepends = [
          base bytestring containers HTTP lambdabot-core mtl network
          network-uri oeis process regex-tdfa split tagsoup utf8-string
@@ -128802,8 +129381,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-social-plugins";
-       version = "5.1.0.1";
-       sha256 = "1p46qyb2x7h37xs9y69k1mc5v84rwvkrgkdwkl4cw6pmnkmjnl42";
+       version = "5.1.0.4";
+       sha256 = "0kjjsnrrsrcdvkn75dsbw7afx8y87i36i6lk54hs6cg88zndailz";
        libraryHaskellDepends = [
          base binary bytestring containers lambdabot-core mtl split time
        ];
@@ -128815,8 +129394,8 @@ self: {
     ({ mkDerivation, base, oeis, QuickCheck, QuickCheck-safe }:
      mkDerivation {
        pname = "lambdabot-trusted";
-       version = "5.1.0.1";
-       sha256 = "11qvpxgv4xbs8iw0lix8mdj174dzj0gwgny7vgvs4vd9pi37sb7r";
+       version = "5.1.0.4";
+       sha256 = "1mlyhxc93d3466xhxqlyzg1c8988spzbyk4d5l0c05l1m0xlq77j";
        libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ];
        description = "Lambdabot trusted code";
        license = "GPL";
@@ -129355,6 +129934,8 @@ self: {
        pname = "language-c-quote";
        version = "0.12.2";
        sha256 = "15c6rdj91768jf8lqzf4fkbi8k6kz9gch5w81x6qzy2l256rncgb";
+       revision = "1";
+       editedCabalFile = "099w1lln1vm000sf06wrmq6gya5sx2w4flrlwqz2c8wwvv8c9j9h";
        libraryHaskellDepends = [
          array base bytestring containers exception-mtl
          exception-transformers filepath haskell-src-meta mainland-pretty
@@ -129453,15 +130034,15 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "language-docker_7_0_0" = callPackage
+  "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
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "7.0.0";
-       sha256 = "0c63la3739fbcf50vy1cp245fk7x723gviyykd3dmggm1jwgm515";
+       version = "8.0.0";
+       sha256 = "00zryknsc0717ysq8g1ip5dm70v8b33lfrscbzpdcw5dd2j32k7n";
        libraryHaskellDepends = [
          base bytestring containers free megaparsec mtl prettyprinter split
          template-haskell text th-lift time
@@ -131171,6 +131752,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "leancheck-enum-instances" = callPackage
+    ({ mkDerivation, base, enum-types, leancheck }:
+     mkDerivation {
+       pname = "leancheck-enum-instances";
+       version = "0.1.0.0";
+       sha256 = "0l14npnkwdr3vcdjv2b20a0g3cka0nd93cm6hrq16dcphm1ckaj1";
+       libraryHaskellDepends = [ base enum-types leancheck ];
+       description = "listable instances for small enum types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "leankit-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, colour, curl, split }:
      mkDerivation {
@@ -131801,6 +132393,8 @@ self: {
        pname = "lens-sop";
        version = "0.2.0.2";
        sha256 = "16bd95cwqiprz55s5272mv6wiw5pmv6mvihviiwbdbilhq400s3z";
+       revision = "1";
+       editedCabalFile = "0k7xdwj64kd56kjh7ghjwm79rjwjqxlw5nwzwj0cq5q56vb340jm";
        libraryHaskellDepends = [
          base fclabels generics-sop transformers
        ];
@@ -131862,6 +132456,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lens-typelevel" = callPackage
+    ({ mkDerivation, base, singletons }:
+     mkDerivation {
+       pname = "lens-typelevel";
+       version = "0.1.1.0";
+       sha256 = "0lsdp6rgacsa13fppa2dfn2nz8cdrvj5clmlshzrv1h0423hfgbp";
+       libraryHaskellDepends = [ base singletons ];
+       description = "Type-level lenses using singletons";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lens-utils" = callPackage
     ({ mkDerivation, aeson, base, containers, data-default, lens
      , monoid, split, template-haskell
@@ -131924,8 +132529,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.0.11.3";
-       sha256 = "0kb9fydcv0skp94bhvhbqggam8vrq2wv5iradxmggaf41h0ly123";
+       version = "1.1.0.0";
+       sha256 = "0qw6nvhlczqywwzinsj0x5p2xw8490bbizl2lmj48dr71mndxdz0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -132573,8 +133178,8 @@ self: {
      }:
      mkDerivation {
        pname = "libmpd";
-       version = "0.9.0.8";
-       sha256 = "0kpdj4ciwrfd6vmr60y7c276h5z2r40avs26a0x8s51rbr00lasq";
+       version = "0.9.0.9";
+       sha256 = "1931m23iqb4wddpdidm4ph746zpaw41kkjzmb074j7yyfpk7x1jv";
        libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class filepath
          mtl network old-locale text time utf8-string
@@ -135055,6 +135660,8 @@ self: {
        pname = "llvm-hs";
        version = "7.0.1";
        sha256 = "1ghgmmks22ra6ivhwhy65yj9ihr51lbhwdghm52pna5f14brhlyy";
+       revision = "1";
+       editedCabalFile = "0nxyjcnsph4mlyxqy47m67ayd4mnpxx3agy5vx7f4v74bg4xx44a";
        setupHaskellDepends = [ base Cabal containers ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers exceptions llvm-hs-pure
@@ -136448,6 +137055,8 @@ self: {
        pname = "long-double";
        version = "0.1";
        sha256 = "072yfv1kv83k8qc9apks2czr9p6znk46bbbjmsdbcpzyb8byh64j";
+       revision = "1";
+       editedCabalFile = "12vmzzrxgb4yqf9axf1fildl4m0dfm3zqxk4vg6k6m5qi6haz1yn";
        libraryHaskellDepends = [ base integer-gmp ];
        description = "FFI bindings for C long double";
        license = stdenv.lib.licenses.bsd3;
@@ -137910,8 +138519,8 @@ self: {
      }:
      mkDerivation {
        pname = "magic-wormhole";
-       version = "0.1.0";
-       sha256 = "0lkwnbr76chiakc7j51pm23q15q26l3xqglg1rj5blwybkymg29x";
+       version = "0.2.1";
+       sha256 = "1wdn5nykn4wqb65xdhkpy8gpz216a5wi3nngadf58c7acym60gyx";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -138204,6 +138813,8 @@ self: {
        pname = "mainland-pretty";
        version = "0.7";
        sha256 = "1xzavchbp345a63i24hs8632l3xk0c1pxqd32b2i6615cp9pnxqi";
+       revision = "1";
+       editedCabalFile = "1apyqnbcsbjfkqc1d6mk74pxl12130r6ijwhj555gddls9g0qdf3";
        libraryHaskellDepends = [
          base containers srcloc text transformers
        ];
@@ -140205,8 +140816,8 @@ self: {
        pname = "mcm";
        version = "0.6.5.0";
        sha256 = "1vf54aziyybxyc9bwnn57pfcjmgli2hjjd2kzij8vy2g64ipip9m";
-       revision = "1";
-       editedCabalFile = "1anhhrl8a627y7vfvcmiwbfjiyvglwrqcim1gc6zycqidyqq22pq";
+       revision = "2";
+       editedCabalFile = "0xgnh356qwc1zdailqr3m6hbv7q5gc36ycqfz31z6l5kphmbblsc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -141399,6 +142010,54 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "metar" = callPackage
+    ({ mkDerivation, base, checkers, deriving-compat, HTTP, lens
+     , network-uri, QuickCheck, semigroupoids, semigroups, tagsoup
+     , tagsoup-selection, tasty, tasty-hunit, tasty-quickcheck
+     , transformers
+     }:
+     mkDerivation {
+       pname = "metar";
+       version = "0.0.2";
+       sha256 = "1iaqjzy1a7hkvcni6ijkwwcsb433j3gkx9f7z8ng1yhlbcr9a556";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base deriving-compat HTTP lens network-uri semigroupoids semigroups
+         tagsoup tagsoup-selection transformers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Australian METAR";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "metar-http" = callPackage
+    ({ mkDerivation, base, checkers, http-types, lens, metar
+     , network-uri, QuickCheck, semigroupoids, semigroups, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string
+     , wai, warp
+     }:
+     mkDerivation {
+       pname = "metar-http";
+       version = "0.0.1";
+       sha256 = "0xpi9x1c05py659a94ldksn3z5xz9ws069gp1swam1fllg8xbxj6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base http-types lens metar network-uri semigroupoids semigroups
+         text transformers utf8-string wai warp
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "HTTP for METAR";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "metric" = callPackage
     ({ mkDerivation, base, data-default, edit-distance, hmatrix
      , QuickCheck, test-framework, test-framework-quickcheck2, vector
@@ -145900,8 +146559,8 @@ self: {
      }:
      mkDerivation {
        pname = "mpi-hs";
-       version = "0.3.0.0";
-       sha256 = "1a8vlsrpvgyzq4p0qa90l4ck3v9a0pncy9bmmn6kjf6j2wa5j9qx";
+       version = "0.3.1.0";
+       sha256 = "1ka212z51ga82fwjj6jz6aiidn4fyvf0b5p9xma67fnv9a7cs4v2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring monad-loops store ];
@@ -146972,10 +147631,8 @@ self: {
     ({ mkDerivation, base, containers, deepseq, doctest, Glob }:
      mkDerivation {
        pname = "multiset";
-       version = "0.3.4";
-       sha256 = "0kdmf0ba946pxq1m8q0x5bk2my2fd5frhaw3cj2i3x88nc9f0ycp";
-       revision = "1";
-       editedCabalFile = "0m7xk2217a5zpwb1hwp5j5r6yzlf0f4lmlnln2lb9bqihjl3j9x8";
+       version = "0.3.4.1";
+       sha256 = "05iynv54mgfwil7l81ni8mrhhb5vz3fdls13vm2m3dnwqgp7vzxh";
        libraryHaskellDepends = [ base containers deepseq ];
        testHaskellDepends = [ base doctest Glob ];
        description = "The Data.MultiSet container type";
@@ -148100,6 +148757,30 @@ self: {
        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
+     , tasty-hunit, tcp-streams, text, time, tls, vector, wire-streams
+     , word24
+     }:
+     mkDerivation {
+       pname = "mysql-haskell";
+       version = "0.8.4.1";
+       sha256 = "0m3kqm5ldy47gv0gbh3sxv2zm4kmszw96r5sar5bzb3v9jvmz94x";
+       libraryHaskellDepends = [
+         base binary binary-ieee754 binary-parsers blaze-textual bytestring
+         bytestring-lexing cryptonite io-streams memory monad-loops network
+         scientific tcp-streams text time tls vector wire-streams word24
+       ];
+       testHaskellDepends = [
+         base bytestring io-streams tasty tasty-hunit text time vector
+       ];
+       description = "pure haskell MySQL driver";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mysql-haskell-nem" = callPackage
     ({ mkDerivation, base, bytestring, io-streams, mysql-haskell
      , scientific, text, time
@@ -150082,6 +150763,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "network-byte-order" = callPackage
+    ({ mkDerivation, base, bytestring, doctest }:
+     mkDerivation {
+       pname = "network-byte-order";
+       version = "0.0.0.0";
+       sha256 = "0wfy57ip87ksppggpz26grk4w144yld95mf2y0c6mhcs1l8z3div";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring doctest ];
+       description = "Network byte order utilities";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "network-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, network, unix }:
      mkDerivation {
@@ -150098,8 +150791,8 @@ self: {
     ({ mkDerivation, base, bytestring, network, text, time, vector }:
      mkDerivation {
        pname = "network-carbon";
-       version = "1.0.13";
-       sha256 = "06cc62fns07flmsl9gbdicmqqg5icmy3m4n0nvp2xqjk1ax8ws39";
+       version = "1.0.14";
+       sha256 = "1jrmda71gkcpppzv8s44kms4vz4zj7yb67wyr882s2b4hcf4il5b";
        libraryHaskellDepends = [
          base bytestring network text time vector
        ];
@@ -151198,8 +151891,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "0.1.2.0";
-       sha256 = "0vkcgj8y4jh63nwh0djxfjvkbpa66zpf32y5912lwj7xf6rm769q";
+       version = "0.2.1.0";
+       sha256 = "1xavggdab7khi8isvrcf85xlrxhy852fb2ccj7jhmdnfmqzbzyyq";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export safe template-haskell
        ];
@@ -151434,18 +152127,18 @@ self: {
      }) {};
 
   "nix-deploy" = callPackage
-    ({ mkDerivation, base, neat-interpolation, optparse-applicative
-     , optparse-generic, text, turtle
+    ({ mkDerivation, base, bytestring, neat-interpolation
+     , optparse-applicative, optparse-generic, text, turtle
      }:
      mkDerivation {
        pname = "nix-deploy";
-       version = "1.0.2";
-       sha256 = "07cirn4gaaarw5va128f63jp2q7jlghmg4kclya4fvapx963qbya";
+       version = "1.0.3";
+       sha256 = "0anhmc9g9k40nwj87f24hq4wnj6mkli36dzhzdpa0p3cpg7sh2kh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base neat-interpolation optparse-applicative optparse-generic text
-         turtle
+         base bytestring neat-interpolation optparse-applicative
+         optparse-generic text turtle
        ];
        description = "Deploy Nix-built software to a NixOS machine";
        license = stdenv.lib.licenses.asl20;
@@ -153011,16 +153704,18 @@ self: {
 
   "nuxeo" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit
-     , conduit-extra, text, time
+     , conduit-extra, optparse-applicative, text, time
      }:
      mkDerivation {
        pname = "nuxeo";
-       version = "0.2.0.3";
-       sha256 = "1assz03rv0vdbgl2ihcr7sbx7ifsv7m2mp6lg2jgy5h0ghnlwzcd";
+       version = "0.3.0.2";
+       sha256 = "1h0asiqlffy0wy76q2dz7id6nzsid5nqkmsy1mxdl77zm3d9id4f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring conduit conduit-extra text time
        ];
-       description = "Nuxeo";
+       executableHaskellDepends = [ base optparse-applicative text ];
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -154181,20 +154876,21 @@ self: {
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , case-insensitive, containers, contravariant, dotenv, hspec
      , hspec-discover, multiset, postgresql-simple, pretty
-     , product-profunctors, profunctors, QuickCheck, semigroups, text
-     , time, time-locale-compat, transformers, uuid, void
+     , product-profunctors, profunctors, QuickCheck, scientific
+     , semigroups, text, time, time-locale-compat, transformers, uuid
+     , void
      }:
      mkDerivation {
        pname = "opaleye";
-       version = "0.6.1.0";
-       sha256 = "0vjiwpdrff4nrs5ww8q3j77ysrq0if20yfk4gy182lr7nzhhwz0l";
-       revision = "2";
-       editedCabalFile = "07yn6xzynvjz9p6mv9kzh1sz05dqqsmihznba8s9q36lixlslyag";
+       version = "0.6.7003.1";
+       sha256 = "1lj4vz1526l11b0mc5y7j9sxf7v6kkzl8c1jymvb1vrqj2qkgxsx";
+       revision = "1";
+       editedCabalFile = "0nwyz9s81hfziwy7a18gpi0663xy6cfc6fl4vx8a1vkwdyfcjjli";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
-         profunctors semigroups text time time-locale-compat transformers
-         uuid void
+         profunctors scientific semigroups text time time-locale-compat
+         transformers uuid void
        ];
        testHaskellDepends = [
          aeson base containers contravariant dotenv hspec hspec-discover
@@ -156935,6 +157631,8 @@ self: {
        pname = "pandoc-pyplot";
        version = "1.0.2.0";
        sha256 = "0q6qj45g8d95z86lqkwpxw7c929x7q68611602mp2ip31dib11xc";
+       revision = "1";
+       editedCabalFile = "0zmvgzqhb4cggsr3m5xw1lhcns586jq5b0s9fhpwq1c3c6k5nq96";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156985,8 +157683,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-types";
-       version = "1.17.5.2";
-       sha256 = "0hppl6drhl4xqav35jybji8g8cpy336mqkp0zb66kdsjya9inpqb";
+       version = "1.17.5.4";
+       sha256 = "09wk2zskr0r2llsyif3s0x7vix05l1ya7qacsmmkrlhba5naib1j";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
          transformers
@@ -157000,30 +157698,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-types_1_17_5_3" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pandoc-types";
-       version = "1.17.5.3";
-       sha256 = "1yrbad67jz8mgdyhl2hvah42g31iwnbvldp16jw87v96y0cbdl72";
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq ghc-prim QuickCheck syb
-         transformers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers HUnit QuickCheck string-qq syb
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Types for representing a structured document";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "pandoc-unlit" = callPackage
     ({ mkDerivation, base, pandoc }:
      mkDerivation {
@@ -157683,8 +158357,8 @@ self: {
        pname = "parallel-io";
        version = "0.3.3";
        sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s";
-       revision = "1";
-       editedCabalFile = "1vlb2x1ghih4l64031rmh7h643c3knh5r5mwilf7g8izb58ypvkm";
+       revision = "2";
+       editedCabalFile = "0mggzni708nzxlsjbibdzf03s3b5lnqj2zi1hnbh1rd4j4jr07ym";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158672,8 +159346,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.8.0.0";
-       sha256 = "1xbddlc73b0sgd02vxkbhra04wz77q0dn1937k6aq5l1vx663i81";
+       version = "0.8.1.1";
+       sha256 = "19nnf08szakwivm7zqv85hr0vwpflpk455373a3hwhcjgkzdfy19";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -160195,6 +160869,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "persist" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, ghc-prim
+     , QuickCheck, test-framework, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "persist";
+       version = "0.1";
+       sha256 = "0akiy8qrx71nj8l80hc7llxy7vnpcvjg01dhk499pl5mjaiqz2sq";
+       libraryHaskellDepends = [
+         array base bytestring containers ghc-prim text
+       ];
+       testHaskellDepends = [
+         base bytestring QuickCheck test-framework
+         test-framework-quickcheck2 text
+       ];
+       description = "Minimal serialization library with focus on performance";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "persist2er" = callPackage
     ({ mkDerivation, base, optparse-applicative, persistent, text }:
      mkDerivation {
@@ -162759,6 +163452,8 @@ self: {
        pname = "pipes-lzma";
        version = "0.1.1.2";
        sha256 = "0wx23wf1vr8d2nyapxgmpn1jk53hjbla1xss714vkmar7am37vrc";
+       revision = "1";
+       editedCabalFile = "13nyh3qqv3baifya0vwnnqh1yvr3k2yjrhjq7apigq0s584iyrka";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring lzma pipes ];
@@ -164607,6 +165302,18 @@ self: {
        license = "LGPL";
      }) {};
 
+  "polyparse_1_12_1" = callPackage
+    ({ mkDerivation, base, bytestring, text }:
+     mkDerivation {
+       pname = "polyparse";
+       version = "1.12.1";
+       sha256 = "19fs18g7fvfdkm9zy28cgighjcxfa6mcpqgyp6whmsjkb3h393fx";
+       libraryHaskellDepends = [ base bytestring text ];
+       description = "A variety of alternative parser combinator libraries";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "polyseq" = callPackage
     ({ mkDerivation, array, base, bytestring, cgi, containers
      , free-theorems, haskell-src, mtl, network, old-locale, old-time
@@ -166999,14 +167706,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "pretty-show_1_8_2" = callPackage
+  "pretty-show_1_9_1" = callPackage
     ({ mkDerivation, array, base, filepath, ghc-prim, happy
      , haskell-lexer, pretty, text
      }:
      mkDerivation {
        pname = "pretty-show";
-       version = "1.8.2";
-       sha256 = "1fc431kr87hpk3rmdpbdiwsq0iyvh61hjwi4w0cp6zyasx8cg91a";
+       version = "1.9.1";
+       sha256 = "0b5diwdkfb2wi6q872fjjnrvysgww7c8nhq55bvccp50n9vs4jhz";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -171635,6 +172342,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "quickcheck-enum-instances" = callPackage
+    ({ mkDerivation, base, enum-types, QuickCheck }:
+     mkDerivation {
+       pname = "quickcheck-enum-instances";
+       version = "0.1.0.0";
+       sha256 = "117lpk15z288ad1bzakwf1z0jcdm7w5c0584lzwpgkmgqr3jgzdc";
+       libraryHaskellDepends = [ base enum-types QuickCheck ];
+       description = "arbitrary instances for small enum types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "quickcheck-instances" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring
      , case-insensitive, containers, hashable, old-time, QuickCheck
@@ -178053,10 +178771,8 @@ self: {
      }:
      mkDerivation {
        pname = "resolv";
-       version = "0.1.1.1";
-       sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9";
-       revision = "3";
-       editedCabalFile = "0r1i7zrnynqxd3nzq4cz9648s3dmj29w63mcip57620d0fimyghm";
+       version = "0.1.1.2";
+       sha256 = "0wczdy3vmpfcfwjn1m95bygc5d83m97xxmavhdvy5ayn8c402fp4";
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring containers
        ];
@@ -178064,7 +178780,7 @@ self: {
          base bytestring directory filepath tasty tasty-hunit
        ];
        description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.gpl2;
      }) {};
 
   "resolve" = callPackage
@@ -180306,6 +181022,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rounded" = callPackage
+    ({ mkDerivation, base, ghc-prim, gmp, hgmp, long-double, mpfr
+     , reflection, singletons
+     }:
+     mkDerivation {
+       pname = "rounded";
+       version = "0.1";
+       sha256 = "02xlc369yi8wvf41z4d3291i63rcryl0yjp0k5lkn3c2f0k5w244";
+       libraryHaskellDepends = [
+         base ghc-prim hgmp long-double reflection singletons
+       ];
+       librarySystemDepends = [ gmp mpfr ];
+       testHaskellDepends = [ base long-double ];
+       description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
+       license = "LGPL";
+     }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;};
+
   "rounding" = callPackage
     ({ mkDerivation, array, base, numeric-extras }:
      mkDerivation {
@@ -182111,6 +182844,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sandi_0_4_3" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, criterion, exceptions
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-th
+     }:
+     mkDerivation {
+       pname = "sandi";
+       version = "0.4.3";
+       sha256 = "0ji1zn9nkh8rdm0m9zpxdnz5zw0q0qypzyp2k9fn6j9v08r17p3n";
+       libraryHaskellDepends = [ base bytestring conduit exceptions ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hunit tasty-quickcheck tasty-th
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       description = "Data encoding library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sandlib" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -183387,6 +184138,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "scotty-path-normalizer" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, scotty, text, wai }:
+     mkDerivation {
+       pname = "scotty-path-normalizer";
+       version = "0.1.0.0";
+       sha256 = "1hv95q3ikf25d9kxzr48fxb2x1331c24n3q5nb47qa7866gy2f4q";
+       libraryHaskellDepends = [ base bytestring scotty text wai ];
+       testHaskellDepends = [ base doctest ];
+       description = "Redirect to a normalized path";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "scotty-resource" = callPackage
     ({ mkDerivation, base, containers, http-types, scotty, text
      , transformers, wai
@@ -184200,8 +184963,8 @@ self: {
      }:
      mkDerivation {
        pname = "secp256k1-haskell";
-       version = "0.1.3";
-       sha256 = "0wdxz8vmk5yfhjrwpynk1zpmvgl1rnwz7zvkx7g7pxxvz3z8rpbz";
+       version = "0.1.4";
+       sha256 = "1vfbn0fvrbk4hmfhsm8gj3yxyijzfdqlywwir64zrafla4yry73l";
        libraryHaskellDepends = [
          base base16-bytestring bytestring cereal entropy hashable
          QuickCheck string-conversions
@@ -185072,8 +185835,8 @@ self: {
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "seqid";
-       version = "0.5.3";
-       sha256 = "1wc7a66k42njc0zv0cp4ycfv7jbcqyf77j9m6fikhdppbvn3cbn4";
+       version = "0.6.0";
+       sha256 = "1zm1zmzp3i60wb17ghr4rp5ljlhvsblll69x2ibjk7kh5icvwfqc";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
@@ -185095,8 +185858,8 @@ self: {
     ({ mkDerivation, base, io-streams, seqid }:
      mkDerivation {
        pname = "seqid-streams";
-       version = "0.6.3";
-       sha256 = "1wmi4iqh6q45cm1s9ml2yi5b34m8cj7y5a0aicjfsc8nyy0pq48r";
+       version = "0.7.0";
+       sha256 = "0z80cclvzkr6dg81n96dpan9a7285rlq9nmchiy4raxsjw4cza58";
        libraryHaskellDepends = [ base io-streams seqid ];
        description = "Sequence ID IO-Streams";
        license = stdenv.lib.licenses.bsd3;
@@ -185452,6 +186215,8 @@ self: {
        pname = "servant-JuicyPixels";
        version = "0.3.0.4";
        sha256 = "10crrcrxap7751wifbc28kr1kv0rjvrx3wlnkajgv3xpr05g00kv";
+       revision = "1";
+       editedCabalFile = "185ym0ac6gx7f98pd92ykc1ib305lswzjzvykly4ij9vk85jn0ax";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -185921,8 +186686,8 @@ self: {
        pname = "servant-client";
        version = "0.14";
        sha256 = "0jr2057y7vp6d2jcnisawkajinnqm68h024crh929r9fdka0p1n6";
-       revision = "2";
-       editedCabalFile = "087ja0xbwm1yg38i5pc26fxsjx4pfdcgqmw0h1lvf0z1alz8rq05";
+       revision = "3";
+       editedCabalFile = "1rjjqxyyf51bjq8li8yilng5pjd9a5n3d8zniqmfw3hys6dz8n8g";
        libraryHaskellDepends = [
          base base-compat bytestring containers exceptions http-client
          http-media http-types monad-control mtl semigroupoids
@@ -185951,8 +186716,8 @@ self: {
        pname = "servant-client-core";
        version = "0.14.1";
        sha256 = "0qfpakwl6yj6l2br9wa9zs0v7nzmj4bngspw6p536swx39npnkn2";
-       revision = "1";
-       editedCabalFile = "04xr6zpslw7pyzxp22qd8k2w9azc3pds5gplnwni12waqahf410i";
+       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
@@ -186356,8 +187121,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-http2-client";
-       version = "0.1.0.1";
-       sha256 = "0jlbczbgbkjx4hai24csnd07r074s36g5hbpizhdxiqr3dcjk8pw";
+       version = "0.1.0.2";
+       sha256 = "0rjzc1dyj0njmh590ays5ma6243240qakrjgzi9qinvkgb7lzad2";
        libraryHaskellDepends = [
          base binary bytestring case-insensitive containers exceptions
          http-media http-types http2 http2-client mtl servant-client-core
@@ -186441,8 +187206,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-kotlin";
-       version = "0.1.1.2";
-       sha256 = "1ad1n1yp6b125fa5gjjnbksnjqf714jf9d8cvxrvpwkl9lxn9ppb";
+       version = "0.1.1.3";
+       sha256 = "07adjx1smqg5x87dklgknlmkavns2axmhqw97fk0jnp99rb1rpb2";
        libraryHaskellDepends = [
          base containers directory formatting lens servant servant-foreign
          text time wl-pprint-text
@@ -186784,10 +187549,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-quickcheck";
-       version = "0.0.7.2";
-       sha256 = "0zsf68c44yijmgkcd2qmcwz9p0kiix6dzhk3g4ifz60s6kv3jfbh";
-       revision = "1";
-       editedCabalFile = "1slgq8q0hmh904ssn5sfmi6mbpd3vkqvc59m3g9kfgzf5j70py2h";
+       version = "0.0.7.3";
+       sha256 = "0d904xfw5q7qcwkp5n7v18drc1idssvfwic2ksfmqlxisnxmyp5r";
        libraryHaskellDepends = [
          aeson base base-compat-batteries bytestring case-insensitive clock
          data-default-class hspec http-client http-media http-types mtl
@@ -187498,7 +188261,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "serverless-haskell_0_7_5" = callPackage
+  "serverless-haskell_0_8_1" = 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
@@ -187506,8 +188269,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.7.5";
-       sha256 = "13l5day4dlwyykwx17v2znyh0ck1paaxjzzawnjklcjzk1rzj0i3";
+       version = "0.8.1";
+       sha256 = "1s5i2l57s0crpk3lysdw0v7kvfx567bhl0v5i18mdsa331bifcpd";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -188435,10 +189198,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.10.0.1";
-       sha256 = "1p95r4ksfrb4hs9v75iq9iz565qz43k3cw63sz32nphqn204dbxz";
-       revision = "1";
-       editedCabalFile = "0x23r58i4yhf9rcaxfdy09nr93cpkr0cmxrwcn11hgcr1nkzaa0d";
+       version = "1.10.1.0";
+       sha256 = "1b5mbb3azjn2wwagciayd5lyb6jd2siwn1l9ispnqrkrh1bqgzb5";
        libraryHaskellDepends = [
          base binary dependency directory hs2ats language-ats microlens
          shake shake-c shake-cabal shake-ext text
@@ -189055,8 +189816,8 @@ self: {
     ({ mkDerivation, base, containers, text, unix }:
      mkDerivation {
        pname = "shell-monad";
-       version = "0.6.5";
-       sha256 = "0vg2g65km3i963scyj7fn17g562wg0mh88syxqrf7favnljid1bk";
+       version = "0.6.6";
+       sha256 = "1z3anvjcix25i2zzwnln2hnpzacwiss95xhyc0mclc33v0j5k038";
        libraryHaskellDepends = [ base containers text unix ];
        description = "shell monad";
        license = stdenv.lib.licenses.bsd3;
@@ -189928,6 +190689,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "simple-affine-space" = callPackage
+    ({ mkDerivation, base, deepseq, directory, filepath, hlint, process
+     , regex-posix
+     }:
+     mkDerivation {
+       pname = "simple-affine-space";
+       version = "0.1";
+       sha256 = "02cy4vnl3fy18dsfxazh60bqgk5c1gw2x460x6i1fb5qysw7q8nh";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
+         base directory filepath hlint process regex-posix
+       ];
+       description = "A simple library for affine and vector spaces";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "simple-atom" = callPackage
     ({ mkDerivation, base, containers, deepseq }:
      mkDerivation {
@@ -189987,6 +190764,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "simple-cmd_0_1_2" = callPackage
+    ({ mkDerivation, base, directory, filepath, process }:
+     mkDerivation {
+       pname = "simple-cmd";
+       version = "0.1.2";
+       sha256 = "10jdyl1ghzczxw5bi8s1694fla42s1aknmj5grxndidwzf95b8g6";
+       libraryHaskellDepends = [ base directory filepath process ];
+       description = "Simple String-based process commands";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-conduit" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, CC-delcont
      , chunked-data, conduit, conduit-combinators, conduit-extra
@@ -190467,8 +191256,8 @@ self: {
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "simple-smt";
-       version = "0.9.1";
-       sha256 = "13dg61jdgby49lpdb53anrg39wn8dwgvg6jpn8vh0y8rf2zilq9b";
+       version = "0.9.3";
+       sha256 = "17v8zpiiha8kyb4xbrqdnfibf1dwzf9lbhxj9kffvl948ygxdp8x";
        libraryHaskellDepends = [ base process ];
        description = "A simple way to interact with an SMT solver process";
        license = stdenv.lib.licenses.bsd3;
@@ -190623,6 +191412,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "simple-vec3_0_4_0_9" = callPackage
+    ({ mkDerivation, base, criterion, doctest, doctest-driver-gen
+     , QuickCheck, tasty, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "simple-vec3";
+       version = "0.4.0.9";
+       sha256 = "1rx4nifv75lpxrdgq6x3a61d56qp0ln9rhf2d10l2ds049dlq0pz";
+       libraryHaskellDepends = [ base QuickCheck vector ];
+       testHaskellDepends = [
+         base doctest doctest-driver-gen tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion vector ];
+       description = "Three-dimensional vectors of doubles with basic operations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-zipper" = callPackage
     ({ mkDerivation, base, hspec, lens }:
      mkDerivation {
@@ -190840,10 +191647,10 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "simtreelo";
-       version = "0.1.1.3";
-       sha256 = "148j6z8rxqaiwfjgxz780fy8w8xv8a8gwida61lfir677jlkwgh9";
+       version = "0.1.1.4";
+       sha256 = "0a8414006gdya8b4dw38251kim3x2i5g7m03ga479ialghralrc8";
        libraryHaskellDepends = [ base containers ];
-       description = "Loader for data organized in a tree";
+       description = "Load data organized in a tree";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -191104,8 +191911,8 @@ self: {
      }:
      mkDerivation {
        pname = "sitepipe";
-       version = "0.3.0.1";
-       sha256 = "1iv0ndllixwn9vj7gqavv1ymfxfxqm4xqqzxqf1y8qiq240b3j6l";
+       version = "0.3.0.2";
+       sha256 = "0f26sqpf8rjrbpk6q9hp0q705hhmhyp71jyj5w9jgq6mnj34rxy8";
        libraryHaskellDepends = [
          aeson base bytestring containers directory exceptions filepath Glob
          lens lens-aeson megaparsec MissingH mtl mustache
@@ -191644,8 +192451,8 @@ self: {
      }:
      mkDerivation {
        pname = "slate";
-       version = "0.11.0.0";
-       sha256 = "0y6l3cjlh0hkc3nch7fwvxpv2i5r9qv6r1kdi3savi0vp0dvgdy8";
+       version = "0.12.0.0";
+       sha256 = "01qi6k9gcz6y8x8hlvsmm2irfvcsbdqqvzg5kgf2x02idmh9zy1a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -192550,8 +193357,8 @@ self: {
        pname = "snap-core";
        version = "1.0.3.2";
        sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc";
-       revision = "2";
-       editedCabalFile = "0m0rjsgv0lkd0y9ragn478ibw98c9iys4mrj26x8ihasdnzgkqxq";
+       revision = "3";
+       editedCabalFile = "0wlhn33r7c9g7j23y006ddq9d87lkmianvvfrbl8jd8mvjvj2gfa";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder case-insensitive
          containers directory filepath hashable HUnit io-streams lifted-base
@@ -192628,8 +193435,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap-extras";
-       version = "0.12.2.0";
-       sha256 = "18d1gfpk2gzvaidb6l13y64540hfyqk5hw6gpx7z495ay1dafdzr";
+       version = "0.12.2.1";
+       sha256 = "0mzvw49v6i77ysdlxfrdva5kn0vj9p5h2br6qlwvhdwqq8269gqp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -192754,8 +193561,8 @@ self: {
        pname = "snap-server";
        version = "1.1.0.0";
        sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4";
-       revision = "2";
-       editedCabalFile = "03jmxbz9bf0yr3vzf3xa7ajbz3q9i6cn7bzqan4vy5f26c0n6xld";
+       revision = "3";
+       editedCabalFile = "0a9d3nqb5rvgm25nak68lp6yj9m6cwhbgdbg5l7ib5i2czcg7yjh";
        configureFlags = [ "-fopenssl" ];
        isLibrary = true;
        isExecutable = true;
@@ -195011,14 +195818,21 @@ self: {
      }) {};
 
   "spdx" = callPackage
-    ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }:
+    ({ mkDerivation, base, base-compat, Cabal, containers, QuickCheck
+     , tasty, tasty-quickcheck, transformers
+     }:
      mkDerivation {
        pname = "spdx";
-       version = "0.2.2.0";
-       sha256 = "1jxxivxlhzjx4idy69qhqqv37sspqhk3f3i93mydzn8cyhn87aqp";
-       libraryHaskellDepends = [ base transformers ];
-       testHaskellDepends = [ base tasty tasty-quickcheck ];
-       description = "SPDX license expression language";
+       version = "1";
+       sha256 = "1vw6pqj86slgzgbrd6kmsn5xlbxln0cys9qxxa47ypfy4spxmfkd";
+       libraryHaskellDepends = [ base Cabal containers transformers ];
+       testHaskellDepends = [
+         base base-compat Cabal tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base base-compat Cabal QuickCheck tasty-quickcheck
+       ];
+       description = "SPDX license expression language, Extras";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -197916,6 +198730,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "statsdi" = callPackage
+    ({ mkDerivation, base, bytestring, dequeue, ether, hashable, hspec
+     , network, random, stm, tasty, tasty-hspec, template-haskell, time
+     , transformers, transformers-lift, unordered-containers
+     }:
+     mkDerivation {
+       pname = "statsdi";
+       version = "0.2.0.0";
+       sha256 = "1gbaxrvn8ilrj808hplqlibawy9kdmfb5pc2yzzdghmcsjys24g1";
+       revision = "1";
+       editedCabalFile = "02kf7pigkvqsm720l8rn6m3gdjqrdhli5yijsjf8n11mj6k8xrk0";
+       libraryHaskellDepends = [
+         base bytestring dequeue ether hashable network random stm
+         template-haskell time transformers transformers-lift
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring hspec network stm tasty tasty-hspec time
+       ];
+       description = "A lovely [Dog]StatsD implementation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "status-notifier-item" = callPackage
     ({ mkDerivation, base, bytestring, containers, dbus, dbus-hslogger
      , filepath, hslogger, lens, network, optparse-applicative, spool
@@ -198790,57 +199627,6 @@ self: {
      }) {};
 
   "store" = callPackage
-    ({ mkDerivation, array, async, base, base-orphans
-     , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
-     , containers, contravariant, criterion, cryptohash, deepseq
-     , directory, filepath, free, ghc-prim, hashable, hspec
-     , hspec-smallcheck, integer-gmp, lifted-base, monad-control
-     , mono-traversable, network, primitive, resourcet, safe, semigroups
-     , smallcheck, store-core, syb, template-haskell, text, th-lift
-     , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
-     , transformers, unordered-containers, vector
-     , vector-binary-instances, void, weigh
-     }:
-     mkDerivation {
-       pname = "store";
-       version = "0.5.0";
-       sha256 = "1ivr2pvfja2plhp625wjv9lbd47vmydp33f31ljwdyzqik2j7vij";
-       libraryHaskellDepends = [
-         array async base base-orphans base64-bytestring bifunctors
-         bytestring containers contravariant cryptohash deepseq directory
-         filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
-         lifted-base monad-control mono-traversable network primitive
-         resourcet safe semigroups smallcheck store-core syb
-         template-haskell text th-lift th-lift-instances th-orphans
-         th-reify-many th-utilities time transformers unordered-containers
-         vector void
-       ];
-       testHaskellDepends = [
-         array async base base-orphans base64-bytestring bifunctors
-         bytestring cereal cereal-vector containers contravariant criterion
-         cryptohash deepseq directory filepath free ghc-prim hashable hspec
-         hspec-smallcheck integer-gmp lifted-base monad-control
-         mono-traversable network primitive resourcet safe semigroups
-         smallcheck store-core syb template-haskell text th-lift
-         th-lift-instances th-orphans th-reify-many th-utilities time
-         transformers unordered-containers vector vector-binary-instances
-         void weigh
-       ];
-       benchmarkHaskellDepends = [
-         array async base base-orphans base64-bytestring bifunctors
-         bytestring containers contravariant criterion cryptohash deepseq
-         directory filepath free ghc-prim hashable hspec hspec-smallcheck
-         integer-gmp lifted-base monad-control mono-traversable network
-         primitive resourcet safe semigroups smallcheck store-core syb
-         template-haskell text th-lift th-lift-instances th-orphans
-         th-reify-many th-utilities time transformers unordered-containers
-         vector void
-       ];
-       description = "Fast binary serialization";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "store_0_5_0_1" = callPackage
     ({ mkDerivation, array, async, base, base-orphans
      , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
      , clock, containers, contravariant, criterion, cryptohash, deepseq
@@ -198889,7 +199675,6 @@ self: {
        ];
        description = "Fast binary serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "store-core" = callPackage
@@ -198970,15 +199755,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_26_1" = callPackage
+  "stratosphere_0_26_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.26.1";
-       sha256 = "0npmnj71gaf61gcxi772h4sgsz68j5jk7v5z3bjc120z7vc1a22v";
+       version = "0.26.2";
+       sha256 = "0f4vqll4bfwrf6hysdnh1gkjl79qcs1pwn3p6224xlqzmajb9hc5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -199429,8 +200214,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-fft";
-       version = "0.1.0.0";
-       sha256 = "1qphhbap1va897ghcr8v4d3nnpcb4w0b422d24isz8rg138m99wi";
+       version = "0.1.0.1";
+       sha256 = "1bs0wqcns0nn62rw04a1574qakqhflxhsybchf9pzig0gyrj4538";
        libraryHaskellDepends = [
          base contiguous-fft ghc-prim prim-instances primitive streaming
        ];
@@ -199666,7 +200451,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "streamly_0_5_1" = callPackage
+  "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
@@ -199674,8 +200459,8 @@ self: {
      }:
      mkDerivation {
        pname = "streamly";
-       version = "0.5.1";
-       sha256 = "04hc87jwcfpbwydm75ic3rz87m76s39aysi14m514nib87xprbji";
+       version = "0.5.2";
+       sha256 = "1pla9356yhf6zv2yz4mh8g1dslzdkkych4jrjyi4rw66frvw0jg6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -200458,8 +201243,8 @@ self: {
      }:
      mkDerivation {
        pname = "structured-cli";
-       version = "2.0.0.1";
-       sha256 = "1xgf49pd1dm80qp1h14f2nyqv71axrijrd8k66jmmqkczf24jah2";
+       version = "2.2.0.0";
+       sha256 = "1ia9xbbshzx0p69i8gq3y88qbg60cks52kb6hxm2ylkm7jnzgxzj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -201152,28 +201937,27 @@ self: {
   "super-user-spark" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , filepath, genvalidity, genvalidity-hspec, genvalidity-hspec-aeson
-     , genvalidity-path, hashable, hspec, hspec-core, HUnit, iostring
-     , mtl, optparse-applicative, parsec, path, path-io, process
-     , QuickCheck, text, transformers, unix, validity, validity-path
+     , genvalidity-path, hashable, hspec, hspec-core, mtl
+     , optparse-applicative, parsec, path, path-io, process, QuickCheck
+     , text, transformers, unix, validity, validity-path
      }:
      mkDerivation {
        pname = "super-user-spark";
-       version = "0.4.0.0";
-       sha256 = "1yk0kkp9rj63m7vqvki7zs3l8r5da8as7hpw1l6qk2gf74lpkfdy";
+       version = "0.4.0.1";
+       sha256 = "0pxkvc1vjarh4p5rqnai6nlsqxv9as8jvqs2vpywl1525nsfyvy5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring directory filepath hashable
-         iostring mtl optparse-applicative parsec path path-io process text
-         unix validity validity-path
+         aeson aeson-pretty base bytestring directory filepath hashable mtl
+         optparse-applicative parsec path path-io process text unix validity
+         validity-path
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
          aeson aeson-pretty base bytestring directory filepath genvalidity
          genvalidity-hspec genvalidity-hspec-aeson genvalidity-path hashable
-         hspec hspec-core HUnit iostring mtl optparse-applicative parsec
-         path path-io process QuickCheck text transformers unix validity
-         validity-path
+         hspec hspec-core mtl optparse-applicative parsec path path-io
+         process QuickCheck text transformers unix validity validity-path
        ];
        description = "Configure your dotfile deployment with a DSL";
        license = stdenv.lib.licenses.mit;
@@ -201825,8 +202609,8 @@ self: {
        pname = "swagger2";
        version = "2.3.0.1";
        sha256 = "1l8piv2phl8kq3rgna8wld80b569vazqk2ll1rgs5iakm42lxr1f";
-       revision = "1";
-       editedCabalFile = "12w7bsld9wp2nm61vwdwb6ndjd3g99i0g4hjr32mrycmf41yvs1a";
+       revision = "2";
+       editedCabalFile = "0dfxf47mzzb5rmln2smsk0qx53kj1lc3a087r52g2rzz6971zivb";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base base-compat-batteries bytestring containers generics-sop
@@ -201970,8 +202754,8 @@ self: {
      }:
      mkDerivation {
        pname = "sws";
-       version = "0.4.2.0";
-       sha256 = "0bwfpw348g167a195f8g4cp3h553hkanm6s67bairhn8qprh8az4";
+       version = "0.4.3.0";
+       sha256 = "0zwh7az9pgsgvx9wbjnz8lzy2v8lrkkwv3h72jfy5sj50xylrzbr";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -202214,8 +202998,8 @@ self: {
        pname = "symbol";
        version = "0.2.4";
        sha256 = "0cc8kdm68pirb0s7n46v0yvw5b718qf7qip40jkg5q3c3xsafx6h";
-       revision = "1";
-       editedCabalFile = "01ab7600ja88wfvg9x8zmxksw44j9klmm71y9zmig7qxs1qslb25";
+       revision = "2";
+       editedCabalFile = "0jdbaap11pkgb6m98v57k7qnx62pqxy7pa2i7293ywa4q305qgm1";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "A 'Symbol' type for fast symbol comparison";
        license = stdenv.lib.licenses.bsd3;
@@ -204578,6 +205362,8 @@ self: {
        pname = "tasty-hedgehog-coverage";
        version = "0.1.0.0";
        sha256 = "1d2hnhkpk71k0xjw63jsn6fa4ih01xqn4dgdbflp6yrs0zw6p95c";
+       revision = "1";
+       editedCabalFile = "1p3d9w24q39fnljv9m5a8anpv3j3cvazbca4d3hqrjx5w06ik42f";
        libraryHaskellDepends = [
          base containers hedgehog mtl tagged tasty tasty-hedgehog text
          transformers wl-pprint-annotated
@@ -206011,8 +206797,8 @@ self: {
      }:
      mkDerivation {
        pname = "term-rewriting";
-       version = "0.3";
-       sha256 = "03y5s9c9n1mnij3yh5z4c69isg5cbpwczj5sjjvajqaaqf6xy5f3";
+       version = "0.3.0.1";
+       sha256 = "0fa2yqdhw93r7byx47z050sq2yc0arfsvwnzl4jp1vyhdzarfwqd";
        libraryHaskellDepends = [
          ansi-wl-pprint array base containers mtl multiset parsec
          union-find-array
@@ -206889,10 +207675,8 @@ self: {
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.11.1.1";
-       sha256 = "1syvyiw84as79c76mssw1p4d3lrnghnwdyy4ip1w48qd07fadxf6";
-       revision = "1";
-       editedCabalFile = "0740lpg42r0wdj9hm9gvnzrjka9mqpkzazx2s3qnliiigy39zk96";
+       version = "0.11.1.2";
+       sha256 = "1wac48qlcwrfm5j1yng27929iqnj2x0zkj7ffrwkj3rchf0i4grp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -211193,24 +211977,21 @@ self: {
      }) {};
 
   "toodles" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, bytestring, cmdargs
-     , directory, filepath, http-types, megaparsec, MissingH
-     , regex-posix, servant, servant-blaze, servant-server, strict, text
-     , transformers, wai, warp, yaml
+    ({ mkDerivation, aeson, base, blaze-html, cmdargs, directory
+     , megaparsec, MissingH, regex-posix, servant, servant-blaze
+     , servant-server, strict, text, wai, warp, yaml
      }:
      mkDerivation {
        pname = "toodles";
-       version = "0.1.0.9";
-       sha256 = "01gjxd4pclilm19iw7nkr23pmyavd7d9k0wa1c63hwhdzm1591f7";
-       revision = "3";
-       editedCabalFile = "08zadf5r79dpw9g0hg6lsnyvcnpprzb9d0lfs67kpyigm5ih9w8w";
+       version = "0.1.0.16";
+       sha256 = "1xr9cl69v5m08d44xgprlpk9j5j2lby84lzcp3fjzlvfdnnx0q72";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
-         aeson base blaze-html bytestring cmdargs directory filepath
-         http-types megaparsec MissingH regex-posix servant servant-blaze
-         servant-server strict text transformers wai warp yaml
+         aeson base blaze-html cmdargs directory megaparsec MissingH
+         regex-posix servant servant-blaze servant-server strict text wai
+         warp yaml
        ];
        description = "Manage the TODO entries in your code";
        license = stdenv.lib.licenses.mit;
@@ -211743,8 +212524,10 @@ self: {
      }:
      mkDerivation {
        pname = "traildb";
-       version = "0.1.4.0";
-       sha256 = "1qp3m8vfjy9kim9jikhxplyp6c21scj18n9qnb0pfd0hpjyigd9b";
+       version = "0.1.4.1";
+       sha256 = "1h3pscbxjl3cpcxbch4ydiv6y5j54k99v8kq61jv01gv1vjisd2r";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers directory exceptions primitive
          profunctors text time transformers unix vector
@@ -212413,8 +213196,8 @@ self: {
        pname = "tree-diff";
        version = "0.0.1";
        sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz";
-       revision = "5";
-       editedCabalFile = "1rj2n9d6mmk6zijnlc0q72s2qs8hhwhf25gpqqswaiqhbbh7gxi2";
+       revision = "6";
+       editedCabalFile = "1wyhygrpqphxzzwlrk6nl4h5xbyx6zi0y34i1nxvsy726fl5idai";
        libraryHaskellDepends = [
          aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
          containers generics-sop hashable MemoTrie parsec parsers pretty
@@ -215024,8 +215807,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "typenums";
-       version = "0.1.2";
-       sha256 = "1729iws0m6xr8y5aqcrxv4br1ihvly6fagkkgfp9kj71a5jzaw7l";
+       version = "0.1.2.1";
+       sha256 = "06wrsvbddv2ga7k39954697jnclb5r6g4m95pr0fmv34ws1y1d66";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Type level numbers using existing Nat functionality";
@@ -223807,6 +224590,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "web3_0_8_1_0" = callPackage
+    ({ mkDerivation, aeson, async, base, basement, bytestring, cereal
+     , cryptonite, data-default, exceptions, generics-sop, hspec
+     , hspec-contrib, hspec-discover, hspec-expectations, http-client
+     , http-client-tls, machines, memory, microlens, microlens-aeson
+     , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random
+     , relapse, secp256k1-haskell, split, stm, tagged, template-haskell
+     , text, time, transformers, vinyl
+     }:
+     mkDerivation {
+       pname = "web3";
+       version = "0.8.1.0";
+       sha256 = "0aliq3iblnlz7waswzprb8z28v82sjq8qpc2bbcyknmpp52p2r26";
+       libraryHaskellDepends = [
+         aeson async base basement bytestring cereal cryptonite data-default
+         exceptions generics-sop http-client http-client-tls machines memory
+         microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple
+         parsec relapse secp256k1-haskell tagged template-haskell text
+         transformers vinyl
+       ];
+       testHaskellDepends = [
+         aeson async base basement bytestring cereal cryptonite data-default
+         exceptions generics-sop hspec hspec-contrib hspec-discover
+         hspec-expectations http-client http-client-tls machines memory
+         microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple
+         parsec random relapse secp256k1-haskell split stm tagged
+         template-haskell text time transformers vinyl
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Ethereum API for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "webapi" = callPackage
     ({ mkDerivation, aeson, base, binary, blaze-builder, bytestring
      , bytestring-lexing, bytestring-trie, case-insensitive, containers
@@ -224934,14 +225751,12 @@ self: {
     ({ mkDerivation, base, bytestring, deepseq, dnsapi }:
      mkDerivation {
        pname = "windns";
-       version = "0.1.0.0";
-       sha256 = "1hphwmwc1182p5aqjswcgqjbilm91rv5svjqhd93cqq599gg8q0c";
-       revision = "3";
-       editedCabalFile = "0j6gqyvhv7hxm5n249nrv0d9r41qb0yc4qdrzkjgs6lchndi6mrp";
+       version = "0.1.0.1";
+       sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8";
        libraryHaskellDepends = [ base bytestring deepseq ];
        librarySystemDepends = [ dnsapi ];
-       description = "Domain Name Service (DNS) lookup via the Windows dnsapi standard library";
-       license = stdenv.lib.licenses.gpl3;
+       description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library";
+       license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {dnsapi = null;};
 
@@ -226126,6 +226941,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "writer-cps-exceptions" = callPackage
+    ({ mkDerivation, base, exceptions, transformers
+     , writer-cps-transformers
+     }:
+     mkDerivation {
+       pname = "writer-cps-exceptions";
+       version = "0.1.0.0";
+       sha256 = "1s44h5d0f847w3j65frvjq2g6khz2ipsch109qnq5h2vcbgxid4v";
+       libraryHaskellDepends = [
+         base exceptions transformers writer-cps-transformers
+       ];
+       description = "Control.Monad.Catch instances for the stricter CPS WriterT and RWST";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "writer-cps-full" = callPackage
     ({ mkDerivation, base, writer-cps-lens, writer-cps-morph
      , writer-cps-mtl, writer-cps-transformers
@@ -228120,8 +228950,8 @@ self: {
        pname = "xmlhtml";
        version = "0.2.5.2";
        sha256 = "1p2v1cj9jjwbqyb0fyv2201zd7ljz5d46qg5kwy7rz2bchbqd0b4";
-       revision = "1";
-       editedCabalFile = "15lvbvdcagnqr62wfs3zz9xlcv553jr4ixbl50fsaxhkvlnymk45";
+       revision = "2";
+       editedCabalFile = "1d7q7acdv72zbbqq2n0swf3ia3lz1zplni6q5r97sp2w1a3xm6hf";
        libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring
          bytestring-builder containers parsec text unordered-containers
@@ -229434,6 +230264,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yampa-gloss" = callPackage
+    ({ mkDerivation, base, gloss, Yampa }:
+     mkDerivation {
+       pname = "yampa-gloss";
+       version = "0.1.0.0";
+       sha256 = "1h9x76swrq64add2v6935542gh5l5rpf5nqdy1nl2q78ksk6r04g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base gloss Yampa ];
+       description = "A GLOSS backend for Yampa";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yampa-glut" = callPackage
     ({ mkDerivation, base, GLUT, newtype, OpenGL, vector-space
      , Yampa-core
@@ -229477,8 +230320,8 @@ self: {
      }:
      mkDerivation {
        pname = "yampa-test";
-       version = "0.1.0.0";
-       sha256 = "1d69qa8dzwsj6pawlg88vwv1r2ig2vnx11zbaq0pbl5hczfnknpd";
+       version = "0.1.1";
+       sha256 = "1qc1aic4apml5akq056i5c460x12hf613r1zkisshjm0na4gx5mb";
        libraryHaskellDepends = [
          base normaldistribution QuickCheck Yampa
        ];
@@ -231450,6 +232293,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-recaptcha2_0_3_0" = callPackage
+    ({ mkDerivation, aeson, base, classy-prelude, http-conduit
+     , yesod-auth, yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-recaptcha2";
+       version = "0.3.0";
+       sha256 = "12bgj16vfmvk6ri55wmx444njhlmf11v4cins8c1a6isjk8alhhc";
+       libraryHaskellDepends = [
+         aeson base classy-prelude http-conduit yesod-auth yesod-core
+         yesod-form
+       ];
+       description = "yesod recaptcha2";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-routes" = callPackage
     ({ mkDerivation, base, bytestring, containers, hspec, HUnit
      , path-pieces, template-haskell, text, vector
@@ -232541,6 +233401,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yoda" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "yoda";
+       version = "0.1.0.0";
+       sha256 = "1p8zvxf63fbj2dpp3pa9awq1jc0makyka42j1aqsljfp08nx4pzn";
+       libraryHaskellDepends = [ base ];
+       description = "Parser combinators for young padawans";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yoga" = callPackage
     ({ mkDerivation, base, bindings-DSL, ieee754 }:
      mkDerivation {
-- 
GitLab


From b376d55e5221f7cc96fec7706988a43f34321686 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 31 Oct 2018 12:00:45 +0100
Subject: [PATCH 0751/1065] haskell-easytest: drop obsolete override for
 ghc-8.6.x

---
 .../development/haskell-modules/configuration-ghc-8.6.x.nix | 6 ------
 1 file changed, 6 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 61f188aeddb..15497cd692e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -111,12 +111,6 @@ self: super: {
   # https://github.com/jgm/skylighting/issues/55
   skylighting-core = dontCheck super.skylighting-core;
 
-  # https://github.com/joelburget/easytest/issues/12
-  easytest = appendPatch super.easytest (pkgs.fetchpatch {
-    url = https://github.com/joelburget/easytest/pull/13.patch;
-    sha256 = "0gnsgga8x2yxyg27pya6rhmxfsxf167vsi4xdj98fn8v0j7zz1v1";
-  });
-
   # https://github.com/jgm/pandoc/issues/4974
   pandoc = doJailbreak super.pandoc_2_3_1;
 
-- 
GitLab


From 1bc42cb1935020a85845e59e38e3dd484991eaaf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 31 Oct 2018 12:01:17 +0100
Subject: [PATCH 0752/1065] haskell-xmobar: drop obsolete override for
 ghc-8.6.x

---
 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 15497cd692e..37d11e08c98 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -117,7 +117,4 @@ self: super: {
   # Break out of "yaml >=0.10.4.0 && <0.11".
   stack = doJailbreak super.stack;
 
-  # https://github.com/vimus/libmpd-haskell/issues/109
-  xmobar = disableCabalFlag (super.xmobar.override { libmpd = null; }) "with_mpd";
-
 }
-- 
GitLab


From cd68a8c7cc602e75a4abbadc94663347a73ae24e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 31 Oct 2018 12:03:38 +0100
Subject: [PATCH 0753/1065] haskell-fltkhs-themes: disable Hydra build to avoid
 evaluation errors

---
 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 a2b86b22094..1b85a564e31 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2586,6 +2586,7 @@ dont-distribute-packages:
   fltkhs-demos:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   fltkhs-fluid-demos:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fltkhs-hello-world:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fltkhs-themes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-dom-hello:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-dom-webkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-javascriptcore:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-- 
GitLab


From 3d5f7e368f31a201d0151b90e4508aa0f693110e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 31 Oct 2018 12:05:11 +0100
Subject: [PATCH 0754/1065] haskell-polyparse: drop obsolete override for
 ghc-8.6.x

---
 .../development/haskell-modules/configuration-ghc-8.6.x.nix | 6 ------
 1 file changed, 6 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 37d11e08c98..b9277727650 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -99,12 +99,6 @@ self: super: {
   # https://github.com/bmillwood/haskell-src-meta/pull/80
   haskell-src-meta = doJailbreak super.haskell-src-meta;
 
-  # The official 1.12 release is broken and unmaintained.
-  polyparse = appendPatch (overrideCabal super.polyparse (drv: { editedCabalFile = null; })) (pkgs.fetchpatch {
-    url = https://github.com/bergmark/polyparse/commit/8a69ee7e57db798c106d8b56dce05b1dfc4fed37.patch;
-    sha256 = "11r73wx1w6bfrkrnk6r9k7rfzp6qrvkdikb2by37ld06c0w6nn57";
-  });
-
   # https://github.com/skogsbaer/HTF/issues/69
   HTF = markBrokenVersion "0.13.2.4" super.HTF;
 
-- 
GitLab


From 8c717a5701c780cf7fb95a553fb5a7e81eccd080 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 31 Oct 2018 07:00:04 -0500
Subject: [PATCH 0755/1065] activation-script: add libc to path to provide nscd
 when needed

---
 nixos/modules/system/activation/activation-script.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 0ed7c0f53eb..74c150a848d 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -22,6 +22,7 @@ let
       gnugrep
       findutils
       getent
+      stdenv.cc.libc # nscd in update-users-groups.pl
       shadow
       nettools # needed for hostname
       utillinux # needed for mount and mountpoint
-- 
GitLab


From cd1ff3beded0ca8fcb7afd63df83ba0df1ee3eb4 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 26 Oct 2018 14:00:23 +0000
Subject: [PATCH 0756/1065] python3Packages.aiohttp_remotes: init at 0.1.2

---
 .../aiohttp-remotes/default.nix               | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/aiohttp-remotes/default.nix

diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix
new file mode 100644
index 00000000000..51120d07121
--- /dev/null
+++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix
@@ -0,0 +1,34 @@
+{ lib, fetchpatch, buildPythonPackage, fetchPypi
+, aiohttp, pytest, pytestcov, pytest-aiohttp
+}:
+
+buildPythonPackage rec {
+  pname = "aiohttp_remotes";
+  version = "0.1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "43c3f7e1c5ba27f29fb4dbde5d43b900b5b5fc7e37bf7e35e6eaedabaec4a3fc";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = https://github.com/aio-libs/aiohttp-remotes/commit/188772abcea038c31dae7d607e487eeed44391bc.patch;
+      sha256 = "0pb1y4jb8ar1szhnjiyj2sdmdk6z9h6c3wrxw59nv9kr3if5igvs";
+    })
+  ];
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  checkInputs = [ pytest pytestcov pytest-aiohttp ];
+  checkPhase = ''
+    python -m pytest
+  '';
+
+  meta = with lib; {
+    homepage = https://github.com/wikibusiness/aiohttp-remotes;
+    description = "A set of useful tools for aiohttp.web server";
+    license = licenses.mit;
+    maintainers = [ maintainers.qyliss ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e732eb38bb3..98afb639631 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -708,6 +708,8 @@ in {
 
   aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };
 
+  aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { };
+
   aioprocessing = callPackage ../development/python-modules/aioprocessing { };
 
   ajpy = callPackage ../development/python-modules/ajpy { };
-- 
GitLab


From 6ff17834db3383410145c816085d816fc16790ee Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 31 Oct 2018 14:32:08 +0100
Subject: [PATCH 0757/1065] youtube-dl: 2018.10.05 -> 2018.10.29

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 9de0f850d49..8c08ee65805 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,11 +16,14 @@
 buildPythonPackage rec {
 
   pname = "youtube-dl";
-  version = "2018.10.05";
+  # 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.10.29";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1iq02kwxdgh07bf0w0fvbsjbdshs4kja35gy8m70ji9cj10l1mbw";
+    sha256 = "1ndkkpnmjdyz5gjjmvaf18761lxa2c0kypicm9bpqpaj7sdr9s27";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From c8c77476dc32afd42b6ac511c9895db7d93b1bc9 Mon Sep 17 00:00:00 2001
From: CharlesHD <charleshdespointes@gmail.com>
Date: Tue, 30 Oct 2018 16:01:56 +0100
Subject: [PATCH 0758/1065] cmusfm: init at 2018-10-11

---
 pkgs/applications/audio/cmusfm/default.nix | 36 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/audio/cmusfm/default.nix

diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix
new file mode 100644
index 00000000000..e528e9699a7
--- /dev/null
+++ b/pkgs/applications/audio/cmusfm/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  version = "2018-10-11";
+  name = "cmusfm-unstable-${version}";
+  src = fetchFromGitHub {
+    owner = "Arkq";
+    repo = "cmusfm";
+    rev = "ad2fd0aad3f4f1a25add1b8c2f179e8859885873";
+    sha256 = "0wpwdwgyrp64nvwc6shy0n387p31j6aw6cnmfi9x2y1jhl5hbv6b";
+  };
+  # building
+  configureFlags = [ "--enable-libnotify" ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ curl libnotify gdk_pixbuf ];
+
+  meta = with stdenv.lib; {
+    description = "Last.fm and Libre.fm standalone scrobbler for the cmus music player";
+    longDescription = ''
+      Features:
+      + Listening now notification support
+      + Off-line played track cache for later submission
+      + POSIX ERE-based file name parser
+      + Desktop notification support (optionally)
+      + Customizable scrobbling service
+      + Small memory footprint
+      Configuration:
+      + run `cmusfm init` to generate configuration file under ~/.config/cmus/cmusfm.conf
+      + Inside cmus run `:set status_display_program=cmusfm` to set up cmusfm
+    '';
+    homepage = https://github.com/Arkq/cmusfm/;
+    maintainers = with stdenv.lib.maintainers; [ CharlesHD ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f98bf64fdf7..455620eedb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16052,6 +16052,8 @@ with pkgs;
     pulseaudioSupport = config.pulseaudio or false;
   };
 
+  cmusfm = callPackage ../applications/audio/cmusfm { };
+
   cni = callPackage ../applications/networking/cluster/cni {};
   cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {};
 
-- 
GitLab


From a7912ecc85af6cd9091eb913a114a08baf5312e6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 31 Oct 2018 16:12:00 +0100
Subject: [PATCH 0759/1065] systemd: 239 -> 239.20181031

Fixes CVE-2018-15688 and updates latest upstream stable v239 branch.

See https://github.com/NixOS/systemd/pull/24 for details.

Co-authored-by: Andreas Rammhold <andreas@rammhold.de>
---
 pkgs/os-specific/linux/systemd/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index db64b8e6f6d..2a17a0a2875 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -18,7 +18,7 @@ let
   pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
 
 in stdenv.mkDerivation rec {
-  version = "239";
+  version = "239.20181031";
   name = "systemd-${version}";
 
   # When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
@@ -26,8 +26,8 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "systemd";
-    rev = "31859ddd35fc3fa82a583744caa836d356c31d7f";
-    sha256 = "1xci0491j95vdjgs397n618zii3sgwnvanirkblqqw6bcvcjvir1";
+    rev = "nixos-v${version}";
+    sha256 = "1rzl0iqrpa4ajvama5k3cb3yc7893c55kzcxkl3cyavpdzsw5505";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];
@@ -91,6 +91,7 @@ in stdenv.mkDerivation rec {
     "-Dsulogin-path=${utillinux}/bin/sulogin"
     "-Dmount-path=${utillinux}/bin/mount"
     "-Dumount-path=${utillinux}/bin/umount"
+    "-Ddns-over-tls=false"
   ];
 
   preConfigure = ''
-- 
GitLab


From 8798de63fb0c4bf1680d5ba771052d5f2d00ee15 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 31 Oct 2018 08:46:48 -0500
Subject: [PATCH 0760/1065] gitAndTools.grv: 0.2.0 -> 0.3.0

Remove 'update_latest_release.go' so we don't try to build it
since this fails due to unmet dependencies.

AFAICT this utility is only meant for developer use anyway,
and helps manage/create new github releases for the project.
---
 .../version-management/git-and-tools/grv/default.nix      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index 962ddf98d6c..dd080799557 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGo19Package, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }:
 let
-  version = "0.2.0";
+  version = "0.3.0";
 in
 buildGo19Package {
   name = "grv-${version}";
@@ -14,10 +14,14 @@ buildGo19Package {
     owner = "rgburke";
     repo = "grv";
     rev = "v${version}";
-    sha256 = "0hlqw6b51jglqzzjgazncckpgarp25ghshl0lxv1mff80jg8wd1a";
+    sha256 = "00v502mwnpv09l7fsbq3s72i5fz5dxbildwxgw0r8zzf6d54xrgl";
     fetchSubmodules = true;
   };
 
+  postPatch = ''
+    rm util/update_latest_release.go
+  '';
+
   buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From 0f601b7f76bd575ec6256dd5c6a686e6af491e21 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 31 Oct 2018 18:26:46 +0100
Subject: [PATCH 0761/1065] wolf-shaper: init at 0.1.6 (#49087)

---
 .../audio/wolf-shaper/default.nix             | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/applications/audio/wolf-shaper/default.nix

diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix
new file mode 100644
index 00000000000..562fdc1be8b
--- /dev/null
+++ b/pkgs/applications/audio/wolf-shaper/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub , libjack2, lv2, xorg, liblo, libGL, libXcursor, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "wolf-shaper-${version}";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner = "pdesaulniers";
+    repo = "wolf-shaper";
+    rev = "v${version}";
+    sha256 = "01h5dm1nrr0i54ancwznr7wn4vpw08dw0b69v3axy32r5j7plw6s";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libjack2 lv2 xorg.libX11 liblo libGL libXcursor  ];
+
+  makeFlags = [
+    "BUILD_LV2=true"
+    "BUILD_DSSI=true"
+    "BUILD_VST2=true"
+    "BUILD_JACK=true"
+  ];
+
+  patchPhase = ''
+    patchShebangs ./dpf/utils/generate-ttl.sh
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib/lv2
+    mkdir -p $out/lib/dssi
+    mkdir -p $out/lib/vst
+    mkdir -p $out/bin/
+    cp -r bin/wolf-shaper.lv2    $out/lib/lv2/
+    cp -r bin/wolf-shaper-dssi*  $out/lib/dssi/
+    cp -r bin/wolf-shaper-vst.so $out/lib/vst/
+    cp -r bin/wolf-shaper        $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://pdesaulniers.github.io/wolf-shaper/;
+    description = "Waveshaper plugin with spline-based graph editor";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 938838dd1c2..b0168299699 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6188,6 +6188,8 @@ with pkgs;
 
   wol = callPackage ../tools/networking/wol { };
 
+  wolf-shaper = callPackage ../applications/audio/wolf-shaper { };
+
   wring = nodePackages.wring;
 
   wrk = callPackage ../tools/networking/wrk { };
-- 
GitLab


From 98fd559eaa67803eba19f32be4dd4347b1cbc340 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 31 Oct 2018 12:36:08 -0500
Subject: [PATCH 0762/1065] strace: 4.24 -> 4.25 (#49518)

https://github.com/strace/strace/releases/tag/v4.25
---
 pkgs/development/tools/misc/strace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 33a46e16a3a..e2022156870 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "strace-${version}";
-  version = "4.24";
+  version = "4.25";
 
   src = fetchurl {
     url = "https://strace.io/files/${version}/${name}.tar.xz";
-    sha256 = "0d061cdzk6a1822ds4wpqxg10ny27mi4i9zjmnsbz8nz3vy5jkhz";
+    sha256 = "00f7zagfh3np5gwi0z7hi7zjd7s5nixcaq7z78n87dvhakkgi1fn";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-- 
GitLab


From 56b88fb03f3e3d7a0e34f27e8d6558bfd649d077 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 31 Oct 2018 18:39:34 +0100
Subject: [PATCH 0763/1065] gxplugins-lv2: init at 0.5 (#48847)

---
 .../audio/gxplugins-lv2/default.nix           | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/audio/gxplugins-lv2/default.nix

diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix
new file mode 100644
index 00000000000..e7e4744eea2
--- /dev/null
+++ b/pkgs/applications/audio/gxplugins-lv2/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, xorg, xproto, cairo, lv2, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "GxPlugins.lv2";
+  version = "0.5";
+
+  src = fetchFromGitHub {
+    owner = "brummer10";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "16r5bj7w726d9327flg530fn0bli4crkxjss7i56yhb1bsi39mbv";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    xorg.libX11 xproto cairo lv2
+  ];
+
+  installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/brummer10/GxPlugins.lv2;
+    description = "A set of extra lv2 plugins from the guitarix project";
+    maintainers = [ maintainers.magnetophon ];
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0168299699..9ceb1b7dc63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17158,6 +17158,8 @@ with pkgs;
 
   gxmessage = callPackage ../applications/misc/gxmessage { };
 
+  gxplugins-lv2 = callPackage ../applications/audio/gxplugins-lv2 { };
+
   hackrf = callPackage ../applications/misc/hackrf { };
 
   hakuneko = callPackage ../tools/misc/hakuneko { };
-- 
GitLab


From 1f1bd5c8e8050ee07c1ffae24359f5ee26c58a68 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 26 Oct 2018 14:01:25 +0000
Subject: [PATCH 0764/1065] python3Packages.aioh2: init at 0.2.2

Tests skipped due to https://github.com/decentfox/aioh2/issues/17.
---
 .../python-modules/aioh2/default.nix          | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/aioh2/default.nix

diff --git a/pkgs/development/python-modules/aioh2/default.nix b/pkgs/development/python-modules/aioh2/default.nix
new file mode 100644
index 00000000000..fdeb5fb0082
--- /dev/null
+++ b/pkgs/development/python-modules/aioh2/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, isPy3k, fetchPypi, h2, priority }:
+
+buildPythonPackage rec {
+  pname = "aioh2";
+  version = "0.2.2";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "03i24wzpw0mrnrpck3w6qy83iigwl7n99sdrndqzxfyrc69b99wd";
+  };
+
+  propagatedBuildInputs = [ h2 priority ];
+
+  doCheck = false; # https://github.com/decentfox/aioh2/issues/17
+
+  meta = with lib; {
+    homepage = https://github.com/decentfox/aioh2;
+    description = "HTTP/2 implementation with hyper-h2 on Python 3 asyncio";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.qyliss ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 98afb639631..1d5ff1778df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -702,6 +702,8 @@ in {
 
   aiofiles = callPackage ../development/python-modules/aiofiles { };
 
+  aioh2 = callPackage ../development/python-modules/aioh2 { };
+
   aiohttp = callPackage ../development/python-modules/aiohttp { };
 
   aiohttp-cors = callPackage ../development/python-modules/aiohttp/cors.nix { };
-- 
GitLab


From 39edfe5a2dbf1a128e0d36754b7a200dce5dba1d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 26 Oct 2018 14:31:35 +0000
Subject: [PATCH 0765/1065] doh-proxy: init at 0.0.8

---
 pkgs/servers/dns/doh-proxy/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/servers/dns/doh-proxy/default.nix

diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix
new file mode 100644
index 00000000000..ac44dbbf04d
--- /dev/null
+++ b/pkgs/servers/dns/doh-proxy/default.nix
@@ -0,0 +1,22 @@
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "doh-proxy";
+  version = "0.0.8";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "0mfl84mcklby6cnsw29kpcxj7mh1cx5yw6mjs4sidr1psyni7x6c";
+  };
+
+  propagatedBuildInputs = with python3Packages;
+    [ aioh2 dnspython aiohttp-remotes pytestrunner flake8 ];
+  doCheck = false; # Trouble packaging unittest-data-provider
+
+  meta = with lib; {
+    homepage = https://facebookexperimental.github.io/doh-proxy/;
+    description = "A proof of concept DNS-Over-HTTPS proxy";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.qyliss ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ace934df95..244af730540 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13208,6 +13208,8 @@ with pkgs;
 
   dex-oidc = callPackage ../servers/dex { };
 
+  doh-proxy = callPackage ../servers/dns/doh-proxy { };
+
   dgraph = callPackage ../servers/dgraph { };
 
   dico = callPackage ../servers/dico { };
-- 
GitLab


From c6fc3bb7fc5f32207a95cc109244e4a49cbd8743 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 31 Oct 2018 18:47:41 +0100
Subject: [PATCH 0766/1065] python3Packages.gplaycli: 3.21 -> 3.25 (#49521)

The version 3.21 isn't compatible with our currently packaged
`pythonPackages.gpapi` which is now at version 0.4.3.

See https://hydra.nixos.org/build/83154918
---
 pkgs/development/python-modules/gplaycli/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix
index 0a882693408..0c7fa8db01c 100644
--- a/pkgs/development/python-modules/gplaycli/default.nix
+++ b/pkgs/development/python-modules/gplaycli/default.nix
@@ -4,18 +4,18 @@
 
 buildPythonPackage rec {
   pname = "gplaycli";
-  version = "3.21";
+  version = "3.25";
 
   src = fetchFromGitHub {
     owner = "matlink";
     repo = "gplaycli";
     rev = version;
-    sha256 = "1r5nzi9yzswam0866gypjcvv3f1rw13jwx9s49chp8byxy1dyrs2";
+    sha256 = "1rygx5cg4b1vwpkiaq6jcpbc1ly7cspslv3sy7x8n8ba61ryq6h4";
   };
 
- disabled = !isPy3k;
+  disabled = !isPy3k;
 
- propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ];
+  propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/matlink/gplaycli;
-- 
GitLab


From f9a8abe86b85a6a87a1a374192ed6f8f9218137c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@github.danieldk.eu>
Date: Wed, 31 Oct 2018 18:49:32 +0100
Subject: [PATCH 0767/1065] hugo: 0.49.2 -> 0.50 (#49525)

Changelog: https://github.com/gohugoio/hugo/releases/tag/v0.50
---
 pkgs/applications/misc/hugo/default.nix | 13 +++----------
 pkgs/applications/misc/hugo/deps.nix    | 16 ++++++++--------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 29b6e41a90d..22badfc8cdd 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.49.2";
+  version = "0.50";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,16 +10,9 @@ buildGoPackage rec {
     owner  = "gohugoio";
     repo   = "hugo";
     rev    = "v${version}";
-    sha256 = "0a320mv6x770vppbz0aw5ikywmy0mxqq1lhc0syp48hgg42d46is";
+    sha256 = "1shrw7pxwrz9g5x9bq6k5qvhn3fqmwznadpw7i07msh97p8b3dyn";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/gohugoio/hugo/commit/b137ad4dbd6d14d0a9af68c044aaee61f2c87fe5.diff";
-      sha256 = "0w1gpg11idqywqcpwzvx4xabn02kk8y4jmyz4h67mc3yh2dhq3ll";
-    })
-  ];
-
   goDeps = ./deps.nix;
 
   buildFlags = "-tags extended";
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 002fb6351b8..d5c24d69048 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -555,8 +555,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/jwalterweatherman";
-      rev = "4a4406e478ca";
-      sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
+      rev = "94f6ae3ed3bc";
+      sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b";
     };
   }
 
@@ -605,8 +605,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/tdewolff/minify";
-      rev = "v2.3.5";
-      sha256 = "0x67kgjhc6mfzjhr4xmw0j3qapzhkgwwahvv5b44rb449ml2qx5m";
+      rev = "v2.3.6";
+      sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb";
     };
   }
 
@@ -615,8 +615,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/tdewolff/parse";
-      rev = "v2.3.3";
-      sha256 = "190y2jykp8qyp6y58ky1v1fvmaqjnrsr1ksbqrrspf1gpjy69i94";
+      rev = "fced451e0bed";
+      sha256 = "1n6wcapk8xbck2zjxd4l5cgfn1v12rr7znrdpd5y2xp1nc3739c3";
     };
   }
 
@@ -625,8 +625,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/tdewolff/test";
-      rev = "265427085153";
-      sha256 = "1h0cmsjjia92w50dzr06c5h10zd5c7snhpixqjv94wbl7dv80yp0";
+      rev = "v1.0.0";
+      sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj";
     };
   }
 
-- 
GitLab


From a9202796ec3e15c8311b4a88230a12c163c5b92d Mon Sep 17 00:00:00 2001
From: baracoder <baracoder@googlemail.com>
Date: Wed, 31 Oct 2018 18:53:51 +0100
Subject: [PATCH 0768/1065] smartgithg: 18.1.4 -> 18.1.5 (#49527)

Bugfix version
---
 pkgs/applications/version-management/smartgithg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index 106b66bcfec..d6ae37c3f7f 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name = "smartgithg-${version}";
-  version = "18_1_4";
+  version = "18_1_5";
 
   src = fetchurl {
     url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz";
-    sha256 = "18gyfcs5g7xq8fqnn1zjzx350jaynrniain0giay8sxych12p4cm";
+    sha256 = "0f2aj3259jvn7n0x6m8sbwliikln9lqffd00jg75dblhxwl8adg3";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 41880aea09cb38dd03f02ef3ac5f919dcb12096d Mon Sep 17 00:00:00 2001
From: "Tristan Helmich (omniIT)" <tristan.helmich@omniit.de>
Date: Wed, 31 Oct 2018 18:59:32 +0100
Subject: [PATCH 0769/1065] saml2aws: 2.6.1 -> 2.10.0

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

diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix
index 047706cd8a6..e90517f1581 100644
--- a/pkgs/tools/security/saml2aws/default.nix
+++ b/pkgs/tools/security/saml2aws/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "saml2aws-${version}";
-  version = "2.6.1";
+  version = "2.10.0";
 
   goPackagePath = "github.com/versent/saml2aws";
   goDeps = ./deps.nix;
@@ -15,7 +15,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "Versent";
     repo = "saml2aws";
-    sha256 = "0sg5qm1gyrisna247lmxfgpa22y6rnz9vd6yg92kxlcwr4ji8l1j";
+    sha256 = "00m8x57fgry601w5f9dxnxdqbbqjiv7c0rsx47iv9qsp0w7l50c5";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 30c92945a4e403bbe14eb3fca7a6c36ad80ab77c Mon Sep 17 00:00:00 2001
From: qolii <qoli@protonmail.com>
Date: Tue, 30 Oct 2018 23:14:54 -0700
Subject: [PATCH 0770/1065] eternal-terminal: 5.1.7 -> 5.1.8.

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

diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 36bc2a9bc28..9d21e7a2673 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "eternal-terminal-${version}";
-  version = "5.1.7";
+  version = "5.1.8";
 
   src = fetchFromGitHub {
     owner = "MisterTea";
     repo = "EternalTCP";
     rev = "refs/tags/et-v${version}";
-    sha256 = "17ndpkpyh8hwr6v7ac6029sja95nhn9c1g8r93g20rp0vz3r6lpa";
+    sha256 = "0fq9a1fn0c77wfpypl3z7y23gbkw295ksy97wi9lhb5zj2m3dkq0";
   };
 
   nativeBuildInputs = [ cmake ninja ];
-- 
GitLab


From c970b4ef126f4133fb6e9877446c7bf852d42a6a Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Wed, 31 Oct 2018 18:59:46 +0100
Subject: [PATCH 0771/1065] eternal-terminal: fix homepage url

---
 pkgs/tools/networking/eternal-terminal/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 9d21e7a2673..73eaa07ac8f 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Remote shell that automatically reconnects without interrupting the session";
     license = licenses.asl20;
-    homepage = https://mistertea.github.io/EternalTCP/;
+    homepage = https://mistertea.github.io/EternalTerminal/;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = [ maintainers.dezgeg ];
   };
-- 
GitLab


From 4133885dab59c9425077df8b6f680902d05b6370 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 30 Oct 2018 18:08:36 +0100
Subject: [PATCH 0772/1065] pythonPackages.pyzmq: use zeromq4

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

diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix
index 31b08d0a9e0..71243ef6f76 100644
--- a/pkgs/development/python-modules/pyzmq/default.nix
+++ b/pkgs/development/python-modules/pyzmq/default.nix
@@ -2,7 +2,7 @@
 , fetchPypi
 , pytest
 , tornado
-, zeromq3
+, zeromq
 , py
 , python
 }:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [  pytest tornado ];
-  buildInputs = [ zeromq3];
+  buildInputs = [ zeromq ];
   propagatedBuildInputs = [ py ];
 
   # test_socket.py seems to be hanging
-- 
GitLab


From 0459a8c8db94069f89dd52c51d731ca9901f0b3b Mon Sep 17 00:00:00 2001
From: "Tristan Helmich (omniIT)" <tristan.helmich@omniit.de>
Date: Wed, 31 Oct 2018 19:28:55 +0100
Subject: [PATCH 0773/1065] sc-controller: 0.4.4 -> 0.4.5

---
 pkgs/misc/drivers/sc-controller/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix
index 9de0ba27778..b504002b7d9 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.4";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner  = "kozec";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0ki9x28i5slpnygkpdglcvj8cssvvjyz732y1cnpzw1f0sj0kris";
+    sha256 = "0mb9r4811rfj5rs4vrdhaf3x38iy1fvxr4sk2zg3xhvc29cdf5wv";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];
@@ -24,10 +24,6 @@ buildPythonApplication rec {
 
   checkInputs = [ pytest ];
 
-  patches = [ 
-    ./fix-udev.patch  # fix upstream issue #401, remove with the next update
-  ];
-
   postPatch = ''
     substituteInPlace scc/paths.py --replace sys.prefix "'$out'"
     substituteInPlace scc/uinput.py --replace /usr/include ${linuxHeaders}/include
-- 
GitLab


From 9c794029620183b714e6eac63df6a9bc0e786178 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 31 Oct 2018 13:32:44 -0500
Subject: [PATCH 0774/1065] hub: 2.5.1 -> 2.6.0, cleanup a bit (#49503)

* categorize inputs appropriately
* only put man pages into share/man; previously we copied other formats
  as well as intermediate files used in man page generation.
  (which 'man' complained about but otherwise seemed to ignore)
---
 .../version-management/git-and-tools/hub/default.nix     | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 113d7f78b90..e01101c6a66 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.5.1";
+  version = "2.6.0";
 
   goPackagePath = "github.com/github/hub";
 
@@ -10,10 +10,11 @@ buildGoPackage rec {
     owner = "github";
     repo = "hub";
     rev = "v${version}";
-    sha256 = "0a5i351v998vdwf883qhh39c15x56db01fr9hscz4ha7r9550pqg";
+    sha256 = "0hxmbpyv2yjxg4v3z50x5ikgcz7mgv5prya8jcpi277vq2s0wwa1";
   };
 
-  buildInputs = [ groff ronn ruby utillinux ] ++
+  nativeBuildInputs = [ groff ronn utillinux ];
+  buildInputs = [ ruby ] ++
     stdenv.lib.optional stdenv.isDarwin Security;
 
   postPatch = ''
@@ -29,7 +30,7 @@ buildGoPackage rec {
     install -D etc/hub.fish_completion  "$bin/share/fish/vendor_completions.d/hub.fish"
 
     make man-pages
-    cp -r share/man $bin/share/man
+    cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From e662e0b8d9eaedfbba4236f5bef5ec4a6c5005f3 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Wed, 31 Oct 2018 19:53:47 +0100
Subject: [PATCH 0775/1065] saxon-he: 9.8.0.6 -> 9.9.0.1 (#49541)

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

diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index ca9aa8fc36e..687e1e8a1de 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -71,12 +71,12 @@ in {
 
   saxon-he = common {
     pname = "saxon-he";
-    version = "9.8.0.6";
+    version = "9.9.0.1";
     prog = "saxon-he";
     jar = "saxon9he";
     src = fetchurl {
-      url = mirror://sourceforge/saxon/Saxon-HE/9.8/SaxonHE9-8-0-6J.zip;
-      sha256 = "03r4djm298rxz8q7jph63h9niglrl3rifxskq1b3bclx5rgxi2lk";
+      url = mirror://sourceforge/saxon/Saxon-HE/9.9/SaxonHE9-9-0-1J.zip;
+      sha256 = "1inxd7ia7rl9fxfrw8dy9sb7rqv76ipblaki5262688wf2dscs60";
     };
     description = "Processor for XSLT 3.0, XPath 2.0 and 3.1, and XQuery 3.1";
   };
-- 
GitLab


From 363f28f1dec6c7e363512456a03919f7792f2f05 Mon Sep 17 00:00:00 2001
From: leenaars <leenaars@users.noreply.github.com>
Date: Wed, 31 Oct 2018 20:08:18 +0100
Subject: [PATCH 0776/1065] tribler: 7.0.2 -> 7.1.2 (#49386)

---
 pkgs/applications/networking/p2p/tribler/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 77ca7afe871..29ec8158099 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "tribler-${version}";
-  version = "7.0.2";
+  version = "7.1.2";
 
   src = fetchurl {
-    url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
-    sha256 = "1p0d0l0sa0nrnbyx2gg50nklkljwvl581i9w3z5qbkfzc7jsdy42";
+    url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.gz";
+    sha256 = "1ayzqx4358qlx56hsnsn5s8xl6mzdb6nw4kwsalmp86dw6vmmis8";
   };
 
   buildInputs = [
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
     pythonPackages.psutil
     pythonPackages.meliae
     pythonPackages.sip
+    pythonPackages.pillow
+    pythonPackages.networkx
   ];
 
   postPatch = ''
-- 
GitLab


From 7c0122e7e6758af7e5fd972c6047e3cbac9bfa7d Mon Sep 17 00:00:00 2001
From: Patrick Elliott <patrick.d.elliott@gmail.com>
Date: Wed, 31 Oct 2018 20:12:53 +0100
Subject: [PATCH 0777/1065] Added native build dependencies for scuttlebot
 (#49471)

---
 pkgs/development/node-packages/default-v8.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
index be9aafe4741..f7d3e3c908f 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@@ -86,6 +86,10 @@ nodePackages // {
     '';
   };
 
+  scuttlebot = nodePackages.scuttlebot.override {
+    buildInputs = [ pkgs.automake pkgs.autoconf nodePackages.node-gyp-build ];
+  };
+
   statsd = nodePackages.statsd.override {
     # broken with node v8, dead upstream,
     # see #45946 and https://github.com/etsy/statsd/issues/646
-- 
GitLab


From 67c1815d0ab5b55c807683e236cab3fb1f07e91f Mon Sep 17 00:00:00 2001
From: Arnaud <root@arnaud.sh>
Date: Wed, 31 Oct 2018 20:24:58 +0100
Subject: [PATCH 0778/1065] protonmail-bridge: 1.0.6-1 -> 1.1.0-1 (#49517)

---
 .../applications/networking/protonmail-bridge/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index a4a127db73b..3e74fbfb66a 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -2,7 +2,7 @@
   libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }:
 
 let
-  version = "1.0.6-1";
+  version = "1.1.0-1";
 
   description = ''
     An application that runs on your computer in the background and seamlessly encrypts
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
-    sha256 = "1as4xdsik2w9clbrwp1k00491324cg6araz3jq2m013yg1cild28";
+    sha256 = "0l29z208krnd3dginc203m4p5dlmnxf08vpmbm9xzlckwmswizkb";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -38,10 +38,10 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/{bin,lib,share/applications}
-    # mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
+    mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
 
     cp -r usr/lib/protonmail/bridge/Desktop-Bridge{,.sh} $out/lib
-    # cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg
+    cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg
     cp ${desktopItem}/share/applications/* $out/share/applications
 
     ln -s $out/lib/Desktop-Bridge $out/bin/Desktop-Bridge
-- 
GitLab


From f475aee5986dd6b76c171bf9f93540e547d52d13 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 31 Oct 2018 12:30:38 -0700
Subject: [PATCH 0779/1065] closurecompiler: 20180805 -> 20180910 (#48529)

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 63b31c60d98..d26f731c21f 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 = "20180805";
+  version = "20180910";
 
   src = fetchurl {
     url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "1jis9ykbbynq6pa8sl1jy8888l2bk9g4xsiiiab51zn62shqnq26";
+    sha256 = "12k4cp9f8g03k3zf2g70pn6ybx8gk0hfh81ypiyb5hkfij95bi9k";
   };
 
   sourceRoot = ".";
-- 
GitLab


From 5ace2703096f16fa924072f3743d6eaac35bec32 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 31 Oct 2018 14:32:30 -0500
Subject: [PATCH 0780/1065] c-ares: 1.14.0 -> 1.15.0

https://c-ares.haxx.se/changelog.html#1_15_0
---
 pkgs/development/libraries/c-ares/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index 099d02c8263..efe7a5820b5 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -2,23 +2,14 @@
 
 let self =
 stdenv.mkDerivation rec {
-  name = "c-ares-1.14.0";
+  name = "c-ares-1.15.0";
 
   src = fetchurl {
     url = "https://c-ares.haxx.se/download/${name}.tar.gz";
-    sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5";
+    sha256 = "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc";
   };
 
-  configureFlags = if stdenv.hostPlatform.isWindows then [ "--disable-shared" "--enable-static" ] else null;
-
-  # ares_android.h header is missing
-  # see issue https://github.com/c-ares/c-ares/issues/216
-  postPatch = if stdenv.hostPlatform.isAndroid then ''
-    cp ${fetchurl {
-      url = "https://raw.githubusercontent.com/c-ares/c-ares/cares-1_14_0/ares_android.h";
-      sha256 = "1aw8y6r5c8zq6grjwf4mcm2jj35r5kgdklrp296214s1f1827ps8";
-    }} ares_android.h
-  '' else null;
+  configureFlags = stdenv.lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" ];
 
   meta = with stdenv.lib; {
     description = "A C library for asynchronous DNS requests";
-- 
GitLab


From e4c64ae93029a7c3a09a346df94362488a1eae35 Mon Sep 17 00:00:00 2001
From: Christian S <grische@users.noreply.github.com>
Date: Wed, 31 Oct 2018 20:47:24 +0100
Subject: [PATCH 0781/1065] openh264: 1.7.0 -> 1.8.0 (#49544)

encoder fixes, clang compilation error for ARM
---
 pkgs/development/libraries/openh264/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
index 0a0b4c8d549..c8208ce27ba 100644
--- a/pkgs/development/libraries/openh264/default.nix
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "openh264-${version}";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "cisco";
     repo = "openh264";
     rev = "v${version}";
-    sha256 = "0ywrqni05bh925ws5fmd24bm6h9n6z2wp1q19v545v06biiwr46a";
+    sha256 = "1pl7hpk25nh7lcx1lbbv984gvnim0d6hxf4qfmrjjfjf6w37sjw4";
   };
 
   buildInputs = [ nasm ];
-- 
GitLab


From dc00987d959d78b1facecbe1c4ba43b7191c18fb Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 31 Oct 2018 20:52:49 +0100
Subject: [PATCH 0782/1065] androidStudioPackages.beta: 3.3.0.13 -> 3.3.0.14

---
 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 bf9c7b7e129..e97e22e4a9e 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.13"; # "Android Studio 3.3 Beta 1"
-    build = "182.5073496";
-    sha256Hash = "0bg1h0msd6mpkvirkg4pssa1ak32smv2rlxxsjdm3p29p8gg59px";
+    version = "3.3.0.14"; # "Android Studio 3.3 Beta 2"
+    build = "182.5078385";
+    sha256Hash = "10jw508fzxbknfl1l058ksnnli2nav91wmh2x2p0mz96lkf5bvhn";
   };
   latestVersion = { # canary & dev
     version = "3.4.0.1"; # "Android Studio 3.4 Canary 2"
-- 
GitLab


From 40ae90c9e41f7f910b55e6e389e19e60daca6fb8 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Wed, 31 Oct 2018 21:04:31 +0100
Subject: [PATCH 0783/1065] dotnetPackages.SharpFont: 3.1.0 -> 4.0.1 (#49545)

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index ee1b94c8638..bcfef9bdad8 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -210,8 +210,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   SharpFont = fetchNuGet {
     baseName = "SharpFont";
-    version = "3.1.0";
-    sha256 = "137y514i4zi0i0qsx7nv4ibl4kifbr8xr23rqdkwf7yxf88jjmh2";
+    version = "4.0.1";
+    sha256 = "1yd3cm4ww0hw2k3aymf792hp6skyg8qn491m2a3fhkzvsl8z7vs8";
     outputFiles = [ "lib/*" "config/*" ];
   };
 
-- 
GitLab


From e07574876980e36c662c4cd8b2a1297893ca9011 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 31 Oct 2018 22:00:18 +0100
Subject: [PATCH 0784/1065] signal-desktop: 1.17.2 -> 1.17.3

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

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 3c2109f14c5..ca6ee04d370 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.17.2";
+  version = "1.17.3";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1ibci07w4dh7r0dkwb3nbqm470rgak2a98rlqf8390rxrinfli3p";
+    sha256 = "1k0gj24562jfj748s7qcn1f7brr1c0zn2dppxvfv2ka2r2n0z1h4";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
-- 
GitLab


From bb2bae69868cf131d50e4e1012a74759a40f4c90 Mon Sep 17 00:00:00 2001
From: royneary <christian@ulrich.earth>
Date: Wed, 31 Oct 2018 22:03:27 +0100
Subject: [PATCH 0785/1065] mosdeph: fix compilation with nim 0.19

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

diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix
index 4b4920a6ca3..3cd83a5cdd2 100644
--- a/pkgs/applications/science/biology/mosdepth/default.nix
+++ b/pkgs/applications/science/biology/mosdepth/default.nix
@@ -4,8 +4,8 @@ let
   hts-nim = fetchFromGitHub {
     owner = "brentp";
     repo = "hts-nim";
-    rev = "9cd83e30522ab64cd71eb8209be4154aa5579ce1";
-    sha256 = "10g408idy14667varq1syf06rrbpk63i3ib7i5dh1md4ib19av6f";
+    rev = "v0.2.5";
+    sha256 = "1fma99rjqxgg9dihkd10hm1jjp5amsk5wsxnvq1lk4mcsjix5xqb";
   };
 
   docopt = fetchFromGitHub {
@@ -28,7 +28,10 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ nim ];
 
-  buildPhase = "nim -p:${hts-nim}/src -p:${docopt}/src c -d:release mosdepth.nim";
+  buildPhase = ''
+    HOME=$TMPDIR
+    nim -p:${hts-nim}/src -p:${docopt}/src c --nilseqs:on -d:release mosdepth.nim
+  '';
   installPhase = "install -Dt $out/bin mosdepth";
   fixupPhase = "patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc htslib pcre ]} $out/bin/mosdepth";
 
-- 
GitLab


From 18aa80f352914101827a98cab82460c89525c526 Mon Sep 17 00:00:00 2001
From: royneary <christian@ulrich.earth>
Date: Wed, 31 Oct 2018 22:04:00 +0100
Subject: [PATCH 0786/1065] nrpl: fix compilation with nim 0.19

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

diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix
index d6a35723590..234f5a5bfae 100644
--- a/pkgs/development/tools/nrpl/default.nix
+++ b/pkgs/development/tools/nrpl/default.nix
@@ -25,7 +25,10 @@ stdenv.mkDerivation rec {
     "-lpcre"
   ];
 
-  buildPhase = "nim c -d:release nrpl.nim";
+  buildPhase = ''
+    HOME=$TMPDIR
+    nim c -d:release nrpl.nim
+  '';
 
   installPhase = "install -Dt $out/bin nrpl";
 
-- 
GitLab


From a2d39a802d8ced741471d63a5ec08edb8605fb10 Mon Sep 17 00:00:00 2001
From: qolii <36613499+qolii@users.noreply.github.com>
Date: Wed, 31 Oct 2018 21:05:03 +0000
Subject: [PATCH 0787/1065] linux-hardkernel: 4.14.73-149 -> 4.14.78-150
 (#49535)

---
 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 fc9cb2f238b..8ad96f4f1bf 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.73-149";
+  version = "4.14.78-150";
 
   # modDirVersion needs to be x.y.z.
-  modDirVersion = "4.14.73";
+  modDirVersion = "4.14.78";
 
   # branchVersion needs to be x.y.
   extraMeta.branch = "4.14";
@@ -13,7 +13,7 @@ buildLinux (args // rec {
     owner = "hardkernel";
     repo = "linux";
     rev = version;
-    sha256 = "1zc5py6v3xyvy6dwghnqb7nsn9l1aib3d96i5bqy9dd56vyiy5m2";
+    sha256 = "0139qciaf1vlz41s9idjbcx20c1svrp1l7qaazfkwfx52ghb4pvv";
   };
 
   defconfig = "odroidxu4_defconfig";
-- 
GitLab


From 8f4c5700309ca0bbcad792bfd5e2b8d31f09df97 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Wed, 31 Oct 2018 22:33:28 +0100
Subject: [PATCH 0788/1065] sbcl: include info manual

---
 pkgs/development/compilers/sbcl/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 334ecbb168b..381e7b1d84e 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -5,6 +5,7 @@
   # Note that the created binaries still need `patchelf --set-interpreter ...`
   # to get rid of ${glibc} dependency.
 , purgeNixReferences ? false
+, texinfo
 }:
 
 stdenv.mkDerivation rec {
@@ -16,6 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "0maa4h5zdykq050hdqk5wd74dhl6k7br3qrhfd4f2387skk8ky7a";
   };
 
+  buildInputs = [texinfo];
+
   patchPhase = ''
     echo '"${version}.nixos"' > version.lisp-expr
     echo "
@@ -83,6 +86,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}"
+    (cd doc/manual ; make info)
   '';
 
   installPhase = ''
-- 
GitLab


From dc50b2b558763f5d7846e481f19e3b78b447309e Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Wed, 31 Oct 2018 23:32:47 +0100
Subject: [PATCH 0789/1065] sbcl: 1.4.12 -> 1.4.13

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 381e7b1d84e..1ef6dd06570 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.4.12";
+  version = "1.4.13";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0maa4h5zdykq050hdqk5wd74dhl6k7br3qrhfd4f2387skk8ky7a";
+    sha256 = "120rnnz8367lk7ljqlf8xidm4b0d738xqsib4kq0q5ms5r7fzgvm";
   };
 
   buildInputs = [texinfo];
@@ -49,11 +49,6 @@ stdenv.mkDerivation rec {
       '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
 
     # Fix the tests
-    sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp
-    sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp
-
     sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
     sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
 
-- 
GitLab


From 622eb09d31fd97ae891e45cdc09885fa5def6618 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 27 Oct 2018 17:25:55 -0400
Subject: [PATCH 0790/1065] quilter: 1.6.3 -> 1.6.8

---
 pkgs/applications/editors/quilter/default.nix | 39 +++++--------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix
index 4d4cb0239bf..87ffd3256a8 100644
--- a/pkgs/applications/editors/quilter/default.nix
+++ b/pkgs/applications/editors/quilter/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, fetchpatch, vala, pkgconfig, meson, ninja, python3
+{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3
 , granite, gtk3, desktop-file-utils, gnome3, gtksourceview, webkitgtk, gtkspell3
 , discount, gobjectIntrospection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "quilter";
-  version = "1.6.3";
+  version = "1.6.8";
 
   name = "${pname}-${version}";
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "1wa0i6dgg6fgb7q9z33v9qmn1a1dn3ik58v1f3a49dvd5xyf8q6q";
+    sha256 = "07i9pivpddgixn1wzbr15gvzf0n5pklx0gkjjaa35kvj2z8k31x5";
   };
 
   nativeBuildInputs = [
@@ -22,40 +22,19 @@ stdenv.mkDerivation rec {
     ninja
     pkgconfig
     python3
-    vala
+    vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
     wrapGAppsHook
   ];
 
   buildInputs = [
     discount
+    gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
+    gnome3.libgee
     granite
     gtk3
     gtksourceview
     gtkspell3
     webkitgtk
-    gnome3.libgee
-  ];
-
-  patches = [
-    # Fix build with vala 0.42 - Drop these in next release
-    (fetchpatch {
-      url = "https://github.com/lainsce/quilter/commit/a58838213cd7f2d33048c7b34b96dc8875612624.patch";
-      sha256 = "1a4w1zql4zfk8scgrrssrm9n3sh5fsc1af5zvrqk8skbv7f2c80n";
-    })
-    (fetchpatch {
-      url = "https://github.com/lainsce/quilter/commit/d1800ce830343a1715bc83da3339816554896be5.patch";
-      sha256 = "0xl5iz8bgx5661vbbq8qa1wkfvw9d3da67x564ckjfi05zq1vddz";
-    })
-    # Correct libMarkdown dependency discovery: See https://github.com/lainsce/quilter/pull/170
-    (fetchpatch {
-      url = "https://github.com/lainsce/quilter/commit/8b1f3a60bd14cb86c1c62f9917c5f0c12bc4e459.patch";
-      sha256 = "1kjc6ygf9yjvqfa4xhzxiava3338swp9wbjhpfaa3pyz3ayh188n";
-    })
-    # post_install script cleanups: See https://github.com/lainsce/quilter/pull/171
-    (fetchpatch {
-      url = "https://github.com/lainsce/quilter/commit/55bf3b10cd94fcc40b0867bbdb1931a09f577922.patch";
-      sha256 = "1330amichaif2qfrh4qkxwqbcpr87ipik7vzjbjdm2bv3jz9353r";
-    })
   ];
 
   postPatch = ''
@@ -65,9 +44,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Focus on your writing - designed for elementary OS";
-    homepage    = https://github.com/lainsce/quilter;
-    license     = licenses.gpl2Plus;
+    homepage = https://github.com/lainsce/quilter;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ worldofpeace ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From 398282c1965bf45e192128ec06a244bbe36d7f78 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 31 Oct 2018 17:52:35 -0400
Subject: [PATCH 0791/1065] bookworm: 1.0.0 -> 2018-10-21

---
 pkgs/applications/office/bookworm/default.nix | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix
index 45c794c82ea..bc2f260c703 100644
--- a/pkgs/applications/office/bookworm/default.nix
+++ b/pkgs/applications/office/bookworm/default.nix
@@ -1,46 +1,70 @@
-{ stdenv, fetchFromGitHub, vala, pkgconfig, libxml2, cmake, ninja, gtk3, granite, gnome3
-, gobjectIntrospection, sqlite, poppler, poppler_utils, html2text, unzip, unar, wrapGAppsHook }:
+{ 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 }:
 
 stdenv.mkDerivation rec {
   pname = "bookworm";
-  version = "1.0.0";
+  version = "4f7b118281667d22f1b3205edf0b775341fa49cb";
 
-  name = "${pname}-${version}";
+  name = "${pname}-2018-10-21";
 
   src = fetchFromGitHub {
     owner = "babluboy";
     repo = pname;
     rev = version;
-    sha256 = "0nv1nxird0s0qfhh8fr82mkj4qimhklw1bwcjwmvjdsvsxxs9520";
+    sha256 = "0bcyim87zk4b4xmgfs158lnds3y8jg7ppzw54kjpc9rh66fpn3b9";
   };
 
+  # See: https://github.com/babluboy/bookworm/pull/220
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/worldofpeace/bookworm/commit/b2faf685c46b95d6a2d4ec3725e4e4122b61e99a.patch";
+      sha256 = "14az86cj5j65hngfflrp1rmnrkdrhg2a8pl7www3jgfwasxay975";
+    })
+  ];
+
   nativeBuildInputs = [
-    cmake
+    bash
     gobjectIntrospection
     libxml2
+    meson
     ninja
     pkgconfig
-    vala
+    python3
+    vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
     wrapGAppsHook
   ];
 
   buildInputs = with gnome3; [
     glib
+    gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
     granite
     gtk3
     html2text
     libgee
     poppler
+    python2
     sqlite
     webkitgtk
   ];
 
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
+  # These programs are expected in PATH from the source code and scripts
   preFixup = ''
     gappsWrapperArgs+=(
-      --prefix PATH : "${stdenv.lib.makeBinPath [ unzip unar poppler_utils html2text ]}"
+      --prefix PATH : "${stdenv.lib.makeBinPath [ unzip unar poppler_utils html2text coreutils curl gnugrep ]}"
+      --prefix PATH : $out/bin
     )
   '';
 
+  postFixup = ''
+    patchShebangs $out/share/bookworm/scripts/mobi_lib/*.py
+    patchShebangs $out/share/bookworm/scripts/tasks/*.sh
+  '';
+
    meta = with stdenv.lib; {
      description = "A simple, focused eBook reader";
      longDescription = ''
-- 
GitLab


From a9288f1d95b660d12f33fc51aac1ad7d29fb9915 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 31 Oct 2018 17:58:23 -0400
Subject: [PATCH 0792/1065] notejot: 1.4.5 -> 1.4.7

---
 pkgs/applications/misc/notejot/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix
index 59ba45e6f37..09c49135ca1 100644
--- a/pkgs/applications/misc/notejot/default.nix
+++ b/pkgs/applications/misc/notejot/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite
+{ stdenv, fetchFromGitHub, vala_0_40, pkgconfig, meson, ninja, python3, granite
 , gtk3, gnome3, gtksourceview, json-glib, gobjectIntrospection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "notejot";
-  version = "1.4.5";
+  version = "1.4.7";
 
   name = "${pname}-${version}";
 
@@ -20,11 +20,12 @@ stdenv.mkDerivation rec {
     ninja
     pkgconfig
     python3
-    vala
+    vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
     wrapGAppsHook
   ];
 
   buildInputs = [
+    gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
     gnome3.libgee
     granite
     gtk3
@@ -39,9 +40,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Stupidly-simple sticky notes applet";
-    homepage    = https://github.com/lainsce/notejot;
-    license     = licenses.gpl2Plus;
+    homepage = https://github.com/lainsce/notejot;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ worldofpeace ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From 8bf705658adbca74a7dbcc804ef5249cc14574ee Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 31 Oct 2018 18:04:02 -0400
Subject: [PATCH 0793/1065] hashit: 0.2.0 -> 1.0.0

---
 pkgs/tools/misc/hashit/default.nix | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix
index 69d73aafff9..46e460db354 100644
--- a/pkgs/tools/misc/hashit/default.nix
+++ b/pkgs/tools/misc/hashit/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala, python3, gnome3, gtk3, granite, gobjectIntrospection, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala_0_40, python3, gnome3, gtk3, granite, gobjectIntrospection, desktop-file-utils, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "hashit";
-  version = "0.2.0";
+  version = "1.0.0";
 
   name = "${pname}-${version}";
 
@@ -10,30 +10,37 @@ stdenv.mkDerivation rec {
     owner = "artemanufrij";
     repo = pname;
     rev = version;
-    sha256 = "1d2g7cm7hhs354waidak9xkhhcvqlwnsl9d0bar9p82gfnpjdg7v";
+    sha256 = "1ba38qmwdk7vkarsxqn89irbymzx52gbks4isx0klg880xm2z4dv";
   };
 
   nativeBuildInputs = [
+    desktop-file-utils
     gobjectIntrospection
     meson
     ninja
     pkgconfig
     python3
-    vala
+    vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
     wrapGAppsHook
   ];
 
   buildInputs = [
+    gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
+    gnome3.libgee
     granite
     gtk3
-    gnome3.libgee
   ];
 
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
   meta = with stdenv.lib; {
     description = "A simple app for checking usual checksums";
-    homepage    = https://github.com/artemanufrij/hashit;
-    license     = licenses.gpl2Plus;
+    homepage = https://github.com/artemanufrij/hashit;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ worldofpeace ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From c1e3f1c45852720741e8ea621dda7095b238d1b0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 31 Oct 2018 18:06:13 -0400
Subject: [PATCH 0794/1065] aesop: 1.0.5 -> 1.0.7

---
 pkgs/applications/office/aesop/default.nix | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix
index 64e2c0b9467..b510fe950a3 100644
--- a/pkgs/applications/office/aesop/default.nix
+++ b/pkgs/applications/office/aesop/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, fetchpatch, vala, pkgconfig, meson, ninja, python3, granite, gtk3
+{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3, granite, gtk3
 , gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "aesop";
-  version = "1.0.5";
+  version = "1.0.7";
 
   name = "${pname}-${version}";
 
@@ -21,11 +21,12 @@ stdenv.mkDerivation rec {
     ninja
     pkgconfig
     python3
-    vala
+    vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
     wrapGAppsHook
   ];
 
   buildInputs = [
+    gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
     gnome3.libgee
     granite
     gtk3
@@ -34,14 +35,6 @@ stdenv.mkDerivation rec {
     poppler
   ];
 
-  # Fix build with vala 0.42
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/lainsce/aesop/commit/a90b3c711bd162583533370deb031c2c6254c82d.patch";
-      sha256 = "1zf831g6sqq3966q0i00x3jhlbfh9blcky6pnyp5qp59hxyxy169";
-    })
-  ];
-
   postPatch = ''
     chmod +x meson/post_install.py
     patchShebangs meson/post_install.py
@@ -49,9 +42,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The simplest PDF viewer around";
-    homepage    = https://github.com/lainsce/aesop;
-    license     = licenses.gpl2Plus;
+    homepage = https://github.com/lainsce/aesop;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ worldofpeace ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From 6759b7900eac5782f511a8161bd680ffd263b996 Mon Sep 17 00:00:00 2001
From: David Costa <david@zarel.net>
Date: Wed, 31 Oct 2018 23:01:40 +0000
Subject: [PATCH 0795/1065] ntp: fix ntpd shutdown by using upstream patch

After a series of amendments the seccomp.patch made ntpd work properly
but only on 32-bit systems.
This commit replaces that patch with the one submitted upstream by
cleverca22 and that fixes the issue also on 64-bit systems.

Close #38627, #45885
---
 pkgs/tools/networking/ntp/seccomp.patch | 32 +++++++++++++++++--------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/ntp/seccomp.patch b/pkgs/tools/networking/ntp/seccomp.patch
index 872bf8e7fcc..c75536dac7f 100644
--- a/pkgs/tools/networking/ntp/seccomp.patch
+++ b/pkgs/tools/networking/ntp/seccomp.patch
@@ -1,7 +1,18 @@
-diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c
---- ntp-4.2.8p10.orig/ntpd/ntpd.c	2017-04-02 20:21:17.371319663 +0200
-+++ ntp-4.2.8p10/ntpd/ntpd.c	2017-04-02 21:26:02.766178723 +0200
-@@ -1157,10 +1157,12 @@
+From 881e427f3236046466bdb8235edf86e6dfa34391 Mon Sep 17 00:00:00 2001
+From: Michael Bishop <cleverca22@gmail.com>
+Date: Mon, 11 Jun 2018 08:30:48 -0300
+Subject: [PATCH] fix the seccomp filter to include a few previously missed
+ syscalls
+
+---
+ ntpd/ntpd.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
+index 2c7f02ec5..4c59dc2ba 100644
+--- a/ntpd/ntpd.c
++++ b/ntpd/ntpd.c
+@@ -1140,10 +1140,12 @@ int scmp_sc[] = {
  	SCMP_SYS(close),
  	SCMP_SYS(connect),
  	SCMP_SYS(exit_group),
@@ -14,15 +25,16 @@ diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c
  	SCMP_SYS(getsockname),
  	SCMP_SYS(ioctl),
  	SCMP_SYS(lseek),
-@@ -1179,6 +1181,7 @@
+@@ -1162,6 +1164,8 @@ int scmp_sc[] = {
  	SCMP_SYS(sendto),
  	SCMP_SYS(setitimer),
  	SCMP_SYS(setsid),
-+        SCMP_SYS(setsockopt),
++	SCMP_SYS(setsockopt),
++	SCMP_SYS(openat),
  	SCMP_SYS(socket),
  	SCMP_SYS(stat),
  	SCMP_SYS(time),
-@@ -1195,9 +1198,11 @@
+@@ -1178,9 +1182,11 @@ int scmp_sc[] = {
  	SCMP_SYS(clock_settime),
  	SCMP_SYS(close),
  	SCMP_SYS(exit_group),
@@ -34,12 +46,12 @@ diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c
  	SCMP_SYS(madvise),
  	SCMP_SYS(mmap),
  	SCMP_SYS(mmap2),
-@@ -1211,6 +1216,8 @@
+@@ -1194,6 +1200,8 @@ int scmp_sc[] = {
  	SCMP_SYS(select),
  	SCMP_SYS(setitimer),
  	SCMP_SYS(setsid),
-+        SCMP_SYS(setsockopt),
-+        SCMP_SYS(openat),
++	SCMP_SYS(setsockopt),
++	SCMP_SYS(openat),
  	SCMP_SYS(sigprocmask),
  	SCMP_SYS(sigreturn),
  	SCMP_SYS(socketcall),
-- 
GitLab


From aa964c82d330abd8dd19804307793eee2e91eb47 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 6 Sep 2018 14:28:44 -0400
Subject: [PATCH 0796/1065] lib.systems.platforms: Add more ARM autodetection

---
 lib/systems/platforms.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 56783d99e3d..1ed072e9464 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -471,6 +471,7 @@ rec {
       "x86_64-linux" = pc64;
       "armv5tel-linux" = sheevaplug;
       "armv6l-linux" = raspberrypi;
+      "armv7a-linux" = armv7l-hf-multiplatform;
       "armv7l-linux" = armv7l-hf-multiplatform;
       "aarch64-linux" = aarch64-multiplatform;
       "mipsel-linux" = fuloong2f_n32;
-- 
GitLab


From 8f2a1dc9554ec389b122f7d15eee3fd0ad5e6b9a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 29 Oct 2018 19:06:17 -0500
Subject: [PATCH 0797/1065] regextester: 0.1.7 -> 1.0.1

* uses meson now
* crashes on start complaining schema not installed,
  so I added a postInstall that compiles the schema?
  Fixes the problem but I'm not particularly familiar
  with these bits so review appreciated.
---
 .../applications/misc/regextester/default.nix | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix
index c1b1cfb48a2..6f056292d77 100644
--- a/pkgs/applications/misc/regextester/default.nix
+++ b/pkgs/applications/misc/regextester/default.nix
@@ -3,47 +3,51 @@
 , gettext
 , libxml2
 , pkgconfig
-, gtk3
+, glib
 , granite
+, gtk3
 , gnome3
-, cmake
+, meson
 , ninja
-, vala
-, elementary-cmake-modules
+, gobjectIntrospection
+, gsettings-desktop-schemas
+, vala_0_40
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "regextester-${version}";
-  version = "0.1.7";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "artemanufrij";
     repo = "regextester";
     rev = version;
-    sha256 = "07shdm10dc7jz2hka5dc51yp81a0dgc47nmkrp6fs6r9wqx0j30n";
+    sha256 = "1xwwv1hccni1mrbl58f7ly4qfq6738vn24bcbl2q346633cd7kx3";
   };
 
-  XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [
-    "${granite}/share"
-    "${gnome3.libgee}/share"
-  ];
-
   nativeBuildInputs = [
     pkgconfig
-    wrapGAppsHook
-    vala
-    cmake
+    meson
     ninja
     gettext
+    gobjectIntrospection
     libxml2
-    elementary-cmake-modules
+    vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
+    wrapGAppsHook
   ];
   buildInputs = [
-    gtk3
+    glib
     granite
+    gtk3
+    gnome3.defaultIconTheme
     gnome3.libgee
+    gsettings-desktop-schemas
   ];
 
+  postInstall = ''
+    ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+  '';
+
   meta = with stdenv.lib; {
     description = "A desktop application to test regular expressions interactively";
     homepage = https://github.com/artemanufrij/regextester;
-- 
GitLab


From 144c7267dd4708bc141fc0c81e3670fc62bfb26a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 31 Oct 2018 18:25:22 -0400
Subject: [PATCH 0798/1065] spice-up: 1.3.2 -> 1.6.0

---
 pkgs/applications/office/spice-up/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix
index 520510698e3..3141223d728 100644
--- a/pkgs/applications/office/spice-up/default.nix
+++ b/pkgs/applications/office/spice-up/default.nix
@@ -12,25 +12,27 @@
 , ninja
 , libgudev
 , libevdev
-, vala
+, libsoup
+, vala_0_40
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "spice-up-${version}";
-  version = "1.3.2";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "Philip-Scott";
     repo = "Spice-up";
     rev = version;
-    sha256 = "087cdi7na93pgz7vf046h94v5ydvpiccpwhllq85ix8g4pa5rp85";
+    sha256 = "1qb1hlw7g581dmgg5mh832ixjkcgqm3lqzj6xma2cz8wdncwwjaq";
   };
+
   USER = "nix-build-user";
 
   nativeBuildInputs = [
     pkgconfig
     wrapGAppsHook
-    vala
+    vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
     cmake
     ninja
     gettext
@@ -38,12 +40,14 @@ stdenv.mkDerivation rec {
     gobjectIntrospection # For setup hook
   ];
   buildInputs = [
-    gtk3
-    granite
+    gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
     gnome3.libgee
+    granite
+    gtk3
     json-glib
-    libgudev
     libevdev
+    libgudev
+    libsoup
   ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From 73344be7bfd18dbeb5893b5dc12f567358782fb5 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 1 Nov 2018 09:12:12 +0900
Subject: [PATCH 0799/1065] thunderbird-bin: 60.2.1 -> 60.3.0

---
 .../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 a97dfce2744..576fbcc7b8a 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.2.1";
+  version = "60.3.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ar/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ar/thunderbird-60.3.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "026d4f74378ab0c94e14689161187793ec614a3c492a20d41401714d3a51a5478d060d0a6072a48e20dca88e7d0f4853efc293d36999ddfea431de466dcf94d6";
+      sha512 = "7cbd8c54fb220ad3f781cbc908d42f2723109786a1d7a947646bcc231e8849035c014335daa4ab85f9cd69646fa870cbfac3a0e0ec45d3fa82d0f0b74591b6a3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ast/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ast/thunderbird-60.3.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "a9156cd525d072711a78f7c45261d50e9057f1f797fe0847c0b52ebdcb42a9f283432da036c870209aedc37183b2fd4df12527e128f46a06d5eb289bdb11d379";
+      sha512 = "936a6366add759a89db391394479ff2e7865248b46c81cf45457ddb6fa6b37660ca9efa6f125fe97b22f6db2cdfae7ad0abefdc3874820fa3ef0bee91f6caa74";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/be/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/be/thunderbird-60.3.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "d75dc81e7ed655e5bc539362b4ea212ef47bed496c483a6401c8cc52fe2aa7c89f12024ef5364e8e44826c5df2a7cc0eae01a55cbfb22c78b7d29744e05c2389";
+      sha512 = "4580436c4719a2ca5821d9676aa6bfd5f2c731cdf0bdc2969fd0177bfd2c3cc2570479de60515e59b152e0aec4611c437fedce7d0bd13c7a06bcebafff0bd20d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/bg/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/bg/thunderbird-60.3.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "4302c20cec5239d3cffd1c5756537059f98eb19ebe6332ce255ddeb555f8f07b6ce03c18ccfd2adc7b1a51c954a0ef3dfbd98ca2a5238cf510d4abea48d10df9";
+      sha512 = "fafc3c2d186616be2b56e1087df528d3fb93ce431ae24c286c0209177a9dcf5f229ec5aa521d68ae531c5d763ca4c2e339945a7f874825e73ad63f86d13b510b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/br/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/br/thunderbird-60.3.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "c22bd6606886c50fd782f1646f03917d9988a76020fc5e1a210e39a771980badcea965332ddc80f6f08fd062be4f08a499cbf7ea3585c78cb7089d40b40b92af";
+      sha512 = "71fe4d4e67971bfdc56ff6ad73eecffe15d2b808e07b25a7b4c827094b95afa7c04d451081dc45045e0d1eb83b15a3c8e964186a615f72a0a545dece221318d9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ca/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ca/thunderbird-60.3.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "7827c61dcc0294b85db7709029021daf52148a9d00b1d06c3a05f2e3591ca1e9e75a84bed3ac01da3a7f4af7bb2842b7574ec519849c8a5cde30600f0d237c85";
+      sha512 = "0be271223abd6f0fe79d0914b037cea5ea765ac1486a78922123666bec1ce8ec3bcbfa54c7fa552101adbe4a22bed0628eabed39391e4ca1dbccb118157fbded";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/cs/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/cs/thunderbird-60.3.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "dd51fee0d4e2c87e841c1e13aeff54c49e375bb95ed69f539320815cb551d57853032d42346516627024f88ba77154a8f1aeba651f3e90b5d5ef206dfeb23c5b";
+      sha512 = "5d9f911af1f29928ddfb96d114fc7e484370e69f9f1aabdad753dae5ba0b6ad476d7b0c373919a2ccec3c2528f4fc78ee874a72fe691ad3e7d2e3e9e1650f76a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/cy/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/cy/thunderbird-60.3.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "29c32c26fc56d1fe7ae47fc93d121b8591e75f0d42b25ef3e1f9d98f3bfa66bdce551d96c8f98f553bca6425173da43f9e9a13f3f006db1259f1b69a68abb7cc";
+      sha512 = "18c7dabbcdb5235bcfe0dd01746f39d82d88bc71c2a4c4986ee268d15ab5a5cc060273f4783b2e472dafbcdcd98f29f8ad2c2b33ed87a9a3c484f61dbf0a7492";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/da/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/da/thunderbird-60.3.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "f57484cf06388193dbf3e6ec9c8c631829e6e0914dd785fa81b007bcd9789cdffc777d6f5df5939a1e125f66f9cd2a04d0b4a9dac5250aa615c7033bffb70d97";
+      sha512 = "f6dcc69ed4509b6d81b856cf6981d7d00e3ca3689f3e28b64b858d64f96ef96196a4b9b2c14ee5292507b5ba00bedbfd5ecf4b2db241068b36d8ee786eacf1c0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/de/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/de/thunderbird-60.3.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "d12857d40c23f3817809e09e1edf9cf1131939d2aa5e830da2e9a13b4971096f33691deed0a29188510c2f84aeaa2a7ab704f54ced3c79885ea7b883cbd88f49";
+      sha512 = "a60ab91787961d405c926027570d161e9f6cfef77f6e8d40a24e97ac5c0c9b515a31dde5b9386e7b2a855f4970ff7533be4252474136e242a998cafab123de66";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/dsb/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/dsb/thunderbird-60.3.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "c65ce176520eaafe2afe54cf3ff6266bdeaef437c29f82e5580f286c31bb97881fe9724435995b5debd14306332ce2d379e45a30350296473f140d8caaeaee6f";
+      sha512 = "c827f7b392fe42cd2f6432870552239bd73e808ddfad10ac2c86968915697dfe119c965469baa6e2098bfd0fb61c36fbb5ed17378e423531b64b0ebd153602d4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/el/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/el/thunderbird-60.3.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "8aad41efc6bae79e6e5f238ad6209f0cec7ff3ed0f82a4ef22a0e1e12c3ffb2577ff105983b1f1892591e1b2a58f2d8bb8d9ea51051ec930649dfa954341b219";
+      sha512 = "287be8c4ca83f7238833cad36de9476907bcf9c8c915626dd0c5114328160e75d95bfe25a0db10900f3c2a727e76f583fe1902a76c208106480fc3349c2ed917";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/en-GB/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/en-GB/thunderbird-60.3.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "b75eab236a8749a185083c33b8f28492d903ee84b2b5a9aa3659e04eae7bc72cc93493a6cafa39ca29ebd0c065301e1091d21a23836b41bc4a5b60f4e61f6668";
+      sha512 = "aae1c22caeab14d262054af5855f6e983b34fc54e8f9d8cd0f49f5ae7ad3425d74f26025d85b4948a7d519ba771f7298ca7bf14fbd67c3d8ed84f0e9e394b9da";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/en-US/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/en-US/thunderbird-60.3.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "71308c1d6691894ef60144f7bc119709491eaa3af400197e4fec61f25231266b085e925fe1163d6de8d3d1f3ce34475a299968e9405341a9881c512fbd6e4362";
+      sha512 = "53b3872c3e4c49080e34540f95d5dec680b2320890601249eeb09e26d8aec66bce8e46e40368c8cfbc6937186a894a078348f64065ead28d32453a310a43891f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/es-AR/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/es-AR/thunderbird-60.3.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "061f0ea13b7c213ef2020aa2cf9ebee51b6b72f0de9b65ccb095f7e67152f5325d6806af90b5f600b7498d8cbd18916079e81914affd29308e04de0c7535939e";
+      sha512 = "9ae6f2a7c93a1d7a4efa22bdc8f6f5df8fb5a46f42507146eec7ceed6ee47d175d6c7791decc661be0c7d3cfd7513cc9a050138fe6661daf192f5f6064bc6a8f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/es-ES/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/es-ES/thunderbird-60.3.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "39c7b2806400cd57cd3e778d57f174a45eaa6e15bf1975d7e82f082d31d965e13a43ef130952e00300df9a13470c780c60f0ec9b398210b183593492d30c158a";
+      sha512 = "6dcc03919a384f7dcfae1264e3176d57ced792cb40ce7aa469a1c5229c9c97bcc83a0e58947f0ed14ff0ff74ddc529c74e7bcd3e38fb89edcdc4038f491a1c08";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/et/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/et/thunderbird-60.3.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "29b0399f7d896b09bb74b9ab78d10686061052493b880f72ee31c00db7cc226e3fe04e9519ff23e139c9644045bf9d6a45a8570d105a9675cbbbc310a930370f";
+      sha512 = "eb18921995d209a95444ae213740596ebb0d70d362662741a94a196e75c8b5857ff999ab4c822c95eed1ba3339038b82c725dc46e05d21bc4a5692323a87c589";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/eu/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/eu/thunderbird-60.3.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "d53ced6a20ff89966888d9241fe483d0a6a5586ae8da4a6d9584f6298a8c254a06e2e1e4527536e38c42f92cc14b778cc8264f402efa6abbaba6ca52486c5e06";
+      sha512 = "5fc6dd684e9f1ec9be951929f2bbed0e75f5e2c0215206496a2efecb361f194a2009fe5bf2e91f09cae63dfc3f08b51e47a2a82d6b59d425df8dcf4ba316b271";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fi/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/fi/thunderbird-60.3.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "2fdf8b87cee0829e78d130ebf87b5d4bf62266abf17475d349440f7dca043ff7e1c14feef1f69b630cc81afb42bca52440643d0e2f833ce0a61f19e1c1f25721";
+      sha512 = "9da23f9aba9cc5f8939bdcf632f764566acbafc48bd05dc04036eae5fc04f41df506a4f80f3543b60a09b057939c074f3ae9eefc2353f765256dc9e0db1aa8e0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fr/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/fr/thunderbird-60.3.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "288f8346cf90dd666cbb082f1761ad8fdd77a33e43bcca1cfa58c1f84c86bd6c3f7cd6d1d4effdb9ed77c6a50d07b8e5ef3505dc2e2098dc3c38ec32e7fa99c2";
+      sha512 = "0c844ef274cf892cadceea78c93efde1f7a110bfd0bdbe3cfdba5c23fef0e2fbb7b3fc3dc59f9b6edbb5c346a6d5ac06b69f4b19541942d09c5d088d6b0e0322";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fy-NL/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/fy-NL/thunderbird-60.3.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "836a74aaf424a93304e12a412f0104ed5d577bd10ad1beceed1b78f2dac65d096103e9999298e25cdb8fea9d616fb4f814ad8c3bca84aeaff0cdcdc38b8763e9";
+      sha512 = "0df85e025f9a72255a23ca93a692a0f79a69c9447f8391ff97eea075077a147c6eb164f4851dee47d771dd3db3bacb3dcac71aed91b39fc34dbd65c8ae67bcf7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ga-IE/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ga-IE/thunderbird-60.3.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "8c680f783e26193a26c507491b82128b123ed89e73dba328391d18264c5780ad88b9f077d4d12868dab6968f4be7e8f1c0dbe397196b556a5af31c07c1b1072e";
+      sha512 = "e1feb134d5ed55269fead90efea01f4d74ab03517def2fb9418435c5c699735d14ef3f64bfd33109b87bedefcb90034b1c12da74b798eb0e6b7bc74766d3f425";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/gd/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/gd/thunderbird-60.3.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "e5b092f6b1b79b93225c0cae4022bde8452598d8c36b9e5ebd8fb4b9449d265df048526c30a1207b9ebeb7a5ad421ae77085306dbeb9d1d5b9c34decb98da1af";
+      sha512 = "3483c8655e81938554d95492952b967770cd659b625c25dc8864e59dfd5b6cc94bef725f495e725d6ceb24bc05edeb1d2c3ce41a303bc313715788ab03b75c9a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/gl/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/gl/thunderbird-60.3.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "ec235f57cdc56a66885f2d8098ab9ce80ab3fb87fb30b4c5cc97cde874ae321e326b3ce4fc9e69a6c7f0e61e43cbfb28c0392349151b25ee25a2503e13bf5c3a";
+      sha512 = "012ca498f3907f077c9e75e2bceb53fd0a781752b98319cf3b7ccb94a9112896dc2360d45acc440d7c50bdad0a15e125ad8123e13203a3a017e905c2f0e3d252";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/he/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/he/thunderbird-60.3.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "fc9f1ef3dd117b6b4198a09997e3e4095036dddcbf50a32b94a36f53ec886bfdb33debaa2c69b68c14ba7af945c1a35891b11fe9ae8602c11842d381bdf0286b";
+      sha512 = "1d7f92a0274bed7390ad0f813066dd7d71bd66f03ea8203d71f025a8f8a8fb4480e2b660ecbc052290a27351662d3f7811c1311eb8ff02e63ffc5f0c8745edfd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hr/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hr/thunderbird-60.3.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "4d548d121cc8111711ff7a35383ffe859cdd99a692b255dc71d52cb4cfa90614a5415a58f000ce447209c998b03fa545608333a53c5230fe01527aa882eea295";
+      sha512 = "6d19c5ad55486b3aff055476a29353179bf8ff7e9285618f29490c430817af2ff3bc51cfa75c52c82d804a7bce0e367e8ee4d444a03b0bdf4bda57ab75bcd016";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hsb/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hsb/thunderbird-60.3.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "2f98ebdaa190aeebbe60fe20d6246d027425c3d5408abfefcbd50857ba800e9fc53b0177f54cf8b710a013bfc59e4a58b237991058a123cd2f8f0e1f4afaa1b6";
+      sha512 = "452927013a6ddc2f2f0dfe3a69a585641df06aac24f6458bb269095abe35101bff6c1a37d21afe8f37f1856a7a3311d49409bd0c456b52eb494cf846e426e2dd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hu/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hu/thunderbird-60.3.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "b54703d9b7eb868a771538c0f5ffb0e881efd9137ed29b684dc149e77b3f9a675d0b59feac21c8b1f54c35545b9a2ea2274bcb485ce583102a406e916c3c25f2";
+      sha512 = "bbda4eceb8258bf46ed5a90d4bff27a769e0f74a14d76f50e77fc3b2f1b53863fe8a68f0e375aadcd0d60b177f7f31edc6876666dfb95e955083078f813896b8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hy-AM/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/hy-AM/thunderbird-60.3.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "f3e3918538df95e6a278bd680d019b39c5382078c79eece57f23810aeadd43fd61810967aa384f222f6d21d5d815cf3bd7520a7d31e44b3d2e6c024ff6b46a47";
+      sha512 = "79ca9e61fcfb62da522c2cd23a39e1ec8be14dd09bbf3d1cee23bd2a74a9a94a4b9b20af6f37e2a6a75d4b416fbf2b8c3f5196ea4fa52495dc0628a2ae5b26bf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/id/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/id/thunderbird-60.3.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "3b1956f69a4b82a900dca97f90b29d7cb685c79e6d6063b58bd8de629fd604dca58d058c8b0855ae46daf9517edb1451c40f669cc98e986ada02e317b131b19c";
+      sha512 = "2959a8ed196509a6a844db918b283bb3b133b1489cf229e0649ea0033fcd0536cc8fa792554adc7148c41267dabc92309670da6fbaaa1329bb65340192ced249";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/is/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/is/thunderbird-60.3.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "fa5e7574bd73c1d85d300b151a5d1c7852fb035ca5e4599b675008170074736045ee034169108eafe6171371ee94b84003922088e8e0dc4b1c05ba7837499c4f";
+      sha512 = "f78de4c7e0125b14a5930cb081bae4b49010b47726268b4e6ce01a0eb0e26b627d5ba47284c060031175787146406d4bca86404fa3d79f3ea67a67443e813862";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/it/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/it/thunderbird-60.3.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "a2bd51df6adf2caf4bb22edd02b3b70d94abb1d3ce22731a3188c718161b492f860be1cdd94c39c4a64e6ccbbbe80092310448ff08d671d870ec565b36466b33";
+      sha512 = "2a855ca03a703a7e843c7101ff02be356e5851fd2f6d01d1c1a6012946fb5bc57c018fc4e9804cdf66a7febc91c80c278fd420f068bef36bf1daff6f8a3c7640";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ja/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ja/thunderbird-60.3.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "b065494dbefeb8ed79b40b255bc8551dca4f0606c204f00d7c0cc0534fa1aeff45d0b7fa80454fe8ae8803b002600d3e332f7b3138894005922aac48cbdf9ef3";
+      sha512 = "323222bffb53d7a8c983bd5a2e06d388fa64689e4a31f888e6919b1c5fd9fb192840fb6c914db1ef988ae0f7505339d086b5388e9690eb77d377ef8037880eef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/kab/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/kab/thunderbird-60.3.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "a22017107f11151f2b383d11d6a6b8aa45571c3c4def1ce422fa4b108b546273a362279889c60bf5b01dff73b497879d881b0f8960be97ad92526ceb0ae16488";
+      sha512 = "432426fa6185ef49dc7a204f97e38214dbc70e63a960036ca96d85c1a8fe10e7818dec80013c7d812d40808303cc09b70bf1bac8534eebde089e0d41387be797";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/kk/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/kk/thunderbird-60.3.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "9d9abbd85a6bda636aacf361dafa05b7f64dff8a7cebe81d2ff9b6d5eca9c800753cfbd3e9dd66ca17edea0bdf8b656d242f47e53f5aab364b14a88d2917da0d";
+      sha512 = "a0d4da436365759f0019250f42bb05304a5c80886268a0ac2ea76bb52167670be71fd036392efa6965d699171341b23e2360f795770de0ebc5f4973ce6cdadfe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ko/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ko/thunderbird-60.3.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "083b33b6b50af83380e2976fffcfe9d4fa3fc64199bd6895606392842888ac66734deff738788dbbe449ee7c7a1e06608caa25320c12b1d49885825f7dd8a500";
+      sha512 = "ed28830ab1af7482115e53b0a4486d74d2b87b98f8c12a45f6a54c2221de5fae7b7450f1cf07a095d68638bf9f8b25778784606d857067b2ddb142079b411fc2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/lt/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/lt/thunderbird-60.3.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "33c16ff80c9cea364bf2d4a501d3d7f04eb6a04c70785d99e0d8d5fa2272acfdaeeb09b45e618ea1c08b9da083f7fdbbfd571eb84699d0d93718e103810983aa";
+      sha512 = "52d36def8bf79c58002e42d7912598630140646cfd23254821524c42faeba3782d2d9f16db4ecb432457298bad342648e2271ff71a2d1e6fcfd386134da2265f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ms/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ms/thunderbird-60.3.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "92368bcdf6157b7fbcaad6f5abd40a6dfea2c12d3aaa6eb58a2cc118621ee8df50f34f506aa124413264a44cedadd1755e5dd827f4ad6df069fab9d6cf3b08ec";
+      sha512 = "d368bd578add39df284174dbf1eb97e5e3eda26b141af1c729db98f93782fb8da7dc44fdae0ce9a3c070c5905a73dd0dd25fd665144e7af33f975867997437b8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nb-NO/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/nb-NO/thunderbird-60.3.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "d06ccb94bbe15947b8cc1d685e6ab8f8001e717e104cd1af6799a02c47ac79ce8e1b5315feb6ea3683f9d89b72202e1e2e41a0226f994931304880535a25e2dc";
+      sha512 = "ef795c45d7ccf4b8c89abf804d5e758e14534b9d12a1424ae0fc58bb5681dc24e49d6972c128855f886b996dbeaa8a7af0a1af6f4959fbcacf575307332e528a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nl/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/nl/thunderbird-60.3.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "2650806011a205cf6dfb1756c270a6a8ec33dc36cfa67d85bbf70264bd306a2b98edf973eac001ac79657fc624f2c56d39c24e7ada9b53b6aaf5825d701c4df5";
+      sha512 = "c4d62cdbc421c08d1fd4d8579d58993d51f6cca207d1619240d95b2d9f0484e7e93f4dc6e103d09918fefa384349e5d676973b43a6113f807c28879d829a6d3b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nn-NO/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/nn-NO/thunderbird-60.3.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "bd58db3533496758873a273d988f9b53f2d201a176b936b549ca543bd3e612e0898c83a42f761885a9b9ac58f5a3dfd38e93e9f807afed02717dc6b47f574c5c";
+      sha512 = "f06459d02dc5d0be311d06c62cdb2a11199722d635411fd63773b01c9103ed232070b3cd9c6c3984e658a54007f8fbf728c51346cdd3a1eee243ecc3bda8bd9b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pl/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/pl/thunderbird-60.3.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "3d2961721fb1d70b4a40b447ff4364039159115b096eb75aff418db20709e102bbf3f752e04bbbc735506b2b4d45554d38b1d217459efa7405676908831fe4f0";
+      sha512 = "77b27ba6c8bc519aae04f1576d278690f24a165a53bee7f1341aa81d2441fe86bc02115a3ec6e3dd3f40d466d6a39bcca615d70e9504945355e706b69d9e68d3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pt-BR/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/pt-BR/thunderbird-60.3.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "3610306eeb52cc29ea739b1d5140bf0e4cec8536aed99278a82ea0847a592975e5a9fd23d4763032d3a178a9a830e5a8c87bbe6b0be7765a4f961c00fab05f6a";
+      sha512 = "a480dae9a78d473a1614047d2e973f4706ab5a2b754fdecd83cb1eea988f78c53760fbaeea3e98206400a3809e419a5615aa745bd759d652d6f7ce8680d096db";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pt-PT/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/pt-PT/thunderbird-60.3.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "30ad1102cd1abdf091cee8971ecd537ee7727e0ff3ef31bc535f830c3c50f8598330b98ab5acd5b1c22d9b4a245f9952b7f6ea0e8ca373c58aaf57f4ae78d554";
+      sha512 = "af3fb38963879e99e2c3344ebeca0d300f87b96c4dc031f50dfb5c75e04e1189c930b2df46aa4a343ad93b9461ac38439936ca9a3bc83948668b662f6be69599";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/rm/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/rm/thunderbird-60.3.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "8581718d7ef1b0e3c6ffbc2dd38f9a183577d80613a79bfdeed4aefdaddb6fe060429c76ac0ecf4c18a4a445499a444f5b0315ec32f3da00ebdd2d1a3e70d262";
+      sha512 = "454264f5629854bdc037c4d826ef31a5fb4857f14aee5780669832e298b788ca98d22c521360dfa5d4f3ff25a18ecc267120a8455423785c801b1a51115ad90c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ro/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ro/thunderbird-60.3.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "e9393e95ef620474fa40188bcc3deb110b21c58eedeb2791cd7d17d0621f45f345fe219eaeaf4a5d71d80e303ad23b5d8ab93c8b5f7d085c3eead902ce239e5c";
+      sha512 = "5c23f69b167807abd0823f2b0e81e58695fe7cc53f6edd5ed5f67da77ab3b461637cc3d84dc0c77680421cf70dcaae1190f653aeec82cd6e2e89d429a30f0f1a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ru/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/ru/thunderbird-60.3.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "dfa9aba3a85bc6f3264849b54d8f6ef14a5cbfcab2eec6f71b5130eaad6b7d8dfdfa2b9572f965fc19b51f80868183008e441961ee0072a1500eef183111f1c4";
+      sha512 = "2a2cd091d81da62e24fe7b454fd28477f6089b0982a21973d2e68d78548d90d33eea34c324fe7389100a7938dad226be6f4a3095eed0587b047a9a0691d2f190";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/si/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/si/thunderbird-60.3.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "b669455b70def2b7a8e08cf8f7c77db857ef0062b4f791a91ad636e7fcd0eba0aaa5199bbe49d7895a6872370e8cd442e142d017ec6855327d0f555129fa2d68";
+      sha512 = "75ca936cc8f3f17803e2e4f086da82598f6f78c4977c239bac929b950b388c61bf675d904638dd4b801afc7a9b58bd9ab0b04b2cecf5f2487e64ef0a599c2ad4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sk/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sk/thunderbird-60.3.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "0719f9073db07793a4f061cf430b3aff539ec3e124ae2a7b6596ca5505e0d0ba96d1af1a3e1dfeebc55601be1ea7a173c5c89657036606b0fdf92c07a35efc7d";
+      sha512 = "cd34d310fd49a8c7fa47731ac8972c25b2d32a4000ccbc8ff0dc4c7b2d0c5905942176b6f85d777683204c9d35f4c49c5195740afa8971e4782441a1ea38a0a7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sl/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sl/thunderbird-60.3.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "66d8ab801f86a5a6a68d5fb48ebb255c3348fe7a0e9eee975fee7c939712cf5cc3bcec084c853600235f8f9774c4bfe66507fae856bc4c9a88d170bc3d6d4e6a";
+      sha512 = "cacdb9aa0d01f9641863b52b0c2ec2c61e3c60c03fb7fc1da1fa42cbcedb94797543fe6984538d3ff75594726dc61a1676a2644abd6595902bcafad36d4d370a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sq/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sq/thunderbird-60.3.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "eeb3d2396f8de38cbd9495a82c766183e1640bb05c48dcb4accf770c4c00fb4823be55c5cab6561dbd2dc413316f383265cdae9e0809da1150b9afde678bf4aa";
+      sha512 = "6930f66acf54dd47e2cfcb50d2b451a90a4533f54c895d16a872dfb28266d33596929cfa81fbc21536ab1ab7f933d4fb9853979c8be9a621c416817ada423fd3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sr/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sr/thunderbird-60.3.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "e251e7c1970e68849bfaa6bd9a34894e9b710c7adba1cd54ea063274e7f07735795879a01b4dde2256eb612539d3fd433507fc9c586a28ec803cd636194ca12f";
+      sha512 = "ac987c431c719e2c4a61a421a0b2d03bde011579782b29f589efa7f5361879762c0df5d57e809b9386072004e2c85f5aeb770185c6ad3978ce1de0fdc6b6346c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sv-SE/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/sv-SE/thunderbird-60.3.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "c6d2d165eaa2e46adc9131cbc4aa203308852ee80ccbdc226def37be9505c4e2649e70b668ce38d061dbfebc284e0d604db1094418a02092f189ddd3e7317419";
+      sha512 = "078765f08b2f6f53f319037f1237bc68ffeebfa1437fd921051a1f804f8f6e4fdcf7faa377c0fc066f8adf49a0bd6429981708ac3e0dfaffee3f196c9f97c8e8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/tr/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/tr/thunderbird-60.3.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "d23cb1cac7becb82cedb768376e200108e08814e55c8308492cc65a687d5d9aa5fd38ae742c39572ead41b2d2c3e03dbf2222f88fb0b94ceba6183d6b8a4d0e0";
+      sha512 = "4ac98caac0d51467059c90ef0867b78847c7260b4fa36187ccd670f7275ebc1cdd93fbfb934575f82d2cc7f0b0cae6b781842a883e5a8242b3f8d6295d18ae33";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/uk/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/uk/thunderbird-60.3.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "7385c719fb86a3c6d64c5d6ed8bea81cb7366cf1cdc97858dd177fb1435f24f3d3d257c60a319dd2db82da1274b9a2e14b73d3eaf20684ca955a0bd7b7b7e3a5";
+      sha512 = "9a187b5a401eec58a0c15dceb0ad0e894036f4d2af3e3d129444e31169c1fafff7228093ebb0acf37b9896d72eb88d02d04f8bf16be14092bb27086816a06a65";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/vi/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/vi/thunderbird-60.3.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "369be97c79232b58ce2a096814d63c3ee805e2fca8ba40566ddace637c5d9d3686c06e8e0a158ce38395d7056dcc85416251b73ae7b50bdeb79c26fd65044200";
+      sha512 = "53388ca676a3c15b41c8ac68a75de4aa10cec3953ff30bec1f67008a26d64a16af8e996b9196e1a23db0f00d835ec5bd22e3bf7e411fa6f8e4d276256afc2a69";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/zh-CN/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/zh-CN/thunderbird-60.3.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "934d49874ab0811ad2959de1c43c94e5c94ac52e45dca2e8a6c91ca32c033bbf7c076ab46fbaff5c1f508301d0635b3ada957f09d9f591647d202d09484940c8";
+      sha512 = "05de7f60510764ddb49b81b907b2b0f3047b38da361a3ac655266b2ecd90320721b3023d943a5fa8fb20ae632625b7dba394bfa85e54434718d392c035abf29f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/zh-TW/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-x86_64/zh-TW/thunderbird-60.3.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "50253f13fe918a1f9b066fc9c8b3245aea8fc79502ff7b5130150cf207da080b569fe0aabc5c19cfd77fb79eebe9a9d48f103d6748ea2070bd06476c0bb90e4d";
+      sha512 = "f2aeb51217083f284af5150179f4173212d9837e4b85225610db78524fad92ca5c29bf6461543e5ca6cdd2c31f11886837651912682d5e07a82f1bce9a82e879";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ar/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ar/thunderbird-60.3.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "3f0da183490797d4046272a85c9584e95f5b0c66edb94ec4e84906f78f009f8558e4e2c4fcf03f83e8d857aebc13febea3305eb02c6c63ac32474749bd28046b";
+      sha512 = "ccd98be198eeaa462e60815fd23a64b854294a63965302477006eb0650dacbf0a9b84d2252bf93a7203410ffece84da42170450303d8e398253f1675e870102d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ast/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ast/thunderbird-60.3.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "e3e0e9d7b30b7a790c681c650e4da123246bb9fc5005dd382f5eb85f3bee9b2e3f79f5a9688f4b5e25da1c1bcb09721ae8c7cce32309e0c554a992fbf1b418ef";
+      sha512 = "95e3737727be104753390535d4b963316d95f80ebaf3e323d791287a12e3b3c137f991e4752dd1d6a7a9e9683d945c047963f7c2f7dc9041abf367a2e85741e5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/be/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/be/thunderbird-60.3.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "ad8c3794452cf734234421b2e7b0e90553f2012e62c1d7ea887610f74aec4af5d60b1ef37765d9cdef93c23367135fdfee800df0f7bcb59cac1761356877e3e0";
+      sha512 = "4d20ea0dfdf556b10d5a47795739aeccb992f5d5970d30c5d90040ec759dd269ec2a146d47074c19d5bae8f8add2bba37b8dfc9b5f16d1eeef88f0dadcd85543";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/bg/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/bg/thunderbird-60.3.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "30076e64f51084059186998f36014047ec53f0ec9d9ea2589808c20793403b777f484569eed31d4ecbfd5dec890e1cd219bf071102140d1b4f5ed401225a411d";
+      sha512 = "085f87242fe9416d6078c1c921bee327772eceaf84787d8ab407fb836c70ef8cd955ef98ca5532952d6ff085005d197f240a92d71cda6f36c0cd171c840ec937";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/br/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/br/thunderbird-60.3.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "9bf11610fdac1278c66bbe7123269e3ebe4e24b619f8b1ee89769460656825c3a170ad730f5297ca5dc1181833ce833b3a812306d5a6339fb80408992eb9f89e";
+      sha512 = "4f95501c6fbfb6c24ae126f7d9e9244c76a84be001f97b0f052f4fd447fa2f8a9357838abb058839072ca5b77409ddf0ff3dde908a4fab884bf120d86c22483c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ca/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ca/thunderbird-60.3.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "95a643963817f5105c76d195c1b3ce4def01e0e5262c730a9cf1ee247512e562d16d56e53968d0078cef12514b9294f30ab59f93e4e25c068553d8ed9633dc59";
+      sha512 = "31329841c564aa4bf488d324b19d62cce15397e2c7bda7714c218907a404447187612b353ce712c647a8a5251ce41b7b07a9dc79e9c9991275e09276216c41fd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/cs/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/cs/thunderbird-60.3.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "a20498a81b5f3a70a0995552875eb8eb2635b1d8d3508540368f6ec9938493927050a17cdbc944e9f0712622666d13ca6e15088cacdfd687de21b83bad7d7b48";
+      sha512 = "f0daaad120fc7a8958f45193151307b386f703c745835c069db7627bd74a8be594d30e4706463468b6ca861c0e628176325bfcff02e3b24ee9e7ebc35ceb76f6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/cy/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/cy/thunderbird-60.3.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "9a7ffb9eb9c3d561ba328e43daf232ca2261a30430a17d49010e283f7ae1e190475e3b0c87ab931e26ba6713eb1cd079a1f6f6ac1cd5cf5e991dcee940eae041";
+      sha512 = "e44f4003847e7c72c681f9cb8e8b02c05420a88d99a0f2831fe02e256410ed4a2d41070d3674227a436a9045fc3ccdd242532cd5aec8c31a93d7bac2f85e3308";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/da/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/da/thunderbird-60.3.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "186a96ba0ade51ac1ef53aeb02b2c140f0b1da048d24dc41f97497ec1b37afeba5226cebcd1b1f0226391f20f972aa385f41220844897bf1cf8ed8f64fd895b8";
+      sha512 = "7462c01d3b9e7ea07047115983985b8d9bf7e71f75ac091248b41bd1e50813971843dcf6da71dfbc5f7f74a5d5fdc50c1b464cec90c4c3e649c9efe3f045e5e2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/de/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/de/thunderbird-60.3.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "68aaa7c30f119407f5a7adfcde55865f06841ca60b7819bc4966b16df12af87e32f24d631e483341a171e712979e90d9086fe43a1b1cdd92a512e178d6374ae8";
+      sha512 = "0c6e1fa83a9a886062ca3123671091b9001c2f54d1b0988a7b68e4e5900c036f436d3686bb0cf346a92e7426b9153f6f58a992766f0df215dca33317b81d04bb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/dsb/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/dsb/thunderbird-60.3.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "0bb90eec8123035e1833b746ac3ad1558ef01fe4647c94706a4988d1c8ed53b01f8621f3ac2aeffda640a8e6fd05cb71b3edca369a7b445608a8eae5dc12dc9d";
+      sha512 = "de2ae2d5e7abf26e021671d4cc8b1ed69817b4ef2361416405f60737d6eb117b10fbf3fcac7d75a204ce483ac6d0623e0b78a27c8229d11214cb6ce02fa70756";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/el/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/el/thunderbird-60.3.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "8f2072017f5edf494c091e712e26b253ae4809fbb81d1ee22063ad02f2cbde06f04d9873c61691245ddd249c489c4b3f58230ca12cb390abee8375114331121d";
+      sha512 = "b52519e5a0040b92c59eefd9a6b6908711b9685fbdd46b9c26149a83c37e0b31aaa591259e6ec40088443a7c9ca2fbe5fc4a4ee046a226a6493eb17c12d1bab5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/en-GB/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/en-GB/thunderbird-60.3.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "8a91106d035033e9a358f99d1b28cebad978586bf2e363b0856333583e6b1fbee191f3a8518efab85c188fa60c8c5d3d4452fffdd8b5f3a7998e213d5e6eaf05";
+      sha512 = "9c0bb3da4f47a6541b8d4d2db5eaf37f04a0190f6761f6dd09aa67a58de66b81321b9985470c09cb6887c660939615971bdae6626c49fbc77365bbb93434449c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/en-US/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/en-US/thunderbird-60.3.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "e104e90333fd9ad786cd59cb323a2a87a532b242aa7e6127ba38df00b9d747278cafda32b359258c9e6ade5a945c4a227ad81595e30717b1a06e314c511e975b";
+      sha512 = "da73b44eb926b981ba6855b9b1e79a030740499ce6d374922a47e311e4b6bbe8c9f39da19bfa705392edd0c0c3e0de1ae86d76a81cd1508ecee50c69bc69e43d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/es-AR/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/es-AR/thunderbird-60.3.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "a7cfeb77ce146102b8583fa086536c58760ff30b69c8f9373be2277815ed57c1132ffdd04edf782ab8224f2ef231ae4c2c581dc13c174db6ff382a72975279b2";
+      sha512 = "fd66717fb818610199eb628e22c5067892740c04924b406ce951afb5ee2a6e7a872224c6419c185b327a4e59f984bdf144628903f8a7bed10d4ea9247afc188f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/es-ES/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/es-ES/thunderbird-60.3.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "7700206c19f5b8a434e323cd3f64df90696b04790620e6e20d23519dc92a8f3abcdcd8799d7d3843968e78cd8a6cf282924f3ebe442eebd40282fc035e096c0c";
+      sha512 = "078d8eb9a7f1373ec90f0e3a1f22881546489fbfaec1fc4c26c6b85867233194c595d417221f6bd801338798bcf46506390d43d835604f8e188a4010a4610500";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/et/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/et/thunderbird-60.3.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "14768d992308cee0fcb30d8c676d89f8e30bebc86f4fb4087c06d38afc41df418666446c65e995e74c67a6a6214c05338fd9471e02d5d5101e438b414c9873e3";
+      sha512 = "c10994ebbe72d3dc4fa27b8dab56baf1625f6d128f961bc935139d224874959f3fe7f6b0d30ec7e72a8c6d49fc81761da1231170cac8d0d74da4354b59e1a407";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/eu/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/eu/thunderbird-60.3.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "b8a33488d452443ee7393d77db68760b96d3f868050f49521a76b522fcddb7f4a573be06810c091e8b02d76b681c393554c01fc6800e420f9adf4c3e42bdb436";
+      sha512 = "0ca85492207350ad85731606bc298765b594a33db3c7889771cd92676e1e04240b4bf4ed9c540b94e61306c0e581ef656ed05e2dda9e333cb107285dd5fc98d9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fi/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/fi/thunderbird-60.3.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "670db16b381e68e2f6faa353d91120a787ce360143d72c4a9041a4684688314e3dc466b2beb9166b76a822f8d96348b41bb32410678d711e39947c932424f295";
+      sha512 = "9d5082cd17e1975152daca9247f103f0a6ddf09cad6c017f3d0ff9f185af58d88f6802e2bcc48206c97c40828335580584dd4ad62b322829169b509a48c353ff";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fr/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/fr/thunderbird-60.3.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "b3474043fb1b3a6fd1d396d6b0490d8db71c135846e4ef74d22e80abf41ab4ca1faf346c9928424e13ef9c12d6cad19f389b4cd38c45385688b5b4587bcc0a0d";
+      sha512 = "33d0496886cd0ada4f944a409d5cef5294d5dd7a3a10874558538a1b5a31e212ae9b3d5661c9e719a64419859e9b1d2945f475b91106b3f30aecf617ee6dab18";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fy-NL/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/fy-NL/thunderbird-60.3.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "41b9f80ae6e8ce765d8fb057bd49af032532cee9d5f2c4b17a4d3833fbe8ace4c7ed4336433273e59f98a1b4cadef1ed49f77a95eca868a39e76e7454d7bf91a";
+      sha512 = "64ad8e580e8b1f8acdbb52245dbeacc22cb15471f9aabd091bfb262669c81e59e2fcaa2b31ce7fbd2d634896a9b0d22884d4151b3d90bc50b75de7f2680be852";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ga-IE/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ga-IE/thunderbird-60.3.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "f89277340c6deb07e73fd7a7227fa216960c89269e9d4ada0f8a6863ee60ba004317beb207a1128930fb8c28477963bb66ffb0a76e86dfcc371579672b0eb26f";
+      sha512 = "0fa4eebfc335022de2118a1bf5b27f83969ab26bf2d03d011d732cb8f2614bd75a60629a4f6c410a4fdf8ac8b3043c849aced85d7cf21bcbd263025ee0338234";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/gd/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/gd/thunderbird-60.3.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "d3ac6c868fb504b71823b5a3139155f6f441839c33f10cf73d8e0bafab5e7d9f7bfae3b884b41fee1ced4c10565321bd13900575855d42f70958e569e7756743";
+      sha512 = "7cd1f55355fa2eecc6e6f79bb642800a014de93d80c273b57c9e910111684cd5f59d26ef4fbfa1bf6a6b1aee12f19cb2a0d376a9822fe8230ee9c7f81deef54c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/gl/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/gl/thunderbird-60.3.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "88f41447654685280aef548951609cb0ce7054a67c632a66892d1707d6d3dad3fe037dcea6ac8222080c0fc2f19d77f622506e82b6ea93114462b131fd4de308";
+      sha512 = "b5c1853b7a225116bb0c6cbca7dcac6256c8d46382fba5af5bdbfd7fec0bf6ce01def72ca1fd26c8243c7f1d77de7fabcf691dc956eaa911997915629a03fac9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/he/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/he/thunderbird-60.3.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "faa622a8b7fb3c5ba4156cfb6ab4414c0a56a820a1593b555e817c3edcefc59fede6b681a0c6722cb540c81ccc425bb27d2895ff84f5ce2e61eaa7b37114be42";
+      sha512 = "9155a7f37288baccadf31063a9955a1b7f6a9a7172c2650c5fc5ea32f3f473e5a682a6e269efae4429f23dda15a2afe00119594e4a5e9225eb298fd8ab48ae84";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hr/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hr/thunderbird-60.3.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "74321b6e6833014d60b698d7f83337c846452fc1e2148634150f192425607595795036e13d55ea0366c4d3e7c998c9c3766f50abebd606dd2ce7c3e6fbbf4963";
+      sha512 = "7fd14cf6e2844d264c8931e740f0281efd3b205bbd3bef08906628e6a65a703642c0794e85c8f2d56d944b6bc5b0d4590c369c668a13f54379e91d16d124b29c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hsb/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hsb/thunderbird-60.3.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "5964563cc323a606dd33019888ac483bda47f0da073e3d64ba329521cb7a192ae9014cdd2d44e48091d2f3f0219dab11a60497842e42e37a7b3be9415843fd76";
+      sha512 = "eec8cd8a07f1d044387fd540d7ab848c562f36bebae19ab4b90dee0043f0578b21af9b1894d88db344adbee1127df5822e50caa8563c15fe5f2996c8888c35ed";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hu/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hu/thunderbird-60.3.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "20ed810d74584d9c79b0dad65c50ab8422f841aa2e4974dcdef249aaf4901315c79ee1f071c4d03cd83fbb973eae35fa730aa0db88fb46617454ad5a4371f107";
+      sha512 = "af2a83eb2cdcd184c36c4f190690b50747a7df4e9b962f4858e41657ca1ce589e9e7167192a3a678d60458cf7fca89a3788607c100b96522d58d465b3f84dfc7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hy-AM/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/hy-AM/thunderbird-60.3.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "90973c56fb46c3c150efad6cfd48d24916983302dc459f386c5fa11ebeb4b32d7b7d4a35e8b3e0ff7358b4af9c13e112d01eb30abc069dfaa8ef8aa3af043955";
+      sha512 = "0647b06bb64dd7f749029d95c242acf3a9c27e75c234198275d8d533d3376d5b26e9c872a75b966d6dcf2ccedc9054d26c56a474286d4108d298b69687be908a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/id/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/id/thunderbird-60.3.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "9838d3e9a9fd30e03885f4195a951e285230a33757672c54c60edeecfedd220e6a8951d9bbfad34688ab0d16fe38507b3f8524d1ff3a987482cf761d67a17dc1";
+      sha512 = "3a9a6fc713a8fdd9e28db9f381632ca65f00d78e642922091a6df4386bff2db0f1925118a2362073bab3565cc6741a64804c17e577568e665a3ba2414bd43c87";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/is/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/is/thunderbird-60.3.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "b951f6db2e2a70a6bf43e5cc7ce203d59b9062aad44bae3634db03dfe202aac723bb8b2283deeace96e8401c772f43aa985b76259de538f62dd970e285b09a42";
+      sha512 = "a041121fd514c3af8fca1451992cf15642a5bfbff14336769afb5de56017362e35cbd3c3a9717a1ef861b3b47f5951670f37bac50ed318c60bb932196aaf4798";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/it/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/it/thunderbird-60.3.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "389ec0d921b42e4238ce13546df6bdd1256381e95aea9e9e18e46524feeb4837b2be534fa452a4cae51d3fb060e059dbdffe7f26f017adc4f88aebea19f656ae";
+      sha512 = "246dcdba4a29d3ef657edf9850727baccc3c6246a56cdf9b0634faf54ed2b2736cccf6c544fe34ada3efcfcff5ad334ad3a4b1f29e986518dc88816d727b42c7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ja/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ja/thunderbird-60.3.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "d012b6339c6e18aa49c4f6a4db40aae3315128b89938bbc64fee94a90db8cbd65b27bda9742a7a761c52fa974d9b5ab5e1d98ab485123c33be318d216ea8628e";
+      sha512 = "f6ada0506ce125d46721710dae96f086da51abb15c3b20c5d5425946362534d8c99d67e3002131390e774b2ef867f422db215b51f368074b54f1f91e7fece482";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/kab/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/kab/thunderbird-60.3.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "06b05f5d4c97008706eca67eb9b513b35122716a3083bdf3f3fb97cf0a6f1606c97a097a5c979657234562e505203f66bba483879fc2070c97514000326cdc23";
+      sha512 = "3838eb63f96e916402bd158aacb082ae97a9044cd0a6133206da0f6f8d389c361b55e84295b8c483a4be5920aa12b2eb3961525cb011327efcd720856fff41ff";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/kk/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/kk/thunderbird-60.3.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "0ea99590b068925f137a63bfad3a0cce2e380f80388a94910836e7f517f0375d43f6f1325c6660eab13a97d1b9685102cef921f99135504abe70650ba7de9697";
+      sha512 = "a3d010da794cf16d8ddfc14ca50f8504c8063091dc2770eb673281bf52c47faca96f5fce87bba5a691294117e23c46edf5a54b8c8b56d9a57902c088e247142c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ko/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ko/thunderbird-60.3.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "e89d27c4cae745c902f61d9534b6582e2af3806714e596dffac1a0d49416a0ab4eca76d9810853c759312c192679b2aae4a6cdb289c5b5d1f472450757c71ccb";
+      sha512 = "8243d3ae0cb32d8805887d41764f5bc06dab1d2777c32e5d3b3a95dc52755f79e5d11fad4f93553262749a2cc6151462091a3a1228d83c4bda7ab04a6c427b1f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/lt/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/lt/thunderbird-60.3.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "3f86701c031aa174ffaacb532f198f7911045a855f8526e8a47ed26695e86bd40d1d83140cdab123e40a9759317724296f4ec7d788781b767590f0135b0c79c5";
+      sha512 = "8c9456bf6add79ef4cfc46b0400a7de4e6ff37e45788e524565bddbbc31152072ed6f10a033d5c77bfcbf46809132e87722dc5b77ac063a63cec6086d630e8d4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ms/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ms/thunderbird-60.3.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "d44ddf44d0c0b5190f3b282be2e3f98dbd28a584727970ceb8b3569672634ae476b85c4dda4659d1a58d8ae36adb9db1c5a4d341f9f1f7d861af64287e546316";
+      sha512 = "a0df7d3fc076370728909e32f9205c98b5c0f14b829148348f02c4f10a20ff21bd3e37ba54784b93f6b577c5710f0c021181146f50119789fbecbf7afd86285f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nb-NO/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/nb-NO/thunderbird-60.3.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "d0455dbd94fddabbd474037325c792e3e30fc4aba419d04f0425bdd33db17a1532c955a992b1bf3ffe2c16f440c6ed5c15a5ca6e259c74a5ee1e3f84f457de5e";
+      sha512 = "b363b84cec28b80b80a89ad0aa91d81952a7503aa985b705cd0f6045f309287d0a3671c96fc871cbc1dc51d62f30d00532914f1e06255e240593dfcf9b7f8ef5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nl/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/nl/thunderbird-60.3.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "b4c24a1b73078a9196178d5ff0f386502afc451f0108321bb45641b30bbbe8225ffd54e00b883515b4849bc76ad8c4dfce525ae5e2aea378ffc31ffa5867dca1";
+      sha512 = "1f9184da2d2b28649f7051f00e68491694ab19de23a318429ea29dccf9175520dfe1c8fd4ab9040d9b4e8ec2f0b65a884d1c130d3df034193a9c8bb23b23f024";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nn-NO/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/nn-NO/thunderbird-60.3.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "56ee8a0911a7a7034f18f246d1a607733842846f31d9715611b1e3df5aeb5b70f4d13e4af6785be53ba75a79e845066ffc7ce2aaa8d7319dc92d6ff04a2a5901";
+      sha512 = "f85bbd7f6a3bebe7485c678318183082dc09ac259316d35874eeab67b77358495c2a8a6e01d09364bf4b9da0608b99541704894b78946ddd3e2833694a1a9fe4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pl/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/pl/thunderbird-60.3.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "256331ad82a25c162681e4cc79f5f1c1127b09672e8bb663968950fcfbeeeadce26acb9ecbe10322552ec7d11e80612fab8582906380880e90ae6caa84be6cd3";
+      sha512 = "ffa67d8f9f8f923341bc8a9235503af0dd20798e65f406d7aefd4fa30a06371ba265b3b8b67f31ca0792cad09033ef46b7f064d6270c76af9191c3122933bd4d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pt-BR/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/pt-BR/thunderbird-60.3.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "67c7d28061ce5d1f2062092c308be8f88f7a718be637d359c400e56a772e5ff3722bbe3388b5673262dd12373b9728e6e58afbf9a713dabce5d3172532a8257e";
+      sha512 = "bd92b016722347ae7662e8d44bbe205b8db19a9a3f9c5e537db4e9bf7d84e8bb69ca860d34b2b78219f01c6130ffd8e79aaf842545397766dc1199e1df8af3c1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pt-PT/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/pt-PT/thunderbird-60.3.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "ce818347a10f580eaeb7f97d343a73149db571527ab207e3eef9108aca7309222e0ed7bda41d523d6e371abd6518d3cccfdc760d28eab692e23746b30940b556";
+      sha512 = "f97d92c60f64380ee35c2eb41cc7c494e09b48a367a14ec1f2cf05f6bedda4bfc5014b41d456e0434a328c663e1adefc104b59c2c6366ccbf51c5a6466bb8e09";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/rm/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/rm/thunderbird-60.3.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "c2cf9e67ebc7aeeb8642fc2f32d721f4c9656456d9fc7d04df31672b9c6b07352d87f25d58d75267d9a8388dbaca238d605373559dca4bc238b02bc7a27dd837";
+      sha512 = "03ab5b1eef8082489471159786027b8fdca8cadedd396c28e5c00bca31554ba4ce14b8e810b055c9852f1d8964c8b1bd83b34e1a79b840146806ad701ff8a4a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ro/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ro/thunderbird-60.3.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "f567baa16a96617e01753136f74744cc72c147ef59e40861292048fafb37745e0f8654d355c5e60752a4b86236b378fc15d09f656998a920ab970c6f7ca6e4cd";
+      sha512 = "e7fd6217ecb683dd78ababecb4dc17e7705a04c6761f445b34fffdb32527818f5b71361a8613ef54250956462f305faa59267698c89c6ea64eae2c5bb80c1dc2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ru/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/ru/thunderbird-60.3.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "e28699b8884f7859323870987fe425af0a8408152a3d373007b634aea1868ab1de483830c07da7efa1fd49c96b5be6c52f5bef91c21c8de0533216be57644fc6";
+      sha512 = "051593bb3f0d0ce571aba9365455d97d392377b482db7fa0efa42a50ae52981c294e84f185abd0dd52a07fcbae852d55f0427ede0f5172632a8dac416ed528a1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/si/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/si/thunderbird-60.3.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "e8ea29c2b77398611b79cebd674983f9458d07b4866597fa2bc35ce6d78bf81daebe4311e93604e4e5a391e632eaa9f6601eb75d022ef1b2dfc225b9cc61b0c9";
+      sha512 = "0e859053b989734e1134c365a28a5fdb628fd61125cd6c4d3b7cf598e861dc8b08330ec017c148eda8fd02df49a7688d6b5d7e057ab75b387362dca884c9a90d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sk/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sk/thunderbird-60.3.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "587f54eb86b0d0069433e14dce5f24e07ebc355f35f22eaba3ee0982e257782fe4ce5799ee0f7c733fa5a571935d2404ff950acf25b9be61dced6250d76611bd";
+      sha512 = "f7d8191bd1f8b78a1a04d669b5193d1067413f3d1f5600940129cf018e38aae85b2c7d274308ca56b2b871d3ec594703d5dde2d5ae12dafee0332ce37393142f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sl/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sl/thunderbird-60.3.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "196a31e47578bcf064b42c3d3ed1ac3b623a54b5694fab72e1177257d68c13013352228a09ec8dd4fc53d91a0e8036b2b7c815432fdd35c624852cd74f98541c";
+      sha512 = "c6e9ec49518f19bbfb045b85aec4f11e43645a55892cd3e8570f90b0c4fcc90f4e57848ed5419708c5544aa5df93b1a61786ca1422976938795bc7c5c2743098";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sq/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sq/thunderbird-60.3.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "5a2b966e7119853fd98e976e555831058aa0c8cfdc463dcc79ca698aa4bb5d9b43b5fa2e6cb60a51cfee987c360c651de509463002aeb9c4e1fbe58b6fa4dd08";
+      sha512 = "e5586b535c014b400535680964c0ec03ef9a4d9cbd3bea4701293f681635faf6218744d8a8cb8781310ad4797143610ce1821de5c24232e990a24a87a57a7f2e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sr/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sr/thunderbird-60.3.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "62666fe7d94f3486d1d5df1cf479bd21a13b9bdc9a4f24fa1f280a838c008d28a2fd6e78ac445ea6ce126fc54b60151e3c4f9b3820e231c8593fa83aab1076fa";
+      sha512 = "7bbd3dd52ed742cc59d474f9235a1370d5cb8d9a805df87fffbc9eb13fa50d3bcba630a720effdfaab42580148a9328ba09869b09d06151eaa5ded55db13cbf3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sv-SE/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/sv-SE/thunderbird-60.3.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "b8f75bfdb3ad9ffa768a5ef4cdfed93004232d9d4f301b0e5b9ce56fd47d34efc779fafcb67c0b848a83ed59c1fa4bb17dbdb583599a99b78186489099159d92";
+      sha512 = "157772822f5f28fbbc4fe2b19b38c1cee3e11d7c62c802620e3b3df17898cf61d3c7ffd1e77e2373ddbfd67452e177eabdd34c3a025f7b4bbcb587dc2fa607b2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/tr/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/tr/thunderbird-60.3.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "b72e4c0d1564248927e1f2d8922651e3f7e37e99de77dc548508d4c0c1951e0e59b461cad18cf0dca0145d7465fe7bac93ecb4841c18db2b57822b0014b2f83e";
+      sha512 = "7748d29478930265e632973ccee211d3edef2e5ee5ff363145d57c9bbaf7257e8e963287eb854cce4de16ad976d54305be14bb848e164c9feaf223ad40e1c8e2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/uk/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/uk/thunderbird-60.3.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "7287cb6fce1c1482e0adf00598139b0e9e97371171a14b15ea42652c5890fb1c7de0aa213220444c68c5fe33a43f242f0475b5836deebcfe5fc6b52e21c195e5";
+      sha512 = "c8cc86f2c802f05131d2ceb2ab3fb1c3fc72c9253efd40833046c2022de61d581222275d84584938a3720f0d20df6eeee4ca50751554fe53fd7551577db0591b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/vi/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/vi/thunderbird-60.3.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "07886cd20ea43fbac59055d5cf34776fd38616477f8c55f4af78031034f8198ef57d716b365ee7a08f267fef0e3b50ba188dd31b1ba1508545b85fd7001f4326";
+      sha512 = "81bd7e3276e2b7ad50456d29fc84260b0cd694acaeea6818b0fdfcda91ed0e04b3c03b8721303c5b3a6cb8a7570c5b925922c9d6725a258c525250ff42c076e8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/zh-CN/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/zh-CN/thunderbird-60.3.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "d34dde5c5f063d8d79a0aa032f54602570426bcce920810d1fc3c8e842827fdbb0b8b9dfa3e4049bf37de4c98356f7e87942bfdd3f7483bb6e3dc7ddd2ebd246";
+      sha512 = "2d120d666559ce4c0bbb1045d03aaa7c9f851c929b91fd6addc20c3a81ca7accba550f49540e3249ee227caa19aaf24414db995d930f0e02f651d75c230e3429";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/zh-TW/thunderbird-60.2.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.3.0/linux-i686/zh-TW/thunderbird-60.3.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "e8de34531211a60099e677dd619e9e75883f0d5a935df4807b0075dc3d8c57c97dc364eef629896aa46066d290f7138ed67e002fe0cadf7e86b0c77cf99f080f";
+      sha512 = "ad36e3c82d68215765a83cf0098bfc392b2e3f32dbdb7998f54e4b83885f5be53a65cf814990237d7cd35b4695a23f5a4dff363e185b5c75a5aa2248c96ab80e";
     }
     ];
 }
-- 
GitLab


From 7b66d96910cc19a78e642e592913fb8079186793 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 31 Oct 2018 20:08:48 -0500
Subject: [PATCH 0800/1065] webkitgtk: 2.22.2 -> 2.22.3

https://webkitgtk.org/2018/10/29/webkitgtk2.22.3-released.html
---
 pkgs/development/libraries/webkitgtk/2.22.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.22.nix b/pkgs/development/libraries/webkitgtk/2.22.nix
index 7eae5819daf..71b3dc24fe2 100644
--- a/pkgs/development/libraries/webkitgtk/2.22.nix
+++ b/pkgs/development/libraries/webkitgtk/2.22.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.3";
 
   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 = "0wnddhm2bihmmkmi919lyxskvjk2wrzx6azkiypyjfwm08lm9zcx";
   };
 
   patches = optionals stdenv.isDarwin [
-- 
GitLab


From 841a0bee5f4395ac678616c4ee7520a7b3550a71 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Wed, 31 Oct 2018 22:05:59 -0400
Subject: [PATCH 0801/1065] lightstep-tracer-cpp: 0.36 -> 0.8.1

---
 .../lightstep-tracer-cpp/default.nix          | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
index f2a8d75a9cb..ab0e51bae26 100644
--- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
+++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf, automake
-, autoreconfHook, zlib
-, enableGrpc ? false
+{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf, cmake, zlib
+, opentracing-cpp, enableGrpc ? false
 }:
 
 let
@@ -9,33 +8,31 @@ let
     fetchFromGitHub {
       owner = "lightstep";
       repo = "lightstep-tracer-common";
-      rev = "fe1f65f4a221746f9fffe8bf544c81d4e1b8aded";
-      sha256 = "1qqpjxfrjmhnhs15nhbfv28fsgzi57vmfabxlzc99j4vl78h5iln";
+      rev = "5fe3bf885bcece14c3c65df06c86c826ba45ad69";
+      sha256 = "1q39a0zaqbnqyhl2hza2xzc44235p65bbkfkzs2981niscmggq8w";
     };
 
 in
 
 stdenv.mkDerivation rec {
   name = "lightstep-tracer-cpp-${version}";
-  version = "0.36";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "lightstep";
     repo = "lightstep-tracer-cpp";
-    rev = "v0_36";
-    sha256 = "1sfj91bn7gw7fga7xawag076c8j9l7kiwhm4x3zh17qhycmaqq16";
+    rev = "v${version}";
+    sha256 = "1m4kl70lhvy1bsmkdh6bf2fddz5v1ikb27vgi99i2akpq40g4fvf";
   };
 
   postUnpack = ''
     cp -r ${common}/* $sourceRoot/lightstep-tracer-common
   '';
 
-  preConfigure = lib.optionalString (!enableGrpc) ''
-    configureFlagsArray+=("--disable-grpc")
-  '';
+  cmakeFlags = ["-DOPENTRACING_INCLUDE_DIR=${opentracing-cpp}/include" "-DOPENTRACING_LIBRARY=${opentracing-cpp}/lib/libopentracing.so"] ++ lib.optional (!enableGrpc) [ "-DWITH_GRPC=OFF" ];
 
   nativeBuildInputs = [
-    pkgconfig automake autoreconfHook
+    pkgconfig cmake
   ];
 
   buildInputs = [
@@ -48,6 +45,5 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ cstrahan ];
-    broken = true; # 2018-02-16
   };
 }
-- 
GitLab


From 1836905bf16dcab518aaf57c1b0c23ec70d870cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 1 Nov 2018 08:22:55 +0100
Subject: [PATCH 0802/1065] cargo-tree: 0.20.0 -> 0.21.0

---
 pkgs/tools/package-management/cargo-tree/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix
index 90f2ad71fc2..dd7d88ff848 100644
--- a/pkgs/tools/package-management/cargo-tree/default.nix
+++ b/pkgs/tools/package-management/cargo-tree/default.nix
@@ -1,17 +1,17 @@
 { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }:
 rustPlatform.buildRustPackage rec {
   name = "cargo-tree-${version}";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "sfackler";
     repo = "cargo-tree";
     rev = "v${version}";
 
-    sha256 = "197kbr7q7aqzv5l8xilz60m50rbkmfwfswyd6ka7w83j5bi88jw3";
+    sha256 = "0vr1mv8ns67kslxgwkvic8w86fvmqasxs6yd4yn21j49zg23866k";
   };
 
-  cargoSha256 = "1v84cj42ch49jrigrkivg99hzxa79jii8s3fddjk23hi1xx1c35y";
+  cargoSha256 = "0924bpcwz15zlp4vjaqap05s4nynw9mqz0np1kph3vx7aj9rsaw6";
 
   nativeBuildInputs = [ pkgconfig cmake ];
   buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
-- 
GitLab


From 718d3aea7ca70cb371282b7cca15c287a74553cc Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 30 Oct 2018 21:38:57 +0800
Subject: [PATCH 0803/1065] platformio: 3.5.3 -> 3.6.1

---
 pkgs/development/arduino/platformio/core.nix | 69 +++++++++++++++++---
 1 file changed, 61 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix
index de058530999..5489adc5399 100644
--- a/pkgs/development/arduino/platformio/core.nix
+++ b/pkgs/development/arduino/platformio/core.nix
@@ -1,17 +1,57 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ stdenv, lib, buildPythonApplication, fetchFromGitHub
 , bottle, click, colorama
 , lockfile, pyserial, requests
-, semantic-version
+, pytest, semantic-version, tox
 , git
 }:
 
-buildPythonPackage rec {
+let
+  args = lib.concatStringsSep " " ((map (e: "--deselect tests/${e}") [
+    "commands/test_ci.py::test_ci_boards"
+    "commands/test_ci.py::test_ci_project_conf"
+    "commands/test_ci.py::test_ci_lib_and_board"
+    "commands/test_init.py::test_init_enable_auto_uploading"
+    "commands/test_init.py::test_init_custom_framework"
+    "commands/test_init.py::test_init_incorrect_board"
+    "commands/test_init.py::test_init_ide_atom"
+    "commands/test_init.py::test_init_ide_eclipse"
+    "commands/test_init.py::test_init_duplicated_boards"
+    "commands/test_init.py::test_init_special_board"
+    "commands/test_lib.py::test_search"
+    "commands/test_lib.py::test_install_duplicates"
+    "commands/test_lib.py::test_global_lib_update_check"
+    "commands/test_lib.py::test_global_lib_update"
+    "commands/test_lib.py::test_global_lib_uninstall"
+    "commands/test_lib.py::test_lib_show"
+    "commands/test_lib.py::test_lib_stats"
+    "commands/test_lib.py::test_global_install_registry"
+    "commands/test_lib.py::test_global_install_archive"
+    "commands/test_lib.py::test_global_install_repository"
+    "commands/test_lib.py::test_global_lib_list"
+    "commands/test_test.py::test_local_env"
+    "test_builder.py::test_build_flags"
+    "test_builder.py::test_build_unflags"
+    "test_misc.py::test_api_cache"
+    "test_misc.py::test_ping_internet_ips"
+    "test_pkgmanifest.py::test_packages"
+  ]) ++ (map (e: "--ignore=tests/${e}") [
+    "commands/test_boards.py"
+    "commands/test_platform.py"
+    "commands/test_update.py"
+    "test_maintenance.py"
+    "test_ino2cpp.py"
+  ]));
+
+in buildPythonApplication rec {
   pname = "platformio";
-  version = "3.5.3";
+  version = "3.6.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1l4s2xh1p9h767amk9zapzivz4irl2y3kff3dna6icvsgq6rz011";
+  # pypi tarball doesn't contain tests
+  src = fetchFromGitHub {
+    owner = "platformio";
+    repo = "platformio-core";
+    rev = "v${version}";
+    sha256 = "01xz9figqrzb0m9467q14lg51vmgq0hbaap0xdx08n5v2ycmzj0v";
   };
 
   propagatedBuildInputs =  [
@@ -19,12 +59,25 @@ buildPythonPackage rec {
     pyserial requests semantic-version
   ];
 
+  HOME = "/tmp";
+
+  checkInputs = [ pytest tox ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    py.test -v tests ${args}
+
+    runHook postCheck
+  '';
+
   patches = [ ./fix-searchpath.patch ];
 
   meta = with stdenv.lib; {
+    broken = stdenv.isAarch64;
     description = "An open source ecosystem for IoT development";
     homepage = http://platformio.org;
-    maintainers = with maintainers; [ mog makefu ];
     license = licenses.asl20;
+    maintainers = with maintainers; [ mog makefu ];
   };
 }
-- 
GitLab


From 0111c7d8515d229cc19b487bb0c2e62571413e3c Mon Sep 17 00:00:00 2001
From: Edmund Wu <22758444+eadwu@users.noreply.github.com>
Date: Thu, 1 Nov 2018 05:41:28 -0400
Subject: [PATCH 0804/1065] pythonPackages.zstd: init at 1.3.5.1 (#49339)

---
 .../python-modules/zstd/default.nix           | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/zstd/default.nix

diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix
new file mode 100644
index 00000000000..53c3c8969ab
--- /dev/null
+++ b/pkgs/development/python-modules/zstd/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, pkgconfig, fetchpatch, fetchFromGitHub, buildPythonPackage
+, zstd, pytest }:
+
+buildPythonPackage rec {
+  pname = "zstd";
+  version = "1.3.5.1";
+
+  # Switch back to fetchPypi when tests/ is included, see https://github.com/NixOS/nixpkgs/pull/49339
+  src = fetchFromGitHub {
+    owner = "sergey-dryabzhinsky";
+    repo = "python-zstd";
+    rev = "v${version}";
+    sha256 = "08n1vz4zavas4cgzpdfcbpy33lnv39xxhq5mgj0zv3xi03ypc1rl";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "/usr/bin/pkg-config" "${pkgconfig}/bin/pkg-config"
+  '';
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ zstd ];
+
+  setupPyBuildFlags = [
+    "--external"
+    "--include-dirs=${zstd}/include"
+    "--libraries=zstd"
+    "--library-dirs=${zstd}/lib"
+  ];
+
+  # Running tests via setup.py triggers an attempt to recompile with the vendored zstd
+  ZSTD_EXTERNAL = 1;
+  VERSION = zstd.version;
+  PKG_VERSION = version;
+
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple python bindings to Yann Collet ZSTD compression library";
+    homepage = https://github.com/sergey-dryabzhinsky/python-zstd;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [
+      eadwu
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c25f80a2540..87285f774bf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10903,6 +10903,10 @@ EOF
 
   todoist = callPackage ../development/python-modules/todoist { };
 
+  zstd = callPackage ../development/python-modules/zstd {
+    inherit (pkgs) zstd pkgconfig;
+  };
+
   zxcvbn-python = callPackage ../development/python-modules/zxcvbn-python { };
 
   incremental = callPackage ../development/python-modules/incremental { };
-- 
GitLab


From b3bff5c249aecff11769ef0dbd9ae2747163d3ac Mon Sep 17 00:00:00 2001
From: Edmund Wu <22758444+eadwu@users.noreply.github.com>
Date: Thu, 1 Nov 2018 05:56:56 -0400
Subject: [PATCH 0805/1065] pythonPackages.trueskill: init at 0.4.5 (#49342)

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

diff --git a/pkgs/development/python-modules/trueskill/default.nix b/pkgs/development/python-modules/trueskill/default.nix
new file mode 100644
index 00000000000..2106e4d2e76
--- /dev/null
+++ b/pkgs/development/python-modules/trueskill/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, six }:
+
+buildPythonPackage rec {
+  pname = "trueskill";
+  version = "0.4.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1fv7g1szyjykja9mzax2w4js7jm2z7wwzgnr5dqrsdi84j6v8qlx";
+  };
+
+  propagatedBuildInputs = [
+    six
+  ];
+
+  # Can't build distribute, see https://github.com/NixOS/nixpkgs/pull/49340
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "The video game rating system";
+    homepage = https://trueskill.org;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [
+      eadwu
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 87285f774bf..49bc322d479 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -670,6 +670,8 @@ in {
     hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; };
   };
 
+  trueskill = callPackage ../development/python-modules/trueskill { };
+
   trustme = callPackage ../development/python-modules/trustme {};
 
   trio = callPackage ../development/python-modules/trio {};
-- 
GitLab


From 15692e6f12267268a61c6ee455506258324e8e43 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 26 Sep 2018 08:39:03 +0900
Subject: [PATCH 0806/1065] oraclejdk: remove version 10

---
 .../compilers/oraclejdk/jdk10-linux.nix       | 156 ------------------
 pkgs/top-level/all-packages.nix               |   9 -
 2 files changed, 165 deletions(-)
 delete mode 100644 pkgs/development/compilers/oraclejdk/jdk10-linux.nix

diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
deleted file mode 100644
index 23f44331dd8..00000000000
--- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
+++ /dev/null
@@ -1,156 +0,0 @@
-{ swingSupport ? true
-, stdenv
-, requireFile
-, makeWrapper
-, file
-, xorg ? null
-, packageType ? "JDK" # JDK, JRE, or ServerJRE
-, glib
-, libxml2
-, ffmpeg_2
-, libxslt
-, libGL
-, freetype
-, fontconfig
-, gtk2
-, pango
-, cairo
-, alsaLib
-, atk
-, gdk_pixbuf
-, zlib
-, elfutils
-, setJavaClassPath
-}:
-
-assert swingSupport -> xorg != null;
-
-let
-  version = "10.0.2";
-
-  downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads;
-
-  rSubPaths = [
-    "lib/jli"
-    "lib/server"
-    "lib"
-  ];
-
-in
-
-let result = stdenv.mkDerivation rec {
-  name = if packageType == "JDK"       then "oraclejdk-${version}"
-    else if packageType == "JRE"       then "oraclejre-${version}"
-    else if packageType == "ServerJRE" then "oracleserverjre-${version}"
-    else abort "unknown package Type ${packageType}";
-
-  src =
-    if packageType == "JDK" then
-      requireFile {
-        name = "jdk-${version}_linux-x64_bin.tar.gz";
-        url =  "${downloadUrlBase}/jdk10-downloads-4416644.html";
-        sha256 = "0arpzac64apji1s8d0gzizkvrjz0fbhz7l34af1j0365ac6w4cv6";
-      }
-    else if packageType == "JRE" then
-      requireFile {
-        name = "jre-${version}_linux-x64_bin.tar.gz";
-        url = "${downloadUrlBase}/jre10-downloads-4417026.html";
-        sha256 = "0pc4a0a3fl6874vfaflf6jvpm9da647vp41pj0hihkspjyjhjabx";
-      }
-    else if packageType == "ServerJRE" then
-      requireFile {
-        name = "serverjre-${version}_linux-x64_bin.tar.gz";
-        url = "${downloadUrlBase}/sjre10-downloads-4417025.html";
-        sha256 = "0hbcb4c6ncy0sbz02gyygyqcwkz0xpv4fwrx4sripia6vph9592c";
-      }
-    else abort "unknown package Type ${packageType}";
-
-  nativeBuildInputs = [ file ];
-
-  buildInputs = [ makeWrapper ];
-
-  # See: https://github.com/NixOS/patchelf/issues/10
-  dontStrip = 1;
-
-  installPhase = ''
-    cd ..
-
-    # Set PaX markings
-    exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
-    for file in $exes; do
-      paxmark m "$file"
-      # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
-      ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}
-    done
-
-    mv $sourceRoot $out
-
-    shopt -s extglob
-    for file in $out/*
-    do
-      if test -f $file ; then
-        rm $file
-      fi
-    done
-
-    if test -z "$pluginSupport"; then
-      rm -f $out/bin/javaws
-    fi
-
-    mkdir $out/lib/plugins
-    ln -s $out/lib/libnpjp2.so $out/lib/plugins
-
-    # for backward compatibility
-    ln -s $out $out/jre
-
-    mkdir -p $out/nix-support
-    printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
-
-    # Set JAVA_HOME automatically.
-    cat <<EOF >> $out/nix-support/setup-hook
-    if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
-    EOF
-  '';
-
-  postFixup = ''
-    rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}"
-
-    # set all the dynamic linkers
-    find $out -type f -perm -0100 \
-        -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "$rpath" {} \;
-
-    find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
-
-    # Oracle Java Mission Control needs to know where libgtk-x11 and related is
-    if test -x $out/bin/jmc; then
-      wrapProgram "$out/bin/jmc" \
-          --suffix-each LD_LIBRARY_PATH ':' "$rpath"
-    fi
-  '';
-
-  /**
-   * libXt is only needed on amd64
-   */
-  libraries =
-    [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++
-    (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
-
-  rpath = stdenv.lib.strings.makeLibraryPath libraries;
-
-  passthru.mozillaPlugin = "/lib/plugins";
-
-  passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package
-
-  passthru.home = result;
-
-  # for backward compatibility
-  passthru.architecture = "";
-
-  meta = with stdenv.lib; {
-    license = licenses.unfree;
-    platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
-    knownVulnerabilities = [ "Support ended in September 2018.  Use OpenJDK or JDK 8." ];
-  };
-
-}; in result
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89b32ec3bfa..a129c119fbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7025,18 +7025,12 @@ with pkgs;
 
   oraclejdk8psu = pkgs.oraclejdk8psu_distro true false;
 
-  oraclejdk10 = pkgs.oraclejdk10distro "JDK" false;
-
   oraclejre = lowPrio (pkgs.jdkdistro false false);
 
   oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false);
 
   oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false);
 
-  oraclejre10 = lowPrio (pkgs.oraclejdk10distro "JRE" false);
-
-  oracleserverjre10 = lowPrio (pkgs.oraclejdk10distro "ServerJRE" false);
-
   jrePlugin = jre8Plugin;
 
   jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true);
@@ -7051,9 +7045,6 @@ with pkgs;
     (if pluginSupport then appendToName "with-plugin" else x: x)
       (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; });
 
-  oraclejdk10distro = packageType: _:
-      (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType; });
-
   javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { };
 
   jikes = callPackage ../development/compilers/jikes { };
-- 
GitLab


From 84db315fb364972cd4d5687b52adb363900d3d86 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Thu, 1 Nov 2018 13:17:01 +0100
Subject: [PATCH 0807/1065] libid3tag: patch CVE-2017-11550 and CVE-2017-11551

---
 .../CVE-2017-11550-and-CVE-2017-11551.patch         | 13 +++++++++++++
 pkgs/development/libraries/libid3tag/default.nix    |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch

diff --git a/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch b/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch
new file mode 100644
index 00000000000..b1f9d0978ce
--- /dev/null
+++ b/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch
@@ -0,0 +1,13 @@
+Common subdirectories: libid3tag-0.15.1b/msvc++ and libid3tag-0.15.1b-patched/msvc++
+diff -uwp libid3tag-0.15.1b/utf16.c libid3tag-0.15.1b-patched/utf16.c
+--- libid3tag-0.15.1b/utf16.c	2004-01-23 10:41:32.000000000 +0100
++++ libid3tag-0.15.1b-patched/utf16.c	2018-11-01 13:12:00.866050641 +0100
+@@ -250,6 +250,8 @@ id3_ucs4_t *id3_utf16_deserialize(id3_by
+   id3_ucs4_t *ucs4;
+ 
+   end = *ptr + (length & ~1);
++  if (end == *ptr)
++    return 0;
+ 
+   utf16 = malloc((length / 2 + 1) * sizeof(*utf16));
+   if (utf16 == 0)
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix
index 0289a5331f8..4b7d9bdc2e3 100644
--- a/pkgs/development/libraries/libid3tag/default.nix
+++ b/pkgs/development/libraries/libid3tag/default.nix
@@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ zlib gperf ];
 
-  patches = [ ./debian-patches.patch ];
+  patches = [
+    ./debian-patches.patch
+    ./CVE-2017-11550-and-CVE-2017-11551.patch
+  ];
 
   preConfigure = ''
     configureFlagsArray+=(
-- 
GitLab


From db1a40a882987f94f8580b2b219a5857a3789a77 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 1 Nov 2018 23:39:37 +0800
Subject: [PATCH 0808/1065] home-assistant: use SIGINT instead of SIGTERM to
 shut down (#49571)

hass will ignore the standard SIGTERM sent by systemd during stop/restart and we
then have to wait for the timeout after which systemd will forcefully kill the
process.

If instead if we send SIGINT, hass will shut down nicely.

There are many issues reported upstream about the inability to shut down/restart
and it is *supposed* to work with SIGTERM but doesn't.
---
 nixos/modules/services/misc/home-assistant.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index 0756e81612a..2e9aa33aeee 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -157,6 +157,7 @@ in {
         Restart = "on-failure";
         ProtectSystem = "strict";
         ReadWritePaths = "${cfg.configDir}";
+        KillSignal = "SIGINT";
         PrivateTmp = true;
         RemoveIPC = true;
       };
-- 
GitLab


From a06fde5e24bf7ee3d1e9eb0b5916de36c69037e4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 1 Nov 2018 10:38:38 -0500
Subject: [PATCH 0809/1065] nlohmann_json: 3.3.0 -> 3.4.0

https://github.com/nlohmann/json/releases/tag/v3.4.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 25d4386cec2..d57461853d3 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.3.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "nlohmann";
     repo = "json";
     rev = "v${version}";
-    sha256 = "1plg9l1avnjsg6khrd88yj9cbzbbkwzpc5synmicqndb35wndn5h";
+    sha256 = "1140gz5za7yvfcphdgxaq1dm4b1vxy1m8d1w0s0smv4vvdvl26ym";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From 81f39ee22f40af86a3b8ec155be63f9b641769ab Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 31 Oct 2018 10:14:06 -0500
Subject: [PATCH 0810/1065] slack-term: init at 0.4.1

---
 .../instant-messengers/slack-term/default.nix | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/slack-term/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
new file mode 100644
index 00000000000..79464f54232
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  # https://github.com/erroneousboat/slack-term
+  name = "slack-term-${version}";
+  version = "0.4.1";
+
+  goPackagePath = "github.com/erroneousboat/slack-term";
+
+  src = fetchFromGitHub {
+    owner = "erroneousboat";
+    repo = "slack-term";
+    rev = "v${version}";
+    sha256 = "1340bq7h31fxykxbxpn6hv7n2hmjf20f8vg5gan9pjf5jaa6kfza";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Slack client for your terminal";
+    homepage = https://github.com/erroneousboat/slack-term;
+    license = licenses.mit;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89b32ec3bfa..531753c19b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17240,6 +17240,8 @@ with pkgs;
 
   slack-cli = callPackage ../tools/networking/slack-cli { };
 
+  slack-term = callPackage ../applications/networking/instant-messengers/slack-term { };
+
   singularity = callPackage ../applications/virtualization/singularity { };
 
   spectmorph = callPackage ../applications/audio/spectmorph { };
-- 
GitLab


From efbf9afb17cc2032f599ccb36479ed158a62f60a Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 19 Sep 2018 01:34:33 +0900
Subject: [PATCH 0811/1065] gImageReader: init at 3.2.99

gImageReader is a GUI for tesseract, an optical character recognition engine.
While the UI supports Qt/Gtk, I have only added the gtk one in the nix derivation.
---
 .../misc/gImageReader/default.nix             | 71 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/applications/misc/gImageReader/default.nix

diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix
new file mode 100644
index 00000000000..16693cfbf09
--- /dev/null
+++ b/pkgs/applications/misc/gImageReader/default.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, libuuid
+, sane-backends, podofo, libjpeg, djvulibre, libxmlxx3, libzip, tesseract
+, enchant, intltool, poppler, json-glib
+, ninja
+, python3
+
+# Gtk deps
+# upstream gImagereader supports Qt too
+, gtk3, gobjectIntrospection, wrapGAppsHook
+, gnome3, gtkspell3, gtkspellmm, cairomm
+}:
+
+let
+  variant = "gtk";
+  pythonEnv = python3.withPackages( ps: with ps;[ pygobject3 ] );
+in
+stdenv.mkDerivation rec {
+  name = "gImageReader-${version}";
+  version = "3.2.99";
+
+  src = fetchFromGitHub {
+    owner= "manisandro";
+    repo = "gImageReader";
+    rev = "v${version}";
+    sha256 = "19dbxq83j77lbvi10a8x0xxgw5hbsqyc852c196zzvmwk3km6pnc";
+  };
+
+  nativeBuildInputs = [
+    cmake ninja
+    intltool
+    pkgconfig
+    pythonEnv
+
+    # Gtk specific
+    wrapGAppsHook
+    gobjectIntrospection
+  ];
+
+  buildInputs = [
+    enchant
+    libxmlxx3
+    libzip
+    libuuid
+    sane-backends
+    podofo
+    libjpeg
+    djvulibre
+    tesseract
+    poppler
+
+    # Gtk specific
+    gnome3.gtkmm
+    gtkspell3
+    gtkspellmm
+    gnome3.gtksourceview
+    gnome3.gtksourceviewmm
+    cairomm
+    json-glib
+  ];
+
+  # interface type can be where <type> is either gtk, qt5, qt4
+  cmakeFlags = [ "-DINTERFACE_TYPE=${variant}" ];
+
+  meta = with stdenv.lib; {
+    description = "A simple Gtk/Qt front-end to tesseract-ocr";
+    homepage = https://github.com/manisandro/gImageReader;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [teto];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89b32ec3bfa..246f40efdac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7984,6 +7984,8 @@ with pkgs;
 
   jython = callPackage ../development/interpreters/jython {};
 
+  gImageReader = callPackage ../applications/misc/gImageReader { };
+
   guile-cairo = callPackage ../development/guile-modules/guile-cairo { };
 
   guile-fibers = callPackage ../development/guile-modules/guile-fibers { };
-- 
GitLab


From 4e89814fc6b721c849e0ce519f255ae1550f5511 Mon Sep 17 00:00:00 2001
From: Michael Roitzsch <reactorcontrol@icloud.com>
Date: Thu, 1 Nov 2018 15:28:41 +0100
Subject: [PATCH 0812/1065] swift: 4.1.3 -> 4.2.1

* necessary tweaks and patches to get swift 4.2.1 to build
* disabled more tests because they would require additional patching
* delete empty directories from final build output
* some minor cleanup
---
 pkgs/development/compilers/swift/default.nix  | 43 ++++++++++---------
 ...sets-linux-don-t-require-using-Ninja.patch |  2 +-
 ...ts-linux-allow-custom-install-prefix.patch |  2 +-
 ...sets-linux-plumb-extra-cmake-options.patch |  2 +-
 .../swift/patches/build-script-pax.patch      |  4 +-
 .../swift/patches/glibc-arch-headers.patch    | 13 ++++++
 .../swift/patches/llvm-include-dirs.patch     | 13 ++++++
 pkgs/development/compilers/swift/purity.patch |  2 +-
 8 files changed, 54 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
 create mode 100644 pkgs/development/compilers/swift/patches/llvm-include-dirs.patch

diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 233eb6647c0..bbfa1be8f92 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -32,11 +32,10 @@
 , makeWrapper
 , gnumake
 , file
-#, systemtap
 }:
 
 let
-  v_base = "4.1.3";
+  v_base = "4.2.1";
   version = "${v_base}-RELEASE";
   version_friendly = "${v_base}";
 
@@ -54,15 +53,15 @@ let
     # For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759
     clang = fetch {
       repo = "swift-clang";
-      sha256 = "0j8bi6jv4m4hqiib02q5cvnxd9j6bwiri853x6px86vai3mdff0h";
+      sha256 = "0l6w4xzpl3w2nax9a0b885nfzhfj38p2g99158nb5bzfd4s0man7";
     };
     llvm = fetch {
       repo = "swift-llvm";
-      sha256 = "0q5cv4iydm8c1kcax32573y3q2cbpihwgj5aa8ws1fnpy4jvq934";
+      sha256 = "1664zwxbq0a1cmxr9n5a0vw6vdk6ygr7rpglpdsfc7ki857vpsyv";
     };
     compilerrt = fetch {
       repo = "swift-compiler-rt";
-      sha256 = "1wkymmxi2v759xkwlzfrq9rivndjfvp6ikrzz10mvvrvyvrgwqnl";
+      sha256 = "19s6qxn4i0kxpf39xjp2i7zg427iinbmaxqkbb1p91g616y367sf";
     };
     cmark = fetch {
       repo = "swift-cmark";
@@ -70,32 +69,32 @@ let
     };
     lldb = fetch {
       repo = "swift-lldb";
-      sha256 = "1d0pa7xm289bjb6r52hkkmlngkqkwbwgixnmm30bin2q18mkxk7s";
+      sha256 = "00kz0xhj1p6ckyandj2gs1yfl29kxv84x9pfph00r8crbkd2jz7b";
     };
     llbuild = fetch {
       repo = "swift-llbuild";
-      sha256 = "04y0ihfyam2n671vmpk9gy0gb9lb3ivh6mr19862p5kg5bmrcic1";
+      sha256 = "1mkkhydshhxr28igbldzr0hhqvb6ql43cpf3ba5vglfkbcz6wh6q";
     };
     pm = fetch {
       repo = "swift-package-manager";
-      sha256 = "08d87fc29qq7m92jaxkiczsa7b567pwbibiwwkzdrj6a0gr11qn3";
+      sha256 = "1aqvmgq9g5zs4k2qnkvw3h3mar66d690hqq6g2dmrapsyb321j9l";
     };
     xctest = fetch {
       repo = "swift-corelibs-xctest";
-      sha256 = "1alkgxx8jsr2jjv2kchnjaaddb1byjwim015m1z3qxh6lknqm0k5";
+      sha256 = "1n4w7bfgy73vjzbvbphlwayy0dw73bbrayrpkqq8lbidg0x9lam8";
     };
     foundation = fetch {
       repo = "swift-corelibs-foundation";
-      sha256 = "1bhrag63rmz41bg2g6ap01qrdpq37hislgf5hg6myy2v69q7mahx";
+      sha256 = "1bfnkj8s3v327cy0czkngz0ryzmz7amjzkkxbsg2zyrhf9a9f0f7";
     };
     libdispatch = fetch {
       repo = "swift-corelibs-libdispatch";
-      sha256 = "198vskbajch8s168a649qz5an92i2mxmmmzcjlgxlzh38fgxri0n";
+      sha256 = "0fibrx54nbaawhsgd7cbr356ji9qvf8y8ahd5bdx28fpj6q0cnwc";
       fetchSubmodules = true;
     };
     swift = fetch {
       repo = "swift";
-      sha256 = "1ydx11pkvaasgjbr29lnha0lpnak758gd5l0aqzmp3q6mcyvfm7a";
+      sha256 = "0y277wi0m6zp1yph9s14mmc65m21q5fm6lgzkn2rkrbaz25fdzak";
     };
   };
 
@@ -111,7 +110,6 @@ let
     ncurses
     sqlite
     swig
-    #    systemtap?
   ];
 
   cmakeFlags = [
@@ -215,8 +213,11 @@ stdenv.mkDerivation rec {
 
     substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \
       --replace '/usr/include' "${stdenv.cc.libc.dev}/include"
+    substituteInPlace swift-corelibs-libdispatch/src/CMakeLists.txt \
+      --replace '/usr/include' "${stdenv.cc.libc.dev}/include"
     substituteInPlace swift/utils/build-script-impl \
       --replace '/usr/include/c++' "${clang.cc.gcc}/include/c++"
+    patch -p1 -d swift -i ${./patches/glibc-arch-headers.patch}
   '' + stdenv.lib.optionalString stdenv.needsPax ''
     patch -p1 -d swift -i ${./patches/build-script-pax.patch}
   '' + ''
@@ -228,24 +229,24 @@ stdenv.mkDerivation rec {
       -e 's/^test-installable-package$/# \0/' \
       -e 's/^test$/# \0/' \
       -e 's/^validation-test$/# \0/' \
-      -e 's/^long-test$/# \0/'
+      -e 's/^long-test$/# \0/' \
+      -e 's/^stress-test$/# \0/' \
+      -e 's/^test-optimized$/# \0/'
 
     # https://bugs.swift.org/browse/SR-5779
     sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake
 
     substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \
-      --replace '  addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \
-                '  addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);'
+      --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "'
+    patch -p1 -d clang -i ${./patches/llvm-include-dirs.patch}
     patch -p1 -d clang -i ${./purity.patch}
 
     # Workaround hardcoded dep on "libcurses" (vs "libncurses"):
     sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt
 
-    # This test fails on one of my machines, not sure why.
-    # Disabling for now.
-    rm llbuild/tests/Examples/buildsystem-capi.llbuild
-
     PREFIX=''${out/#\/}
+    substituteInPlace swift-corelibs-foundation/build.py \
+      --replace usr/lib "$PREFIX/lib"
     substituteInPlace swift-corelibs-xctest/build_script.py \
       --replace usr "$PREFIX"
     substituteInPlace swiftpm/Utilities/bootstrap \
@@ -263,6 +264,7 @@ stdenv.mkDerivation rec {
     # Extract the generated tarball into the store
     PREFIX=''${out/#\/}
     tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX
+    find $out -type d -empty -delete
 
     paxmark pmr $out/bin/swift
     paxmark pmr $out/bin/*
@@ -290,4 +292,3 @@ stdenv.mkDerivation rec {
     broken = stdenv.isAarch64; # 2018-09-04, never built on Hydra
   };
 }
-
diff --git a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
index 6ef83754a67..f2b30e5dcdb 100644
--- a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
+++ b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
@@ -11,7 +11,7 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
 index 7ee57ad2df..e6b0af3581 100644
 --- a/utils/build-presets.ini
 +++ b/utils/build-presets.ini
-@@ -686,7 +686,7 @@ swiftpm
+@@ -717,7 +717,7 @@ swiftpm
  xctest
  dash-dash
  
diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
index 66723f1cdf3..612b33cdb48 100644
--- a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
+++ b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
@@ -11,7 +11,7 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
 index e6b0af3581..1095cbaab7 100644
 --- a/utils/build-presets.ini
 +++ b/utils/build-presets.ini
-@@ -708,7 +708,7 @@ install-lldb
+@@ -723,7 +723,7 @@ install-lldb
  install-llbuild
  install-swiftpm
  install-xctest
diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
index 5493196303c..e84c7eb2a08 100644
--- a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
+++ b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
@@ -11,7 +11,7 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
 index 1739e91dc2..0608fed9c1 100644
 --- a/utils/build-presets.ini
 +++ b/utils/build-presets.ini
-@@ -708,6 +708,8 @@ install-destdir=%(install_destdir)s
+@@ -740,6 +740,8 @@ install-destdir=%(install_destdir)s
  # Path to the .tar.gz package we would create.
  installable-package=%(installable_package)s
  
diff --git a/pkgs/development/compilers/swift/patches/build-script-pax.patch b/pkgs/development/compilers/swift/patches/build-script-pax.patch
index fa2ccdf9d5c..1f47bf8ee04 100644
--- a/pkgs/development/compilers/swift/patches/build-script-pax.patch
+++ b/pkgs/development/compilers/swift/patches/build-script-pax.patch
@@ -1,6 +1,6 @@
 --- swift/utils/build-script-impl	2017-01-23 12:47:20.401326309 -0600
 +++ swift-pax/utils/build-script-impl	2017-01-23 13:24:10.339366996 -0600
-@@ -1823,6 +1823,17 @@ function set_lldb_xcodebuild_options() {
+@@ -1837,6 +1837,17 @@ function set_lldb_xcodebuild_options() {
      fi
  }
  
@@ -18,7 +18,7 @@
  #
  # Configure and build each product
  #
-@@ -2624,6 +2634,12 @@ for host in "${ALL_HOSTS[@]}"; do
+@@ -2735,6 +2746,12 @@ for host in "${ALL_HOSTS[@]}"; do
              fi
  
              call "${CMAKE_BUILD[@]}" "${build_dir}" $(cmake_config_opt ${product}) -- "${BUILD_ARGS[@]}" ${build_targets[@]}
diff --git a/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch b/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
new file mode 100644
index 00000000000..650e1a2429d
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
@@ -0,0 +1,13 @@
+The Nix glibc headers do not use include/x86_64-linux-gnu subdirectories.
+
+--- swift/stdlib/public/Platform/CMakeLists.txt	2018-09-30 17:51:51.581766303 +0200
++++ swift/stdlib/public/Platform/CMakeLists.txt	2018-09-30 18:40:04.118956708 +0200
+@@ -65,7 +65,7 @@
+     endif()
+ 
+     set(GLIBC_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
+-    set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_ARCH_INCLUDE_PATH}")
++    set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
+ 
+     if(NOT "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}" STREQUAL "/")
+       set(GLIBC_INCLUDE_PATH "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}${GLIBC_INCLUDE_PATH}")
diff --git a/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch b/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
new file mode 100644
index 00000000000..9523943c480
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
@@ -0,0 +1,13 @@
+Only use the Nix include dirs when no sysroot is configured.
+
+--- clang/lib/Driver/ToolChains/Linux.cpp	2018-10-05 18:01:15.731109551 +0200
++++ clang/lib/Driver/ToolChains/Linux.cpp	2018-10-05 18:00:27.959509924 +0200
+@@ -565,7 +565,7 @@
+ 
+   // Check for configure-time C include directories.
+   StringRef CIncludeDirs(C_INCLUDE_DIRS);
+-  if (CIncludeDirs != "") {
++  if (CIncludeDirs != "" && (SysRoot.empty() || SysRoot == "/")) {
+     SmallVector<StringRef, 5> dirs;
+     CIncludeDirs.split(dirs, ":");
+     for (StringRef dir : dirs) {
diff --git a/pkgs/development/compilers/swift/purity.patch b/pkgs/development/compilers/swift/purity.patch
index b30d0d0b5d5..d10e407260a 100644
--- a/pkgs/development/compilers/swift/purity.patch
+++ b/pkgs/development/compilers/swift/purity.patch
@@ -11,7 +11,7 @@ diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
 index fe3c0191bb..c6a482bece 100644
 --- a/lib/Driver/ToolChains/Gnu.cpp
 +++ b/lib/Driver/ToolChains/Gnu.cpp
-@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+@@ -398,13 +398,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
    if (!Args.hasArg(options::OPT_static)) {
      if (Args.hasArg(options::OPT_rdynamic))
        CmdArgs.push_back("-export-dynamic");
-- 
GitLab


From 99b4045826f77933a9d7a546fadd29647de71546 Mon Sep 17 00:00:00 2001
From: Yurii Izorkin <Izorkin@gmail.com>
Date: Thu, 1 Nov 2018 20:22:43 +0300
Subject: [PATCH 0813/1065] percona-toolkit: 3.0.11 -> 3.0.12 (#47963)

* percona-toolkit: 3.0.11 -> 3.0.12

License is GPL2 (or Artistic License) but not LGPL2
https://www.percona.com/doc/percona-toolkit/LATEST/copyright_license_and_warranty.html
---
 pkgs/top-level/perl-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 37464458791..e94f8945d39 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12103,19 +12103,19 @@ let
   };
 
   PerconaToolkit = buildPerlPackage rec {
-    name = "Percona-Toolkit-3.0.11";
+    name = "Percona-Toolkit-3.0.12";
     src = fetchFromGitHub {
       owner = "percona";
       repo = "percona-toolkit";
-      rev = "6e5c5c5e6db0a32c6951c8f798c4547539cdab87";
-      sha256 = "18wxvp7psqrx0zdvg47azrals572hv9fx1s3p0q65s87lnk3q63l";
+      rev = "3.0.12";
+      sha256 = "0xk4h4dzl80kf97lbx0nznx9ajrb6kkg7k3iwca3rj6f3rqggv9y";
     };
     outputs = [ "out" ];
     buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey TimeHiRes ];
     meta = {
       description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.'';
       homepage = http://www.percona.com/software/percona-toolkit;
-      license = with stdenv.lib.licenses; [ lgpl2 ];
+      license = with stdenv.lib.licenses; [ gpl2 ];
       platforms = stdenv.lib.platforms.linux;
       maintainers = with stdenv.lib.maintainers; [ izorkin ];
     };
-- 
GitLab


From 89ede978a0614fd7215e0aa2c483df142cc79af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 1 Nov 2018 17:49:52 +0000
Subject: [PATCH 0814/1065] chromium: use jumbo builds to speedup compilation

On Hetzner machine with 1 core: 4h40m
On Hetzner machine with 8 cores: 1h20m
---
 pkgs/applications/networking/browsers/chromium/common.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index a011d0a892e..66198508606 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -222,6 +222,8 @@ let
       use_gold = true;
       gold_path = "${stdenv.cc}/bin";
       is_debug = false;
+      # at least 2X compilation speedup
+      use_jumbo_build = true;
 
       proprietary_codecs = false;
       use_sysroot = false;
-- 
GitLab


From 55905659a91ce39bd2ff7e056ae6fecb596ad168 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 1 Nov 2018 19:59:34 +0100
Subject: [PATCH 0815/1065] avldrums-lv2: init at 0.3.0 (#48896)

---
 .../audio/avldrums-lv2/default.nix            | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/audio/avldrums-lv2/default.nix

diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix
new file mode 100644
index 00000000000..40fb0c6d9e1
--- /dev/null
+++ b/pkgs/applications/audio/avldrums-lv2/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, pkgconfig, pango, cairo, libGLU, lv2 }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "avldrums.lv2";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "x42";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0w51gdshq2i5bix2x5l3g3gnycy84nlzf5sj0jkrw0zrnbk6ghwg";
+    fetchSubmodules = true;
+  };
+
+  installFlags = "PREFIX=$(out)";
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    pango cairo libGLU lv2
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Dedicated AVLDrumkits LV2 Plugin";
+    homepage    = http://x42-plugins.com/x42/x42-avldrums;
+    license     = licenses.gpl2;
+    maintainers = [ maintainers.magnetophon ];
+    platforms   = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 246f40efdac..a1dc1d1958c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -577,6 +577,8 @@ with pkgs;
 
   avfs = callPackage ../tools/filesystems/avfs { };
 
+  avldrums-lv2 = callPackage ../applications/audio/avldrums-lv2 { };
+
   aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {};
 
   awscli = callPackage ../tools/admin/awscli { };
-- 
GitLab


From 5a5ef43b40210d8f93119656dd9fdabe9dfca3f7 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 1 Nov 2018 20:00:24 +0100
Subject: [PATCH 0816/1065] HybridReverb2: init at 2.1.1 (#49080)

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

diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix
new file mode 100644
index 00000000000..19aac1bd1e9
--- /dev/null
+++ b/pkgs/applications/audio/hybridreverb2/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, fetchzip, cmake, pkgconfig, lv2, alsaLib, libjack2,
+  freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon,
+  epoxy, at-spi2-core, dbus, curl, fftwFloat }:
+
+let
+  pname = "HybridReverb2";
+  version = "2.1.1";
+  owner = "jpcima";
+  DBversion = "1.0.0";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  impulseDB = fetchzip {
+    url = "https://github.com/${owner}/${pname}-impulse-response-database/archive/v${DBversion}.zip";
+    sha256 = "1hlfxbbkahm1k2sk3c3n2mjaz7k80ky3r55xil8nfbvbv0qan89z";
+  };
+
+  src = fetchFromGitHub {
+    inherit owner;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "15mba9qvlis0qrklr50wp3jdysvmk33m7pvclp0k1is9pirj97cb";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [ lv2 alsaLib libjack2 freetype libX11 gtk3 pcre
+    libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus curl fftwFloat ];
+
+  cmakeFlags = [
+    "-DHybridReverb2_AdvancedJackStandalone=ON"
+    "-DHybridReverb2_UseLocalDatabase=ON"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/share/${pname}/
+    cp  -r ${impulseDB}/* $out/share/${pname}/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www2.ika.ruhr-uni-bochum.de/HybridReverb2;
+    description = "Reverb effect using hybrid impulse convolution";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1dc1d1958c..ebc74e1555c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3296,6 +3296,8 @@ with pkgs;
 
   hwinfo = callPackage ../tools/system/hwinfo { };
 
+  hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { };
+
   hylafaxplus = callPackage ../servers/hylafaxplus { };
 
   i2c-tools = callPackage ../os-specific/linux/i2c-tools { };
-- 
GitLab


From db72b653387a2741cf227da9c0933459815c29f4 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Thu, 1 Nov 2018 20:07:47 +0100
Subject: [PATCH 0817/1065] pmtools: remove and alias (#49596)

These are the old tools that later became part of ACPICA.
It is obsolete and we already have newer acpica-tools.
Alias to acpica-tools for out of tree backward-compat
---
 pkgs/os-specific/linux/pmtools/default.nix | 23 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/pmtools/default.nix

diff --git a/pkgs/os-specific/linux/pmtools/default.nix b/pkgs/os-specific/linux/pmtools/default.nix
deleted file mode 100644
index a284924f005..00000000000
--- a/pkgs/os-specific/linux/pmtools/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "pmtools-20071116";
-
-  src = fetchurl {
-    url = "http://www.lesswatts.org/patches/linux_acpi/${name}.tar.gz";
-    sha256 = "91751774976e39f6237efd0326eb35196a9346220b92ad35894a33283e872748";
-  };
-
-  installPhase = ''
-    mkdir -p $out/bin $out/share/pmtools
-    cp acpidump/acpidump acpixtract/acpixtract madt/madt $out/bin/
-    cp README $out/share/pmtools/
-  '';
-
-  meta = {
-    homepage = http://www.lesswatts.org/projects/acpi/utilities.php;
-    description = "Linux ACPI utilities";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c0d322b89d8..8f5e866ede5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -224,6 +224,7 @@ mapAliases ({
   pidginwindowmerge = pidgin-window-merge; # added 2018-01-08
   piwik = matomo; # added 2018-01-16
   pltScheme = racket; # just to be sure
+  pmtools = acpica-tools; # added 2018-11-01
   poppler_qt5 = libsForQt5.poppler;  # added 2015-12-19
   postgresql93 = postgresql_9_3;
   postgresql94 = postgresql_9_4;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebc74e1555c..f4055b0d4d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14808,8 +14808,6 @@ with pkgs;
 
   pmutils = callPackage ../os-specific/linux/pm-utils { };
 
-  pmtools = callPackage ../os-specific/linux/pmtools { };
-
   policycoreutils = callPackage ../os-specific/linux/policycoreutils { };
 
   semodule-utils = callPackage ../os-specific/linux/semodule-utils { };
-- 
GitLab


From c8e2b666a7d53173feaa728d85bbb868c2ea4aa2 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 1 Nov 2018 20:09:24 +0100
Subject: [PATCH 0818/1065] atom, atom-beta: 1.32.0 -> 1.32.1, 1.33.0-beta0 ->
 1.33.0-beta1 (#49590)

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index a6525804ee0..834c6bedf3c 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.0";
-      sha256 = "0dha8zi4gshxj993ns7ybi7q86pfqwzsasrk3a7b5xrdqbrcm5md";
+      version = "1.32.1";
+      sha256 = "1x22jbhvagqw9mvq0v7z4z09qp727vl0rkyvaxn98xnj9gvcfkq9";
     };
 
     atom-beta = {
       version = "1.33.0";
-      beta = 0;
-      sha256 = "1x4s12zvfd2gjy7mimndbhs6x9k37jq4dyy6r1mzhwfysix74val";
+      beta = 1;
+      sha256 = "0sf98apmb57msgr5p1xly0mffzn2s808nsfsmbisk4qqmm9fv2m3";
     };
   };
 
-- 
GitLab


From cc41aefe4485dea399930b8d173c26e438cb5e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 1 Nov 2018 20:13:38 +0100
Subject: [PATCH 0819/1065] chromium tests: inherit timeout from the package

/cc #49442.  It should decrease the waste of resources due to abortions.
---
 nixos/tests/chromium.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index c341e83961a..fcc55a59a21 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -12,8 +12,10 @@ with pkgs.lib;
 
 mapAttrs (channel: chromiumPkg: makeTest rec {
   name = "chromium-${channel}";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ aszlig ];
+  meta = {
+    maintainers = with maintainers; [ aszlig ];
+    # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621
+    inherit (chromiumPkg.meta) timeout;
   };
 
   enableOCR = true;
-- 
GitLab


From 79c713bc1498ccceed9f8d2fc0b8d29b1b45a209 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 6 Sep 2018 14:28:44 -0400
Subject: [PATCH 0820/1065] release-lib: Cache cross nixpkgs evals too

This will help with release-cross.nix eval time. It also allowed me to
share code between the cross and native helpers.
---
 pkgs/top-level/release-cross.nix |  6 +-
 pkgs/top-level/release-lib.nix   | 96 ++++++++++++++++++++------------
 2 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 0d15d817a66..ee69dd5a43c 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -81,11 +81,11 @@ in
     # good idea lest there be some irrelevant pass-through debug attrs that
     # cause false negatives.
     testEqualOne = path: system: let
-      f = path: attrs: builtins.toString (lib.getAttrFromPath path (allPackages attrs));
+      f = path: crossSystem: system: builtins.toString (lib.getAttrFromPath path (pkgsForCross crossSystem system));
     in assertTrue (
-        f path { inherit system; }
+        f path null system
         ==
-        f (["buildPackages"] ++ path) { inherit system crossSystem; }
+        f (["buildPackages"] ++ path) crossSystem system
       );
 
     testEqual = path: systems: forMatchingSystems systems (testEqualOne path);
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 623c9d9cb00..2b72de7c7ef 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -11,8 +11,6 @@ in with lib;
 
 rec {
 
-  allPackages = args: packageSet (args // nixpkgsArgs);
-
   pkgs = packageSet (lib.recursiveUpdate { system = "x86_64-linux"; config.allowUnsupportedSystem = true; } nixpkgsArgs);
   inherit lib;
 
@@ -23,29 +21,53 @@ rec {
   /* !!! Hack: poor man's memoisation function.  Necessary to prevent
      Nixpkgs from being evaluated again and again for every
      job/platform pair. */
-  pkgsFor = system:
-    if system == "x86_64-linux" then pkgs_x86_64_linux
-    else if system == "i686-linux" then pkgs_i686_linux
-    else if system == "aarch64-linux" then pkgs_aarch64_linux
-    else if system == "armv6l-linux" then pkgs_armv6l_linux
-    else if system == "armv7l-linux" then pkgs_armv7l_linux
-    else if system == "x86_64-darwin" then pkgs_x86_64_darwin
-    else if system == "x86_64-freebsd" then pkgs_x86_64_freebsd
-    else if system == "i686-freebsd" then pkgs_i686_freebsd
-    else if system == "i686-cygwin" then pkgs_i686_cygwin
-    else if system == "x86_64-cygwin" then pkgs_x86_64_cygwin
-    else abort "unsupported system type: ${system}";
-
-  pkgs_x86_64_linux = allPackages { system = "x86_64-linux"; };
-  pkgs_i686_linux = allPackages { system = "i686-linux"; };
-  pkgs_aarch64_linux = allPackages { system = "aarch64-linux"; };
-  pkgs_armv6l_linux = allPackages { system = "armv6l-linux"; };
-  pkgs_armv7l_linux = allPackages { system = "armv7l-linux"; };
-  pkgs_x86_64_darwin = allPackages { system = "x86_64-darwin"; };
-  pkgs_x86_64_freebsd = allPackages { system = "x86_64-freebsd"; };
-  pkgs_i686_freebsd = allPackages { system = "i686-freebsd"; };
-  pkgs_i686_cygwin = allPackages { system = "i686-cygwin"; };
-  pkgs_x86_64_cygwin = allPackages { system = "x86_64-cygwin"; };
+  mkPkgsFor = crossSystem: let
+    packageSet' = args: packageSet (args // { inherit crossSystem; } // nixpkgsArgs);
+
+    pkgs_x86_64_linux = packageSet' { system = "x86_64-linux"; };
+    pkgs_i686_linux = packageSet' { system = "i686-linux"; };
+    pkgs_aarch64_linux = packageSet' { system = "aarch64-linux"; };
+    pkgs_armv6l_linux = packageSet' { system = "armv6l-linux"; };
+    pkgs_armv7l_linux = packageSet' { system = "armv7l-linux"; };
+    pkgs_x86_64_darwin = packageSet' { system = "x86_64-darwin"; };
+    pkgs_x86_64_freebsd = packageSet' { system = "x86_64-freebsd"; };
+    pkgs_i686_freebsd = packageSet' { system = "i686-freebsd"; };
+    pkgs_i686_cygwin = packageSet' { system = "i686-cygwin"; };
+    pkgs_x86_64_cygwin = packageSet' { system = "x86_64-cygwin"; };
+
+    in system:
+      if system == "x86_64-linux" then pkgs_x86_64_linux
+      else if system == "i686-linux" then pkgs_i686_linux
+      else if system == "aarch64-linux" then pkgs_aarch64_linux
+      else if system == "armv6l-linux" then pkgs_armv6l_linux
+      else if system == "armv7l-linux" then pkgs_armv7l_linux
+      else if system == "x86_64-darwin" then pkgs_x86_64_darwin
+      else if system == "x86_64-freebsd" then pkgs_x86_64_freebsd
+      else if system == "i686-freebsd" then pkgs_i686_freebsd
+      else if system == "i686-cygwin" then pkgs_i686_cygwin
+      else if system == "x86_64-cygwin" then pkgs_x86_64_cygwin
+      else abort "unsupported system type: ${system}";
+
+  inherit (pkgsForCross null) pkgsFor;
+
+
+  # More poor man's memoisation
+  pkgsForCross = let
+    examplesByConfig = lib.flip lib.mapAttrs'
+      (builtins.removeAttrs lib.systems.examples [ "riscv" ])
+      (_: crossSystem: nameValuePair crossSystem.config {
+        inherit crossSystem;
+        pkgsFor = mkPkgsFor crossSystem;
+      });
+    native = mkPkgsFor null;
+  in crossSystem: let
+    errorMsg = "unsupported crossSystem: ${toString crossSystem.config or "<something without config>"}";
+    candidate = examplesByConfig.${crossSystem.config} or (throw errorMsg);
+  in if crossSystem == null
+      then native
+    else if lib.matchAttrs crossSystem candidate.crossSystem
+      then candidate.pkgsFor
+    else throw errorMsg;
 
 
   # Given a list of 'meta.platforms'-style patterns, return the sublist of
@@ -90,30 +112,32 @@ rec {
      platform as an argument .  We return an attribute set containing
      a derivation for each supported platform, i.e. ‘{ x86_64-linux =
      f pkgs_x86_64_linux; i686-linux = f pkgs_i686_linux; ... }’. */
-  testOn = metaPatterns: f: forMatchingSystems metaPatterns
-    (system: hydraJob' (f (pkgsFor system)));
+  testOn = testOnCross null;
 
 
   /* Similar to the testOn function, but with an additional
-     'crossSystem' parameter for allPackages, defining the target
+     'crossSystem' parameter for packageSet', defining the target
      platform for cross builds. */
   testOnCross = crossSystem: metaPatterns: f: forMatchingSystems metaPatterns
-    (system: hydraJob' (f (allPackages { inherit system crossSystem; })));
+    (system: hydraJob' (f (pkgsForCross crossSystem system)));
 
 
   /* Given a nested set where the leaf nodes are lists of platforms,
      map each leaf node to `testOn [platforms...] (pkgs:
      pkgs.<attrPath>)'. */
-  mapTestOn = mapAttrsRecursive
-    (path: metaPatterns: testOn metaPatterns (pkgs: getAttrFromPath path pkgs));
+  mapTestOn = _mapTestOnHelper id null;
 
 
-  /* Similar to the testOn function, but with an additional 'crossSystem'
-   * parameter for allPackages, defining the target platform for cross builds,
-   * and triggering the build of the host derivation (cross built - crossDrv). */
-  mapTestOnCross = crossSystem: mapAttrsRecursive
+  _mapTestOnHelper = f: crossSystem: mapAttrsRecursive
     (path: metaPatterns: testOnCross crossSystem metaPatterns
-      (pkgs: addMetaAttrs { maintainers = crossMaintainers; } (getAttrFromPath path pkgs)));
+      (pkgs: f (getAttrFromPath path pkgs)));
+
+
+  /* Similar to the testOn function, but with an additional 'crossSystem'
+   * parameter for packageSet', defining the target platform for cross builds,
+   * and triggering the build of the host derivation. */
+  mapTestOnCross = _mapTestOnHelper
+    (addMetaAttrs { maintainers = crossMaintainers; });
 
 
   /* Recursively map a (nested) set of derivations to an isomorphic
-- 
GitLab


From cc476f04b8e2f59f6beaeebd80942b587e83a5e5 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 20:47:54 +0100
Subject: [PATCH 0821/1065] imlib: add license + description

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

diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix
index 2b95742c44c..eec68015c25 100644
--- a/pkgs/development/libraries/imlib/default.nix
+++ b/pkgs/development/libraries/imlib/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation {
 
   buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng];
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "An image loading and rendering library for X11";
+    platforms = platforms.unix;
+    license = with licenses; [ gpl2 lgpl2 ];
   };
 }
-- 
GitLab


From 24e2bc18b6cd15a5d761048f5d3ec65b61d8fbd0 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 1 Nov 2018 16:14:55 -0400
Subject: [PATCH 0822/1065] release-lib: Fallback on uncached rather than error
 for unknown crossSystem

The `ensureUnaffected` the tests purposefully use an absurd crossSystem.
Also sheevaplug and pogoplug share the same config.
---
 pkgs/top-level/release-lib.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 2b72de7c7ef..ac11de698b5 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -61,13 +61,12 @@ rec {
       });
     native = mkPkgsFor null;
   in crossSystem: let
-    errorMsg = "unsupported crossSystem: ${toString crossSystem.config or "<something without config>"}";
-    candidate = examplesByConfig.${crossSystem.config} or (throw errorMsg);
+    candidate = examplesByConfig.${crossSystem.config} or null;
   in if crossSystem == null
       then native
-    else if lib.matchAttrs crossSystem candidate.crossSystem
+    else if candidate != null && lib.matchAttrs crossSystem candidate.crossSystem
       then candidate.pkgsFor
-    else throw errorMsg;
+    else mkPkgsFor crossSystem; # uncached fallback
 
 
   # Given a list of 'meta.platforms'-style patterns, return the sublist of
-- 
GitLab


From 984df7ca0605554bd760efc1a53a8b94d8e04c15 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 1 Nov 2018 16:16:58 -0400
Subject: [PATCH 0823/1065] top-level: libcCrossChooser: More `or` fallback
 hack

This fixes some eval errors in release-cross.nix
---
 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index abd7db6263d..a2e93f038c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9536,11 +9536,11 @@ with pkgs;
     # libc is hackily often used from the previous stage. This `or`
     # hack fixes the hack, *sigh*.
     /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross
-    else if name == "bionic" then targetPackages.bionic
-    else if name == "uclibc" then targetPackages.uclibcCross
+    else if name == "bionic" then targetPackages.bionic or bionic
+    else if name == "uclibc" then targetPackages.uclibcCross or uclibcCross
     else if name == "musl" then targetPackages.muslCross or muslCross
     else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
-    else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries
+    else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries
     else if name == "libSystem" then targetPackages.darwin.xcode
     else throw "Unknown libc";
 
-- 
GitLab


From ffaffb36d152d2cba1da51332d4079a96cd5288d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 1 Nov 2018 16:18:51 -0400
Subject: [PATCH 0824/1065] linux bootstrap-tools: use `stdenv.*Platform` to
 avoid deprecation warning

---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 4fc9999b538..3ebb4e634e2 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -19,7 +19,7 @@ in with pkgs; rec {
   tarMinimal = gnutar.override { acl = null; };
 
   busyboxMinimal = busybox.override {
-    useMusl = !targetPlatform.isRiscV;
+    useMusl = !stdenv.targetPlatform.isRiscV;
     enableStatic = true;
     enableMinimal = true;
     extraConfig = ''
@@ -44,7 +44,7 @@ in with pkgs; rec {
         set -x
         mkdir -p $out/bin $out/lib $out/libexec
 
-      '' + (if (hostPlatform.libc == "glibc") then ''
+      '' + (if (stdenv.hostPlatform.libc == "glibc") then ''
         # Copy what we need of Glibc.
         cp -d ${libc.out}/lib/ld*.so* $out/lib
         cp -d ${libc.out}/lib/libc*.so* $out/lib
@@ -75,7 +75,7 @@ in with pkgs; rec {
         find $out/include -name .install -exec rm {} \;
         find $out/include -name ..install.cmd -exec rm {} \;
         mv $out/include $out/include-glibc
-    '' else if (hostPlatform.libc == "musl") then ''
+    '' else if (stdenv.hostPlatform.libc == "musl") then ''
         # Copy what we need from musl
         cp ${libc.out}/lib/* $out/lib
         cp -rL ${libc.dev}/include $out
@@ -137,7 +137,7 @@ in with pkgs; rec {
         cp -d ${zlib.out}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib
 
-      '' + lib.optionalString (hostPlatform != buildPlatform) ''
+      '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
         # These needed for cross but not native tools because the stdenv
         # GCC has certain things built in statically. See
         # pkgs/stdenv/linux/default.nix for the details.
@@ -199,21 +199,21 @@ in with pkgs; rec {
     bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out";
   };
 
-  bootstrapTools = if (hostPlatform.libc == "glibc") then
+  bootstrapTools = if (stdenv.hostPlatform.libc == "glibc") then
     import ./bootstrap-tools {
-      inherit (hostPlatform) system;
+      inherit (stdenv.hostPlatform) system;
       inherit bootstrapFiles;
     }
-    else if (hostPlatform.libc == "musl") then
+    else if (stdenv.hostPlatform.libc == "musl") then
     import ./bootstrap-tools-musl {
-      inherit (hostPlatform) system;
+      inherit (stdenv.hostPlatform) system;
       inherit bootstrapFiles;
     }
     else throw "unsupported libc";
 
   test = derivation {
     name = "test-bootstrap-tools";
-    inherit (hostPlatform) system;
+    inherit (stdenv.hostPlatform) system;
     builder = bootstrapFiles.busybox;
     args = [ "ash" "-e" "-c" "eval \"$buildCommand\"" ];
 
@@ -232,12 +232,12 @@ in with pkgs; rec {
       grep --version
       gcc --version
 
-    '' + lib.optionalString (hostPlatform.libc == "glibc") ''
+    '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
       ldlinux=$(echo ${bootstrapTools}/lib/ld-linux*.so.?)
       export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}"
       export CC="gcc -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib"
       export CXX="g++ -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib"
-    '' + lib.optionalString (hostPlatform.libc == "musl") ''
+    '' + lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
       ldmusl=$(echo ${bootstrapTools}/lib/ld-musl*.so.?)
       export CPP="cpp -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools}"
       export CC="gcc -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib"
-- 
GitLab


From ed0d0eef73dfa50722d70242e9943d76a2d4019a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 23 Oct 2018 01:20:47 -0700
Subject: [PATCH 0825/1065] vulkan-tools: 1.1.82.0 -> 1.1.85

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 0d8f5bfe1bc..43029380f44 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.82.0";
+  version = "1.1.85";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Tools";
     rev = "sdk-${version}";
-    sha256 = "1viaqp1zfdgli3hw674rz8mrfzxpgv12vxcd07czwr8nyb19f2g5";
+    sha256 = "0f4dfr8g0vy7y1hvs6z9lw52kissailzisby4qnz4akv0zz5y5s5";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From f2ed7c7af9f5b2db5e88b78e192b470c47f4c4fd Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 1 Nov 2018 16:19:17 -0400
Subject: [PATCH 0826/1065] linux bootstrap tools: Use right system for some
 raw derivations

This allows cross builds to work. Evidentallyy this has been done wrong
since I combined the bootstrap tool creation files in
ab651d2c9bab620ebe5e515476fbd70d2c5b0c61. Oops!
---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 3ebb4e634e2..58104e6ce26 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -201,19 +201,19 @@ in with pkgs; rec {
 
   bootstrapTools = if (stdenv.hostPlatform.libc == "glibc") then
     import ./bootstrap-tools {
-      inherit (stdenv.hostPlatform) system;
+      inherit (stdenv.buildPlatform) system; # Used to determine where to build
       inherit bootstrapFiles;
     }
     else if (stdenv.hostPlatform.libc == "musl") then
     import ./bootstrap-tools-musl {
-      inherit (stdenv.hostPlatform) system;
+      inherit (stdenv.buildPlatform) system; # Used to determine where to build
       inherit bootstrapFiles;
     }
     else throw "unsupported libc";
 
   test = derivation {
     name = "test-bootstrap-tools";
-    inherit (stdenv.hostPlatform) system;
+    inherit (stdenv.hostPlatform) system; # We cannot "cross test"
     builder = bootstrapFiles.busybox;
     args = [ "ash" "-e" "-c" "eval \"$buildCommand\"" ];
 
-- 
GitLab


From ddd761abb31ce9b83f1aacdadd1f3c5822922880 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:40:38 +0100
Subject: [PATCH 0827/1065] Revert "virtualgl-lib: fix broken startup script
 (#49185)"

This reverts commit efd3f8b57ff81f263a961c740396b4eb205aa955.
---
 pkgs/tools/X11/virtualgl/lib.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index b3495b189a6..4c911e75633 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -19,12 +19,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postPatch = ''
-    # script calls exec, which fails with plain sh
-    substituteInPlace ./server/vglrun.in \
-      --replace '#!/bin/sh' '#!/usr/bin/env bash'
-  '';
-
   meta = with stdenv.lib; {
     homepage = http://www.virtualgl.org/;
     description = "X11 GL rendering in a remote computer with full 3D hw acceleration";
-- 
GitLab


From 5262cf6d0a154464ae3935b37f0880581b20bcf1 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 1 Nov 2018 21:40:50 +0100
Subject: [PATCH 0828/1065] kapacitor: 1.4.0 -> 1.5.1

---
 pkgs/servers/monitoring/kapacitor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix
index 0e21069bbb0..969a58aff85 100644
--- a/pkgs/servers/monitoring/kapacitor/default.nix
+++ b/pkgs/servers/monitoring/kapacitor/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "kapacitor-${version}";
-  version = "1.4.0";
+  version = "1.5.1";
 
   goPackagePath = "github.com/influxdata/kapacitor";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "influxdata";
     repo = "kapacitor";
     rev = "v${version}";
-    sha256 = "1qanf7qljzqqkyw2cdazg0ll13q8a3fs3sqydcgfbgpdmf707sj2";
+    sha256 = "17f3my1zmqmcx7qqhdcq8n73l60bsxnnxqgvnw0cnf0xsa5g1yks";
   };
 
   meta = with lib; {
-- 
GitLab


From 24d6c0dbde49ca939751fe6caff0f9af3d0e6723 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 1 Nov 2018 21:48:22 +0100
Subject: [PATCH 0829/1065] icecast: 2.4.3 -> 2.4.4

Fixes CVE-2018-18820.
---
 pkgs/servers/icecast/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix
index f1bd1a4c9d8..55ec611d605 100644
--- a/pkgs/servers/icecast/default.nix
+++ b/pkgs/servers/icecast/default.nix
@@ -3,11 +3,11 @@
 , libvorbis, libtheora, speex, libkate, libopus }:
 
 stdenv.mkDerivation rec {
-  name = "icecast-2.4.3";
+  name = "icecast-2.4.4";
 
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz";
-    sha256 = "14n5vm2xnyn8y7kl46lnnlgv6v5fjykhc57ffdsh0qaxfs6a8p68";
+    sha256 = "0i2d9rhav0x6js2qhjf5iy6j2a7f0d11ail0lfv40hb1kygrgda9";
   };
 
   buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate libopus ];
-- 
GitLab


From 60298d1e087b1278c7a5fe64350b3f5fc31d1570 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 1 Nov 2018 21:52:17 +0100
Subject: [PATCH 0830/1065] nixos/kapacitor: new service

---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/monitoring/kapacitor.nix | 154 ++++++++++++++++++
 3 files changed, 157 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/kapacitor.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index a32e4fe3f7c..16737efb185 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -332,6 +332,7 @@
       lirc = 305;
       lidarr = 306;
       slurm = 307;
+      kapacitor = 308;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -624,6 +625,7 @@
       lirc = 305;
       lidarr = 306;
       slurm = 307;
+      kapacitor = 308;
 
       # 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 660644eade8..37e90232da2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -433,6 +433,7 @@
   ./services/monitoring/hdaps.nix
   ./services/monitoring/heapster.nix
   ./services/monitoring/incron.nix
+  ./services/monitoring/kapacitor.nix
   ./services/monitoring/longview.nix
   ./services/monitoring/monit.nix
   ./services/monitoring/munin.nix
diff --git a/nixos/modules/services/monitoring/kapacitor.nix b/nixos/modules/services/monitoring/kapacitor.nix
new file mode 100644
index 00000000000..1de0a8d5af2
--- /dev/null
+++ b/nixos/modules/services/monitoring/kapacitor.nix
@@ -0,0 +1,154 @@
+{ options, config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.kapacitor;
+
+  kapacitorConf = pkgs.writeTextFile {
+    name = "kapacitord.conf";
+    text = ''
+      hostname="${config.networking.hostName}"
+      data_dir="${cfg.dataDir}"
+
+      [http]
+        bind-address = "${cfg.bind}:${toString cfg.port}"
+        log-enabled = false
+        auth-enabled = false
+
+      [task]
+        dir = "${cfg.dataDir}/tasks"
+        snapshot-interval = "${cfg.taskSnapshotInterval}"
+
+      [replay]
+        dir = "${cfg.dataDir}/replay"
+
+      [storage]
+        boltdb = "${cfg.dataDir}/kapacitor.db"
+
+      ${optionalString (cfg.loadDirectory != null) ''
+        [load]
+          enabled = true
+          dir = "${cfg.loadDirectory}"
+      ''}
+
+      ${optionalString (cfg.defaultDatabase.enable) ''
+        [[influxdb]]
+          name = "default"
+          enabled = true
+          default = true
+          urls = [ "${cfg.defaultDatabase.url}" ]
+          username = "${cfg.defaultDatabase.username}"
+          password = "${cfg.defaultDatabase.password}"
+      ''}
+
+      ${cfg.extraConfig}
+    '';
+  };
+in
+{
+  options.services.kapacitor = {
+    enable = mkEnableOption "kapacitor";
+
+    dataDir = mkOption {
+      type = types.path;
+      example = "/var/lib/kapacitor";
+      default = "/var/lib/kapacitor";
+      description = "Location where Kapacitor stores its state";
+    };
+
+    port = mkOption {
+      type = types.int;
+      default = 9092;
+      description = "Port of Kapacitor";
+    };
+
+    bind = mkOption {
+      type = types.str;
+      default = "";
+      example = literalExample "0.0.0.0";
+      description = "Address to bind to. The default is to bind to all addresses";
+    };
+
+    extraConfig = mkOption {
+      description = "These lines go into kapacitord.conf verbatim.";
+      default = "";
+      type = types.lines;
+    };
+
+    user = mkOption {
+      type = types.str;
+      default = "kapacitor";
+      description = "User account under which Kapacitor runs";
+    };
+
+    group = mkOption {
+      type = types.str;
+      default = "kapacitor";
+      description = "Group under which Kapacitor runs";
+    };
+
+    taskSnapshotInterval = mkOption {
+      type = types.str;
+      description = "Specifies how often to snapshot the task state  (in InfluxDB time units)";
+      default = "1m0s";
+      example = "1m0s";
+    };
+
+    loadDirectory = mkOption {
+      type = types.nullOr types.path;
+      description = "Directory where to load services from, such as tasks, templates and handlers (or null to disable service loading on startup)";
+      default = null;
+    };
+
+    defaultDatabase = {
+      enable = mkEnableOption "kapacitor.defaultDatabase";
+
+      url = mkOption {
+        description = "The URL to an InfluxDB server that serves as the default database";
+        example = "http://localhost:8086";
+        type = types.string;
+      };
+
+      username = mkOption {
+        description = "The username to connect to the remote InfluxDB server";
+        type = types.string;
+      };
+
+      password = mkOption {
+        description = "The password to connect to the remote InfluxDB server";
+        type = types.string;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.kapacitor ];
+
+    systemd.services.kapacitor = {
+      description = "Kapacitor Real-Time Stream Processing Engine";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "networking.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.kapacitor}/bin/kapacitord -config ${kapacitorConf}";
+        User = "kapacitor";
+        Group = "kapacitor";
+        PermissionsStartOnly = true;
+      };
+      preStart = ''
+        mkdir -p ${cfg.dataDir}
+        chown ${cfg.user}:${cfg.group} ${cfg.dataDir}
+      '';
+    };
+
+    users.users.kapacitor = {
+      uid = config.ids.uids.kapacitor;
+      description = "Kapacitor user";
+      home = cfg.dataDir;
+    };
+
+    users.groups.kapacitor = {
+      gid = config.ids.gids.kapacitor;
+    };
+  };
+}
-- 
GitLab


From 9fe0e57d9d5e8ae95d081d8e33b867bcfbc4ba24 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 1 Nov 2018 21:58:21 +0100
Subject: [PATCH 0831/1065] tomcat_connectors: 1.2.41-dev-1613051 -> 1.2.46

Fixes CVE-2018-11759, CVE-2018-1323, CVE-2016-6808.
---
 .../apache-modules/tomcat-connectors/default.nix    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
index e569ae8f870..138864aec7d 100644
--- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
+++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, apacheHttpd, jdk }:
 
 stdenv.mkDerivation rec {
-  name = "tomcat-connectors-1.2.41-dev-1613051";
+  name = "tomcat-connectors-1.2.46";
 
   src = fetchurl {
-    url = "https://people.apache.org/~rjung/mod_jk-dev/${name}-src.tar.gz";
-    sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc";
+    url = "mirror://apache/tomcat/tomcat-connectors/jk/${name}-src.tar.gz";
+    sha256 = "1sfbcsmshjkj4wc969ngjcxhjyp4mbkjprbs111d1b0x3l7547by";
   };
 
   configureFlags = [
@@ -24,7 +24,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ apacheHttpd jdk ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Provides web server plugins to connect web servers with Tomcat";
+    homepage = https://tomcat.apache.org/download-connectors.cgi;
+    license = licenses.asl20;
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From 0cca209943e8dfb326ae0ca09a60a02e1028da20 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 1 Nov 2018 18:07:12 -0400
Subject: [PATCH 0832/1065] openscenegraph: revive version 3.4.0

---
 .../libraries/openscenegraph/3.4.0.nix        | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/openscenegraph/3.4.0.nix

diff --git a/pkgs/development/libraries/openscenegraph/3.4.0.nix b/pkgs/development/libraries/openscenegraph/3.4.0.nix
new file mode 100644
index 00000000000..8d083904189
--- /dev/null
+++ b/pkgs/development/libraries/openscenegraph/3.4.0.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip
+, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11
+, cairo, poppler, librsvg, libpng, libtiff, libXrandr
+, xineLib, boost
+, withApps ? false
+, withSDL ? false, SDL
+, withQt4 ? false, qt4
+}:
+
+stdenv.mkDerivation rec {
+  name = "openscenegraph-${version}";
+  version = "3.4.0";
+
+  src = fetchurl {
+    url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip";
+    sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw";
+  };
+
+  nativeBuildInputs = [ pkgconfig cmake doxygen unzip ];
+
+  buildInputs = [
+    freetype libjpeg jasper libxml2 zlib gdal curl libX11
+    cairo poppler librsvg libpng libtiff libXrandr boost
+    xineLib
+  ] ++ lib.optional withSDL SDL
+    ++ lib.optional withQt4 qt4;
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF";
+
+  meta = with stdenv.lib; {
+    description = "A 3D graphics toolkit";
+    homepage = http://www.openscenegraph.org/;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license = "OpenSceneGraph Public License - free LGPL-based license";
+  };
+}
-- 
GitLab


From b54374877142c748ffa3350913c9241bd01a5ff3 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 1 Nov 2018 18:15:10 -0400
Subject: [PATCH 0833/1065] flightgear, simgear & speed_dreams: use
 openscenegraph_3_4 (version 3.4.0) instead of openscenegraph (version 3.6.2)

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a5a4ac6f92..67a74153dd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11605,6 +11605,7 @@ with pkgs;
   opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { };
 
   openscenegraph = callPackage ../development/libraries/openscenegraph { };
+  openscenegraph_3_4 = callPackage ../development/libraries/openscenegraph/3.4.0.nix { };
 
   openslp = callPackage ../development/libraries/openslp {};
 
@@ -12190,7 +12191,7 @@ with pkgs;
     avrlibc = pkgsCross.avr.libcCross;
   };
 
-  simgear = callPackage ../development/libraries/simgear { };
+  simgear = callPackage ../development/libraries/simgear { openscenegraph = openscenegraph_3_4; };
 
   simp_le = callPackage ../tools/admin/simp_le { };
 
@@ -20236,7 +20237,7 @@ with pkgs;
 
   fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
 
-  flightgear = libsForQt5.callPackage ../games/flightgear { };
+  flightgear = libsForQt5.callPackage ../games/flightgear { openscenegraph = openscenegraph_3_4; };
 
   flock = callPackage ../development/tools/flock { };
 
@@ -20678,6 +20679,7 @@ with pkgs;
     # Torcs wants to make shared libraries linked with plib libraries (it provides static).
     # i686 is the only platform I know than can do that linking without plib built with -fPIC
     libpng = libpng12;
+    openscenegraph = openscenegraph_3_4;
   };
 
   torcs = callPackage ../games/torcs { };
-- 
GitLab


From bdc293cabab2db61fdafd2b90c44f87a8b51b7de Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 1 Nov 2018 18:17:34 -0400
Subject: [PATCH 0834/1065] flightgear & simgear: 2017.3.1 -> 2018.2.2

---
 pkgs/development/libraries/simgear/default.nix | 7 +++----
 pkgs/games/flightgear/default.nix              | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index 28b96d17aa6..196fb59bb17 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -6,12 +6,12 @@
 
 stdenv.mkDerivation rec {
   name = "simgear-${version}";
-  version = "2017.3.1";
-  shortVersion = "2017.3";
+  version = "2018.2.2";
+  shortVersion = "2018.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
-    sha256 = "1x71wvycs2bjgmmacswgk6091p65p46fr40mr7f4kcipnx88bq0f";
+    sha256 = "f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5";
   };
 
   buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto
@@ -28,4 +28,3 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl2;
   };
 }
-
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index b7a4af54929..f3b77d87e17 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -6,14 +6,14 @@
 }:
 
 let
-  version = "2017.3.1";
-  shortVersion = "2017.3";
+  version = "2018.2.2";
+  shortVersion = "2018.2";
   data = stdenv.mkDerivation rec {
     name = "flightgear-base-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
-      sha256 = "166q0fsbp17lx1l1n6i8cfk3d1i79pasz1liya09z6m2i1pb026z";
+      sha256 = "c89b94e4cf3cb7eda728daf6cca6dd051f7a47863776c99fd2f3fe0054400ac4";
     };
 
     phases = [ "installPhase" ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
-    sha256 = "1kccf91vmxnzyki6grx09s10dvr4j6qrz34ikj7jn81g5scisbkg";
+    sha256 = "61f809ef0a3f6908d156f0c483ed5313d31b5a6ac74761955d0b266751718147";
   };
 
   # Of all the files in the source and data archives, there doesn't seem to be
-- 
GitLab


From 51b661be2c84bb3a3cd0f44d211449006a047218 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 1 Nov 2018 18:18:25 -0400
Subject: [PATCH 0835/1065] speed_dreams: fix compilation issues

---
 pkgs/games/speed-dreams/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix
index 4bf03fec9de..5f6e20c39b6 100644
--- a/pkgs/games/speed-dreams/default.nix
+++ b/pkgs/games/speed-dreams/default.nix
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
     tar -xf ${wip-cars-and-tracks}
   '';
 
+  prePatch = ''
+    # https://sourceforge.net/p/speed-dreams/mailman/message/35665539/
+    sed -i "s|lastSlash = '\\\0'|lastSlash = NULL|" src/libs/tgf/params.cpp
+    sed -i "s|const char\* error = '\\\0'|const char\* error = NULL|" src/libs/tgfclient/openalmusicplayer.cpp
+  '';
+
   preBuild = ''
     make -C src/libs/portability
     make -C src/libs/portability portability.o
-- 
GitLab


From 31e9f37539636d7ecc53d972b47e8b2f1f8509dd Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Thu, 1 Nov 2018 23:25:26 +0100
Subject: [PATCH 0836/1065] vulkan-tools: 1.1.85 -> 1.1.85.0 (#49615)

sdk-1.1.85 is a branch and not the stable release tag
---
 pkgs/tools/graphics/vulkan-tools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index 43029380f44..afb6812b3a3 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   name = "vulkan-tools-${version}";
-  version = "1.1.85";
+  version = "1.1.85.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "0f4dfr8g0vy7y1hvs6z9lw52kissailzisby4qnz4akv0zz5y5s5";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake python3 vulkan-loader xlibsWrapper libxcb libXrandr wayland ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ python3 vulkan-loader xlibsWrapper libxcb libXrandr wayland ];
   enableParallelBuilding = true;
 
   cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ];
-- 
GitLab


From ba9d6b673ab47913f592a60d20949e123830e991 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 20:52:49 +0100
Subject: [PATCH 0837/1065] incrtcl: add license

---
 pkgs/development/libraries/incrtcl/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index b9781ba9aa0..a4a009c6658 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "incrtcl-${version}";
   version = "4.0.4";
-  
+
   src = fetchurl {
     url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.0.4.tar.gz;
     sha256 = "1ppc9b13cvmc6rp77k7dl2zb26xk0z30vxygmr4h1xr2r8w091k3";
@@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
     libPrefix = "itcl3.4";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://incrtcl.sourceforge.net/;
     description = "Object Oriented Enhancements for Tcl/Tk";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.tcltk;
   };
 }
-- 
GitLab


From 6afad9b00e83edf28313adda9fe17896e934a0ed Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 20:55:38 +0100
Subject: [PATCH 0838/1065] jama: add license

---
 pkgs/development/libraries/jama/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix
index 36eedadc4c2..29fabdbb3b6 100644
--- a/pkgs/development/libraries/jama/default.nix
+++ b/pkgs/development/libraries/jama/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "jama-${version}";
   version = "1.2.5";
-  
+
   src = fetchurl {
     url = https://math.nist.gov/tnt/jama125.zip;
     sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl";
@@ -21,9 +21,10 @@ stdenv.mkDerivation rec {
       cp *.h $out/include
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://math.nist.gov/tnt/;
     description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.publicDomain;
   };
 }
-- 
GitLab


From b13ab27360d022262ac0e3d04f48d5b5e672a15b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 20:58:40 +0100
Subject: [PATCH 0839/1065] jasper: add license

---
 lib/licenses.nix                              | 4 ++++
 pkgs/development/libraries/jasper/default.nix | 1 +
 2 files changed, 5 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 940baf53b7c..092cbbbdb25 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -400,6 +400,10 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     free = false;
   };
 
+  jasper = spdx {
+    spdxId = "JasPer-2.0";
+    fullName = "JasPer License";
+  };
 
   lgpl2 = spdx {
     spdxId = "LGPL-2.0";
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index de4848c7dda..eb928227432 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
     homepage = https://www.ece.uvic.ca/~frodo/jasper/;
     description = "JPEG2000 Library";
     platforms = platforms.unix;
+    license = licenses.jasper;
     maintainers = with maintainers; [ pSub ];
   };
 }
-- 
GitLab


From 08f4d756af15a815996d3bed96e32534bd9d5fca Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:01:54 +0100
Subject: [PATCH 0840/1065] dbus-java: add license

---
 pkgs/development/libraries/java/dbus-java/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix
index daee9adb1fd..5ec10cc7e0d 100644
--- a/pkgs/development/libraries/java/dbus-java/default.nix
+++ b/pkgs/development/libraries/java/dbus-java/default.nix
@@ -18,8 +18,9 @@ stdenv.mkDerivation {
            -e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile
   '';
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.sander ];
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.sander ];
+    license = licenses.afl21;
   };
 }
-- 
GitLab


From eea19467087b9f33db2cca433e98a286e02353c7 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:04:02 +0100
Subject: [PATCH 0841/1065] gwt-dnd: add license

---
 pkgs/development/libraries/java/gwt-dragdrop/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/pkgs/development/libraries/java/gwt-dragdrop/default.nix
index b9d66fdc971..e34699d7740 100644
--- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix
+++ b/pkgs/development/libraries/java/gwt-dragdrop/default.nix
@@ -3,13 +3,14 @@
 stdenv.mkDerivation {
   name = "gwt-dnd-2.6.5";
   builder = ./builder.sh;
-  
+
   src = fetchurl {
     url = http://gwt-dnd.googlecode.com/files/gwt-dnd-2.6.5.jar;
     sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw";
-  };  
+  };
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    platforms = platforms.unix;
+    license = licenses.asl20;
   };
 }
-- 
GitLab


From a923a5aa2d3bd21bc0f644aae1683cb805dc8610 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:08:14 +0100
Subject: [PATCH 0842/1065] gwt-widgets: add licenses

---
 pkgs/development/libraries/java/gwt-widgets/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/pkgs/development/libraries/java/gwt-widgets/default.nix
index b182964f657..ec407076906 100644
--- a/pkgs/development/libraries/java/gwt-widgets/default.nix
+++ b/pkgs/development/libraries/java/gwt-widgets/default.nix
@@ -3,13 +3,14 @@
 stdenv.mkDerivation {
   name = "gwt-widgets-0.2.0";
   builder = ./builder.sh;
-  
+
   src = fetchurl {
     url = mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz;
     sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb";
-  };  
+  };
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    platforms = platforms.unix;
+    license = with licenses; [ afl21 lgpl2 ];
   };
 }
-- 
GitLab


From fe326f87942b3e65172bc68b0f18fad343dbf815 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:12:48 +0100
Subject: [PATCH 0843/1065] hsqldb: add license

---
 pkgs/development/libraries/java/hsqldb/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix
index 97ffcb647d6..a478ab0fc50 100644
--- a/pkgs/development/libraries/java/hsqldb/default.nix
+++ b/pkgs/development/libraries/java/hsqldb/default.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation {
 
   buildInputs = [ unzip
   ];
-  
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+
+  meta = with stdenv.lib; {
+    platforms = platforms.unix;
+    license = licenses.bsd3;
   };
 }
-- 
GitLab


From d356808b2f40f431007e00f7d4c8e35c27430774 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:20:31 +0100
Subject: [PATCH 0844/1065] httpunit: add license + homepage

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

diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix
index 221a2e93e4f..500c575f73a 100644
--- a/pkgs/development/libraries/java/httpunit/default.nix
+++ b/pkgs/development/libraries/java/httpunit/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation {
 
   inherit unzip;
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    homepage = http://httpunit.sourceforge.net;
+    platforms = platforms.unix;
+    license = licenses.mit;
   };
 }
-- 
GitLab


From 0d140370cbb6ef92e6ba70ba0631e3bfd637a19d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:25:38 +0100
Subject: [PATCH 0845/1065] jdom: add meta data

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

diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix
index 99d213a01da..16755471acd 100644
--- a/pkgs/development/libraries/java/jdom/default.nix
+++ b/pkgs/development/libraries/java/jdom/default.nix
@@ -9,7 +9,10 @@ stdenv.mkDerivation {
     sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf";
   };
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code";
+    homepage = http://www.jdom.org;
+    platforms = platforms.unix;
+    license = licenses.bsdOriginal;
   };
 }
-- 
GitLab


From 4598cf4f3feb8b511975532479b816bb226ea35a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:27:44 +0100
Subject: [PATCH 0846/1065] libmatthew-java: add license

---
 .../development/libraries/java/libmatthew-java/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix
index ad5192f94ce..98291a7763c 100644
--- a/pkgs/development/libraries/java/libmatthew-java/default.nix
+++ b/pkgs/development/libraries/java/libmatthew-java/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation {
   PREFIX=''''${out}'';
   buildInputs = [ jdk ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.sander ];
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.sander ];
+    license = licenses.mit;
   };
 }
-- 
GitLab


From 5fabd1b3c62e71523641af49c2fd1067647ea70b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:29:42 +0100
Subject: [PATCH 0847/1065] lucene: add license + description

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

diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix
index 6f6534cee3e..691b9905b04 100644
--- a/pkgs/development/libraries/java/lucene/default.nix
+++ b/pkgs/development/libraries/java/lucene/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh";
   };
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Java full-text search engine";
+    platforms = platforms.unix;
+    license = licenses.asl20;
   };
 }
-- 
GitLab


From 645b5a0e82434297d196f3ecf6f2c101faa576e2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 1 Nov 2018 21:34:18 +0100
Subject: [PATCH 0848/1065] mockobjects: add license + description

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

diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix
index 551375d33bd..ae93765ff98 100644
--- a/pkgs/development/libraries/java/mockobjects/default.nix
+++ b/pkgs/development/libraries/java/mockobjects/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation {
     sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz";
   };
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Generic unit testing framework and methodology for testing any kind of code";
+    platforms = platforms.unix;
+    license = licenses.asl20;
   };
 }
-- 
GitLab


From 678e28dfd582081ce72780ec51857279db810c6d Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <git@echooff.de>
Date: Thu, 1 Nov 2018 23:52:52 +0100
Subject: [PATCH 0849/1065] yarn: 1.10.1 -> 1.12.1 (#49616)

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

diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index 47a11e1b7f4..be2b0689f92 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yarn-${version}";
-  version = "1.10.1";
+  version = "1.12.1";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "0j9y53k0wxgwjvvpbs6rr4nbydg3bn4khcxsrnzyrakym0ihgmr1";
+    sha256 = "084xci8y5na2765sh8flc8c5z7fik62filf1p58aqrb2000vna1j";
   };
 
   buildInputs = [ nodejs ];
-- 
GitLab


From c8c1ed2c78b50e5db5ae715d3f037956ee6d44db Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Mon, 29 Oct 2018 20:22:40 +0000
Subject: [PATCH 0850/1065] nixos/zerotier: binds to network-online.target to
 avoid the 1m30s timeout before kill on shutdown

---
 nixos/modules/services/networking/zerotierone.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix
index a4cd368397e..764af3846fe 100644
--- a/nixos/modules/services/networking/zerotierone.nix
+++ b/nixos/modules/services/networking/zerotierone.nix
@@ -39,7 +39,8 @@ in
     systemd.services.zerotierone = {
       description = "ZeroTierOne";
       path = [ cfg.package ];
-      after = [ "network.target" ];
+      bindsTo = [ "network-online.target" ];
+      after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
       preStart = ''
         mkdir -p /var/lib/zerotier-one/networks.d
-- 
GitLab


From 1a91d50ff2b621d5ea91d88f66acad7072c87dd3 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Fri, 2 Nov 2018 00:11:07 +0100
Subject: [PATCH 0851/1065] dropwatch: init at 1.5 (#49593)

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

diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix
new file mode 100644
index 00000000000..936dbf719a8
--- /dev/null
+++ b/pkgs/os-specific/linux/dropwatch/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, libnl, readline, libbfd, ncurses, zlib }:
+
+stdenv.mkDerivation rec {
+  pname = "dropwatch";
+  version = "1.5";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "nhorman";
+    repo = pname;
+    rev = version;
+    sha256 = "085hyyl28v0vpxfnmzchl97fjfnzj46ynhkg6y4i6h194y0d99m7";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  buildInputs = [ libbfd libnl ncurses readline zlib ];
+
+  # To avoid running into https://sourceware.org/bugzilla/show_bug.cgi?id=14243 we need to define:
+  NIX_CFLAGS_COMPILE = [
+    "-DPACKAGE=${pname}"
+    "-DPACKAGE_VERSION=${version}"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Kernel dropped packet monitor";
+    homepage = https://github.com/nhorman/dropwatch;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.c0bw3b ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a5a4ac6f92..20dbd2552dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14018,6 +14018,8 @@ with pkgs;
 
   drbd = callPackage ../os-specific/linux/drbd { };
 
+  dropwatch = callPackage ../os-specific/linux/dropwatch { };
+
   dstat = callPackage ../os-specific/linux/dstat { };
 
   # unstable until the first 1.x release
-- 
GitLab


From 3f0fa6296a52d5513f86659f4b7d1813a0e59fee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@github.danieldk.eu>
Date: Fri, 2 Nov 2018 00:13:43 +0100
Subject: [PATCH 0852/1065] leveldb: 1.18 -> 1.20 (#49587)

Changelog:

1.20: https://github.com/google/leveldb/releases/tag/v1.20
1.19: https://github.com/google/leveldb/releases/tag/v1.19
---
 pkgs/development/libraries/leveldb/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index 2b50c09af5c..c459a4048e4 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -2,21 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "leveldb-${version}";
-  version = "1.18";
+  version = "1.20";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "leveldb";
     rev = "v${version}";
-    sha256 = "1bnsii47vbyqnbah42qgq6pbmmcg4k3fynjnw7whqfv6lpdgmb8d";
+    sha256 = "01kxga1hv4wp94agx5vl3ybxfw5klqrdsrb6p6ywvnjmjxm8322y";
   };
 
   buildPhase = ''
-    make all leveldbutil libmemenv.a
+    make all
   '';
 
   installPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
-    for file in *.dylib*; do
+    for file in out-shared/*.dylib*; do
       install_name_tool -id $out/lib/$file $file
     done
   '') + # XXX consider removing above after transition to cmake in the next release
@@ -27,9 +27,10 @@ stdenv.mkDerivation rec {
     mkdir -p $out/include/leveldb/helpers
     cp helpers/memenv/memenv.h $out/include/leveldb/helpers
 
-    cp lib* $out/lib
+    cp out-shared/lib* $out/lib
+    cp out-static/lib* $out/lib
 
-    cp leveldbutil $out/bin
+    cp out-static/leveldbutil $out/bin
   ";
 
   meta = with stdenv.lib; {
-- 
GitLab


From 0810d631a489fcd819eafc530c45e768570ace8d Mon Sep 17 00:00:00 2001
From: Brian Olsen <brian@maven-group.org>
Date: Thu, 1 Nov 2018 23:55:44 +0100
Subject: [PATCH 0853/1065] nixos/rspamd: Add support for included files

By default rspamd will look for multiple files in /etc/rspamd/local.d
and /etc/rspamd/override.d to be included in subsections of the merged
final config for rspamd. Most of the config snippets in the official
rspamd documentation are made to these files and so it makes sense for
NixOS to support them and this is what this commit does.

As part of rspamd 1.8.1 support was added for having custom Lua
rules stored in $LOCAL_CONFDIR/rspamd.local.lua which means that it is
now possible for NixOS to support such rules and so this commit also
adds support for this to the rspamd module.
---
 nixos/modules/services/mail/rspamd.nix | 79 +++++++++++++++++++++++++-
 nixos/tests/rspamd.nix                 | 77 ++++++++++++++++++++++++-
 2 files changed, 151 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index ff01a5dee53..d83d6f1f750 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -127,11 +127,15 @@ let
       options {
         pidfile = "$RUNDIR/rspamd.pid";
         .include "$CONFDIR/options.inc"
+        .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/options.inc"
+        .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc"
       }
 
       logging {
         type = "syslog";
         .include "$CONFDIR/logging.inc"
+        .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/logging.inc"
+        .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc"
       }
 
       ${concatStringsSep "\n" (mapAttrsToList (name: value: ''
@@ -149,6 +153,41 @@ let
       ${cfg.extraConfig}
    '';
 
+  rspamdDir = pkgs.linkFarm "etc-rspamd-dir" (
+    (mapAttrsToList (name: file: { name = "local.d/${name}"; path = file.source; }) cfg.locals) ++
+    (mapAttrsToList (name: file: { name = "override.d/${name}"; path = file.source; }) cfg.overrides) ++
+    (optional (cfg.localLuaRules != null) { name = "rspamd.local.lua"; path = cfg.localLuaRules; }) ++
+    [ { name = "rspamd.conf"; path = rspamdConfFile; } ]
+  );
+
+  configFileModule = prefix: { name, config, ... }: {
+    options = {
+      enable = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether this file ${prefix} should be generated.  This
+          option allows specific ${prefix} files to be disabled.
+        '';
+      };
+
+      text = mkOption {
+        default = null;
+        type = types.nullOr types.lines;
+        description = "Text of the file.";
+      };
+
+      source = mkOption {
+        type = types.path;
+        description = "Path of the source file.";
+      };
+    };
+    config = {
+      source = mkIf (config.text != null) (
+        let name' = "rspamd-${prefix}-" + baseNameOf name;
+        in mkDefault (pkgs.writeText name' config.text));
+    };
+  };
 in
 
 {
@@ -167,6 +206,41 @@ in
         description = "Whether to run the rspamd daemon in debug mode.";
       };
 
+      locals = mkOption {
+        type = with types; loaOf (submodule (configFileModule "locals"));
+        default = {};
+        description = ''
+          Local configuration files, written into <filename>/etc/rspamd/local.d/{name}</filename>.
+        '';
+        example = literalExample ''
+          { "redis.conf".source = "/nix/store/.../etc/dir/redis.conf";
+            "arc.conf".text = "allow_envfrom_empty = true;";
+          }
+        '';
+      };
+
+      overrides = mkOption {
+        type = with types; loaOf (submodule (configFileModule "overrides"));
+        default = {};
+        description = ''
+          Overridden configuration files, written into <filename>/etc/rspamd/override.d/{name}</filename>.
+        '';
+        example = literalExample ''
+          { "redis.conf".source = "/nix/store/.../etc/dir/redis.conf";
+            "arc.conf".text = "allow_envfrom_empty = true;";
+          }
+        '';
+      };
+
+      localLuaRules = mkOption {
+        default = null;
+        type = types.nullOr types.path;
+        description = ''
+          Path of file to link to <filename>/etc/rspamd/rspamd.local.lua</filename> for local
+          rules written in Lua
+        '';
+      };
+
       workers = mkOption {
         type = with types; attrsOf (submodule workerOpts);
         description = ''
@@ -242,16 +316,17 @@ in
       gid = config.ids.gids.rspamd;
     };
 
-    environment.etc."rspamd.conf".source = rspamdConfFile;
+    environment.etc."rspamd".source = rspamdDir;
 
     systemd.services.rspamd = {
       description = "Rspamd Service";
 
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
+      restartTriggers = [ rspamdDir ];
 
       serviceConfig = {
-        ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f";
+        ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c /etc/rspamd/rspamd.conf -f";
         Restart = "always";
         RuntimeDirectory = "rspamd";
         PrivateTmp = true;
diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix
index a12622b6aa0..af765f37b91 100644
--- a/nixos/tests/rspamd.nix
+++ b/nixos/tests/rspamd.nix
@@ -27,7 +27,7 @@ let
       $machine->succeed("id \"rspamd\" >/dev/null");
       ${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "660" }
       sleep 10;
-      $machine->log($machine->succeed("cat /etc/rspamd.conf"));
+      $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf"));
       $machine->log($machine->succeed("systemctl cat rspamd.service"));
       $machine->log($machine->succeed("curl http://localhost:11334/auth"));
       $machine->log($machine->succeed("curl http://127.0.0.1:11334/auth"));
@@ -55,7 +55,7 @@ in
       $machine->waitForFile("/run/rspamd.sock");
       ${checkSocket "/run/rspamd.sock" "root" "root" "600" }
       ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" }
-      $machine->log($machine->succeed("cat /etc/rspamd.conf"));
+      $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf"));
       $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat"));
       $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping"));
     '';
@@ -86,9 +86,80 @@ in
       $machine->waitForFile("/run/rspamd.sock");
       ${checkSocket "/run/rspamd.sock" "root" "root" "600" }
       ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" }
-      $machine->log($machine->succeed("cat /etc/rspamd.conf"));
+      $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf"));
       $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat"));
       $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping"));
     '';
   };
+  customLuaRules = makeTest {
+    name = "rspamd-custom-lua-rules";
+    machine = {
+      environment.etc."tests/no-muh.eml".text = ''
+        From: Sheep1<bah@example.com>
+        To: Sheep2<mah@example.com>
+        Subject: Evil cows
+
+        I find cows to be evil don't you?
+      '';
+      environment.etc."tests/muh.eml".text = ''
+        From: Cow<cow@example.com>
+        To: Sheep2<mah@example.com>
+        Subject: Evil cows
+
+        Cows are majestic creatures don't Muh agree?
+      '';
+      services.rspamd = {
+        enable = true;
+        locals."groups.conf".text = ''
+          group "cows" {
+            symbol {
+              NO_MUH = {
+                weight = 1.0;
+                description = "Mails should not muh";
+              }
+            }
+          }
+        '';
+        localLuaRules = pkgs.writeText "rspamd.local.lua" ''
+          local rspamd_logger = require "rspamd_logger"
+          rspamd_config.NO_MUH = {
+            callback = function (task)
+              local parts = task:get_text_parts()
+              if parts then
+                for _,part in ipairs(parts) do
+                  local content = tostring(part:get_content())
+                  rspamd_logger.infox(rspamd_config, 'Found content %s', content)
+                  local found = string.find(content, "Muh");
+                  rspamd_logger.infox(rspamd_config, 'Found muh %s', tostring(found))
+                  if found then
+                    return true
+                  end
+                end
+              end
+              return false
+            end,
+            score = 5.0,
+	          description = 'Allow no cows',
+            group = "cows",
+          }
+          rspamd_logger.infox(rspamd_config, 'Work dammit!!!')
+        '';
+      };
+    };
+    testScript = ''
+      ${initMachine}
+      $machine->waitForOpenPort(11334);
+      $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf"));
+      $machine->log($machine->succeed("cat /etc/rspamd/rspamd.local.lua"));
+      $machine->log($machine->succeed("cat /etc/rspamd/local.d/groups.conf"));
+      ${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "660" }
+      $machine->log($machine->succeed("curl --unix-socket /run/rspamd/rspamd.sock http://localhost/ping"));
+      $machine->log($machine->succeed("rspamc -h 127.0.0.1:11334 stat"));
+      $machine->log($machine->succeed("cat /etc/tests/no-muh.eml | rspamc -h 127.0.0.1:11334"));
+      $machine->log($machine->succeed("cat /etc/tests/muh.eml | rspamc -h 127.0.0.1:11334 symbols"));
+      $machine->waitUntilSucceeds("journalctl -u rspamd | grep -i muh >&2");
+      $machine->log($machine->fail("cat /etc/tests/no-muh.eml | rspamc -h 127.0.0.1:11334 symbols | grep NO_MUH"));
+      $machine->log($machine->succeed("cat /etc/tests/muh.eml | rspamc -h 127.0.0.1:11334 symbols | grep NO_MUH"));
+    '';
+  };
 }
-- 
GitLab


From 10e3dde91f4f1a4628d295b5dc1716ace194d28f Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 2 Nov 2018 00:54:37 +0000
Subject: [PATCH 0854/1065] polybar: nuke reference to stdenv.cc, small clean
 up

---
 pkgs/applications/misc/polybar/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 0c358e4221a..9756e8ca6c4 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -64,10 +64,15 @@ stdenv.mkDerivation rec {
       (if i3Support || i3GapsSupport then makeWrapper else null)
     ];
 
-    fixupPhase = if (i3Support || i3GapsSupport) then ''
-    wrapProgram $out/bin/polybar \
-      --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin"
-  '' else null;
+    postConfigure = ''
+      substituteInPlace ../include/settings.hpp --replace \
+        "${stdenv.cc}" "${stdenv.cc.name}"
+    '';
+
+    postInstall = if (i3Support || i3GapsSupport) then ''
+      wrapProgram $out/bin/polybar \
+        --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin"
+    '' else "";
 
     nativeBuildInputs = [
       cmake pkgconfig
-- 
GitLab


From 1ed146b438dba092af44fcae1e0e90f66573657e Mon Sep 17 00:00:00 2001
From: Lysergia <prikhi@users.noreply.github.com>
Date: Thu, 1 Nov 2018 22:08:19 -0400
Subject: [PATCH 0855/1065] lightdm-mini-greeter: 0.3.2 -> 0.3.3 (#49619)

New upstream release.
---
 .../display-managers/lightdm-mini-greeter/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
index ef80aa00563..cf5c30a1ead 100644
--- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lightdm-mini-greeter-${version}";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "prikhi";
     repo = "lightdm-mini-greeter";
     rev = version;
-    sha256 = "1g3lrh034w38hiq96b0xmghmlf87hcycwdh06dwkdksr0hl08wxy";
+    sha256 = "1xlj5wqagp765rqw40ci4wir21qwyszasynk82x8308k5d3asvwb";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "A minimal, configurable, single-user GTK3 LightDM greeter";
     homepage = https://github.com/prikhi/lightdm-mini-greeter;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ mnacamura ];
+    maintainers = with maintainers; [ mnacamura prikhi ];
     platforms = platforms.linux;
   };
 }
-- 
GitLab


From c246b5283c6805a1e3d222fb9271301a72451150 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 2 Nov 2018 02:10:11 +0000
Subject: [PATCH 0856/1065] perldevel: 5.29.3 -> 5.29.4 (#49624)

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

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 42cc2a518d6..8d21d92ef43 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -186,7 +186,7 @@ in rec {
 
   # the latest Devel version
   perldevel = common {
-    version = "5.29.3";
-    sha256 = "054xi629408p2hv9475jghv6zd1bj69qqpiby8cy9qw5vismgi17";
+    version = "5.29.4";
+    sha256 = "153r0f6jdqrl7hxrvhfivf5g8ivhbvggfhg841q3hi3db5rc86k4";
   };
 }
-- 
GitLab


From 62429fe41b3ac06705ae9d8ddf5b66afa739c65a Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 20 Oct 2018 22:56:20 -0400
Subject: [PATCH 0857/1065] raspberrypiWirelessFirmware: 2018-05-30 ->
 2018-08-20

---
 .../firmware/raspberrypi-wireless/default.nix | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
index eb5b0bd294c..89b4f70264e 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
@@ -1,52 +1,51 @@
-{ stdenv, fetchurl, dpkg }:
+{ stdenv, fetchurl, fetchFromGitHub, dpkg }:
 
 stdenv.mkDerivation rec {
   name = "raspberrypi-wireless-firmware-${version}";
-  version = "2018-05-30";
+  version = "2018-08-20";
 
   srcs = [
-    (fetchurl {
-      url = "https://archive.raspberrypi.org/debian/pool/main/b/bluez-firmware/bluez-firmware_1.2-3+rpt5.debian.tar.xz";
-      sha256 = "06zpyrz6frkgjy26hr3998klnhjdqxwashgjgvj9rgbcqy70nkxg";
+    (fetchFromGitHub {
+      name = "bluez-firmware";
+      owner = "RPi-Distro";
+      repo = "bluez-firmware";
+      rev = "ade2bae1aaaebede09abb8fb546f767a0e4c7804";
+      sha256 = "07gm76gxp5anv6paryvxcp34a86fkny8kdlzqhzcpfczzglkp6ag";
     })
-    (fetchurl {
-      url = "https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/firmware-brcm80211_20161130-3+rpt3_all.deb";
-      sha256 = "10l74ac28baprnsiylf2vy4pkxgb3crixid90ngs6si9smm7rn6z";
+    (fetchFromGitHub {
+      name = "firmware-nonfree";
+      owner = "RPi-Distro";
+      repo = "firmware-nonfree";
+      rev = "b518de45ced519e8f7a499f4778100173402ae43";
+      sha256 = "1d5026ic9awji6c67irpwsxpxgsc0dhn11d3abkxi2vvra1pir4g";
     })
   ];
 
   sourceRoot = ".";
+
   dontBuild = true;
   # Firmware blobs do not need fixing and should not be modified
   dontFixup = true;
 
-
-  # Unpack the debian package
-  nativeBuildInputs = [ dpkg ];
-  unpackCmd = ''
-    if ! [[ "$curSrc" =~ \.deb$ ]]; then return 1; fi
-    dpkg -x "$curSrc" .
-  '';
-
   installPhase = ''
     mkdir -p "$out/lib/firmware/brcm"
 
     # Wifi firmware
-    for filename in lib/firmware/brcm/brcmfmac434??-sdio.*; do
+    for filename in firmware-nonfree/brcm/brcmfmac434??-sdio.*; do
       cp "$filename" "$out/lib/firmware/brcm"
     done
 
     # Bluetooth firmware
-    cp broadcom/*.hcd "$out/lib/firmware/brcm"
+    cp bluez-firmware/broadcom/*.hcd "$out/lib/firmware/brcm"
   '';
 
   outputHashMode = "recursive";
   outputHashAlgo = "sha256";
-  outputHash = "1gwzasl5w5nc0awqv3w2081ns63wd1yds0xh0dg95dc6brnqhhf8";
+  outputHash = "1s5gb00v42s5izbaw8irs1fwvhh7z9wl07czc0nkw6p91871ivb7";
 
   meta = with stdenv.lib; {
     description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3 and Zero W";
-    homepage = https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/;
+    homepage = https://github.com/RPi-Distro/firmware-nonfree;
     license = licenses.unfreeRedistributableFirmware;
     platforms = platforms.linux;
     maintainers = with maintainers; [ lopsided98 ];
-- 
GitLab


From f422f8d0ad94cbb0ba1d0daf2c5a95e8ddf14a4d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 1 Nov 2018 22:29:18 -0500
Subject: [PATCH 0858/1065] pyre: fix darwin build

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

diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index 99e53610c01..108f8bdb3ab 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -77,7 +77,7 @@ let
     description = "A performant type-checker for Python 3";
     homepage = https://pyre-check.org;
     license = licenses.mit;
-    platforms = with platforms; linux;
+    platforms = ocamlPackages.ocaml.meta.platforms;
     maintainers = with maintainers; [ teh ];
   };
 };
-- 
GitLab


From c7c278dc0fdf97aea865efebb76454df6b44af2b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 1 Nov 2018 22:31:11 -0500
Subject: [PATCH 0859/1065] pyre: enable tests

---
 pkgs/development/tools/pyre/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index 108f8bdb3ab..a0ea5f59f25 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 }:
+, dune, python3, rsync, fetchpatch, buck }:
 let
   # Manually set version - the setup script requires
   # hg and git + keeping the .git directory around.
@@ -120,6 +120,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"
+    substituteInPlace client/buck.py \
+        --replace '"buck"' '"${buck}/bin/buck"'
+    substituteInPlace client/tests/buck_test.py \
+        --replace '"buck"' '"${buck}/bin/buck"'
   '';
 
   buildInputs = [ pyre-bin rsync ];
@@ -128,6 +132,8 @@ in python3.pkgs.buildPythonApplication rec {
     bash scripts/build-pypi-package.sh --version ${pyre-version} --bundle-typeshed ${typeshed}
     cp -r build/dist dist
   '';
-
-  doCheck = false; # can't open file 'nix_run_setup':
+  checkPhase = ''
+    sed -i 's/which python3/command -v python3/g' scripts/run-python-tests.sh
+    bash scripts/run-python-tests.sh
+  '';
 }
-- 
GitLab


From 61aa7e0e2905d9614e01633bdb54a10a82ef2280 Mon Sep 17 00:00:00 2001
From: Peter Romfeld <peter.romfeld.hk@gmail.com>
Date: Fri, 2 Nov 2018 15:10:18 +0800
Subject: [PATCH 0860/1065] fastlane: 2.105.2 -> 2.107.0

---
 pkgs/tools/admin/fastlane/Gemfile.lock | 10 +++++-----
 pkgs/tools/admin/fastlane/gemset.nix   | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock
index 631d9cb9628..88162a3432d 100644
--- a/pkgs/tools/admin/fastlane/Gemfile.lock
+++ b/pkgs/tools/admin/fastlane/Gemfile.lock
@@ -26,7 +26,7 @@ GEM
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.4)
-    fastlane (2.105.2)
+    fastlane (2.107.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -71,10 +71,10 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
       signet (~> 0.9)
-    googleauth (0.6.6)
+    googleauth (0.6.7)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.12)
+      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.7)
@@ -105,7 +105,7 @@ GEM
     rouge (2.0.7)
     rubyzip (1.2.2)
     security (0.1.3)
-    signet (0.10.0)
+    signet (0.11.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
@@ -127,7 +127,7 @@ GEM
     unf_ext (0.0.7.5)
     unicode-display_width (1.4.0)
     word_wrap (1.0.0)
-    xcodeproj (1.6.0)
+    xcodeproj (1.7.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix
index c2133c7c8c9..5afad1683c9 100644
--- a/pkgs/tools/admin/fastlane/gemset.nix
+++ b/pkgs/tools/admin/fastlane/gemset.nix
@@ -153,10 +153,10 @@
     dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fq1zqvwim939klkx2893cbm1v4gi3a991qrj8933l3qg1y41fx2";
+      sha256 = "1d3jv7ik3rivmhxzcapia2lzf9xjmjgi4yxkl60ly6pcbbvhl48w";
       type = "gem";
     };
-    version = "2.105.2";
+    version = "2.107.0";
   };
   gh_inspector = {
     source = {
@@ -179,10 +179,10 @@
     dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l";
+      sha256 = "1yj7j1rnyamxpn5ybgdgbiw89v9bq2r0h85s2y2jzvqanvm7iflq";
       type = "gem";
     };
-    version = "0.6.6";
+    version = "0.6.7";
   };
   highline = {
     source = {
@@ -367,10 +367,10 @@
     dependencies = ["addressable" "faraday" "jwt" "multi_json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14rhv3riz6ki4ix4l79b6ckq7d015673gxkxvzdcxjl1h8plpdcy";
+      sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4";
       type = "gem";
     };
-    version = "0.10.0";
+    version = "0.11.0";
   };
   simctl = {
     dependencies = ["CFPropertyList" "naturally"];
@@ -476,10 +476,10 @@
     dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1f4shbzff3wsk1jq0v9bs10496qdx69k2jfpf11p4q2ik3jdnsv7";
+      sha256 = "1hy2ihcqfjlsrnf8qkm51m1kk154yp0l0007f269ky8j9z5lyw3p";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.7.0";
   };
   xcpretty = {
     dependencies = ["rouge"];
-- 
GitLab


From 6a449c0742be295deb0f6edc25ff94870bb5250e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 2 Nov 2018 08:51:24 +0000
Subject: [PATCH 0861/1065] coqPackages.contribs.zfc: enable for Coq 8.8

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

diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix
index d12d3fefb94..a1ecdd610a3 100644
--- a/pkgs/development/coq-modules/contribs/default.nix
+++ b/pkgs/development/coq-modules/contribs/default.nix
@@ -1018,7 +1018,7 @@ let mkContrib = repo: revs: param:
     sha256 = "0fp3vdl79c8d759qjhk42rjfpkd0ba4pcw572f5gxn28kfwz3rrj";
   };
 
-  zfc = mkContrib "zfc" [ "8.5" "8.6" "8.7" ] {
+  zfc = mkContrib "zfc" [ "8.5" "8.6" "8.7" "8.8" ] {
     version = "v8.5.0-5-gbba3259";
     rev = "bba325933370fea64780b1afa2fad54c1b567819";
     sha256 = "0iwkpmc22nwasrk4g7ki4s5y05zjs7kmqk3j98giwp2wiavhgapn";
-- 
GitLab


From de6d025592be1ade67166817abf1e624d1c7e642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 2 Nov 2018 09:20:05 +0100
Subject: [PATCH 0862/1065] mupdf: 1.13.0 -> 1.14.0

Changelog: https://mupdf.com/release_history.html
---
 pkgs/applications/misc/mupdf/darwin.patch     | 71 +++++++------------
 pkgs/applications/misc/mupdf/default.nix      | 18 ++---
 .../misc/mupdf/mupdf-1.13-shared_libs-1.patch | 45 ------------
 .../misc/mupdf/mupdf-1.14-shared_libs.patch   | 39 ++++++++++
 4 files changed, 72 insertions(+), 101 deletions(-)
 delete mode 100644 pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch
 create mode 100644 pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch

diff --git a/pkgs/applications/misc/mupdf/darwin.patch b/pkgs/applications/misc/mupdf/darwin.patch
index 7466fc2ca62..be1b84b0012 100644
--- a/pkgs/applications/misc/mupdf/darwin.patch
+++ b/pkgs/applications/misc/mupdf/darwin.patch
@@ -1,47 +1,30 @@
-diff --git a/Makerules b/Makerules
---- a/Makerules
-+++ b/Makerules
-@@ -81,22 +81,10 @@ HAVE_GLUT ?= yes
- SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
- 
--CC = xcrun cc
--AR = xcrun ar
--LD = xcrun ld
--RANLIB_CMD = xcrun ranlib $@
--
--# Linux uses pkg-config for system libraries.
--else ifeq "$(OS)" "Linux"
+diff -ruN mupdf-1.14.0-source.orig/Makerules mupdf-1.14.0-source/Makerules
+--- mupdf-1.14.0-source.orig/Makerules	2018-11-02 06:57:12.114012496 +0100
++++ mupdf-1.14.0-source/Makerules	2018-11-02 10:11:56.717232992 +0100
+@@ -80,13 +80,6 @@
+   HAVE_GLUT := yes
+   SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
+   SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
+-  CC = xcrun cc
+-  AR = xcrun ar
+-  LD = xcrun ld
+-  RANLIB = xcrun ranlib
 -
- HAVE_PTHREAD := yes
- SYS_PTHREAD_CFLAGS :=
- SYS_PTHREAD_LIBS := -lpthread
+-else ifeq ($(OS),Linux)
+-  HAVE_OBJCOPY := yes
  
--HAVE_GLUT := yes
--SYS_GLUT_CFLAGS :=
--SYS_GLUT_LIBS := -lglut -lGL
--
- ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
- HAVE_LIBCRYPTO := yes
- SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
-@@ -113,7 +101,7 @@ SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl)
- SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
- endif
- endif
--SYS_CURL_DEPS += -lpthread -lrt
-+SYS_CURL_DEPS += -lpthread
+   ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
+ 	SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+@@ -119,12 +112,6 @@
+ 	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
+   endif
  
- ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
- HAVE_X11 := yes
-diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c
-index d58f7ba..808af18 100644
---- a/platform/gl/gl-main.c
-+++ b/platform/gl/gl-main.c
-@@ -16,6 +16,7 @@ void glutExit(void) {}
- void glutMouseWheelFunc(void *fn) {}
- void glutInitErrorFunc(void *fn) {}
- void glutInitWarningFunc(void *fn) {}
-+#define glutSetOption(X,Y)
- #endif
- 
- enum
+-  HAVE_GLUT := yes
+-  ifeq ($(HAVE_GLUT),yes)
+-	SYS_GLUT_CFLAGS :=
+-	SYS_GLUT_LIBS := -lglut -lGL
+-  endif
+-
+   HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
+   ifeq ($(HAVE_X11),yes)
+ 	X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index bce2a79cde3..d4f59272c9c 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg
+{ stdenv, lib, fetchurl, pkgconfig, freetype, harfbuzz, openjpeg
 , jbig2dec, libjpeg , darwin
 , enableX11 ? true, libX11, libXext, libXi, libXrandr
 , enableCurl ? true, curl, openssl
@@ -14,23 +14,17 @@ let
 
 
 in stdenv.mkDerivation rec {
-  version = "1.13.0";
+  version = "1.14.0";
   name = "mupdf-${version}";
 
   src = fetchurl {
     url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz";
-    sha256 = "02faww5bnjw76k6igrjzwf0lnw4xd9ckc8d6ilc3c4gfrdi6j707";
+    sha256 = "093p7lv6pgyymagn28n58fs0np928r0i5p2az9cc4gwccwx4hhy4";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2018-10289.patch";
-      url = "https://bugs.ghostscript.com/attachment.cgi?id=15230";
-      sha256 = "0jmpacxd9930g6k57kda9jrcrbk75whdlv8xwmqg5jwn848qvy4q";
-    })
-  ]
+  patches =
     # Use shared libraries to decrease size
-    ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.13-shared_libs-1.patch
+       stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch
     ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch
   ;
 
@@ -38,7 +32,7 @@ in stdenv.mkDerivation rec {
     sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
   '';
 
-  makeFlags = [ "prefix=$(out)" ];
+  makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ];
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ]
                 ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
diff --git a/pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch b/pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch
deleted file mode 100644
index e29f1f52077..00000000000
--- a/pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- mupdf-1.12.0-source.orig/Makefile	2017-12-13 15:00:30.000000000 +0100
-+++ mupdf-1.12.0-source/Makefile	2017-12-31 00:05:23.003277481 +0100
-@@ -14,7 +14,7 @@
- # Do not specify CFLAGS or LIBS on the make invocation line - specify
- # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
- # set a variable that was set on the command line.
--CFLAGS += $(XCFLAGS) -Iinclude
-+CFLAGS += $(XCFLAGS) -Iinclude -fPIC
- LIBS += $(XLIBS) -lm
- 
- LIBS += $(FREETYPE_LIBS)
-@@ -312,10 +312,10 @@
- 
- # --- Library ---
- 
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdfthird.a
--THREAD_LIB = $(OUT)/libmuthreads.a
--PKCS7_LIB = $(OUT)/libmupkcs7.a
-+MUPDF_LIB = $(OUT)/libmupdf.so
-+THIRD_LIB = $(OUT)/libmupdfthird.so
-+THREAD_LIB = $(OUT)/libmuthreads.so
-+PKCS7_LIB = $(OUT)/libmupkcs7.so
- 
- MUPDF_OBJ := \
- 	$(FITZ_OBJ) \
-@@ -343,13 +343,17 @@
- 	$(ZLIB_OBJ) \
- 	$(LCMS2_OBJ)
- 
--$(MUPDF_LIB) : $(MUPDF_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined
- $(THIRD_LIB) : $(THIRD_OBJ)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so -Wl,--no-undefined
- $(THREAD_LIB) : $(THREAD_OBJ)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so -Wl,--no-undefined -lpthread
- $(PKCS7_LIB) : $(PKCS7_OBJ)
-+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupkcs7.so
- 
--INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
- 
- # --- Tools and Apps ---
- 
diff --git a/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch b/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch
new file mode 100644
index 00000000000..131a1bbbf6b
--- /dev/null
+++ b/pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch
@@ -0,0 +1,39 @@
+--- mupdf-1.14.0-source.orig/Makefile	2018-11-02 06:57:12.114012496 +0100
++++ mupdf-1.14.0-source/Makefile	2018-11-02 09:57:10.067945307 +0100
+@@ -20,7 +20,7 @@
+ # Do not specify CFLAGS or LIBS on the make invocation line - specify
+ # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
+ # set a variable that was set on the command line.
+-CFLAGS += $(XCFLAGS) -Iinclude
++CFLAGS += $(XCFLAGS) -Iinclude -fPIC
+ LIBS += $(XLIBS) -lm
+ 
+ ifneq ($(threading),no)
+@@ -190,17 +190,21 @@
+ 
+ # --- Library ---
+ 
+-MUPDF_LIB = $(OUT)/libmupdf.a
+-THIRD_LIB = $(OUT)/libmupdf-third.a
+-THREAD_LIB = $(OUT)/libmupdf-threads.a
+-PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
++MUPDF_LIB = $(OUT)/libmupdf.so
++THIRD_LIB = $(OUT)/libmupdf-third.so
++THREAD_LIB = $(OUT)/libmupdf-threads.so
++PKCS7_LIB = $(OUT)/libmupdf-pkcs7.so
+ 
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
++	$(LINK_CMD) $(THIRD_LIBS) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined
+ $(THIRD_LIB) : $(THIRD_OBJ)
++	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so -Wl,--no-undefined
+ $(THREAD_LIB) : $(THREAD_OBJ)
++	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-threads.so -Wl,--no-undefined -lpthread
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
++	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-pkcs7.so
+ 
+-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
+ 
+ # --- Main tools and viewers ---
+ 
-- 
GitLab


From 73cdd5a4762b3372634eed039912a0e25a5fd501 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 2 Nov 2018 10:18:51 +0100
Subject: [PATCH 0863/1065] nixos/tests/chromium: Fix sandbox info matching

As reported by @andir, the regular expressions that match the sandbox
output are no longer matching in the recent Chromium bump as of
bb03fbc2c8b97ef5a4f4205eee51029155164b8a.

Instead of a boolean field that determines whether namespace sandboxes
are on, the namespace sandbox is now an enum within "Layer 1 Sandbox".

I've modified the regular expressions accordingly and also ran the test
for the stable branch, which now succeeds.

Signed-off-by: aszlig <aszlig@nix.build>
Issue: https://github.com/NixOS/nixpkgs/issues/49442
Cc: @bendlas, @andir
---
 nixos/tests/chromium.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index fcc55a59a21..e5097609fb2 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -168,7 +168,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
 
       my $clipboard = $machine->succeed(ru "${pkgs.xclip}/bin/xclip -o");
       die "sandbox not working properly: $clipboard"
-      unless $clipboard =~ /namespace sandbox.*yes/mi
+      unless $clipboard =~ /layer 1 sandbox.*namespace/mi
           && $clipboard =~ /pid namespaces.*yes/mi
           && $clipboard =~ /network namespaces.*yes/mi
           && $clipboard =~ /seccomp.*sandbox.*yes/mi
@@ -186,7 +186,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
 
       my $clipboard = $machine->succeed(ru "${pkgs.xclip}/bin/xclip -o");
       die "copying twice in a row does not work properly: $clipboard"
-      unless $clipboard =~ /namespace sandbox.*yes/mi
+      unless $clipboard =~ /layer 1 sandbox.*namespace/mi
           && $clipboard =~ /pid namespaces.*yes/mi
           && $clipboard =~ /network namespaces.*yes/mi
           && $clipboard =~ /seccomp.*sandbox.*yes/mi
-- 
GitLab


From 7bd88054088149bebe4d2a63b182fe33d42556e1 Mon Sep 17 00:00:00 2001
From: ikarulus <github.ikarulus@zer.one>
Date: Fri, 2 Nov 2018 10:32:32 +0100
Subject: [PATCH 0864/1065] kicad 5.0.0 -> 5.0.1 (#49561)

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

diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index c92da3eeb29..5d0165eb6dd 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -13,11 +13,11 @@ with lib;
 stdenv.mkDerivation rec {
   name = "kicad-${version}";
   series = "5.0";
-  version = "5.0.0";
+  version = "5.0.1";
 
   src = fetchurl {
     url = "https://launchpad.net/kicad/${series}/${version}/+download/kicad-${version}.tar.xz";
-    sha256 = "17nqjszyvd25wi6550j981whlnb1wxzmlanljdjihiki53j84x9p";
+    sha256 = "0skig2wdxxc2677m8a8m1xrg3pkhqiqnmkcyr2hv0b2j30rzdr2z";
   };
 
   postPatch = ''
-- 
GitLab


From 1ccafe56f9b5bf967a30ad47b5ac947264cb0c4b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 2 Nov 2018 18:12:07 +0800
Subject: [PATCH 0865/1065] pythonPackages.broadlink: init at 0.9

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

diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix
new file mode 100644
index 00000000000..d1ecddded77
--- /dev/null
+++ b/pkgs/development/python-modules/broadlink/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchPypi, buildPythonPackage
+, pyaes, pycrc }:
+
+buildPythonPackage rec {
+  pname = "broadlink";
+  version = "0.9";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10dnd859yjh1h6qrxhvkslbsj5fh5g654xsq2yqblkkv3xd711rs";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace pyaes==1.6.0 pyaes
+    '';
+
+  propagatedBuildInputs = [ pyaes pycrc ];
+
+  # no tests available
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python API for controlling Broadlink IR controllers";
+    homepage =  http://github.com/mjg59/python-broadlink;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c5870b529c..f8b6990ce83 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -260,6 +260,8 @@ in {
 
   brotli = callPackage ../development/python-modules/brotli { };
 
+  broadlink = callPackage ../development/python-modules/broadlink { };
+
   browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { };
 
   browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {});
-- 
GitLab


From f8a415f793c5caa1f4469e84810fd33407a2e376 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 2 Nov 2018 18:12:19 +0800
Subject: [PATCH 0866/1065] home-assistant: make broadlink module available

---
 pkgs/servers/home-assistant/component-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index f1ee1eda95d..2a701dc870d 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -851,7 +851,7 @@
     "sensor.bme680" = ps: with ps; [  ];
     "sensor.bmw_connected_drive" = ps: with ps; [  ];
     "sensor.bom" = ps: with ps; [  ];
-    "sensor.broadlink" = ps: with ps; [  ];
+    "sensor.broadlink" = ps: with ps; [ broadlink ];
     "sensor.buienradar" = ps: with ps; [  ];
     "sensor.canary" = ps: with ps; [  ];
     "sensor.cert_expiry" = ps: with ps; [  ];
@@ -1139,7 +1139,7 @@
     "switch.arduino" = ps: with ps; [  ];
     "switch.arest" = ps: with ps; [  ];
     "switch.bbb_gpio" = ps: with ps; [  ];
-    "switch.broadlink" = ps: with ps; [  ];
+    "switch.broadlink" = ps: with ps; [ broadlink ];
     "switch.command_line" = ps: with ps; [  ];
     "switch.deconz" = ps: with ps; [  ];
     "switch.deluge" = ps: with ps; [ deluge-client ];
-- 
GitLab


From 91ce8c050fdc1bd3fb29caa54cade79adb04979d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 2 Nov 2018 06:42:05 -0500
Subject: [PATCH 0867/1065] pyre: 0.0.14 -> 0.0.17

---
 pkgs/development/tools/pyre/default.nix | 43 +++++++++----------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index a0ea5f59f25..382e733cb98 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -3,7 +3,13 @@
 let
   # Manually set version - the setup script requires
   # hg and git + keeping the .git directory around.
-  pyre-version = "0.0.14";
+  pyre-version = "0.0.17";  # also change typeshed revision below with $pyre-src/.typeshed-version
+  pyre-src = fetchFromGitHub {
+    owner = "facebook";
+    repo = "pyre-check";
+    rev = "v${pyre-version}";
+    sha256 = "0y86a3g5xbgh0byksyx5jw7yq7w840x85dhz9inz6mkg5j06mcis";
+  };
   versionFile = writeScript "version.ml" ''
     cat > "./version.ml" <<EOF
     open Core
@@ -20,12 +26,7 @@ let
  pyre-bin = stdenv.mkDerivation {
   name = "pyre-${pyre-version}";
 
-  src = fetchFromGitHub {
-    owner = "facebook";
-    repo = "pyre-check";
-    rev = "v${pyre-version}";
-    sha256 = "0c8xzaa3ljqb6llr041sydw0l4xqn7x21nw9vaymdxh35nx9bp2v";
-  };
+  src = pyre-src;
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -49,7 +50,6 @@ let
     export HOME=.
 
     # "external" because https://github.com/facebook/pyre-check/pull/8/files
-    cp Makefile.template Makefile
     sed "s/%VERSION%/external/" dune.in > dune
 
     cp ${versionFile} ./scripts/generate-version-number.sh
@@ -83,14 +83,12 @@ let
 };
 typeshed = stdenv.mkDerivation {
   name = "typeshed";
-  # typeshed doesn't have versions, it seems to be synchronized with
-  # mypy relases. I'm assigning a random version here (same as pyre).
   version = pyre-version;
   src = fetchFromGitHub {
     owner = "python";
     repo = "typeshed";
-    rev = "a08c6ea";
-    sha256 = "0wy8yh43vhyyc4g7iqnmlj66kz5in02y5qc0c4jdckhpa3mchaqk";
+    rev = "bc3f9fe1d3c43b00c04cedb23e0eeebc9e1734b6";
+    sha256 = "06b2kj4n49h4sgi8hn5kalmir8llhanfdc7f1924cxvrkj5ry94b";
   };
   phases = [ "unpackPhase" "installPhase" ];
   installPhase = "cp -r $src $out";
@@ -98,19 +96,8 @@ typeshed = stdenv.mkDerivation {
 in python3.pkgs.buildPythonApplication rec {
   pname = "pyre-check";
   version = pyre-version;
-  src = fetchFromGitHub {
-    owner = "facebook";
-    repo = "pyre-check";
-    rev = "v${pyre-version}";
-    sha256 = "0ig7bx2kfn2kbxw74wysh5365yp5gyby42l9l29iclrzdghgk32l";
-  };
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/facebook/pyre-check/commit/b473d2ed9fc11e7c1cd0c7b8c42f521e5cdc2003.patch";
-      sha256 = "05xvyp7j4n6z92bxf64rxfq5pvaadxgx1c8c5qziy75vdz72lkcy";
-    })
-    ./pyre-bdist-wheel.patch
-  ];
+  src = pyre-src;
+  patches = [ ./pyre-bdist-wheel.patch ];
 
   # The build-pypi-package script does some funky stuff with build
   # directories - easier to patch it a bit than to replace it
@@ -119,21 +106,21 @@ in python3.pkgs.buildPythonApplication rec {
     mkdir ./build
     substituteInPlace scripts/build-pypi-package.sh \
         --replace 'NIX_BINARY_FILE' '${pyre-bin}/bin/pyre.bin' \
-        --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$(pwd)/build"
+        --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$PWD/build"
     substituteInPlace client/buck.py \
         --replace '"buck"' '"${buck}/bin/buck"'
     substituteInPlace client/tests/buck_test.py \
         --replace '"buck"' '"${buck}/bin/buck"'
   '';
 
-  buildInputs = [ pyre-bin rsync ];
+  buildInputs = [ pyre-bin ];
+  nativeBuildInputs = [ rsync ]; # only required for build-pypi-package.sh
   propagatedBuildInputs = with python3.pkgs; [ docutils typeshed ];
   buildPhase = ''
     bash scripts/build-pypi-package.sh --version ${pyre-version} --bundle-typeshed ${typeshed}
     cp -r build/dist dist
   '';
   checkPhase = ''
-    sed -i 's/which python3/command -v python3/g' scripts/run-python-tests.sh
     bash scripts/run-python-tests.sh
   '';
 }
-- 
GitLab


From 4f8cac02c6d468abf0d57245fc624ad6e26c245a Mon Sep 17 00:00:00 2001
From: "Tristan Helmich (omniIT)" <tristan.helmich@omniit.de>
Date: Wed, 31 Oct 2018 20:25:30 +0100
Subject: [PATCH 0868/1065] simgrid: 3.20 -> 3.21

---
 pkgs/applications/science/misc/simgrid/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index b6cd8c294c1..258073e4080 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -18,13 +18,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "simgrid-${version}";
-  version = "3.20";
+  version = "3.21";
 
   src = fetchFromGitHub {
     owner = "simgrid";
     repo = "simgrid";
-    rev = "v${version}";
-    sha256 = "0xb20qhvsah2dz2hvn850i3w9a5ghsbcx8vka2ap6xsdkxf593gy";
+    rev = "v${replaceChars ["."] ["_"] version}";
+    sha256 = "1v0dwlww2wl56ms8lvg5zwffzbmz3sjzpkqc73f714mrc9g02bxs";
   };
 
   nativeBuildInputs = [ cmake perl python3 boost valgrind ]
@@ -107,6 +107,6 @@ stdenv.mkDerivation rec {
     homepage = http://simgrid.gforge.inria.fr/;
     license = licenses.lgpl2Plus;
     maintainers = with maintainers; [ mickours ];
-    platforms = platforms.x86_64;
+    platforms = ["x86_64-linux"];
   };
 }
-- 
GitLab


From 87e4e1ba72dafd0ea1208cd959d047c04612b4aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 2 Nov 2018 14:33:55 +0100
Subject: [PATCH 0869/1065] Revert "c-ares: 1.14.0 -> 1.15.0"

This reverts commit 5ace2703096f16fa924072f3743d6eaac35bec32.
It's a mass rebuild, moving to staging.
---
 pkgs/development/libraries/c-ares/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index efe7a5820b5..099d02c8263 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -2,14 +2,23 @@
 
 let self =
 stdenv.mkDerivation rec {
-  name = "c-ares-1.15.0";
+  name = "c-ares-1.14.0";
 
   src = fetchurl {
     url = "https://c-ares.haxx.se/download/${name}.tar.gz";
-    sha256 = "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc";
+    sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5";
   };
 
-  configureFlags = stdenv.lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" ];
+  configureFlags = if stdenv.hostPlatform.isWindows then [ "--disable-shared" "--enable-static" ] else null;
+
+  # ares_android.h header is missing
+  # see issue https://github.com/c-ares/c-ares/issues/216
+  postPatch = if stdenv.hostPlatform.isAndroid then ''
+    cp ${fetchurl {
+      url = "https://raw.githubusercontent.com/c-ares/c-ares/cares-1_14_0/ares_android.h";
+      sha256 = "1aw8y6r5c8zq6grjwf4mcm2jj35r5kgdklrp296214s1f1827ps8";
+    }} ares_android.h
+  '' else null;
 
   meta = with stdenv.lib; {
     description = "A C library for asynchronous DNS requests";
-- 
GitLab


From 93aa285376daea647df6d95c50622230d118fd01 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 23 Oct 2018 15:49:42 -0500
Subject: [PATCH 0870/1065] nixos: fix #48917 by setting
 SYSTEMD_TIMEDATED_NTP_SERVICES

Setting this variable in the environment of systemd-timedated allows
'timedatectl' to tell if an NTP service is running.

Closes #48917.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/networking/chrony.nix | 2 ++
 nixos/modules/services/networking/ntpd.nix   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index a363b545d64..9b8005e706a 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -93,6 +93,8 @@ in
 
     services.timesyncd.enable = mkForce false;
 
+    systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "chronyd.service"; };
+
     systemd.services.chronyd =
       { description = "chrony NTP daemon";
 
diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
index 342350d49ab..32174100b0f 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntpd.nix
@@ -67,6 +67,8 @@ in
     environment.systemPackages = [ pkgs.ntp ];
     services.timesyncd.enable = mkForce false;
 
+    systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "ntpd.service"; };
+
     users.users = singleton
       { name = ntpUser;
         uid = config.ids.uids.ntp;
-- 
GitLab


From 6a0e8c27380340751cc492b02b4efb1c83baf053 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 2 Nov 2018 09:26:42 -0500
Subject: [PATCH 0871/1065] .github/CODEOWNERS: add myself as the PostgreSQL
 owner

Since the development of #38698, I have been radically overhauling the
PostgreSQL support and plan on maintaining it in the long run, taking
over from @ocharles, who authored most of it initially.

However, while #38698 has not been merged (yet), I'm taking the time to
go ahead and add myself as the owner of all the related code, so that I
can be marked as a reviewer for things people submit in the mean time.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .github/CODEOWNERS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 76fb19529b0..f222af230bb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -97,3 +97,9 @@
 /pkgs/desktops/plasma-5 @ttuegel
 /pkgs/development/libraries/kde-frameworks @ttuegel
 /pkgs/development/libraries/qt-5 @ttuegel
+
+# PostgreSQL and related stuff
+/pkgs/servers/sql/postgresql @thoughtpolice
+/nixos/modules/services/databases/postgresql.xml @thoughtpolice
+/nixos/modules/services/databases/postgresql.nix @thoughtpolice
+/nixos/tests/postgresql.nix @thoughtpolice
-- 
GitLab


From 06acfb853fb6598237b944bb129da66593f228e6 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Sat, 27 Oct 2018 10:38:47 +0200
Subject: [PATCH 0872/1065] nomachine-client: init at 6.3.6_1

Packages mainly the nxplayer part of the client, since the tray
doesn't work very well without the server / a complete installation.

Use the shipped libs, since nxplayer really doesn't like any others. I
believe they use internally modified versions of many libs.

Audio doesn't work: the libasound.so shipped looks for the alsa config
files in the wrong place, and even if it finds them, it still doesn't
work. Using the one from alsaLib doesn't work either and adds
instability.
---
 maintainers/maintainer-list.nix               |  5 ++
 pkgs/tools/admin/nomachine-client/default.nix | 83 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 90 insertions(+)
 create mode 100644 pkgs/tools/admin/nomachine-client/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 22ea07b9f11..f04e02bb1c7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4143,6 +4143,11 @@
     github = "taku0";
     name = "Takuo Yonezawa";
   };
+  talyz = {
+    email = "kim.lindberger@gmail.com";
+    github = "talyz";
+    name = "Kim Lindberger";
+  };
   tari = {
     email = "peter@taricorp.net";
     github = "tari";
diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix
new file mode 100644
index 00000000000..be616c1bf9e
--- /dev/null
+++ b/pkgs/tools/admin/nomachine-client/default.nix
@@ -0,0 +1,83 @@
+{ stdenv, lib, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp }:
+let
+  versionMajor = "6.3";
+  versionMinor = "6_1";
+in
+  stdenv.mkDerivation rec {
+    name = "nomachine-client-${version}";
+    version = "${versionMajor}.${versionMinor}";
+  
+    src =
+      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";
+        }
+      else if stdenv.hostPlatform.system == "i686-linux" then
+        fetchurl {
+          url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_i686.tar.gz";
+          sha256 = "07j9f6mlq9m01ch8ik5dybi283vrp5dlv156jr5n7n2chzk34kf3";
+        }
+      else
+        throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";
+    
+    postUnpack = ''
+      mv $(find . -type f -name nxclient.tar.gz) .
+      mv $(find . -type f -name nxplayer.tar.gz) .
+      rm -r NX/
+      tar xf nxclient.tar.gz
+      tar xf nxplayer.tar.gz
+      rm $(find . -maxdepth 1 -type f)
+    '';
+  
+    nativeBuildInputs = [ file makeWrapper autoPatchelfHook ];
+    buildInputs = [ jsoncpp ];
+
+    installPhase = ''
+      rm bin/nxplayer bin/nxclient
+
+      mkdir -p $out/NX
+      cp -r bin lib share $out/NX/
+
+      ln -s $out/NX/bin $out/bin
+
+      for i in share/icons/*; do
+        if [[ -d "$i" ]]; then
+          mkdir -p "$out/share/icons/hicolor/$(basename $i)/apps"
+          cp "$i"/* "$out/share/icons/hicolor/$(basename $i)/apps/"
+        fi
+      done
+  
+      mkdir $out/share/applications
+      cp share/applnk/player/xdg/*.desktop $out/share/applications/
+      cp share/applnk/client/xdg-mime/*.desktop $out/share/applications/
+
+      mkdir -p $out/share/mime/packages
+      cp share/applnk/client/xdg-mime/*.xml $out/share/mime/packages/
+
+      for i in $out/share/applications/*.desktop; do
+        substituteInPlace "$i" --replace /usr/NX/bin $out/bin
+      done
+    '';
+  
+    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
+    '';
+  
+    dontBuild = true;
+    dontStrip = true;
+
+    meta = with stdenv.lib; {
+      description = "NoMachine remote desktop client (nxplayer)";
+      homepage = https://www.nomachine.com/;
+      license = {
+        fullName = "NoMachine 6 End-User License Agreement";
+        url = https://www.nomachine.com/licensing-6;
+        free = false;
+      };
+      maintainers = with maintainers; [ talyz ];
+      platforms = [ "x86_64-linux" "i686-linux" ];
+    };
+  }
+  
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57f65c28deb..99b95e7345a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4362,6 +4362,8 @@ with pkgs;
 
   nms = callPackage ../tools/misc/nms { };
 
+  nomachine-client = callPackage ../tools/admin/nomachine-client { };
+
   notify-desktop = callPackage ../tools/misc/notify-desktop {};
 
   nkf = callPackage ../tools/text/nkf {};
-- 
GitLab


From 1fe3328593e555668d38e4d48929bbea8b6f911e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 2 Nov 2018 16:46:03 +0100
Subject: [PATCH 0873/1065] knot-resolver: 3.0.0 -> 3.1.0

https://lists.nic.cz/pipermail/knot-resolver-users/2018/000086.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 b760b080ab7..ceefa542e6a 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.0.0";
+  version = "3.1.0";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "68a0137e0e15061ee7dec53a2e424aa3266611720db3843853c6e7774a414f40";
+    sha256 = "8f3deba4695784a666cde317bc6af80ecf42ce1047b01f4b9c582fdc021c7492";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 8cf1e97fcf8db2a4f8a4a3d2e52fc49b4e0c5ade Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 2 Nov 2018 12:44:05 -0400
Subject: [PATCH 0874/1065] granite: 5.1.0 -> 5.2.0

- Correct License to LGPLv3+
---
 .../development/libraries/granite/default.nix | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix
index 1ee0970ffad..6892ea6364d 100644
--- a/pkgs/development/libraries/granite/default.nix
+++ b/pkgs/development/libraries/granite/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }:
+{ stdenv, fetchFromGitHub, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, gnome3, gtk3, glib, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "granite-${version}";
-  version = "5.1.0";
+  pname = "granite";
+  version = "5.2.0";
+
+  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = "granite";
+    repo = pname;
     rev = version;
     sha256 = "1v1yhz6rp616xi417m9r8072s6mpz5i8vkdyj264b73p0lgjwh40";
   };
@@ -21,10 +23,10 @@ stdenv.mkDerivation rec {
     gettext
     gobjectIntrospection
     ninja
-    perl
     pkgconfig
-    vala_0_40
+    vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
   ];
+
   buildInputs = [
     glib
     gnome3.libgee
@@ -33,9 +35,12 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An extension to GTK+ used by elementary OS";
-    longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS.";
+    longDescription = ''
+      Granite is a companion library for GTK+ and GLib. Among other things, it provides complex widgets and convenience functions
+      designed for use in apps built for elementary OS.
+    '';
     homepage = https://github.com/elementary/granite;
-    license = licenses.lgpl3;
+    license = licenses.lgpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ vozz worldofpeace ];
   };
-- 
GitLab


From cac5c9401e7d17db94bf5c0b6e0df9e38e497cc8 Mon Sep 17 00:00:00 2001
From: Tom McLaughlin <pyro777@gmail.com>
Date: Mon, 29 Oct 2018 16:24:56 -0700
Subject: [PATCH 0875/1065] R: update CRAN and BIOC package sets

Closes https://github.com/NixOS/nixpkgs/pull/49430.
---
 .../r-modules/bioc-annotation-packages.nix    |  298 +-
 .../r-modules/bioc-experiment-packages.nix    |  164 +-
 pkgs/development/r-modules/bioc-packages.nix  | 1539 +++---
 pkgs/development/r-modules/cran-packages.nix  | 4902 +++++++++--------
 pkgs/development/r-modules/default.nix        |    6 -
 5 files changed, 3806 insertions(+), 3103 deletions(-)

diff --git a/pkgs/development/r-modules/bioc-annotation-packages.nix b/pkgs/development/r-modules/bioc-annotation-packages.nix
index 54c4968607d..863d7c9fcfe 100644
--- a/pkgs/development/r-modules/bioc-annotation-packages.nix
+++ b/pkgs/development/r-modules/bioc-annotation-packages.nix
@@ -7,11 +7,12 @@
 let derive2 = derive { biocVersion = "3.8"; };
 in with self; {
   AHCytoBands = derive2 { name="AHCytoBands"; version="0.99.0"; sha256="0g92nz33rx14zl5can7s701bipdgz7rxqygvvc22c4a0qj52ijnq"; depends=[]; };
-  AHEnsDbs = derive2 { name="AHEnsDbs"; version="1.0.6"; sha256="1sdxj2rxhc2cj2rgfif2flnic57zkdrhdvhr3y64amcmrp57xgj4"; depends=[AnnotationHubData ensembldb]; };
+  AHEnsDbs = derive2 { name="AHEnsDbs"; version="1.0.8"; sha256="1v1177l4y0l546mzp8ybhvhnjwrsck5bkic8w6n6n2xq07d6aahz"; depends=[AnnotationHubData ensembldb]; };
   BSgenome_Alyrata_JGI_v1 = derive2 { name="BSgenome.Alyrata.JGI.v1"; version="1.0.0"; sha256="06549kkzy36n378zb61lrf9zardncp7i20r73rmmiq1pnfjp3gww"; depends=[BSgenome]; };
   BSgenome_Amellifera_BeeBase_assembly4 = derive2 { name="BSgenome.Amellifera.BeeBase.assembly4"; version="1.4.0"; sha256="02zs16q441zcbfp7xvv1gny5nn02ivfr8md1wh5s5rpnj6sdl6kj"; depends=[BSgenome]; };
   BSgenome_Amellifera_UCSC_apiMel2 = derive2 { name="BSgenome.Amellifera.UCSC.apiMel2"; version="1.4.0"; sha256="1967w7aly7qydykk7rar712kvgsav3zjr4kirybkj17nwiynd74g"; depends=[BSgenome]; };
   BSgenome_Amellifera_UCSC_apiMel2_masked = derive2 { name="BSgenome.Amellifera.UCSC.apiMel2.masked"; version="1.3.99"; sha256="128jmpnpbz1afqvhvdc9vrc8gmlyg26ca7qz362qsx89jrm4khpr"; depends=[BSgenome BSgenome_Amellifera_UCSC_apiMel2]; };
+  BSgenome_Aofficinalis_NCBI_V1 = derive2 { name="BSgenome.Aofficinalis.NCBI.V1"; version="1.0.0"; sha256="0n6m5jnpiz6bv46b7s396qkxha2d8271j747j50v2zb6a7wd0rjr"; depends=[BSgenome]; };
   BSgenome_Athaliana_TAIR_04232008 = derive2 { name="BSgenome.Athaliana.TAIR.04232008"; version="1.3.1000"; sha256="0dsbjfh2yf0v3zmbypn9p3alvwhfw2qyr5vivyj7x9ablylb6qxc"; depends=[BSgenome]; };
   BSgenome_Athaliana_TAIR_TAIR9 = derive2 { name="BSgenome.Athaliana.TAIR.TAIR9"; version="1.3.1000"; sha256="0n45sn80c5nchfj1wzbcaicfyg66id2zhr5xm3w238idkbj05l00"; depends=[BSgenome]; };
   BSgenome_Btaurus_UCSC_bosTau3 = derive2 { name="BSgenome.Btaurus.UCSC.bosTau3"; version="1.4.0"; sha256="0vh3664q7pynfw763pwg2h74h0ncmi5nslvj7y5bj1q7pvf03zpc"; depends=[BSgenome]; };
@@ -21,6 +22,7 @@ in with self; {
   BSgenome_Btaurus_UCSC_bosTau6 = derive2 { name="BSgenome.Btaurus.UCSC.bosTau6"; version="1.4.0"; sha256="0waaf9wfmdl5jbi3la64vsiqb83lyw9fqg3sn90bf1q7k3k617p3"; depends=[BSgenome]; };
   BSgenome_Btaurus_UCSC_bosTau6_masked = derive2 { name="BSgenome.Btaurus.UCSC.bosTau6.masked"; version="1.3.99"; sha256="07isv0lcvlsl0aha1p474l0pps0j7bsh455m33vfxwahivqsfy27"; depends=[BSgenome BSgenome_Btaurus_UCSC_bosTau6]; };
   BSgenome_Btaurus_UCSC_bosTau8 = derive2 { name="BSgenome.Btaurus.UCSC.bosTau8"; version="1.4.2"; sha256="16wjy1aw9nvx03r7w8yh5w7sw3pn8i9nczd0n0728l6nnyqxlsz6"; depends=[BSgenome]; };
+  BSgenome_Carietinum_NCBI_v1 = derive2 { name="BSgenome.Carietinum.NCBI.v1"; version="1.0.0"; sha256="1asyyb1p1bzc7dv9s2igjxrf9f144vvz2xbv9qxg15w9qzzx7r33"; depends=[BSgenome]; };
   BSgenome_Celegans_UCSC_ce10 = derive2 { name="BSgenome.Celegans.UCSC.ce10"; version="1.4.0"; sha256="1zaym97jk4npxk14ifvwz2rvhm4zx9xgs33r9vvx9rlynp0gydrk"; depends=[BSgenome]; };
   BSgenome_Celegans_UCSC_ce11 = derive2 { name="BSgenome.Celegans.UCSC.ce11"; version="1.4.2"; sha256="0d4bxfglpqiv1f0n6imdgz101g9383hfj3ra91268wryzlm0yk5w"; depends=[BSgenome]; };
   BSgenome_Celegans_UCSC_ce2 = derive2 { name="BSgenome.Celegans.UCSC.ce2"; version="1.4.0"; sha256="1x7nvisz7mjrpqlsiw4an04f8hksygzn96p5ld0388hljg78dax8"; depends=[BSgenome]; };
@@ -78,6 +80,7 @@ in with self; {
   BSgenome_Ptroglodytes_UCSC_panTro3 = derive2 { name="BSgenome.Ptroglodytes.UCSC.panTro3"; version="1.4.0"; sha256="1vbfx0zrj4rcwcsm1q09xdiv0mmrycj8223lnxqb8nr5r017f7gm"; depends=[BSgenome]; };
   BSgenome_Ptroglodytes_UCSC_panTro3_masked = derive2 { name="BSgenome.Ptroglodytes.UCSC.panTro3.masked"; version="1.3.99"; sha256="18ga0whdcp5zpigrmh68wjmn99lzvfyvgxjm58y0jx66rmg94mir"; depends=[BSgenome BSgenome_Ptroglodytes_UCSC_panTro3]; };
   BSgenome_Ptroglodytes_UCSC_panTro5 = derive2 { name="BSgenome.Ptroglodytes.UCSC.panTro5"; version="1.4.2"; sha256="0wxciajcyf0hr6g6zcji125jm18nnspwvnv5x3jibjvxzx55gcds"; depends=[BSgenome]; };
+  BSgenome_Ptroglodytes_UCSC_panTro6 = derive2 { name="BSgenome.Ptroglodytes.UCSC.panTro6"; version="1.4.2"; sha256="1l1fqnw1iqb2a7kvyvb0m1vdvq6cxs6py92yvbaf4zwklmgmdq0b"; depends=[BSgenome]; };
   BSgenome_Rnorvegicus_UCSC_rn4 = derive2 { name="BSgenome.Rnorvegicus.UCSC.rn4"; version="1.4.0"; sha256="1aww2bxyqbb81iln3vgrb0659r82v9yv1z41k9r3zws8b7k7df6x"; depends=[BSgenome]; };
   BSgenome_Rnorvegicus_UCSC_rn4_masked = derive2 { name="BSgenome.Rnorvegicus.UCSC.rn4.masked"; version="1.3.99"; sha256="0jfv1873ab1nwwdr18vrjqcdl4rhv3xgqbf4jfnjk7sjx154pfi6"; depends=[BSgenome BSgenome_Rnorvegicus_UCSC_rn4]; };
   BSgenome_Rnorvegicus_UCSC_rn5 = derive2 { name="BSgenome.Rnorvegicus.UCSC.rn5"; version="1.4.0"; sha256="1s92983m73bi08ihvyd8c17yx29hz5xxrnrs2if8fda4asw1f3f0"; depends=[BSgenome]; };
@@ -105,6 +108,7 @@ in with self; {
   EnsDb_Mmusculus_v79 = derive2 { name="EnsDb.Mmusculus.v79"; version="2.99.0"; sha256="1zpmq7v55if6q9r0h883q9k8l70ym20b01m9hxf121wb256rl9f7"; depends=[ensembldb]; };
   EnsDb_Rnorvegicus_v75 = derive2 { name="EnsDb.Rnorvegicus.v75"; version="2.99.0"; sha256="02sx9l1p67ihkn0dfzbi08cpp8x4k2mjdqn7hvzfiaibsbqp70bb"; depends=[ensembldb]; };
   EnsDb_Rnorvegicus_v79 = derive2 { name="EnsDb.Rnorvegicus.v79"; version="2.99.0"; sha256="1ki2hrn0a55f3ipxny0hpgl5ld9pjkhcwmvvqwwd99f3sqbxf3br"; depends=[ensembldb]; };
+  EuPathDB = derive2 { name="EuPathDB"; version="1.0.0"; sha256="08yl7zx5j6ywnrdcrrsvfkkxnvhrhrcddxw0g5sv90gy55zgv86n"; depends=[AnnotationHub AnnotationHubData Biobase BiocManager Biostrings GenomeInfoDbData GenomicRanges]; };
   FDb_FANTOM4_promoters_hg19 = derive2 { name="FDb.FANTOM4.promoters.hg19"; version="1.0.0"; sha256="04sn5x1r5fcbghzw6n1bvy0z8zyhrbk86wsqz1p5gk665vicz8rw"; depends=[AnnotationDbi Biostrings GenomicFeatures]; };
   FDb_InfiniumMethylation_hg18 = derive2 { name="FDb.InfiniumMethylation.hg18"; version="2.2.0"; sha256="0vwzqzj49imjdsn8ssiwqi7qic7rqw5pbsiinyxgy7y10fn2i42a"; depends=[AnnotationDbi Biostrings GenomicFeatures org_Hs_eg_db TxDb_Hsapiens_UCSC_hg18_knownGene]; };
   FDb_InfiniumMethylation_hg19 = derive2 { name="FDb.InfiniumMethylation.hg19"; version="2.2.0"; sha256="0gq90fvph6kgrpjb89nvzq6hl1k24swn19rgjh5g98l86mja6nk0"; depends=[AnnotationDbi Biostrings GenomicFeatures org_Hs_eg_db TxDb_Hsapiens_UCSC_hg19_knownGene]; };
@@ -112,8 +116,8 @@ in with self; {
   FDb_UCSC_snp137common_hg19 = derive2 { name="FDb.UCSC.snp137common.hg19"; version="1.0.0"; sha256="1q1r7rk29q0zlzxz6fvfy1kjfli6wxzvhvhhfnf3z4ksy5332q63"; depends=[AnnotationDbi GenomicFeatures]; };
   FDb_UCSC_tRNAs = derive2 { name="FDb.UCSC.tRNAs"; version="1.0.1"; sha256="1dymdalx9fzrplxyc0fd9faa4r5jimi7zyry9k65lyz1pabpkwqz"; depends=[AnnotationDbi GenomicFeatures]; };
   GGHumanMethCancerPanelv1_db = derive2 { name="GGHumanMethCancerPanelv1.db"; version="1.4.1"; sha256="0ag1pkbh4mx4aplfrrz1q4f4cl05mczq9pcsfkd1071qk51dcwvx"; depends=[AnnotationDbi AnnotationForge org_Hs_eg_db]; };
-  GO_db = derive2 { name="GO.db"; version="3.6.0"; sha256="0fi2qywr9apg5lwfqfq9qq6bgrnv4rdhxx25656qn4bsy62i838j"; depends=[AnnotationDbi]; };
-  GenomeInfoDbData = derive2 { name="GenomeInfoDbData"; version="1.1.0"; sha256="0k1hsjx6n2i1sf14hyrgdhxqxm5mxk0bgnivhiax944whcicmzbf"; depends=[]; };
+  GO_db = derive2 { name="GO.db"; version="3.7.0"; sha256="0i3wcf5h3n0dawzc1hy0kv74f06j80c47n4p3g3fmrcxlhi3jpa5"; depends=[AnnotationDbi]; };
+  GenomeInfoDbData = derive2 { name="GenomeInfoDbData"; version="1.2.0"; sha256="0di6nlqpsyqf693k2na65ayqldih563x3zfrczpqc5q2hl5kg35c"; depends=[]; };
   Homo_sapiens = derive2 { name="Homo.sapiens"; version="1.3.1"; sha256="151vj7h5p1c8yd5swrchk46z469p135wk50hvkl0nhgndvy0jj01"; depends=[AnnotationDbi GenomicFeatures GO_db org_Hs_eg_db OrganismDbi TxDb_Hsapiens_UCSC_hg19_knownGene]; };
   Hs6UG171_db = derive2 { name="Hs6UG171.db"; version="3.2.3"; sha256="034aady3hy8j9bm7pbl8l8h0gcfnzmpyxg9l9s1ky0pj7ryzr93a"; depends=[AnnotationDbi org_Hs_eg_db]; };
   HsAgilentDesign026652_db = derive2 { name="HsAgilentDesign026652.db"; version="3.2.3"; sha256="0x6nxvzmc8k4qp382ca32y58awkxpg0b3kc7m1mz9iag6sq7c5vx"; depends=[AnnotationDbi org_Hs_eg_db]; };
@@ -136,6 +140,18 @@ in with self; {
   JazaeriMetaData_db = derive2 { name="JazaeriMetaData.db"; version="3.2.3"; sha256="04lvcmm4ybxkfwgbiwcnpyj6kpbd0gd7jz6ijlbbvv6zdgdmvykb"; depends=[AnnotationDbi org_Hs_eg_db]; };
   KEGG_db = derive2 { name="KEGG.db"; version="3.2.3"; sha256="0qv9in1nmnqcbjxh0y45x33xyw9zdp4jf5hmlvcsh1pclcq4dsh2"; depends=[AnnotationDbi]; };
   LAPOINTE_db = derive2 { name="LAPOINTE.db"; version="3.2.3"; sha256="0960gy5p4ybs5zs6251cgc3nk5a9gsh1nh23gkbkr3gc8jddinfm"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  LRBase_Ath_eg_db = derive2 { name="LRBase.Ath.eg.db"; version="0.99.1"; sha256="0v7zyp6mngdfrqgx0fb6lj0ara7q4ch2dahnwqjk5y9psmvi8m16"; depends=[LRBaseDbi RSQLite]; };
+  LRBase_Bta_eg_db = derive2 { name="LRBase.Bta.eg.db"; version="0.99.1"; sha256="14yl5d4vmm2hjrlxsflwvkw18j0kcz364b3mc3fnxzbk8phisy3l"; depends=[LRBaseDbi RSQLite]; };
+  LRBase_Cel_eg_db = derive2 { name="LRBase.Cel.eg.db"; version="0.99.1"; sha256="18w8ay874qjs4qgb3g1j77k2fspvvvbyy3p85wgzy1yl839ngy3b"; depends=[LRBaseDbi RSQLite]; };
+  LRBase_Dme_eg_db = derive2 { name="LRBase.Dme.eg.db"; version="0.99.1"; sha256="0qbc5942g57mjdlhqpnapwq58bmi5xbc0mrqbqkfbxpx881ka2v6"; depends=[LRBaseDbi RSQLite]; };
+  LRBase_Dre_eg_db = derive2 { name="LRBase.Dre.eg.db"; version="0.99.1"; sha256="0wpx9dg2nhw20f3vvmaqy5yip8xwg1niswspxs4jv9krd0z6h5d8"; depends=[LRBaseDbi RSQLite]; };
+  LRBase_Gga_eg_db = derive2 { name="LRBase.Gga.eg.db"; version="0.99.1"; sha256="0nycj3h69ca2gxxmc08zvf0jv5zylfayhd6sgzrmqz0zsr0n5fxk"; depends=[LRBaseDbi RSQLite]; };
+  LRBase_Hsa_eg_db = derive2 { name="LRBase.Hsa.eg.db"; version="0.99.1"; sha256="0g690d63sp5pb0i28zvi80y41n6b31mzza46invjvq9c1j2rijzd"; depends=[LRBaseDbi RSQLite]; };
+  LRBase_Mmu_eg_db = derive2 { name="LRBase.Mmu.eg.db"; version="0.99.1"; sha256="0kmd69a31hw8i2p8qg64m074ypa102cfa7qpyz2m7nr6gwb3ik3z"; depends=[LRBaseDbi RSQLite]; };
+  LRBase_Pab_eg_db = derive2 { name="LRBase.Pab.eg.db"; version="0.99.1"; sha256="0scycwpdmr6yvfyqsani1372pmyqxzvv30wsvy8hx3km7dcd4ypz"; depends=[LRBaseDbi RSQLite]; };
+  LRBase_Rno_eg_db = derive2 { name="LRBase.Rno.eg.db"; version="0.99.1"; sha256="1b5rzb9kpnak90fb55y380qmspd8gah3wxvsliv1lddab65m5ch3"; depends=[LRBaseDbi RSQLite]; };
+  LRBase_Ssc_eg_db = derive2 { name="LRBase.Ssc.eg.db"; version="0.99.1"; sha256="1p1crrh3wkinvhqmy9b1h4j9yfvwbsykhm6b0xlhn0kzdqxlizjf"; depends=[LRBaseDbi RSQLite]; };
+  LRBase_Xtr_eg_db = derive2 { name="LRBase.Xtr.eg.db"; version="0.99.1"; sha256="0aqzcll2ylzbbq42ns0hp7l9p6343l2qlsv5zkglla1bxdxl6m4h"; depends=[LRBaseDbi RSQLite]; };
   LowMACAAnnotation = derive2 { name="LowMACAAnnotation"; version="0.99.3"; sha256="0ri301ci54s8wwkah1jccy5h44xg8yjk08j5b15qmdsm25hli4wm"; depends=[]; };
   LymphoSeqDB = derive2 { name="LymphoSeqDB"; version="0.99.2"; sha256="1cdyn2imjh4zr23szndc4vwyiacxs1jsp14gil2dyq9aifa25qr7"; depends=[]; };
   MafDb_1Kgenomes_phase1_GRCh38 = derive2 { name="MafDb.1Kgenomes.phase1.GRCh38"; version="3.7.0"; sha256="160whyhwjspqji6ys19qgi4y3k7z1qqzr75nhpw0yl8h1rc6rfg0"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
@@ -148,86 +164,91 @@ in with self; {
   MafDb_ExAC_r1_0_hs37d5 = derive2 { name="MafDb.ExAC.r1.0.hs37d5"; version="3.7.0"; sha256="00b022hzwr0l6m9wzw76iirdq5szvi5z8a9yi2i44sydhwqsb4cy"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
   MafDb_ExAC_r1_0_nonTCGA_GRCh38 = derive2 { name="MafDb.ExAC.r1.0.nonTCGA.GRCh38"; version="3.7.0"; sha256="1dvzzwj9dhrls8caabdcgddsk64a6q9jqcya424h8n48fkx6fpjn"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
   MafDb_ExAC_r1_0_nonTCGA_hs37d5 = derive2 { name="MafDb.ExAC.r1.0.nonTCGA.hs37d5"; version="3.7.0"; sha256="10rn7nqrnhmhdqcygi8l3cwf1385jyy56qzqjgqyhvmi4g8dnjsn"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_TOPMed_freeze5_hg19 = derive2 { name="MafDb.TOPMed.freeze5.hg19"; version="3.7.1"; sha256="0a8rgh3lkbplg3y1yl0804f55dlw7v8lcb33ygg8kg39dk60m102"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
   MafDb_TOPMed_freeze5_hg38 = derive2 { name="MafDb.TOPMed.freeze5.hg38"; version="3.7.1"; sha256="1kxk3qqw1igkygqmj8yjl4cp99fan1w84gilh6q35nsaja0fapa8"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_gnomAD_r2_0_1_GRCh38 = derive2 { name="MafDb.gnomAD.r2.0.1.GRCh38"; version="3.7.0"; sha256="0dp82x6dag4ndizvppr2g5x1v8sbj08r6n7mi98c89fn4f7nvqqw"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_gnomAD_r2_0_1_hs37d5 = derive2 { name="MafDb.gnomAD.r2.0.1.hs37d5"; version="3.8.0"; sha256="0kb50g4kmj1b4xm9p8q6j1yzpv5ygxf71vqhkb7c0ajqffqbyznm"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_gnomAD_r2_1_hs37d5 = derive2 { name="MafDb.gnomAD.r2.1.hs37d5"; version="3.8.0"; sha256="00ld23685xlrkx9rpgrcqaycq3zxbxqg734r99avrw8p3lmj4fvc"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
   MafDb_gnomADex_r2_0_1_GRCh38 = derive2 { name="MafDb.gnomADex.r2.0.1.GRCh38"; version="3.7.0"; sha256="0hwyyqa4g3hp85hk4b6qfzm10yk6h20sh0f2mf09yr0hpmkjyl59"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
-  MafDb_gnomADex_r2_0_1_hs37d5 = derive2 { name="MafDb.gnomADex.r2.0.1.hs37d5"; version="3.7.0"; sha256="1y1kzbs37h804c81rll64kz83rpzmzl1z410frabyyblpxm275j5"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
-  MeSH_AOR_db = derive2 { name="MeSH.AOR.db"; version="1.10.0"; sha256="0dc2j64v93j7gj28yl9lpbxdqlqszr8sn3p7jbkcwixgpczhqzbj"; depends=[MeSHDbi]; };
-  MeSH_Aca_eg_db = derive2 { name="MeSH.Aca.eg.db"; version="1.10.0"; sha256="1p0495kyg2vcbf98scfxb1iidn4xvv1r1jwxx40g1fjwl1s0rm4k"; depends=[MeSHDbi]; };
-  MeSH_Aga_PEST_eg_db = derive2 { name="MeSH.Aga.PEST.eg.db"; version="1.10.0"; sha256="0ipnzigw2791fgzr6s2a8m4idpicwlk46pplq9q3ql9ss0nw4swi"; depends=[MeSHDbi]; };
-  MeSH_Ame_eg_db = derive2 { name="MeSH.Ame.eg.db"; version="1.10.0"; sha256="1kpr0li13kwn2ynnghaj775ln7zxim8jdasbrmnyrq8b61v1784s"; depends=[MeSHDbi]; };
-  MeSH_Aml_eg_db = derive2 { name="MeSH.Aml.eg.db"; version="1.10.0"; sha256="0aa6qgk9vwdkwykkml10j0vcjp53ypa2p3p8za9qgfk0r19831wi"; depends=[MeSHDbi]; };
-  MeSH_Ana_eg_db = derive2 { name="MeSH.Ana.eg.db"; version="1.10.0"; sha256="1v81wccvd2kgx05h2lffbdjkl8xsdb0f5h2i12csfnlhfgvgasdf"; depends=[MeSHDbi]; };
-  MeSH_Ani_FGSC_eg_db = derive2 { name="MeSH.Ani.FGSC.eg.db"; version="1.10.0"; sha256="0caii8lq500rc5kaqq354zldrb2b0zapypqzr6kfh4swa6fa90x5"; depends=[MeSHDbi]; };
-  MeSH_Ath_eg_db = derive2 { name="MeSH.Ath.eg.db"; version="1.10.0"; sha256="1x33f3g8951kawq3j1p1aic9jlx10dbf8qb1g0yrcrq1nvxnywlq"; depends=[MeSHDbi]; };
-  MeSH_Bfl_eg_db = derive2 { name="MeSH.Bfl.eg.db"; version="1.10.0"; sha256="1inpqz39ingljyjsp9v7mfvx8jcmmmkc3p3k4ffcw9xfd17iiw9s"; depends=[MeSHDbi]; };
-  MeSH_Bsu_168_eg_db = derive2 { name="MeSH.Bsu.168.eg.db"; version="1.10.0"; sha256="1bwmy42s7rvnng5p1lqcbjhxvw42pr9gbyp7r1951n69f1311n45"; depends=[MeSHDbi]; };
-  MeSH_Bta_eg_db = derive2 { name="MeSH.Bta.eg.db"; version="1.10.0"; sha256="1fw30l682sfcpdqqg8r5vyk0slxx00k1agxgli1syhvhh1hrbnxx"; depends=[MeSHDbi]; };
-  MeSH_Cal_SC5314_eg_db = derive2 { name="MeSH.Cal.SC5314.eg.db"; version="1.10.0"; sha256="0xgzsvqr62g8gipz1i73mxrbg8784axc6hj82v034i03zh0kz2rp"; depends=[MeSHDbi]; };
-  MeSH_Cbr_eg_db = derive2 { name="MeSH.Cbr.eg.db"; version="1.10.0"; sha256="136cg8nmwhc6iplzj2wxmgy4nggi3532xv3kff0hx85g5nbj6k6g"; depends=[MeSHDbi]; };
-  MeSH_Cel_eg_db = derive2 { name="MeSH.Cel.eg.db"; version="1.10.0"; sha256="05wj3ib1xjiy2asz41h32r29371qyd8dc3xrx78wwfj2a7760b4y"; depends=[MeSHDbi]; };
-  MeSH_Cfa_eg_db = derive2 { name="MeSH.Cfa.eg.db"; version="1.10.0"; sha256="1b8jc8gc62knhkl0g6isx6d0kb2b33mydb0wpp3v0xlmzpv3f4qn"; depends=[MeSHDbi]; };
-  MeSH_Cin_eg_db = derive2 { name="MeSH.Cin.eg.db"; version="1.10.0"; sha256="0qiwjxrjz7np4ml2hxdqfqmjaql5hgnzv2919rcxfikp5cxq7b51"; depends=[MeSHDbi]; };
-  MeSH_Cja_eg_db = derive2 { name="MeSH.Cja.eg.db"; version="1.10.0"; sha256="06vk6imry285qcmgcrjqlxj0ihxqasg94ap18xcxiwwps1dbha89"; depends=[MeSHDbi]; };
-  MeSH_Cpo_eg_db = derive2 { name="MeSH.Cpo.eg.db"; version="1.10.0"; sha256="1xv54fhn44l3kjgbmrga3lfqjjf3zgwprm0j518qlvycxvr41znr"; depends=[MeSHDbi]; };
-  MeSH_Cre_eg_db = derive2 { name="MeSH.Cre.eg.db"; version="1.10.0"; sha256="0582xmkwmpr3hjsh9qzv6q60bypdmrk34rcp0jzzqjnfrn9mxasb"; depends=[MeSHDbi]; };
-  MeSH_Dan_eg_db = derive2 { name="MeSH.Dan.eg.db"; version="1.10.0"; sha256="1cjzilbbw6r5sayy8bifx9rrbj3y95yzm8vdpxg5y1kvsa8047y1"; depends=[MeSHDbi]; };
-  MeSH_Dda_3937_eg_db = derive2 { name="MeSH.Dda.3937.eg.db"; version="1.10.0"; sha256="099s4v5rr0jpzh8x60cjb7rxz8c4f8m2s3r09cgzi1fxpmmlzspm"; depends=[MeSHDbi]; };
-  MeSH_Ddi_AX4_eg_db = derive2 { name="MeSH.Ddi.AX4.eg.db"; version="1.10.0"; sha256="0apr6i080wkhb5s5h6v64b40wdx6fygn422vllwicjkqxllbaa4x"; depends=[MeSHDbi]; };
-  MeSH_Der_eg_db = derive2 { name="MeSH.Der.eg.db"; version="1.10.0"; sha256="1ln50lqba33vsvbk6wydgm2akpnvv92305zxcpbl6d2px0xbjldz"; depends=[MeSHDbi]; };
-  MeSH_Dgr_eg_db = derive2 { name="MeSH.Dgr.eg.db"; version="1.10.0"; sha256="0nwag2828j1hqx6biihnpprzbrimc7as3nn3p4kkhs067bz457ny"; depends=[MeSHDbi]; };
-  MeSH_Dme_eg_db = derive2 { name="MeSH.Dme.eg.db"; version="1.10.0"; sha256="1bcqyrcff510l5my5wha0yrl76wznm7xljlbv24q1i2mjb00x087"; depends=[MeSHDbi]; };
-  MeSH_Dmo_eg_db = derive2 { name="MeSH.Dmo.eg.db"; version="1.10.0"; sha256="1zsq4fkr2bqcfdf1v5w3gn5x29f1q9y4b4qx7nhiipfwiybnjdpd"; depends=[MeSHDbi]; };
-  MeSH_Dpe_eg_db = derive2 { name="MeSH.Dpe.eg.db"; version="1.10.0"; sha256="1xr4h3d3fs20cfwzaj1jjipfnbbvgmx7rlmxfvv8q8hxpfzp7vsp"; depends=[MeSHDbi]; };
-  MeSH_Dre_eg_db = derive2 { name="MeSH.Dre.eg.db"; version="1.10.0"; sha256="1hjywgbgbpgsk8hhwlfz9phx3hwi14j9yxa8zmbas3w9cf9hg35a"; depends=[MeSHDbi]; };
-  MeSH_Dse_eg_db = derive2 { name="MeSH.Dse.eg.db"; version="1.10.0"; sha256="05mhyfjj2m1mx575nyc53lrwhj0lip4bcv5xa37swz7n1x821bnq"; depends=[MeSHDbi]; };
-  MeSH_Dsi_eg_db = derive2 { name="MeSH.Dsi.eg.db"; version="1.10.0"; sha256="03vrcnfcpj1ayrfawwqgvdvb7mymkwng36pr8p491l8vmk4yhsgs"; depends=[MeSHDbi]; };
-  MeSH_Dvi_eg_db = derive2 { name="MeSH.Dvi.eg.db"; version="1.10.0"; sha256="113zcn037fx15g5xipz9bczw0b913yd8sp4l3yg8zffai8qmhwcj"; depends=[MeSHDbi]; };
-  MeSH_Dya_eg_db = derive2 { name="MeSH.Dya.eg.db"; version="1.10.0"; sha256="00i6r7fhqrnbyxmkcpvsyhm1wzmskmrqnfsvd7ls0xcw3h6lpp7v"; depends=[MeSHDbi]; };
-  MeSH_Eco_55989_eg_db = derive2 { name="MeSH.Eco.55989.eg.db"; version="1.10.0"; sha256="1azyzg3ak01mbgdw8l7csgiwpzd5fwk6h3x8n261xxm1yd5f1g9l"; depends=[MeSHDbi]; };
-  MeSH_Eco_ED1a_eg_db = derive2 { name="MeSH.Eco.ED1a.eg.db"; version="1.10.0"; sha256="0j7rga9n6gl6k1gh5ppz742gy4swriwwnfavrjam6k6inl40as57"; depends=[MeSHDbi]; };
-  MeSH_Eco_IAI39_eg_db = derive2 { name="MeSH.Eco.IAI39.eg.db"; version="1.10.0"; sha256="0cibmy5hyg7aw960cb9zbqdaabbh9f5mwlxdv9gynghkxrqppcaq"; depends=[MeSHDbi]; };
-  MeSH_Eco_K12_MG1655_eg_db = derive2 { name="MeSH.Eco.K12.MG1655.eg.db"; version="1.10.0"; sha256="1yw0kamb6j25cv3fz7649n43slaxah0f6yzwhglsa4fjffam1ycm"; depends=[MeSHDbi]; };
-  MeSH_Eco_O157_H7_Sakai_eg_db = derive2 { name="MeSH.Eco.O157.H7.Sakai.eg.db"; version="1.10.0"; sha256="129yw8yrm89rv999va8pn7513c0dl1r1xffsdc01i4wadhq3rrx0"; depends=[MeSHDbi]; };
-  MeSH_Eco_UMN026_eg_db = derive2 { name="MeSH.Eco.UMN026.eg.db"; version="1.10.0"; sha256="17faizllk30rcw66arfr2nkcx4a70vkjzsca1zf7wpl9myad1r3q"; depends=[MeSHDbi]; };
-  MeSH_Eqc_eg_db = derive2 { name="MeSH.Eqc.eg.db"; version="1.10.0"; sha256="1hqm92vmrg5s07dkr1xa7a2jwspx90v969piba3cf6gdmjw81p5j"; depends=[MeSHDbi]; };
-  MeSH_Gga_eg_db = derive2 { name="MeSH.Gga.eg.db"; version="1.10.0"; sha256="06cvyg8ib4dkcn92br7wkx9bj36dji9lsn53aliyj6h5sq6ssvfn"; depends=[MeSHDbi]; };
-  MeSH_Gma_eg_db = derive2 { name="MeSH.Gma.eg.db"; version="1.10.0"; sha256="11q2gv8c5cv7ll22f6w34pqr7r8jzgkx1bhwl4fj49s8n7rfh0cg"; depends=[MeSHDbi]; };
-  MeSH_Hsa_eg_db = derive2 { name="MeSH.Hsa.eg.db"; version="1.10.0"; sha256="1gw20014wcf67n574p6r7cwcchyk3c915bbkqcwkj25bvvk4cmga"; depends=[MeSHDbi]; };
-  MeSH_Laf_eg_db = derive2 { name="MeSH.Laf.eg.db"; version="1.10.0"; sha256="1hh81rhr3iq8a98w7lvbz6cwjq0hfcxrazv7sdy0pjggd12l991r"; depends=[MeSHDbi]; };
-  MeSH_Lma_eg_db = derive2 { name="MeSH.Lma.eg.db"; version="1.10.0"; sha256="0p6zhf5fjh5bn1ibmmmjmnpfp2vplx84fa1zbs7djg96vpvz8flp"; depends=[MeSHDbi]; };
-  MeSH_Mdo_eg_db = derive2 { name="MeSH.Mdo.eg.db"; version="1.10.0"; sha256="1f497wkvbgw11887gsbcygi38xj2fb4vxg34k3jf668yq1x25jcm"; depends=[MeSHDbi]; };
-  MeSH_Mes_eg_db = derive2 { name="MeSH.Mes.eg.db"; version="1.10.0"; sha256="1mfg8vbqgqbb573ddv7pp3k2nl4gq27jc472rp4y3x4g8b2ci5hv"; depends=[MeSHDbi]; };
-  MeSH_Mga_eg_db = derive2 { name="MeSH.Mga.eg.db"; version="1.10.0"; sha256="1l27hl4cl1h02k9al51485f61qlwwqmsgyp46dcvvdg1l8hlckmq"; depends=[MeSHDbi]; };
-  MeSH_Miy_eg_db = derive2 { name="MeSH.Miy.eg.db"; version="1.10.0"; sha256="0vvkgbvg6kzl4w8jbvlvaawkxc2j3x1pipqf6q4niy0yk951r30r"; depends=[MeSHDbi]; };
-  MeSH_Mml_eg_db = derive2 { name="MeSH.Mml.eg.db"; version="1.10.0"; sha256="02mp7q0g7by8ihjpjwc39d6kwnwpxkn6xhx9v6fzdfy4q558qpnk"; depends=[MeSHDbi]; };
-  MeSH_Mmu_eg_db = derive2 { name="MeSH.Mmu.eg.db"; version="1.10.0"; sha256="1248y32km28aaj92caar8c97bmkml7853l8xp643vxawgwlmc7a6"; depends=[MeSHDbi]; };
-  MeSH_Mtr_eg_db = derive2 { name="MeSH.Mtr.eg.db"; version="1.10.0"; sha256="09576k1m19mjsdm17iw78djn9pb21g5i237rqrdk709rifar6nny"; depends=[MeSHDbi]; };
-  MeSH_Nle_eg_db = derive2 { name="MeSH.Nle.eg.db"; version="1.10.0"; sha256="0azrd1jmyyk6n9whgc3jdaqmalqal3vw6sx5cr84m9cbv9b9c9s1"; depends=[MeSHDbi]; };
-  MeSH_Oan_eg_db = derive2 { name="MeSH.Oan.eg.db"; version="1.10.0"; sha256="0cgq3caxikrv22y19fg4gpphz4cf3xb2w0s0rsnmwb1bkj57y2x2"; depends=[MeSHDbi]; };
-  MeSH_Ocu_eg_db = derive2 { name="MeSH.Ocu.eg.db"; version="1.10.0"; sha256="1w118c82694wplqr5q7wvzgcdhf9cm2cbyhajlvh9iad089m4cam"; depends=[MeSHDbi]; };
-  MeSH_Oni_eg_db = derive2 { name="MeSH.Oni.eg.db"; version="1.10.0"; sha256="0ka2fsmznlaxn24sqg5fvfy7y9plwqywr75hxfxls3dcykhvsn4r"; depends=[MeSHDbi]; };
-  MeSH_Osa_eg_db = derive2 { name="MeSH.Osa.eg.db"; version="1.10.0"; sha256="0cqwnjz77r5faf0gi39hg802hxwswzab56m8l55w9paxq4p5n1jx"; depends=[MeSHDbi]; };
-  MeSH_PCR_db = derive2 { name="MeSH.PCR.db"; version="1.10.0"; sha256="0gjnbah7ik8sarx05y6hzl94s669j4c8gxi5n6fa6pb9b4kilqfw"; depends=[MeSHDbi]; };
-  MeSH_Pab_eg_db = derive2 { name="MeSH.Pab.eg.db"; version="1.10.0"; sha256="11gfdh385vcyzwwszj8fjfbw06ksra677fhmj99f4nrbnvbdjlc8"; depends=[MeSHDbi]; };
-  MeSH_Pae_PAO1_eg_db = derive2 { name="MeSH.Pae.PAO1.eg.db"; version="1.10.0"; sha256="0yb0qg11fwpk47kb06w4ck518jff9x2j4kkfi254lbn7asawlgv3"; depends=[MeSHDbi]; };
-  MeSH_Pfa_3D7_eg_db = derive2 { name="MeSH.Pfa.3D7.eg.db"; version="1.10.0"; sha256="0fzcg6m73qa1fzzbq0kqir69axxcgilr0r3kgajrh8hfdrqvxhx2"; depends=[MeSHDbi]; };
-  MeSH_Pto_eg_db = derive2 { name="MeSH.Pto.eg.db"; version="1.10.0"; sha256="0kmsmdpvjnfa2wqdpka70wl5cbpf7bc0bvnf2lj559sdg18glr0d"; depends=[MeSHDbi]; };
-  MeSH_Ptr_eg_db = derive2 { name="MeSH.Ptr.eg.db"; version="1.10.0"; sha256="106wa8vv3v13yn3c3dfbqsp5gm8g2bh1r5yc6kynp3pyxxwnmmpi"; depends=[MeSHDbi]; };
-  MeSH_Rno_eg_db = derive2 { name="MeSH.Rno.eg.db"; version="1.10.0"; sha256="000p0jvdwxjkkzh94llzxbhdp5q76d3n8wbgk7iblxwm7aq48q4l"; depends=[MeSHDbi]; };
-  MeSH_Sce_S288c_eg_db = derive2 { name="MeSH.Sce.S288c.eg.db"; version="1.10.0"; sha256="04mn9gihl6zdv7d05f7q2jvr9xh6f2276p38rxq13xyh1y797lsf"; depends=[MeSHDbi]; };
-  MeSH_Sco_A32_eg_db = derive2 { name="MeSH.Sco.A32.eg.db"; version="1.10.0"; sha256="1h8x4jwcn0dra927nb5s0dq2w4rv8vdmf82vd17xpj46f051k10m"; depends=[MeSHDbi]; };
-  MeSH_Sil_eg_db = derive2 { name="MeSH.Sil.eg.db"; version="1.10.0"; sha256="09s2q794zylkv7ac73dja8cm3i33dv334dzyppw4d3hjdc7fbb8h"; depends=[MeSHDbi]; };
-  MeSH_Spu_eg_db = derive2 { name="MeSH.Spu.eg.db"; version="1.10.0"; sha256="1dbhnyppwq1hhs71a123c0l3zlvmgzys71wlihvfp9cbz65cav6p"; depends=[MeSHDbi]; };
-  MeSH_Ssc_eg_db = derive2 { name="MeSH.Ssc.eg.db"; version="1.10.0"; sha256="0m3pa3nap2z0sdw0fcx74jly8rkpvrqjzjhjqbck86zirzw48r82"; depends=[MeSHDbi]; };
-  MeSH_Syn_eg_db = derive2 { name="MeSH.Syn.eg.db"; version="1.10.0"; sha256="000d65ba942dqk73jbp7hf8jkq5jhvy5b3xqqbmqjp0a3m1pm6ln"; depends=[MeSHDbi]; };
-  MeSH_Tbr_9274_eg_db = derive2 { name="MeSH.Tbr.9274.eg.db"; version="1.10.0"; sha256="16294ss0i9vpsxapn0m6awf7bl8nglh6ir2i0z47985vaclzx86x"; depends=[MeSHDbi]; };
-  MeSH_Tgo_ME49_eg_db = derive2 { name="MeSH.Tgo.ME49.eg.db"; version="1.10.0"; sha256="050lv051549bcx1n7hlbgh76wxwmz9yrdn0582ixmc240jvgg8xs"; depends=[MeSHDbi]; };
-  MeSH_Tgu_eg_db = derive2 { name="MeSH.Tgu.eg.db"; version="1.10.0"; sha256="1nhnqljin6ia8ra6ma3hkabsnm7vqad411a6bb16yfn9c384c0x9"; depends=[MeSHDbi]; };
-  MeSH_Vvi_eg_db = derive2 { name="MeSH.Vvi.eg.db"; version="1.10.0"; sha256="0zg433hj5f0l7lls4172lv3f3vnr90gc5fxiifpviam2ibv1r114"; depends=[MeSHDbi]; };
-  MeSH_Xla_eg_db = derive2 { name="MeSH.Xla.eg.db"; version="1.10.0"; sha256="08yzw25ahckffy6sqwp0qbsp79jr00dk2qgs0g7k3yv7j86yfla9"; depends=[MeSHDbi]; };
-  MeSH_Xtr_eg_db = derive2 { name="MeSH.Xtr.eg.db"; version="1.10.0"; sha256="0bkd4skxdv3ffhq21j74ghg1ksgd0666rbj89d3c01dyn0dhb1lv"; depends=[MeSHDbi]; };
-  MeSH_Zma_eg_db = derive2 { name="MeSH.Zma.eg.db"; version="1.10.0"; sha256="0zhkq8skl4ahbqims1s72m5mf59lvjvzz1x6fg9kwbskfv4y3i93"; depends=[MeSHDbi]; };
-  MeSH_db = derive2 { name="MeSH.db"; version="1.10.0"; sha256="1vh7r2din6746z2v4z42inhyyhywi9lahwszm6z42rirzxhcg3xz"; depends=[MeSHDbi]; };
+  MafDb_gnomADex_r2_0_1_hs37d5 = derive2 { name="MafDb.gnomADex.r2.0.1.hs37d5"; version="3.8.0"; sha256="0xz6ayip0cdbal6gsc8wpjyg3rr1kadaddv8flw5k8ky84mckzbc"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MafDb_gnomADex_r2_1_hs37d5 = derive2 { name="MafDb.gnomADex.r2.1.hs37d5"; version="3.8.0"; sha256="06vicw9z05j1pw30sw0f2nkcixc14yn3anq0g3317i3rb1kvmwid"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
+  MeSH_AOR_db = derive2 { name="MeSH.AOR.db"; version="1.11.0"; sha256="02ysykmbn1b6rv3fbq71g9lnv16gvxyvb9p9smvm0k9brb7s0q24"; depends=[MeSHDbi]; };
+  MeSH_Aca_eg_db = derive2 { name="MeSH.Aca.eg.db"; version="1.11.0"; sha256="13x69ki5g99hravrfdll98z2n7nghvf02v920q4g2bgjzzh68sks"; depends=[MeSHDbi]; };
+  MeSH_Aga_PEST_eg_db = derive2 { name="MeSH.Aga.PEST.eg.db"; version="1.11.0"; sha256="1sffv89v1vrlgy36kf7q7ixnc2iwfaa2h0dsxrg0pjmzsq669h9s"; depends=[MeSHDbi]; };
+  MeSH_Ame_eg_db = derive2 { name="MeSH.Ame.eg.db"; version="1.11.0"; sha256="0ssivaq31rjagw5sdjg9ai3bm73mdvdrkqz0snf3phdgxpvldqms"; depends=[MeSHDbi]; };
+  MeSH_Aml_eg_db = derive2 { name="MeSH.Aml.eg.db"; version="1.11.0"; sha256="0cl95vipqcjf1pb9bjzvxa4dc0d5rzac84n9f6l061vhifa2c3pn"; depends=[MeSHDbi]; };
+  MeSH_Ana_eg_db = derive2 { name="MeSH.Ana.eg.db"; version="1.11.0"; sha256="190h3pch16bzx0h674kwywcy3pr1y16jbzczbmmvsxg1l2j549zm"; depends=[MeSHDbi]; };
+  MeSH_Ani_FGSC_eg_db = derive2 { name="MeSH.Ani.FGSC.eg.db"; version="1.11.0"; sha256="0w6gq9xy1v84ksbd849jpj073s51fbhgss8wl6ax4ybxvfp22m0s"; depends=[MeSHDbi]; };
+  MeSH_Ath_eg_db = derive2 { name="MeSH.Ath.eg.db"; version="1.11.0"; sha256="0jdxvnhxrajhd5dr6hzfii7b1n6x874qfc8999pw8y8rwh8c4ln7"; depends=[MeSHDbi]; };
+  MeSH_Bfl_eg_db = derive2 { name="MeSH.Bfl.eg.db"; version="1.11.0"; sha256="0vqyanf9n9ji77zkck3vyrrhm87hx3yxiy9fpwal6a0vh31vrjb9"; depends=[MeSHDbi]; };
+  MeSH_Bsu_168_eg_db = derive2 { name="MeSH.Bsu.168.eg.db"; version="1.11.0"; sha256="11f9jibxf0amhixhs2pvmx6ir1530qkm9xcjrj09hwyx687bs3z8"; depends=[MeSHDbi]; };
+  MeSH_Bta_eg_db = derive2 { name="MeSH.Bta.eg.db"; version="1.11.0"; sha256="03nbmbnbfvpja1p9rnqy1mpamlab0fd2y4fkx456jmnl87m1zk0n"; depends=[MeSHDbi]; };
+  MeSH_Cal_SC5314_eg_db = derive2 { name="MeSH.Cal.SC5314.eg.db"; version="1.11.0"; sha256="0pd9gigwrckz9drh3x7n9nvvcq2q2wwmczkhhkqlpp4qhg85yp7g"; depends=[MeSHDbi]; };
+  MeSH_Cbr_eg_db = derive2 { name="MeSH.Cbr.eg.db"; version="1.11.0"; sha256="1rjb9ldrn2jg73p2j9mjn61ljw83bhr07yq7482lp4mglhwvqibm"; depends=[MeSHDbi]; };
+  MeSH_Cel_eg_db = derive2 { name="MeSH.Cel.eg.db"; version="1.11.0"; sha256="14ywqllqgynwfxyxrkw2d6r7m2n82znx9s15l62d7jb88pvaajn6"; depends=[MeSHDbi]; };
+  MeSH_Cfa_eg_db = derive2 { name="MeSH.Cfa.eg.db"; version="1.11.0"; sha256="0b5b5dyh99gykdp3whdz7rjz1862p3w4jigy7s1bjmhv4pm3bn2d"; depends=[MeSHDbi]; };
+  MeSH_Cin_eg_db = derive2 { name="MeSH.Cin.eg.db"; version="1.11.0"; sha256="1cbwqyb4ja10j0250lggbpxgpivf0xj1m7hn4l687rdidxgrmy4s"; depends=[MeSHDbi]; };
+  MeSH_Cja_eg_db = derive2 { name="MeSH.Cja.eg.db"; version="1.11.0"; sha256="0b5q8yclcx18f8aq45ikv7qyw0xfsksjf1fbl6fprflvzfz2cnir"; depends=[MeSHDbi]; };
+  MeSH_Cpo_eg_db = derive2 { name="MeSH.Cpo.eg.db"; version="1.11.0"; sha256="1rd90rzipaa480sahh7pqlv1qzj1wcx543gkshj6mcfkr6r08zci"; depends=[MeSHDbi]; };
+  MeSH_Cre_eg_db = derive2 { name="MeSH.Cre.eg.db"; version="1.11.0"; sha256="0xg2mi60qlg76g1zxmybcixci8nivw4ld91qxf13jybcr0mwf9xn"; depends=[MeSHDbi]; };
+  MeSH_Dan_eg_db = derive2 { name="MeSH.Dan.eg.db"; version="1.11.0"; sha256="0l80s6v7p2n7p17chbk6a7y5y2b02z38x034jwg3yvyfqy073r11"; depends=[MeSHDbi]; };
+  MeSH_Dda_3937_eg_db = derive2 { name="MeSH.Dda.3937.eg.db"; version="1.11.0"; sha256="187zq75qz7jysz8jg5k5sgvxkrpvdyyi8xlsidi774nyb7z5d96l"; depends=[MeSHDbi]; };
+  MeSH_Ddi_AX4_eg_db = derive2 { name="MeSH.Ddi.AX4.eg.db"; version="1.11.0"; sha256="1aicyzgw5nx6z9q339cd1iabi7a1yjswla0j94anqwh783lqrpxq"; depends=[MeSHDbi]; };
+  MeSH_Der_eg_db = derive2 { name="MeSH.Der.eg.db"; version="1.11.0"; sha256="03rvcxawyhckg693w2ngnk3sljgz7idha6iqyax8p8wagl2h5ipv"; depends=[MeSHDbi]; };
+  MeSH_Dgr_eg_db = derive2 { name="MeSH.Dgr.eg.db"; version="1.11.0"; sha256="17d3ankadjsvddfqxqm3hnqcmsr2rknkbvraq6zpdl7xw3r21yfn"; depends=[MeSHDbi]; };
+  MeSH_Dme_eg_db = derive2 { name="MeSH.Dme.eg.db"; version="1.11.0"; sha256="1j3wsmspg7w30y04l173pihac9xg633w8zj2scz6jnph6rgxw3p1"; depends=[MeSHDbi]; };
+  MeSH_Dmo_eg_db = derive2 { name="MeSH.Dmo.eg.db"; version="1.11.0"; sha256="0640jfik9qp15h5180rn1afd2kv2wh5s0nbv2zjiz6089csb2fnf"; depends=[MeSHDbi]; };
+  MeSH_Dpe_eg_db = derive2 { name="MeSH.Dpe.eg.db"; version="1.11.0"; sha256="1y058sma4p48fj5f8v2i79nak5892pkk7rmr3i18jv44c8246zzl"; depends=[MeSHDbi]; };
+  MeSH_Dre_eg_db = derive2 { name="MeSH.Dre.eg.db"; version="1.11.0"; sha256="03dybrs5zhnil83jp37hq4rh8ybvyjnqpkr2vwa7f1kd65mq33za"; depends=[MeSHDbi]; };
+  MeSH_Dse_eg_db = derive2 { name="MeSH.Dse.eg.db"; version="1.11.0"; sha256="032kjhsm39jck9gxlg15g4x6n4r2iyi339vm6b9v4xcays45h9hi"; depends=[MeSHDbi]; };
+  MeSH_Dsi_eg_db = derive2 { name="MeSH.Dsi.eg.db"; version="1.11.0"; sha256="0h60gqkc4cjkbqs8i3x6z774qq4ihp20bssi70wli6fvsiysgbly"; depends=[MeSHDbi]; };
+  MeSH_Dvi_eg_db = derive2 { name="MeSH.Dvi.eg.db"; version="1.11.0"; sha256="1c8rg4h6gcs4y5gxz1z66a0ma3xpg4sdp6zwzcyrq02r2vjwj6ls"; depends=[MeSHDbi]; };
+  MeSH_Dya_eg_db = derive2 { name="MeSH.Dya.eg.db"; version="1.11.0"; sha256="03aycm5222wkx6rh7x204rkcxnh6amghm2zpzqiy4c5a2a871y9d"; depends=[MeSHDbi]; };
+  MeSH_Eco_55989_eg_db = derive2 { name="MeSH.Eco.55989.eg.db"; version="1.11.0"; sha256="0qqwwa3hk8ds2nv7xndqx4z9s00524sqrpgxh690yhdczn1ridqd"; depends=[MeSHDbi]; };
+  MeSH_Eco_ED1a_eg_db = derive2 { name="MeSH.Eco.ED1a.eg.db"; version="1.11.0"; sha256="1v47a80lvhhbl7sqx881nx1m4pqi6mprmgd03cvk4vhrgv74ji8f"; depends=[MeSHDbi]; };
+  MeSH_Eco_IAI39_eg_db = derive2 { name="MeSH.Eco.IAI39.eg.db"; version="1.11.0"; sha256="0mpabfvji1y1irgm5wkbinabriwbbb6wg6a0rc4mq5vn6j8nia36"; depends=[MeSHDbi]; };
+  MeSH_Eco_K12_MG1655_eg_db = derive2 { name="MeSH.Eco.K12.MG1655.eg.db"; version="1.11.0"; sha256="1sb0b82ibvk2n22a88c7qkmb3wch6zcgaah54p920dih2xxx24nb"; depends=[MeSHDbi]; };
+  MeSH_Eco_O157_H7_Sakai_eg_db = derive2 { name="MeSH.Eco.O157.H7.Sakai.eg.db"; version="1.11.0"; sha256="1i65691h3w34kvqswfkg6klpj8gm39p6csa8da4hlbwc7q58zzpf"; depends=[MeSHDbi]; };
+  MeSH_Eco_UMN026_eg_db = derive2 { name="MeSH.Eco.UMN026.eg.db"; version="1.11.0"; sha256="12yrsy71g0r6w028i56kxknkb4gr34x4d6064m61023234j31j69"; depends=[MeSHDbi]; };
+  MeSH_Eqc_eg_db = derive2 { name="MeSH.Eqc.eg.db"; version="1.11.0"; sha256="19ihdqwlrifd6nyi1bbxnjbq7qqb535d47mm5h0f1pz2h6w6jps6"; depends=[MeSHDbi]; };
+  MeSH_Gga_eg_db = derive2 { name="MeSH.Gga.eg.db"; version="1.11.0"; sha256="1f2f9vqdaqi6iak6yg3rcgcpvhaz76zl4hywnlz1gi7aszxiff0k"; depends=[MeSHDbi]; };
+  MeSH_Gma_eg_db = derive2 { name="MeSH.Gma.eg.db"; version="1.11.0"; sha256="075hhjahc34bznvmqrlc6vnlq25c4ybsyd6ry5qmnzccpxyqhgv8"; depends=[MeSHDbi]; };
+  MeSH_Hsa_eg_db = derive2 { name="MeSH.Hsa.eg.db"; version="1.11.0"; sha256="0c7kb73jrr74a05jgyf903bvy92pn23aklflnl2cqqwxqjc6f9hm"; depends=[MeSHDbi]; };
+  MeSH_Laf_eg_db = derive2 { name="MeSH.Laf.eg.db"; version="1.11.0"; sha256="1zg7c08z6j02sg74ff1q3hnmy5bszd6g5dyr0hxxqivx28bmirya"; depends=[MeSHDbi]; };
+  MeSH_Lma_eg_db = derive2 { name="MeSH.Lma.eg.db"; version="1.11.0"; sha256="1p70v5bvhawsh954mmnxiy734n0z6b0mfl4j3i2g3jijwrds9f6v"; depends=[MeSHDbi]; };
+  MeSH_Mdo_eg_db = derive2 { name="MeSH.Mdo.eg.db"; version="1.11.0"; sha256="0997k7iwq49sf2fn88lgx5j3rhsv9g7mldsm2bpsqmw52d8j568f"; depends=[MeSHDbi]; };
+  MeSH_Mes_eg_db = derive2 { name="MeSH.Mes.eg.db"; version="1.11.0"; sha256="16pxwy7yycdp59j3nvz58jc8h2y251b4prpk4nn589z7pk37hw52"; depends=[MeSHDbi]; };
+  MeSH_Mga_eg_db = derive2 { name="MeSH.Mga.eg.db"; version="1.11.0"; sha256="0dmdfi983i2sf56b06p7q1w7n8ik3j1dkfw1x1cc207wmmns4916"; depends=[MeSHDbi]; };
+  MeSH_Miy_eg_db = derive2 { name="MeSH.Miy.eg.db"; version="1.11.0"; sha256="024076n31mpz2fr7dbf5di6gxn1w1gajx95065vl4555zx46i9n1"; depends=[MeSHDbi]; };
+  MeSH_Mml_eg_db = derive2 { name="MeSH.Mml.eg.db"; version="1.11.0"; sha256="0rbnysb12i2f1a9xz0869m5n031j60c8bxnj1cp0zxlnylamf7w0"; depends=[MeSHDbi]; };
+  MeSH_Mmu_eg_db = derive2 { name="MeSH.Mmu.eg.db"; version="1.11.0"; sha256="1h9jz00bgz54nknl95jf60qqgmn5iyq766sdkxn7r54h9315c9g9"; depends=[MeSHDbi]; };
+  MeSH_Mtr_eg_db = derive2 { name="MeSH.Mtr.eg.db"; version="1.11.0"; sha256="1b4nhix3ky4d0cm8hix9m7chcgdyskvd0h7fj3k13a4zxyxvfw9x"; depends=[MeSHDbi]; };
+  MeSH_Nle_eg_db = derive2 { name="MeSH.Nle.eg.db"; version="1.11.0"; sha256="16fcswjrv056g5d6ikf2g8af470djf02pyxhp5ib6gk932vl7kp0"; depends=[MeSHDbi]; };
+  MeSH_Oan_eg_db = derive2 { name="MeSH.Oan.eg.db"; version="1.11.0"; sha256="08cdkyvwss0cczd6j19j02950jpqhhzi79y9swqnzzh3nydb3aqj"; depends=[MeSHDbi]; };
+  MeSH_Ocu_eg_db = derive2 { name="MeSH.Ocu.eg.db"; version="1.11.0"; sha256="09nigd6hc3iy3s2r70ixfyj04la8cnaxhvr5i1k0adapjgf4q1mx"; depends=[MeSHDbi]; };
+  MeSH_Oni_eg_db = derive2 { name="MeSH.Oni.eg.db"; version="1.11.0"; sha256="1cwhbrpiznkfbkxchpddkr68jzcxzn0mvn8cy81dm0vj4x8dxjb8"; depends=[MeSHDbi]; };
+  MeSH_Osa_eg_db = derive2 { name="MeSH.Osa.eg.db"; version="1.11.0"; sha256="0psaqhdi4hicy5vkngkh7ig5ndsjl768n9fg36zlvqllww58kfis"; depends=[MeSHDbi]; };
+  MeSH_PCR_db = derive2 { name="MeSH.PCR.db"; version="1.11.0"; sha256="0jdwxkwinbnvap0mpirzcd4zgfvhsmca2r57s2lzh2i1x24hxa4c"; depends=[MeSHDbi]; };
+  MeSH_Pab_eg_db = derive2 { name="MeSH.Pab.eg.db"; version="1.11.0"; sha256="16qcm0d8m53dkwfbcsygbm3xj7x6hblwpa4agds5vnlkb26m48qn"; depends=[MeSHDbi]; };
+  MeSH_Pae_PAO1_eg_db = derive2 { name="MeSH.Pae.PAO1.eg.db"; version="1.11.0"; sha256="1w3zqynqjv79ixxnmn3khvj3p6586nq48dx00rap6vzirmhzigqv"; depends=[MeSHDbi]; };
+  MeSH_Pfa_3D7_eg_db = derive2 { name="MeSH.Pfa.3D7.eg.db"; version="1.11.0"; sha256="0ryxhk5g07fpnnk72q5a2847k6w509956fcxnrvwvp7f98p3z50x"; depends=[MeSHDbi]; };
+  MeSH_Pto_eg_db = derive2 { name="MeSH.Pto.eg.db"; version="1.11.0"; sha256="0i1772rpq95ppzxa809ms1r65d9rk5vqhcl36ndjs2lhzdydw8fz"; depends=[MeSHDbi]; };
+  MeSH_Ptr_eg_db = derive2 { name="MeSH.Ptr.eg.db"; version="1.11.0"; sha256="0xgi89vzhxkmqx0y84i58jkxikksqdi64r82p59ir6l1anpyvvc9"; depends=[MeSHDbi]; };
+  MeSH_Rno_eg_db = derive2 { name="MeSH.Rno.eg.db"; version="1.11.0"; sha256="0g0fnackq1yjaw0b3ppzbcj0sfx288wm6cv57ly69svfg1n0wlk5"; depends=[MeSHDbi]; };
+  MeSH_Sce_S288c_eg_db = derive2 { name="MeSH.Sce.S288c.eg.db"; version="1.11.0"; sha256="1z29d19is5lq8rqrkk1dyifgn0v2i68pbw8i7dlwnnicj2sfpynb"; depends=[MeSHDbi]; };
+  MeSH_Sco_A32_eg_db = derive2 { name="MeSH.Sco.A32.eg.db"; version="1.11.0"; sha256="0dcxjlpc9diz1lvrkpbrab5zjz96r837x7ij9786966a3x458xk0"; depends=[MeSHDbi]; };
+  MeSH_Sil_eg_db = derive2 { name="MeSH.Sil.eg.db"; version="1.11.0"; sha256="0gpj4i2mls1qkyivxy2gk3b8w9vkxnwf2b0cpmbv5bvpjcsbw47i"; depends=[MeSHDbi]; };
+  MeSH_Spu_eg_db = derive2 { name="MeSH.Spu.eg.db"; version="1.11.0"; sha256="14knm1h8mp5qfjbny2wwkj772x72laxgymhsa04m78mb38qhypwq"; depends=[MeSHDbi]; };
+  MeSH_Ssc_eg_db = derive2 { name="MeSH.Ssc.eg.db"; version="1.11.0"; sha256="0hwgkq669g99yrkbpk3pjpxbz7q0vwvkcx3rrvdk9dnjinlbcn54"; depends=[MeSHDbi]; };
+  MeSH_Syn_eg_db = derive2 { name="MeSH.Syn.eg.db"; version="1.11.0"; sha256="1mz986apgfd6sn62wws948yi46r87fzaszxnv450fgc42l23l0jx"; depends=[MeSHDbi]; };
+  MeSH_Tbr_9274_eg_db = derive2 { name="MeSH.Tbr.9274.eg.db"; version="1.11.0"; sha256="0dvz5xbx6vdmqibpq8xmpdjfvvqw7iqq3w4d350sxj5kaw2afp5s"; depends=[MeSHDbi]; };
+  MeSH_Tgo_ME49_eg_db = derive2 { name="MeSH.Tgo.ME49.eg.db"; version="1.11.0"; sha256="08hyvaqsvdpcizsqr53ab6bfh1fnlsj8d62pq03lpgr96rlyqi8q"; depends=[MeSHDbi]; };
+  MeSH_Tgu_eg_db = derive2 { name="MeSH.Tgu.eg.db"; version="1.11.0"; sha256="0mid3qmv7kxc7kn69vbhgchvrbv4fig97nw9zxsbd0rj66abzas2"; depends=[MeSHDbi]; };
+  MeSH_Vvi_eg_db = derive2 { name="MeSH.Vvi.eg.db"; version="1.11.0"; sha256="1pwq58mm7ripnzxcn13k1y157pjasrv30xxmrrqb4rv55nk61vbf"; depends=[MeSHDbi]; };
+  MeSH_Xla_eg_db = derive2 { name="MeSH.Xla.eg.db"; version="1.11.0"; sha256="0qd75lkyrs864sy3sci3bablipn9gabk24wbriis9bi0qf7hccv5"; depends=[MeSHDbi]; };
+  MeSH_Xtr_eg_db = derive2 { name="MeSH.Xtr.eg.db"; version="1.11.0"; sha256="0djsx876h0xz0h8jhs6yad8iqqjlr72b0fxasqgh89zpfp2hkvwd"; depends=[MeSHDbi]; };
+  MeSH_Zma_eg_db = derive2 { name="MeSH.Zma.eg.db"; version="1.11.0"; sha256="08b92lhq2gbvbm7y0q4zc991wi1fjhm68n03b782h2g6syczmlma"; depends=[MeSHDbi]; };
+  MeSH_db = derive2 { name="MeSH.db"; version="1.11.0"; sha256="1l6hynwmhb8p666q8n9dnvd0nhjy1f9nz2jg3z2p13dc5jl6syiw"; depends=[MeSHDbi]; };
   MmAgilentDesign026655_db = derive2 { name="MmAgilentDesign026655.db"; version="3.2.3"; sha256="00d0yjcb5id7zacx4bzdwy4q6f4qvnnx8ph4d4xz1fmcbspz2qiz"; depends=[AnnotationDbi org_Mm_eg_db]; };
   MoExExonProbesetLocation = derive2 { name="MoExExonProbesetLocation"; version="1.15.0"; sha256="0bvj3bji4bwwmxjz4b57n1aqypdibdmry30rfwmlxss1hav96sl7"; depends=[AnnotationDbi]; };
   Mu15v1_db = derive2 { name="Mu15v1.db"; version="3.2.3"; sha256="0qchqkbx6ybijab8qhflxj33kwksfll1d3d3917vydjac9fzw1lz"; depends=[AnnotationDbi org_Mm_eg_db]; };
@@ -236,7 +257,7 @@ in with self; {
   Norway981_db = derive2 { name="Norway981.db"; version="3.2.3"; sha256="04ngc2hilqi9m7933mnm7jcvkxlz68vqqh5b628db575vcxql9b9"; depends=[AnnotationDbi org_Hs_eg_db]; };
   OperonHumanV3_db = derive2 { name="OperonHumanV3.db"; version="3.2.3"; sha256="082gff88cwk2p50q8g9bixggacaclgqcvk6w5dc11h9fkgvd160i"; depends=[AnnotationDbi org_Hs_eg_db]; };
   PANTHER_db = derive2 { name="PANTHER.db"; version="1.0.4"; sha256="1vl8anixkhcb9axlszk479yaw48bz1hhgmff41nqk8k8w4jkyn1y"; depends=[AnnotationDbi RSQLite]; };
-  PFAM_db = derive2 { name="PFAM.db"; version="3.6.0"; sha256="1zlrwps1kwl2h0cmvh0qqmn93n2md6yrkm47nz2vy080dry0q0ix"; depends=[AnnotationDbi]; };
+  PFAM_db = derive2 { name="PFAM.db"; version="3.7.0"; sha256="0ih3xz8vk80xzqwgv6ff3rp1a24qhwd1v1frkq1m6d981g7ymdap"; depends=[AnnotationDbi]; };
   POCRCannotation_db = derive2 { name="POCRCannotation.db"; version="3.2.3"; sha256="0ybvs4hrxpivdkhm0fxpib11vlxqqdk8prlyj78vj5qzyb3iy89d"; depends=[AnnotationDbi org_Hs_eg_db]; };
   PartheenMetaData_db = derive2 { name="PartheenMetaData.db"; version="3.2.3"; sha256="0d37c5b7s3fgkkvg7sj7gl9ksrjk5pyyv54vkys8w3qwgsm8yrdz"; depends=[AnnotationDbi org_Hs_eg_db]; };
   PolyPhen_Hsapiens_dbSNP131 = derive2 { name="PolyPhen.Hsapiens.dbSNP131"; version="1.0.2"; sha256="1kikygkli41sn3rqihz0924prmqg2264ifj29vmg1a7qccm0kf7c"; depends=[AnnotationDbi RSQLite VariantAnnotation]; };
@@ -257,38 +278,39 @@ in with self; {
   SNPlocs_Hsapiens_dbSNP144_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP144.GRCh38"; version="0.99.20"; sha256="0yxmsnxncr7w30r0d7bg5i96pclm2vf40p9jdqa02rc67a6sximn"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
   SNPlocs_Hsapiens_dbSNP149_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP149.GRCh38"; version="0.99.20"; sha256="17bv25p1261hn9d7mxfp6pvivj15pxyvr92gms8a8msfqg9y0xkb"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
   SNPlocs_Hsapiens_dbSNP150_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP150.GRCh38"; version="0.99.20"; sha256="0jkwwgxxpm9ry8kizq8hs70sky41pks1ag40y5aqq91yjbpqlckj"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
+  SNPlocs_Hsapiens_dbSNP151_GRCh38 = derive2 { name="SNPlocs.Hsapiens.dbSNP151.GRCh38"; version="0.99.20"; sha256="19mmzlg76hh0imrqf135kcbwxkmm403gj9y7wk6ij9k12afr9kfz"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
   TxDb_Athaliana_BioMart_plantsmart22 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart22"; version="3.0.1"; sha256="0j2zr4cddad7z1lxx9m9kfgyy7jajjnblpk9j8igd39ia3ixrpzc"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Athaliana_BioMart_plantsmart25 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart25"; version="3.1.3"; sha256="0a6v0l6p13zmiysi3k8dxzdlxng552qqj9rnlbdavdiidla0pvm3"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Athaliana_BioMart_plantsmart28 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart28"; version="3.2.2"; sha256="1yjyvrbx55y024lqg3b2rlf8pngqw5xi3p83j5ipan05wf0aq6ir"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Btaurus_UCSC_bosTau8_refGene = derive2 { name="TxDb.Btaurus.UCSC.bosTau8.refGene"; version="3.4.3"; sha256="1i4r6gmw2kv67hiwc5k2f0jzh87nx2l8q8ksxqy9hdn1q5wpsrxl"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Celegans_UCSC_ce11_refGene = derive2 { name="TxDb.Celegans.UCSC.ce11.refGene"; version="3.4.3"; sha256="1q68ds8j7m4a1sagn1ypc6p7qqdkdvmhjg7z57ksdl3w4rhkk1w9"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Btaurus_UCSC_bosTau8_refGene = derive2 { name="TxDb.Btaurus.UCSC.bosTau8.refGene"; version="3.4.4"; sha256="18gmx57savyvvdkgnrvmc4xj3xrakybyx4pkfmpabnqy29z6n71q"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Celegans_UCSC_ce11_refGene = derive2 { name="TxDb.Celegans.UCSC.ce11.refGene"; version="3.4.4"; sha256="04jcx40z2380x760wbl686zvm780y38kls1js215jhmw7hff8md5"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Celegans_UCSC_ce6_ensGene = derive2 { name="TxDb.Celegans.UCSC.ce6.ensGene"; version="3.2.2"; sha256="1sgppva33cdy4isj2is8mfalj5gmmkpbkq9w1d83a4agcq31mi90"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Cfamiliaris_UCSC_canFam3_refGene = derive2 { name="TxDb.Cfamiliaris.UCSC.canFam3.refGene"; version="3.4.3"; sha256="1yh4cp509rfw5xj0la49gyxy26l8fasap7dhianhhfnsdqkayzrs"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Cfamiliaris_UCSC_canFam3_refGene = derive2 { name="TxDb.Cfamiliaris.UCSC.canFam3.refGene"; version="3.4.4"; sha256="1rl7yc2csc3fs2iri0kkvpjv34jnhkzc0jhh2a3hnyvhv55lzmf0"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Dmelanogaster_UCSC_dm3_ensGene = derive2 { name="TxDb.Dmelanogaster.UCSC.dm3.ensGene"; version="3.2.2"; sha256="1337x23rdmiiza83ms225kri37h16q5hw1lw0m577abcgip3d7c7"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Dmelanogaster_UCSC_dm6_ensGene = derive2 { name="TxDb.Dmelanogaster.UCSC.dm6.ensGene"; version="3.4.1"; sha256="0sdw0gbk84lfjmiyy2x4q01zh1vbjq3vfziwxkb4h0v6nab63k01"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Drerio_UCSC_danRer10_refGene = derive2 { name="TxDb.Drerio.UCSC.danRer10.refGene"; version="3.4.3"; sha256="03awii2bq91glqwklr0m48p6qlxq4rij39ncq2f6sbzw5iqqjjbr"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Ggallus_UCSC_galGal4_refGene = derive2 { name="TxDb.Ggallus.UCSC.galGal4.refGene"; version="3.4.3"; sha256="1a17401a8lfkv7acxxsh02yrmrmw7mj3207jgrcxjmbd6sicymy8"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Ggallus_UCSC_galGal5_refGene = derive2 { name="TxDb.Ggallus.UCSC.galGal5.refGene"; version="3.4.3"; sha256="124hdrj3n77pw7jkxfga8b4flp5xlzynn50fpfjh163jkdb6r9ij"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Dmelanogaster_UCSC_dm6_ensGene = derive2 { name="TxDb.Dmelanogaster.UCSC.dm6.ensGene"; version="3.4.4"; sha256="18nwjnkbrvrkk6g5jns3h55874hk92fdbrfyjvvxk4daw0p7gii8"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Drerio_UCSC_danRer10_refGene = derive2 { name="TxDb.Drerio.UCSC.danRer10.refGene"; version="3.4.4"; sha256="1ck4ymlxj0fjrbgxzgdqgbyl3z4nqyc6bczw1cgwblmcv52h3cj0"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Ggallus_UCSC_galGal4_refGene = derive2 { name="TxDb.Ggallus.UCSC.galGal4.refGene"; version="3.4.4"; sha256="1cxdrdg3pqwi0rfk5bzik05r1hvxwsva862b7cf7pfcf202dkqg5"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Ggallus_UCSC_galGal5_refGene = derive2 { name="TxDb.Ggallus.UCSC.galGal5.refGene"; version="3.4.4"; sha256="15laq4kdm85755lk176lqsi2aryi9i85b4c1arrj4qgjkjrbylvq"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_BioMart_igis = derive2 { name="TxDb.Hsapiens.BioMart.igis"; version="2.3.2"; sha256="0590a2hkrpm33hmjg5g0gm6sig3xvc09m0q6lwmafgaajf90h6ky"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_UCSC_hg18_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg18.knownGene"; version="3.2.2"; sha256="1yk9ggclkqqfzrdp8gcqyplvif824pa7df54ck5gb1xb9q5s975w"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_UCSC_hg19_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg19.knownGene"; version="3.2.2"; sha256="1sajhcqqwazgz2lqbik7rd935i7kpnh08zxbp2ra10j72yqy4g86"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_UCSC_hg19_lincRNAsTranscripts = derive2 { name="TxDb.Hsapiens.UCSC.hg19.lincRNAsTranscripts"; version="3.2.2"; sha256="0bmbp7kydvviczw8axgxq2wdlwq6fdas90jk9bg56avjq5syws2g"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_UCSC_hg38_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg38.knownGene"; version="3.4.0"; sha256="0i0xw0mcn403r911ijqdnrwg9k5bspdnjibfjvnhxq4h8vcfprn5"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Mmulatta_UCSC_rheMac3_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac3.refGene"; version="3.4.3"; sha256="0g14rkxk44bzrhgl5xyfdb8lpq7m5iv95yk92inljz02qxinp9j4"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Mmulatta_UCSC_rheMac8_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac8.refGene"; version="3.4.3"; sha256="16cmwrij91hj10q3alcxpv0qrfah25z5x23m7lmzrgchsjd84rmw"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Mmulatta_UCSC_rheMac3_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac3.refGene"; version="3.4.4"; sha256="13nv7l71piwf0frnwplwbac82ad7vxbw31yrfnqvnd1knh7ns99x"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Mmulatta_UCSC_rheMac8_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac8.refGene"; version="3.4.4"; sha256="1qgm66hnhqb3jyal8s43yri96k1xwb3vamb83894n86bh2g6nlca"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Mmusculus_UCSC_mm10_ensGene = derive2 { name="TxDb.Mmusculus.UCSC.mm10.ensGene"; version="3.4.0"; sha256="0saxi1fdiwd38sfvy1rynd3v44rbp158jv6sjqcivvaqnd84zg9s"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Mmusculus_UCSC_mm10_knownGene = derive2 { name="TxDb.Mmusculus.UCSC.mm10.knownGene"; version="3.4.0"; sha256="08gava9wsvpcqz51k2sni3pj03n5155v32d9riqbf305nbirqbkb"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Mmusculus_UCSC_mm10_knownGene = derive2 { name="TxDb.Mmusculus.UCSC.mm10.knownGene"; version="3.4.4"; sha256="01lgxc1fx5nhlpbwjd5zqghkkbmh6axd98ikx4b0spv0jdg6gf39"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Mmusculus_UCSC_mm9_knownGene = derive2 { name="TxDb.Mmusculus.UCSC.mm9.knownGene"; version="3.2.2"; sha256="16bjxy00363hf91ik2mqlqls86i07gia72qh92xc3l1ncch61mx2"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Ptroglodytes_UCSC_panTro4_refGene = derive2 { name="TxDb.Ptroglodytes.UCSC.panTro4.refGene"; version="3.4.3"; sha256="0yi7lxvf6aq634nhdpyg0hxj8hab93fs9z8iw6janasb2b5any14"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Ptroglodytes_UCSC_panTro5_refGene = derive2 { name="TxDb.Ptroglodytes.UCSC.panTro5.refGene"; version="3.4.3"; sha256="1ra1kjmqza1y6i018j8q46s4qa5hxnk1w2a0szip9sckxbj8xlab"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Ptroglodytes_UCSC_panTro4_refGene = derive2 { name="TxDb.Ptroglodytes.UCSC.panTro4.refGene"; version="3.4.4"; sha256="12fdcs4vv4l0d3sksdq76nwwj88f8psiy84rd1jhfw8kbxqrhh8y"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Ptroglodytes_UCSC_panTro5_refGene = derive2 { name="TxDb.Ptroglodytes.UCSC.panTro5.refGene"; version="3.4.4"; sha256="00mirzp38iqm0l0py1a7mlslnbmkfzzk1krcg6jdyr8gan2sskpi"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Rnorvegicus_BioMart_igis = derive2 { name="TxDb.Rnorvegicus.BioMart.igis"; version="2.3.2"; sha256="1099vkk8g3lxbgjxsm1p1m3mjj08nsw282mqxgzpnrxf7m6jll76"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Rnorvegicus_UCSC_rn4_ensGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn4.ensGene"; version="3.2.2"; sha256="0gv8bynfxxa471ap069mjvfrb1d7a0c4w5k8hxkr4hnsm44mschm"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Rnorvegicus_UCSC_rn5_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn5.refGene"; version="3.4.3"; sha256="0jpkg9s3ghb61xn3i8x50h7wa0x2ixhzj09n6qk1y661ary5kac2"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Rnorvegicus_UCSC_rn6_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn6.refGene"; version="3.4.3"; sha256="15h2fgxjn92xfyj5yvm460ap7j6ayhkm6i5fgvqyhvgyarmss9a3"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Rnorvegicus_UCSC_rn5_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn5.refGene"; version="3.4.4"; sha256="1h9vmsp8lcr8yyvd1mjm81p8l660bjsx2kyhg3wm96izxgd4i7gn"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Rnorvegicus_UCSC_rn6_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn6.refGene"; version="3.4.4"; sha256="1k4g78kh52ppr4fd5z4bwzzgw8jg6j3zi129fnny4ks6zkadhlw6"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Scerevisiae_UCSC_sacCer2_sgdGene = derive2 { name="TxDb.Scerevisiae.UCSC.sacCer2.sgdGene"; version="3.2.2"; sha256="0l5gcwhbvzx60p9hjhd31angamb0hkgdg2avga7341j77rd5pwza"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Scerevisiae_UCSC_sacCer3_sgdGene = derive2 { name="TxDb.Scerevisiae.UCSC.sacCer3.sgdGene"; version="3.2.2"; sha256="1sjwl7fb3l3zxxbk8gkvzxwdsind0xjj7kmh7dachm6fi17hpb3d"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Sscrofa_UCSC_susScr11_refGene = derive2 { name="TxDb.Sscrofa.UCSC.susScr11.refGene"; version="3.4.3"; sha256="1lwr8yza22q2wqxdbcg37rn3aml5m96hp2m6rkxvs3g08q7wngis"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Sscrofa_UCSC_susScr3_refGene = derive2 { name="TxDb.Sscrofa.UCSC.susScr3.refGene"; version="3.4.3"; sha256="0agd0vn7fb658srqkr3gzk2y8x86xrcsn4hxbyfp2jhiypx60zzx"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Sscrofa_UCSC_susScr11_refGene = derive2 { name="TxDb.Sscrofa.UCSC.susScr11.refGene"; version="3.4.4"; sha256="1c6kbkp6iq6zzpg6wpnbgclp1vsdhh19g220va8b61jhgcccr2c6"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Sscrofa_UCSC_susScr3_refGene = derive2 { name="TxDb.Sscrofa.UCSC.susScr3.refGene"; version="3.4.4"; sha256="1yvjwsq9cn9kyjir53n20fbi8nyf1m64zim18w5mv05w9rn86gdl"; depends=[AnnotationDbi GenomicFeatures]; };
   XtraSNPlocs_Hsapiens_dbSNP141_GRCh38 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP141.GRCh38"; version="0.99.12"; sha256="0a27y0ngg760y5wwcja4dpd7cjd8h5zg1s2b3a1r54s21k65zny3"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
   XtraSNPlocs_Hsapiens_dbSNP144_GRCh37 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP144.GRCh37"; version="0.99.12"; sha256="0k823fvqjmdkmd47m7wyra6jxmv8lnk2i1xl4pp0mh3zgb87hgfb"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
   XtraSNPlocs_Hsapiens_dbSNP144_GRCh38 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP144.GRCh38"; version="0.99.12"; sha256="0d4q32ij2x4726wvw06sgmivid0n94vfdmszdyh607xlcahqxa5z"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
@@ -298,22 +320,22 @@ in with self; {
   agprobe = derive2 { name="agprobe"; version="2.18.0"; sha256="1vnawamcpz16na8nmlq2czfxcr325fwdnngxl65mmnbd0f4lmy3k"; depends=[AnnotationDbi]; };
   alternativeSplicingEvents_hg19 = derive2 { name="alternativeSplicingEvents.hg19"; version="1.0.1"; sha256="1v714abdpzhwa450zr66s1yjpxl6lkwi3wjbwn8phn87cgf8rj7q"; depends=[AnnotationHub]; };
   alternativeSplicingEvents_hg38 = derive2 { name="alternativeSplicingEvents.hg38"; version="1.0.1"; sha256="0im87mrh1n6kv84q6lm4y15lb93rih88zdpa0jms5az91lyvsf25"; depends=[AnnotationHub]; };
-  anopheles_db0 = derive2 { name="anopheles.db0"; version="3.6.0"; sha256="04dgk9q3hsrh4fncf9w4hx8l7qjwcbhbh1cnnfny5y7cpfliib6m"; depends=[AnnotationDbi]; };
-  arabidopsis_db0 = derive2 { name="arabidopsis.db0"; version="3.6.0"; sha256="10xvx3vfj10xcx4w6jvm2c09p6diqjwaspgvwl5lvcm1xxaghsmf"; depends=[AnnotationDbi]; };
+  anopheles_db0 = derive2 { name="anopheles.db0"; version="3.7.1"; sha256="0f940ybh7kr30d9pkqhr0w2yrwsqa25yxbhzhlccn4a6a6svzcwb"; depends=[AnnotationDbi]; };
+  arabidopsis_db0 = derive2 { name="arabidopsis.db0"; version="3.7.1"; sha256="1d7cnhbm44dv0g6mjv76sdr8dgni34fbffzkk95rqikdqag8s9cy"; depends=[AnnotationDbi]; };
   ath1121501_db = derive2 { name="ath1121501.db"; version="3.2.3"; sha256="1zrf26cfhlmrb5pyfawwk4v8l1mflx8c43zsxrwkbmxzc1jnc7dv"; depends=[AnnotationDbi org_At_tair_db]; };
   ath1121501cdf = derive2 { name="ath1121501cdf"; version="2.18.0"; sha256="1naq8f8dwgbmndx178nm2pw6hjx5ljx0w1wb4dfjifnl4bs5rqcc"; depends=[AnnotationDbi]; };
   ath1121501probe = derive2 { name="ath1121501probe"; version="2.18.0"; sha256="0a2nd8zhp3ybis780l3rrmwcxskbl3a111g8w6m8qfwsw5vnlqg1"; depends=[AnnotationDbi]; };
   barley1cdf = derive2 { name="barley1cdf"; version="2.18.0"; sha256="0rbij5cqr2sz33y5waybv85nrcgf70iwj5gk13g0xn9p1l1zxyn2"; depends=[AnnotationDbi]; };
   barley1probe = derive2 { name="barley1probe"; version="2.18.0"; sha256="1kh5r748b4vkmvlfaclmrh07ypbrzgxn90liqfz1rwkabh6rfk71"; depends=[AnnotationDbi]; };
   bovine_db = derive2 { name="bovine.db"; version="3.2.3"; sha256="1i8mgk60hlmvngb4c727wajix9mca9gfg0pzxrnfcjwi87rpw7fy"; depends=[AnnotationDbi org_Bt_eg_db]; };
-  bovine_db0 = derive2 { name="bovine.db0"; version="3.6.0"; sha256="0183qqj03r2wd6s527403zyd9r0jd0yapffp9881xsd3pcn2n310"; depends=[AnnotationDbi]; };
+  bovine_db0 = derive2 { name="bovine.db0"; version="3.7.1"; sha256="17q8hkfips8znwnkk062m8xsvcpaf6ynpf2jjszrcm02495vbw45"; depends=[AnnotationDbi]; };
   bovinecdf = derive2 { name="bovinecdf"; version="2.18.0"; sha256="13mf0yy0dypkm5n2ghl04xm6ayb9bn9qijqhgynksghi7s2k34mb"; depends=[AnnotationDbi]; };
   bovineprobe = derive2 { name="bovineprobe"; version="2.18.0"; sha256="0i4afa5dksnir2nfrfh2cynjm59sm6vfaqa9wyag8cxg7c2nlm1i"; depends=[AnnotationDbi]; };
   bsubtiliscdf = derive2 { name="bsubtiliscdf"; version="2.18.0"; sha256="1rihrjim37b49rhqr4nxga8sp67qri9xqlqc141mhbngh6cw3iyl"; depends=[AnnotationDbi]; };
   bsubtilisprobe = derive2 { name="bsubtilisprobe"; version="2.18.0"; sha256="0k99hvgaswn96x4yanvr9cy8bdy69sd5q7yp6dj9synxj7s1fcw9"; depends=[AnnotationDbi]; };
   cMAP = derive2 { name="cMAP"; version="1.15.1"; sha256="0pzizm27rgcaic7wsh52z30v1jwarmz4cwh1mksbygp63k54mwiv"; depends=[]; };
   canine_db = derive2 { name="canine.db"; version="3.2.3"; sha256="0wbyzhk827l49yxzimvznx9z6yag5nd4djm2hddysf5nk1ndapqs"; depends=[AnnotationDbi org_Cf_eg_db]; };
-  canine_db0 = derive2 { name="canine.db0"; version="3.6.0"; sha256="1cn3s23h8g3a0h0i97v33qh6yz94bw9i8kzd6xwvgwkj0yinw1ib"; depends=[AnnotationDbi]; };
+  canine_db0 = derive2 { name="canine.db0"; version="3.7.1"; sha256="1z691m0ap7x5sb7pbxlk8cs5s6hwvgvdbjjdxlfp8vilciwrsgwn"; depends=[AnnotationDbi]; };
   canine2_db = derive2 { name="canine2.db"; version="3.2.3"; sha256="1gzd2x23dkfiwnwqz9pdn5lp4l8aby525mhscn3xakw633si4dvz"; depends=[AnnotationDbi org_Cf_eg_db]; };
   canine2cdf = derive2 { name="canine2cdf"; version="2.18.0"; sha256="077cmmnhjdk0vxjzm1kqf3q5kgx6chwkm59dr4s5dy019rqb6sqr"; depends=[AnnotationDbi]; };
   canine2probe = derive2 { name="canine2probe"; version="2.18.0"; sha256="1l849a1dqy4kpcsxs0lvb48ag81i0f0ys0w4757rw4kp8ry59z4b"; depends=[AnnotationDbi]; };
@@ -323,10 +345,10 @@ in with self; {
   celeganscdf = derive2 { name="celeganscdf"; version="2.18.0"; sha256="0a6w0a48azg0i21j3aqb7fnxck3ff9w3gsi89bnlfh0zx6pknx7p"; depends=[AnnotationDbi]; };
   celegansprobe = derive2 { name="celegansprobe"; version="2.18.0"; sha256="05k7si3f8pzkyb8jv0r2vkavbrqxsn4nawl92gcphfsylrwcddqb"; depends=[AnnotationDbi]; };
   chicken_db = derive2 { name="chicken.db"; version="3.2.3"; sha256="1rq9afkpcpv8qi75shvnsw8di3ycai4ylv7jq9zwj51zlwlw9cpq"; depends=[AnnotationDbi org_Gg_eg_db]; };
-  chicken_db0 = derive2 { name="chicken.db0"; version="3.6.0"; sha256="1rkqdlnimxnvb8lwlw11w6iwsn42g11nbihj0v78rx9m0n7s6ik1"; depends=[AnnotationDbi]; };
+  chicken_db0 = derive2 { name="chicken.db0"; version="3.7.1"; sha256="0jib8pamnqzppk2x1i8c7szrwvhhilsxbk2x83ajzbzk3df3rvnd"; depends=[AnnotationDbi]; };
   chickencdf = derive2 { name="chickencdf"; version="2.18.0"; sha256="09hhim5s9xj7n2b5rhn1svf5qly2mn0rr2v2ls25hfzyrqcbxlz1"; depends=[AnnotationDbi]; };
   chickenprobe = derive2 { name="chickenprobe"; version="2.18.0"; sha256="1fdsiwfyg7fwslrr7xs3gny7sw24bzg5k1fvlyzb1477sgj0pid3"; depends=[AnnotationDbi]; };
-  chimp_db0 = derive2 { name="chimp.db0"; version="3.6.0"; sha256="121hzz3s816xhbv6rh87i9qas02j2k89cb6my22n9jhyf74r7nfi"; depends=[AnnotationDbi]; };
+  chimp_db0 = derive2 { name="chimp.db0"; version="3.7.1"; sha256="0bgn2yjj1jg0dswn5m4n78lydlzz7qb8fxpm8pl7909xrkcd1lpw"; depends=[AnnotationDbi]; };
   citruscdf = derive2 { name="citruscdf"; version="2.18.0"; sha256="1326mj1xf3k4v5iyyn46whx24qfng0x3cv6rvckdr1ycc1v887dn"; depends=[AnnotationDbi]; };
   citrusprobe = derive2 { name="citrusprobe"; version="2.18.0"; sha256="0bf1wic136cxwgs4j13wsyqasnyvr0jw1hzg6qizndmy7g8hrb87"; depends=[AnnotationDbi]; };
   clariomdhumanprobeset_db = derive2 { name="clariomdhumanprobeset.db"; version="8.7.0"; sha256="039bsywnim0nr8b3w6vkj4m20j0pggnm6ajjz24bnlikm9zzrs6l"; depends=[AnnotationDbi org_Hs_eg_db]; };
@@ -349,14 +371,14 @@ in with self; {
   ecoli2_db = derive2 { name="ecoli2.db"; version="3.2.3"; sha256="07vc5fl2zq2f65ndcldyzvwfpl65snp6ygvw658j4036lbb7cpjl"; depends=[AnnotationDbi org_EcK12_eg_db]; };
   ecoli2cdf = derive2 { name="ecoli2cdf"; version="2.18.0"; sha256="1rkxrwadq9kg9685z9pg6rgc4bblkx5p3c6snsl4gv2k188dva9r"; depends=[AnnotationDbi]; };
   ecoli2probe = derive2 { name="ecoli2probe"; version="2.18.0"; sha256="11q4ka0ncjapahic49xdl9919vm9frrwlqgj101krgkg262lfm8n"; depends=[AnnotationDbi]; };
-  ecoliK12_db0 = derive2 { name="ecoliK12.db0"; version="3.6.0"; sha256="0l64cb1zqhz9wbm4chbapv9mzm9k0h9v7xzga3syydalzaqlln5l"; depends=[AnnotationDbi]; };
-  ecoliSakai_db0 = derive2 { name="ecoliSakai.db0"; version="3.6.0"; sha256="129w24f8k7kg7h99jh6jgrvriy1avblz20dk13linhf9bk466vaw"; depends=[AnnotationDbi]; };
+  ecoliK12_db0 = derive2 { name="ecoliK12.db0"; version="3.7.1"; sha256="075ngixclxh1qqgn5p1afxyx8610rfxj1ax3iqmbvqqlyq9nc9ar"; depends=[AnnotationDbi]; };
+  ecoliSakai_db0 = derive2 { name="ecoliSakai.db0"; version="3.7.1"; sha256="1p3lvf92l44kqn47jhgwd6nqnjl0ksnvmsj1052lrbalh5xl3rcd"; depends=[AnnotationDbi]; };
   ecoliasv2cdf = derive2 { name="ecoliasv2cdf"; version="2.18.0"; sha256="16i6has9qgmzakcy24racc1h9j331wndv5c87qp5r1zrai61zyav"; depends=[AnnotationDbi]; };
   ecoliasv2probe = derive2 { name="ecoliasv2probe"; version="2.18.0"; sha256="1hfrnal170cdigc2fmnynb75jjsiq77p4x6ws9gah558hvx87nk3"; depends=[AnnotationDbi]; };
   ecolicdf = derive2 { name="ecolicdf"; version="2.18.0"; sha256="18g5prjykn356k35m131ifn128k5mhij2x26balqav0azigzjqsn"; depends=[AnnotationDbi]; };
   ecoliprobe = derive2 { name="ecoliprobe"; version="2.18.0"; sha256="17g5zxfzsak7a0w51irc0w1w2i5ngdkx9db6rhv1fyp8mfjgaphd"; depends=[AnnotationDbi]; };
   fitCons_UCSC_hg19 = derive2 { name="fitCons.UCSC.hg19"; version="3.7.1"; sha256="19isa4x8js0pdb4k8a11bw3bzmzv6jc4jphzrvav7piqkvrgykzx"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
-  fly_db0 = derive2 { name="fly.db0"; version="3.6.0"; sha256="15kwa0yl7n0nc579xi3il7yyk4dpijsls34gyd17v8mi4v1a1kwm"; depends=[AnnotationDbi]; };
+  fly_db0 = derive2 { name="fly.db0"; version="3.7.1"; sha256="0l617pksrcgb96bm25qsxlyjz7jp7hqk1sfba516l2gd2rvbp7rs"; depends=[AnnotationDbi]; };
   geneplast_data_string_v91 = derive2 { name="geneplast.data.string.v91"; version="0.99.6"; sha256="0mc26d0sgmpmfmqsqinqv5k6vhg0hlc8hsjkcnvf369yav224nq1"; depends=[]; };
   genomewidesnp5Crlmm = derive2 { name="genomewidesnp5Crlmm"; version="1.0.6"; sha256="06dmwnjy3gb53y6nr02dmp22qzfl5d63wppazrabcqbzwimhnvp8"; depends=[]; };
   genomewidesnp6Crlmm = derive2 { name="genomewidesnp6Crlmm"; version="1.0.7"; sha256="16qcxa32fmbdcv5dck0grsnqyfcqql7wpxa1l6andv9hrvabv2jx"; depends=[]; };
@@ -487,7 +509,7 @@ in with self; {
   hugene20sttranscriptcluster_db = derive2 { name="hugene20sttranscriptcluster.db"; version="8.7.0"; sha256="0ba3yvizj9ya61rr9ik2hdxhy0q67908x16n58jjjfq8wf96h7sp"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hugene21stprobeset_db = derive2 { name="hugene21stprobeset.db"; version="8.7.0"; sha256="0chkxxpfl696qqiai3i30ylpsihyicbs0hbcni6nmnhfz9k5800g"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hugene21sttranscriptcluster_db = derive2 { name="hugene21sttranscriptcluster.db"; version="8.7.0"; sha256="0wk2lg74zkgxh6frmikhk4bxndiyvc1j7mhvz65w8fxfqiwfyf5i"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  human_db0 = derive2 { name="human.db0"; version="3.6.0"; sha256="050cwz99yz27gyrnfhkv474vqz5rfqbv2f7wdjnaphd9xxq8xjr4"; depends=[AnnotationDbi]; };
+  human_db0 = derive2 { name="human.db0"; version="3.7.1"; sha256="1vikw70n828prccs1vlnw3f4rwp5lsp5cb02f56hih4n3mapky9f"; depends=[AnnotationDbi]; };
   human1mduov3bCrlmm = derive2 { name="human1mduov3bCrlmm"; version="1.0.4"; sha256="1p7qpzk6svafgdafljhh4k0z7pcs78qmwwfd80r0a1yhkssmp0v9"; depends=[]; };
   human1mv1cCrlmm = derive2 { name="human1mv1cCrlmm"; version="1.0.3"; sha256="1qlph3qrjv52ddzlj8pwa93zzh70x4mbdrdr7q9pan427lpck9gx"; depends=[]; };
   human370quadv3cCrlmm = derive2 { name="human370quadv3cCrlmm"; version="1.0.3"; sha256="1chjx9vsmqz2whslw1l7jn7nfn7zx6pcjfmqqm9mh81i74rzrdik"; depends=[]; };
@@ -525,7 +547,7 @@ in with self; {
   m20kcod_db = derive2 { name="m20kcod.db"; version="3.4.0"; sha256="1p2sm5j4b50iqzwcb984qrh74c3hf6yml7b8mvxlhhhvxz4iy1np"; depends=[AnnotationDbi org_Mm_eg_db]; };
   maizecdf = derive2 { name="maizecdf"; version="2.18.0"; sha256="0yfz5gjhsq4wz6j63s1b1hxjz03gsmrlfs2cdc8smq6azp3zdid4"; depends=[AnnotationDbi]; };
   maizeprobe = derive2 { name="maizeprobe"; version="2.18.0"; sha256="01h5dv5i0zaqlphkii9ipxy9wswv1srgprrpr5vmi01c9d98qsk0"; depends=[AnnotationDbi]; };
-  malaria_db0 = derive2 { name="malaria.db0"; version="3.6.0"; sha256="0874knxhybbi6idfb9rig3dhwb65xr7imkgqg1yl3scikyvpn37m"; depends=[AnnotationDbi]; };
+  malaria_db0 = derive2 { name="malaria.db0"; version="3.7.1"; sha256="1ljk5xfshp96pibw9k1yb5cl664iashb9rhc1y1bjalyidraznk7"; depends=[AnnotationDbi]; };
   medicagocdf = derive2 { name="medicagocdf"; version="2.18.0"; sha256="1clz679cc887x98c6jk93cphijkbg5r2nd9idrj5901yvh6p9n5q"; depends=[AnnotationDbi]; };
   medicagoprobe = derive2 { name="medicagoprobe"; version="2.18.0"; sha256="0w6j1pfkvb3npc8srpjifq2ywnqxhc9q090jqzmkx22x36cw9cl5"; depends=[AnnotationDbi]; };
   mgu74a_db = derive2 { name="mgu74a.db"; version="3.2.3"; sha256="0xd2gbvry061409kiwq99i13641g8x6m9kbgg4yr0x6m9dh7hxa8"; depends=[AnnotationDbi org_Mm_eg_db]; };
@@ -579,7 +601,7 @@ in with self; {
   mogene20sttranscriptcluster_db = derive2 { name="mogene20sttranscriptcluster.db"; version="8.7.0"; sha256="1s7cdjglrc9qqf3gsmhsyycfa0h5qrbk28i4z3z4mb9g6242r1r4"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mogene21stprobeset_db = derive2 { name="mogene21stprobeset.db"; version="8.7.0"; sha256="0l8y2zbhykzqs9hbjhj1cys1mzdjhmi4rjv4l3v0sv5969h6sl96"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mogene21sttranscriptcluster_db = derive2 { name="mogene21sttranscriptcluster.db"; version="8.7.0"; sha256="1mkw3997mqr7ssa60zpwhlyajda51smcrnlnxwif78g99yj0nrxb"; depends=[AnnotationDbi org_Mm_eg_db]; };
-  mouse_db0 = derive2 { name="mouse.db0"; version="3.6.0"; sha256="0dxx2853blbsbxn65md4zlp59pdqj7wraiq39spxlbkail76yggp"; depends=[AnnotationDbi]; };
+  mouse_db0 = derive2 { name="mouse.db0"; version="3.7.1"; sha256="1fyawqxf1m6cnl6p41q1bqb75k59n8ixn3kw8gf4kq34cldl0h9k"; depends=[AnnotationDbi]; };
   mouse4302_db = derive2 { name="mouse4302.db"; version="3.2.3"; sha256="1wdgqawqzkr39xwl32cap4ksr59p7r7i83g82h1ss4q3lm58gxpm"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mouse4302cdf = derive2 { name="mouse4302cdf"; version="2.18.0"; sha256="1mpyma4x8zfs2fmmx57xw4cfs2cf9lhw71nc3icl72d7vmwidswc"; depends=[AnnotationDbi]; };
   mouse4302frmavecs = derive2 { name="mouse4302frmavecs"; version="1.5.0"; sha256="04clwkfz1gqqwrnqbavkka3hv480w6vi6c4q947qqnhw8j5jjp7s"; depends=[]; };
@@ -616,25 +638,25 @@ in with self; {
   nugomm1a520177cdf = derive2 { name="nugomm1a520177cdf"; version="3.4.0"; sha256="0skd5b76si0vydzk5qhg4f1a1j655alxflm9sqci8fi8safwj96a"; depends=[AnnotationDbi]; };
   nugomm1a520177probe = derive2 { name="nugomm1a520177probe"; version="3.4.0"; sha256="1n70k0mhv146983myjgk1cgkr9rmmcpqdv8wpkcr320qcvgf9bn7"; depends=[AnnotationDbi]; };
   oligoData = derive2 { name="oligoData"; version="1.8.0"; sha256="1d1yfms3jv2c4s255xnh8yxwijrj35skw3nxds7l46y88lg3qn8y"; depends=[oligo]; };
-  org_Ag_eg_db = derive2 { name="org.Ag.eg.db"; version="3.6.0"; sha256="1bqwvg6shkx9764yz8qzy08yhqjajhzgbjmk9cn3fxjipk9v523k"; depends=[AnnotationDbi]; };
-  org_At_tair_db = derive2 { name="org.At.tair.db"; version="3.6.0"; sha256="0vfnfg0cn5iprrsyqn4gjsq9p5fz7imrl16v220497af9k9zg88b"; depends=[AnnotationDbi]; };
-  org_Bt_eg_db = derive2 { name="org.Bt.eg.db"; version="3.6.0"; sha256="1lixfs1w5bnaxc9fyrvwgz9ldp4kxslgv7lm4icvcn517q3knsi4"; depends=[AnnotationDbi]; };
-  org_Ce_eg_db = derive2 { name="org.Ce.eg.db"; version="3.6.0"; sha256="0jvmpm2yk4lr6cjdzqjq6dl4gjfgzb12v8xxws6a1gjbkwyirxd2"; depends=[AnnotationDbi]; };
-  org_Cf_eg_db = derive2 { name="org.Cf.eg.db"; version="3.6.0"; sha256="1xzwi14l2ia5701rzfxl3qmf6nzdlg1a6k4p2q75fxw7c43nkp53"; depends=[AnnotationDbi]; };
-  org_Dm_eg_db = derive2 { name="org.Dm.eg.db"; version="3.6.0"; sha256="0zljw8f7b1c1xlb0rpb3m9p1dj63q7m4ai5dp5qm26wjlhqyk0zx"; depends=[AnnotationDbi]; };
-  org_Dr_eg_db = derive2 { name="org.Dr.eg.db"; version="3.6.0"; sha256="0hj1zxgxxn7ljl1apmlnf2niyb5gjqjv8y0mb8961y8b2iq7wflf"; depends=[AnnotationDbi]; };
-  org_EcK12_eg_db = derive2 { name="org.EcK12.eg.db"; version="3.6.0"; sha256="0pqxbnry2k621szw7zpfg6yn1m3icz3l7l80xh5q4gc2vqri59i8"; depends=[AnnotationDbi]; };
-  org_EcSakai_eg_db = derive2 { name="org.EcSakai.eg.db"; version="3.6.0"; sha256="04gscsr3mrqdprn8jc2ns1mf3h9nm19zh68fayjf0kb1j91k8hdd"; depends=[AnnotationDbi]; };
-  org_Gg_eg_db = derive2 { name="org.Gg.eg.db"; version="3.6.0"; sha256="0jm7k4l8bxrbkhhn1bbc0l9622mszk6c2galrgc3bc091frz1w56"; depends=[AnnotationDbi]; };
-  org_Hs_eg_db = derive2 { name="org.Hs.eg.db"; version="3.6.0"; sha256="0jav4c8av85380lbra41m33ymqy0kx4czni0kn3cpsa3sfk3ij17"; depends=[AnnotationDbi]; };
-  org_Mm_eg_db = derive2 { name="org.Mm.eg.db"; version="3.6.0"; sha256="0l54hi68y6j5jjk88rgy7jhdcjbz6pg474kbpcj6x9z77i0mcfgr"; depends=[AnnotationDbi]; };
-  org_Mmu_eg_db = derive2 { name="org.Mmu.eg.db"; version="3.6.0"; sha256="1y60cvnw5a7nnxryyw97fzrpsic4napsidhrd61qpp6nkbc3aa73"; depends=[AnnotationDbi]; };
-  org_Pf_plasmo_db = derive2 { name="org.Pf.plasmo.db"; version="3.6.0"; sha256="08kfwsyi0bbmkfqyjgj4m04dmav9nzx6kskaw90ayrj2jv70ci77"; depends=[AnnotationDbi]; };
-  org_Pt_eg_db = derive2 { name="org.Pt.eg.db"; version="3.6.0"; sha256="198w077sifyzsrx2vcb8vbrlk6ln6q74lrgkh81sbwshik7nmy4f"; depends=[AnnotationDbi]; };
-  org_Rn_eg_db = derive2 { name="org.Rn.eg.db"; version="3.6.0"; sha256="0v2qx1hghlwsgf4lzax6wf3snc17ll4rrhq6za1cf1a0bgvjf28f"; depends=[AnnotationDbi]; };
-  org_Sc_sgd_db = derive2 { name="org.Sc.sgd.db"; version="3.6.0"; sha256="0pprpk91j95ycr7hnd6a1n0aflbn3ibaizl2n2gsfwyjs2vyzq52"; depends=[AnnotationDbi]; };
-  org_Ss_eg_db = derive2 { name="org.Ss.eg.db"; version="3.6.0"; sha256="02mldrxqmfwlf4fjlc6i9qv786zgr9cggwrfpkn5inj28hh6s29j"; depends=[AnnotationDbi]; };
-  org_Xl_eg_db = derive2 { name="org.Xl.eg.db"; version="3.6.0"; sha256="0p76dj2l9r1rsxq0yh9fsqp22z7jg7i9sq43v5kc32pfgn4nizas"; depends=[AnnotationDbi]; };
+  org_Ag_eg_db = derive2 { name="org.Ag.eg.db"; version="3.7.0"; sha256="101xvx62y1y2kbiv9j427879zhjindm1hzb9iscinmf10lwhyj8q"; depends=[AnnotationDbi]; };
+  org_At_tair_db = derive2 { name="org.At.tair.db"; version="3.7.0"; sha256="0i5dv4lc8dh27ipf37wk84y75fmnbja0bbllzbchb459c9bpwcf9"; depends=[AnnotationDbi]; };
+  org_Bt_eg_db = derive2 { name="org.Bt.eg.db"; version="3.7.0"; sha256="0vdfgh2yrawz8bbszgxl5vvq6iqvn25p5l01j7zhlmx035jcbfak"; depends=[AnnotationDbi]; };
+  org_Ce_eg_db = derive2 { name="org.Ce.eg.db"; version="3.7.0"; sha256="1w5br1ss4ha8wv4v2saj7cmbjc2jw0dyj2f2y269l078z31wcnaz"; depends=[AnnotationDbi]; };
+  org_Cf_eg_db = derive2 { name="org.Cf.eg.db"; version="3.7.0"; sha256="1y3kda375f327bv31cfp470546hvcdw5a8bl3z5h1dm6c556z7cl"; depends=[AnnotationDbi]; };
+  org_Dm_eg_db = derive2 { name="org.Dm.eg.db"; version="3.7.0"; sha256="1pqjrzlyg72bjpy8zsxvaglc7jsv176bnyi87xdajmkvsgxpm7b3"; depends=[AnnotationDbi]; };
+  org_Dr_eg_db = derive2 { name="org.Dr.eg.db"; version="3.7.0"; sha256="1xs5wsbcpy0iwbjyiv7fax57djqc529ai5fk1qfsdcvlja3cpglx"; depends=[AnnotationDbi]; };
+  org_EcK12_eg_db = derive2 { name="org.EcK12.eg.db"; version="3.7.0"; sha256="0ii3k9b0rr6bkb16m108if9liinw7md4mgh8fz4yd4gh8a7zcli7"; depends=[AnnotationDbi]; };
+  org_EcSakai_eg_db = derive2 { name="org.EcSakai.eg.db"; version="3.7.0"; sha256="1zcqbr4sds24mcggg71g4j6v0wp7fri75d1l0bhp0x245b9k5vnw"; depends=[AnnotationDbi]; };
+  org_Gg_eg_db = derive2 { name="org.Gg.eg.db"; version="3.7.0"; sha256="0lyzznrnyyw9lsdp58a0sc5jw2lrccsv44dvrza2ix8mx46gplis"; depends=[AnnotationDbi]; };
+  org_Hs_eg_db = derive2 { name="org.Hs.eg.db"; version="3.7.0"; sha256="1qxz9l80yg3qdqszs6dsscp7lrpfi1bgd0pxh9j7q34vprzwhdim"; depends=[AnnotationDbi]; };
+  org_Mm_eg_db = derive2 { name="org.Mm.eg.db"; version="3.7.0"; sha256="1i3nvrd3wjigf1rmgxq1p5xxc3p8v02h5gwi62s30rkrsyjjfjxx"; depends=[AnnotationDbi]; };
+  org_Mmu_eg_db = derive2 { name="org.Mmu.eg.db"; version="3.7.0"; sha256="1c6mwknyf8cq824qm3cax0a2l3wd2h9dw6pylhwm0x7viz2xf2iz"; depends=[AnnotationDbi]; };
+  org_Pf_plasmo_db = derive2 { name="org.Pf.plasmo.db"; version="3.7.0"; sha256="0s3ibaqvjw3sg1j22pfgzw1gcb9pv9b8a4livj9ph73jqhx03r5i"; depends=[AnnotationDbi]; };
+  org_Pt_eg_db = derive2 { name="org.Pt.eg.db"; version="3.7.0"; sha256="1n9qd34gjkjgbbz07h6ibzgbq9id81z6ni01vmaki3554gmfk3dl"; depends=[AnnotationDbi]; };
+  org_Rn_eg_db = derive2 { name="org.Rn.eg.db"; version="3.7.0"; sha256="10293py12jar1ab3s1b872c5gxpw9d2d5sxk4iq5g38i0gcf5gsc"; depends=[AnnotationDbi]; };
+  org_Sc_sgd_db = derive2 { name="org.Sc.sgd.db"; version="3.7.0"; sha256="0dwaw9v4c1d5wr6skaf97s013wqwqm31bybhggm1fm59aa6mkdwv"; depends=[AnnotationDbi]; };
+  org_Ss_eg_db = derive2 { name="org.Ss.eg.db"; version="3.7.0"; sha256="1s5zizma3ba00z8q1k9h4fajxwj3f2jg1034rfwqlhsscwrhv5ih"; depends=[AnnotationDbi]; };
+  org_Xl_eg_db = derive2 { name="org.Xl.eg.db"; version="3.7.0"; sha256="002i6aacrirvyzi14r26fgr6cqc0bfwn0wg83sbligp2dwqm0bb4"; depends=[AnnotationDbi]; };
   paeg1acdf = derive2 { name="paeg1acdf"; version="2.18.0"; sha256="127pgxxp5wp3hgmafbzdzsk4gqnllq1m1gcsfyzkvpkvmbn4aa9n"; depends=[AnnotationDbi]; };
   paeg1aprobe = derive2 { name="paeg1aprobe"; version="2.18.0"; sha256="0hbyd402wf9nzy2g93nhnf2zsi9jvhgfk0llxlyfk0kqxs0y4byy"; depends=[AnnotationDbi]; };
   pd_081229_hg18_promoter_medip_hx1 = derive2 { name="pd.081229.hg18.promoter.medip.hx1"; version="0.99.4"; sha256="1h4925dmw0vfsnhllg55gswq3sxfmx9rcjzifdvgs9y27399psrr"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite]; };
@@ -811,7 +833,7 @@ in with self; {
   phastCons100way_UCSC_hg19 = derive2 { name="phastCons100way.UCSC.hg19"; version="3.7.2"; sha256="1jmc4k4zgkx5vr2plnidnd9bidlwlb0kr7mjg60cqjw7dq7jl1fa"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
   phastCons100way_UCSC_hg38 = derive2 { name="phastCons100way.UCSC.hg38"; version="3.7.1"; sha256="0dka39rvx4d3wbcjypcgvc19s6cnxkkfywa4irv23kpibq1sjyv0"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
   phastCons7way_UCSC_hg38 = derive2 { name="phastCons7way.UCSC.hg38"; version="3.7.1"; sha256="105isdrb3nsy30wd8yy9vrrv8b7c8izc11xqqixg6rcriacd0rl0"; depends=[BSgenome GenomeInfoDb GenomicRanges GenomicScores IRanges S4Vectors]; };
-  pig_db0 = derive2 { name="pig.db0"; version="3.6.0"; sha256="0qiym7v0z6rr68191lj5hnkzdjc4k61cbjvzj59x5aygba6clm8y"; depends=[AnnotationDbi]; };
+  pig_db0 = derive2 { name="pig.db0"; version="3.7.1"; sha256="06hwggby003y64mhrk4b48zxnh3csqi5hm9y42iccz17qs7j1jmi"; depends=[AnnotationDbi]; };
   plasmodiumanophelescdf = derive2 { name="plasmodiumanophelescdf"; version="2.18.0"; sha256="1vs36091djinn3g6rjhmy9xfdyi58365zbcjc9mf50adnp2i5fq9"; depends=[AnnotationDbi]; };
   plasmodiumanophelesprobe = derive2 { name="plasmodiumanophelesprobe"; version="2.18.0"; sha256="03hfq51nrpmx8ihc48jiih6bk99irrgal9x7i7mgcv8xd508gcsy"; depends=[AnnotationDbi]; };
   poplarcdf = derive2 { name="poplarcdf"; version="2.18.0"; sha256="0j28czs936j2wgwp63qbwl1mjcflcrx7ir88jzxkkw7411ch1gl1"; depends=[AnnotationDbi]; };
@@ -840,14 +862,14 @@ in with self; {
   ragene20sttranscriptcluster_db = derive2 { name="ragene20sttranscriptcluster.db"; version="8.7.0"; sha256="135cgn92raa6f9yiw4k25rn04rpg5mdnf969l66x4s1jcc0rwscq"; depends=[AnnotationDbi org_Rn_eg_db]; };
   ragene21stprobeset_db = derive2 { name="ragene21stprobeset.db"; version="8.7.0"; sha256="0lp4prymrm3cp8yq1hba9bylw22hcvlx7piqpvjx51hj79yrwdig"; depends=[AnnotationDbi org_Rn_eg_db]; };
   ragene21sttranscriptcluster_db = derive2 { name="ragene21sttranscriptcluster.db"; version="8.7.0"; sha256="1b7s2r4w1yy2v3srs6n931zc64qf58nq4apmq2ag5nx50wspima1"; depends=[AnnotationDbi org_Rn_eg_db]; };
-  rat_db0 = derive2 { name="rat.db0"; version="3.6.0"; sha256="1dxmdc4pvr3bl5vc6pw10ddqknxs5ggmr1zvmxgrk8girgkpja1h"; depends=[AnnotationDbi]; };
+  rat_db0 = derive2 { name="rat.db0"; version="3.7.1"; sha256="1k7vx0iihb5sgaicrxbv33fi7kjwqfskbwn37aj769nqxq66fx8h"; depends=[AnnotationDbi]; };
   rat2302_db = derive2 { name="rat2302.db"; version="3.2.3"; sha256="0vj4vkx091m34xqjh6gv6m2iqszvn5rq3kvnpyq3fin5v42wrsr1"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rat2302cdf = derive2 { name="rat2302cdf"; version="2.18.0"; sha256="1748rc6yypd7y8wgr1qg632pcsxx0fkxjz6b3z4fhblgdllhy9wk"; depends=[AnnotationDbi]; };
   rat2302probe = derive2 { name="rat2302probe"; version="2.18.0"; sha256="1zwjgbcb9d4ib6z1iyjz8x11lq0b5gqs08y6j3idb5wf3i2p521v"; depends=[AnnotationDbi]; };
   ratCHRLOC = derive2 { name="ratCHRLOC"; version="2.1.6"; sha256="0mgk6lwvvdwjzjh4r1q1q6nfnx4vqx9iy6gmbrb9f31jf30hqnsb"; depends=[]; };
   rattoxfxcdf = derive2 { name="rattoxfxcdf"; version="2.18.0"; sha256="0q84lfaxnnj2zbm5q8xswa1md15fjj4i0djnqr835ixzn7px4yqn"; depends=[AnnotationDbi]; };
   rattoxfxprobe = derive2 { name="rattoxfxprobe"; version="2.18.0"; sha256="1kp159553rkcn9yh6x3yph3yjz2ja21wi9j5ax03qnhwlsl1x8ik"; depends=[AnnotationDbi]; };
-  reactome_db = derive2 { name="reactome.db"; version="1.64.0"; sha256="1wwgi5wr8ax0wns32zkz92wzh8ivq3q19m4pxvs8rrgwnlbyp81d"; depends=[AnnotationDbi]; };
+  reactome_db = derive2 { name="reactome.db"; version="1.66.0"; sha256="18kh68sx9825bi92904xcygjh9jsbxyhsp4ghw1wh160na65gy3v"; depends=[AnnotationDbi]; };
   rgu34a_db = derive2 { name="rgu34a.db"; version="3.2.3"; sha256="1s2sd5bqlj4qhamhrnb9byxn8nc7z265mqy7zzkgxcd6a2k472vp"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rgu34acdf = derive2 { name="rgu34acdf"; version="2.18.0"; sha256="08z9f16xp1m2mwl9vlmbffxl4zyyl8cgzf6wp66rrm32lvl0nbwq"; depends=[AnnotationDbi]; };
   rgu34aprobe = derive2 { name="rgu34aprobe"; version="2.18.0"; sha256="1gjxyq9128jgv3ic386f84rajgf3wz7yi2dja80y0ff4m0a48dlh"; depends=[AnnotationDbi]; };
@@ -861,10 +883,11 @@ in with self; {
   rgug4105a_db = derive2 { name="rgug4105a.db"; version="3.2.3"; sha256="0lq8k95qm0q7j65nf16p3f09dn9zs87n3k561wxrgi2lb0pf6j40"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rgug4130a_db = derive2 { name="rgug4130a.db"; version="3.2.3"; sha256="0zlcn9spw23bj3px9z1l2f5afn09zbr6rv0nbd2h6dd12wrvy1zk"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rgug4131a_db = derive2 { name="rgug4131a.db"; version="3.2.3"; sha256="1r272jf9cflf1yf4bznp4d59h7bd7adh1i3rf890h5ffc0xzf5cq"; depends=[AnnotationDbi org_Rn_eg_db]; };
-  rhesus_db0 = derive2 { name="rhesus.db0"; version="3.6.0"; sha256="1vlqd4qk0wph3vmd125dw9iipgljf2s3i46kr7bjswj0k9k4385h"; depends=[AnnotationDbi]; };
+  rhesus_db0 = derive2 { name="rhesus.db0"; version="3.7.1"; sha256="1k695lwbwznk4i03dqpfyk0nx4s9n1qlgh9ccfxjy591lraj7b4j"; depends=[AnnotationDbi]; };
   rhesuscdf = derive2 { name="rhesuscdf"; version="2.18.0"; sha256="0q2alkxm80wkzaf0q80df27q30qkswybavz05x6ywsihbs9h0nb8"; depends=[AnnotationDbi]; };
   rhesusprobe = derive2 { name="rhesusprobe"; version="2.18.0"; sha256="0fd8pvwvpcmx41k80nbccjxllh39fvjf7l9dr8facisl1x7gsfil"; depends=[AnnotationDbi]; };
   ri16cod_db = derive2 { name="ri16cod.db"; version="3.4.0"; sha256="1xz533vxjdyxx1wkks0kgk6b90sxs44iqcsvyds0xcm573bx8c6q"; depends=[AnnotationDbi org_Rn_eg_db]; };
+  ribosomaldatabaseproject11_5MgDb = derive2 { name="ribosomaldatabaseproject11.5MgDb"; version="1.00.0"; sha256="04ppa4k8p54bmkq3jm41h0v4lb5hz95cmnakfzmqfml00ir04mxp"; depends=[metagenomeFeatures]; };
   ricecdf = derive2 { name="ricecdf"; version="2.18.0"; sha256="07lsw9rklk2rsvbkcj1ci8hg2x68k3qpkx9yw0cmd7rg5fvydgns"; depends=[AnnotationDbi]; };
   riceprobe = derive2 { name="riceprobe"; version="2.18.0"; sha256="0w6qvszdmnipn3v2bld46x7my2a9hni0jbxd0y1d6xcrrgs951ra"; depends=[AnnotationDbi]; };
   rnu34_db = derive2 { name="rnu34.db"; version="3.2.3"; sha256="0ahridq75rmjyaivmlhn428wg712zv3003cbzzrajm9w6nibbfgk"; depends=[AnnotationDbi org_Rn_eg_db]; };
@@ -878,6 +901,7 @@ in with self; {
   rwgcod_db = derive2 { name="rwgcod.db"; version="3.4.0"; sha256="1k0fpnv314lx2jf3mm6xfqa3jx353sp42awxqys9byzhg9zyj2j3"; depends=[AnnotationDbi org_Rn_eg_db]; };
   saureuscdf = derive2 { name="saureuscdf"; version="2.18.0"; sha256="0vmm3fy10dzzmaq22ah4fb0k3fs1gdbhnsi8mxz7xgp27dcan29j"; depends=[AnnotationDbi]; };
   saureusprobe = derive2 { name="saureusprobe"; version="2.18.0"; sha256="0s5ma3hh7ncsi4dq33r3hwffk85x3gvjbm5cslppbsd0r0bjwkia"; depends=[AnnotationDbi]; };
+  silva128_1MgDb = derive2 { name="silva128.1MgDb"; version="1.00.0"; sha256="0pwwxxa55d3919rbczg5iskd03ignimk80m52kfi930b1kdg9qc2"; depends=[metagenomeFeatures]; };
   soybeancdf = derive2 { name="soybeancdf"; version="2.18.0"; sha256="1dlwxdslm827661z6f4z2hwr7wpwqfzvizhvv63p86ll7l6gs3s8"; depends=[AnnotationDbi]; };
   soybeanprobe = derive2 { name="soybeanprobe"; version="2.18.0"; sha256="06dpwqad7q3wyq0bsgpwkw8kx1gq5fy1s1lw632xrvgcid2fsmf8"; depends=[AnnotationDbi]; };
   sugarcanecdf = derive2 { name="sugarcanecdf"; version="2.18.0"; sha256="0wghc6wr7iwkql63m3wibjjdcdpqd53z0g5rxdh553sjb0ca2n7z"; depends=[AnnotationDbi]; };
@@ -898,8 +922,8 @@ in with self; {
   vitisviniferaprobe = derive2 { name="vitisviniferaprobe"; version="2.18.0"; sha256="1ggz1s37dwvrkhj4vx2civyhap7bgqsshy33lk14z4fjsayfi39a"; depends=[AnnotationDbi]; };
   wheatcdf = derive2 { name="wheatcdf"; version="2.18.0"; sha256="1gmbrdilqvm54h6nkb1cm01ki8aipiywd4qj8gpwlm2hqrimr8kr"; depends=[AnnotationDbi]; };
   wheatprobe = derive2 { name="wheatprobe"; version="2.18.0"; sha256="1fifi3pvzdrg356idwz0kx7qlf5mssdxlyvwpn3cjgw0z7n7cnw8"; depends=[AnnotationDbi]; };
-  worm_db0 = derive2 { name="worm.db0"; version="3.6.0"; sha256="0k99b64gkzmvmrypd5r96k0y2i4ph0kr70kkfnhmmxgwgd8wg0db"; depends=[AnnotationDbi]; };
-  xenopus_db0 = derive2 { name="xenopus.db0"; version="3.6.0"; sha256="1jgdidzpka00w21358rj2lrz1chh518iyqlrj3c5rsamrisdyj2c"; depends=[AnnotationDbi]; };
+  worm_db0 = derive2 { name="worm.db0"; version="3.7.1"; sha256="0p5rzmkars7kl4y4mlq6jbmgp1mdfw3jcnvhl50dnpqc7h28y4xf"; depends=[AnnotationDbi]; };
+  xenopus_db0 = derive2 { name="xenopus.db0"; version="3.7.1"; sha256="067vs7b2slmragqqnfpgy6m187cz1rx9r5agizrjycndzdzkpy3k"; depends=[AnnotationDbi]; };
   xenopuslaeviscdf = derive2 { name="xenopuslaeviscdf"; version="2.18.0"; sha256="1bcz1hr7gxw6ac4qvw0giph6hfcf5i9b11s274ypq512qc1d32iq"; depends=[AnnotationDbi]; };
   xenopuslaevisprobe = derive2 { name="xenopuslaevisprobe"; version="2.18.0"; sha256="0prb14zn2gvgxq8w0y21x1ng51cn3bgjhkppf7zkmnq1xkzvq0pw"; depends=[AnnotationDbi]; };
   xlaevis_db = derive2 { name="xlaevis.db"; version="3.2.3"; sha256="0cdi71c8pflb8n4yfxc0wmfi51w6z0dlz7nw5hv0hkx547v79d53"; depends=[AnnotationDbi org_Xl_eg_db]; };
@@ -911,7 +935,7 @@ in with self; {
   ye6100subbcdf = derive2 { name="ye6100subbcdf"; version="2.18.0"; sha256="1169hv56981b915rlr5w5sn6ppyjd8as7f4k1hbjzadrdrl3glwp"; depends=[AnnotationDbi]; };
   ye6100subccdf = derive2 { name="ye6100subccdf"; version="2.18.0"; sha256="0mhr4zd33gfvvivc17k7fb6nvmhq6h3q0xbx2zl09zd6qk09kizm"; depends=[AnnotationDbi]; };
   ye6100subdcdf = derive2 { name="ye6100subdcdf"; version="2.18.0"; sha256="11b1fflgc34lrj4yf1p7way5n83cm9c7znsbxpzlwddwyy8qib30"; depends=[AnnotationDbi]; };
-  yeast_db0 = derive2 { name="yeast.db0"; version="3.6.0"; sha256="0xv4v1ybcgz5ha7g98zkfmi6mw0ywrdfspzb39rj13np9bwrqfcp"; depends=[AnnotationDbi]; };
+  yeast_db0 = derive2 { name="yeast.db0"; version="3.7.1"; sha256="1shjbflvlxipiyapwd6jpqs9mp8nyr3j63wcpnaznmxv0z5k0fw8"; depends=[AnnotationDbi]; };
   yeast2_db = derive2 { name="yeast2.db"; version="3.2.3"; sha256="1xns0129ifklipbardybkjyxfwnlklavq0k6s15wk2iwk7vxa33s"; depends=[AnnotationDbi org_Sc_sgd_db]; };
   yeast2cdf = derive2 { name="yeast2cdf"; version="2.18.0"; sha256="0c68val9x8bfnv4xx0vag9dxwsx5q8dzbj0dpha3nshh12jw48w9"; depends=[AnnotationDbi]; };
   yeast2probe = derive2 { name="yeast2probe"; version="2.18.0"; sha256="125nif693qcmxc0nnnz917f9avggcdr8g9rfvx2qdc54a2l7vdb7"; depends=[AnnotationDbi]; };
@@ -920,7 +944,7 @@ in with self; {
   ygs98frmavecs = derive2 { name="ygs98frmavecs"; version="1.3.0"; sha256="1xrm1209xnknwvad7nvg1a0mbxz15z12yd4x5bia3cq03zcmzf9m"; depends=[]; };
   ygs98probe = derive2 { name="ygs98probe"; version="2.18.0"; sha256="0awf6z4j2vb2jk9a9j2r512yd3m31660y68pasa9mp488m270a3q"; depends=[AnnotationDbi]; };
   zebrafish_db = derive2 { name="zebrafish.db"; version="3.2.3"; sha256="1n6p04hlm5c32fnficx294s7n7izy5460avagw8hx1g5xryhdzqk"; depends=[AnnotationDbi org_Dr_eg_db]; };
-  zebrafish_db0 = derive2 { name="zebrafish.db0"; version="3.6.0"; sha256="1c7m109yrpvzhj330n8rj1ppvwxr96nlhhwc48rj687qd1fnbj48"; depends=[AnnotationDbi]; };
+  zebrafish_db0 = derive2 { name="zebrafish.db0"; version="3.7.1"; sha256="1x9s6sxxgijjnrvg4fggnqhv10zwsfw6hy1qa93rjmpgqpr7ad20"; depends=[AnnotationDbi]; };
   zebrafishcdf = derive2 { name="zebrafishcdf"; version="2.18.0"; sha256="0sq1xqhblbilvaiabhqyl9gxdj3jg576vgq8v0cls1zvvx0isrx0"; depends=[AnnotationDbi]; };
   zebrafishprobe = derive2 { name="zebrafishprobe"; version="2.18.0"; sha256="1pb8z2rdhq11hq391xyi236scyafbp56kbhhwsnha36yygz5drw0"; depends=[AnnotationDbi]; };
 }
diff --git a/pkgs/development/r-modules/bioc-experiment-packages.nix b/pkgs/development/r-modules/bioc-experiment-packages.nix
index fbf8b26f0ea..04f4d25def2 100644
--- a/pkgs/development/r-modules/bioc-experiment-packages.nix
+++ b/pkgs/development/r-modules/bioc-experiment-packages.nix
@@ -19,31 +19,36 @@ in with self; {
   AmpAffyExample = derive2 { name="AmpAffyExample"; version="1.21.0"; sha256="1k1qzxakbavm10bd0ybs1gk97w1y825iqvwimn0cr128qw2xxkyj"; depends=[affy]; };
   AneuFinderData = derive2 { name="AneuFinderData"; version="1.9.0"; sha256="0m3pvsdd2y1947zl582791bsip95j41fc6g9gbin3cg51y7lb6xr"; depends=[]; };
   AshkenazimSonChr21 = derive2 { name="AshkenazimSonChr21"; version="1.11.0"; sha256="08r5430gqsmkbh4n49ac2fl0m24zmqjnc9yxppw5mr0d4n5l26y5"; depends=[]; };
-  BeadArrayUseCases = derive2 { name="BeadArrayUseCases"; version="1.19.0"; sha256="177zapqbf8ipavs1sp1gby99dbbzsyzgxyjhr258r7849b388k1v"; depends=[beadarray GEOquery limma]; };
-  BloodCancerMultiOmics2017 = derive2 { name="BloodCancerMultiOmics2017"; version="1.1.1"; sha256="1x1cdq226gr69wlnl543ynvwrxd7fr7znvvh6x1ka8iw357sfglf"; depends=[beeswarm Biobase DESeq2 devtools dplyr ggdendro ggplot2 glmnet gtable ipflasso RColorBrewer reshape2 scales SummarizedExperiment survival tibble]; };
+  AssessORFData = derive2 { name="AssessORFData"; version="0.99.2"; sha256="0yi2vxzg21nkqlywcpv6n2vzksl77cvkc42ii9p7gy9kpv56553k"; depends=[DECIPHER]; };
+  BeadArrayUseCases = derive2 { name="BeadArrayUseCases"; version="1.19.1"; sha256="08c7aqnh4wnhnalrvchcyhy5vmxq5xkq26pmp9xjn2x4zwf4156y"; depends=[beadarray GEOquery limma]; };
+  BloodCancerMultiOmics2017 = derive2 { name="BloodCancerMultiOmics2017"; version="1.1.4"; sha256="1hh1l134cmbcmyc40fwfrwrbx6qyiv9a3bz8hp9vbdf1vslhcnpk"; depends=[beeswarm Biobase DESeq2 devtools dplyr ggdendro ggplot2 glmnet gtable ipflasso RColorBrewer reshape2 scales SummarizedExperiment survival tibble]; };
   CCl4 = derive2 { name="CCl4"; version="1.19.0"; sha256="1j4q7mm4lwi3rcf0y6zj36xc6n7c8y6l8iv9ac4avbgvr1rvlxaq"; depends=[Biobase limma]; };
   CLL = derive2 { name="CLL"; version="1.21.0"; sha256="103lmn87zw73sx30ln6g4382ydpi97b1zsm7www8bwlnw6zx7k7g"; depends=[affy Biobase]; };
-  CLLmethylation = derive2 { name="CLLmethylation"; version="1.1.0"; sha256="1rwnc84plgkzlz78gawjhjf4lf6gbdzgdhjp6ap49bqzgpp3c10a"; depends=[ExperimentHub SummarizedExperiment]; };
+  CLLmethylation = derive2 { name="CLLmethylation"; version="1.1.1"; sha256="1vbvxb3bnwx4ngxkk6vrhshcfyrv0fvs3vhlqk0j9q1mhxg8p3a9"; depends=[ExperimentHub SummarizedExperiment]; };
   COHCAPanno = derive2 { name="COHCAPanno"; version="1.17.0"; sha256="199xz5qwp06kr3smr25vx2w25hmzf7qbpaw18aj7bvccsdsyvky9"; depends=[]; };
   CONFESSdata = derive2 { name="CONFESSdata"; version="1.9.0"; sha256="091ydgxqldrcr3b73pqyk6555yyclnnr4yizi0kknqasx33sb802"; depends=[]; };
   COPDSexualDimorphism_data = derive2 { name="COPDSexualDimorphism.data"; version="1.17.0"; sha256="1pgfqrp6cx94marm96swqq8c9nr00xdmlf62hvmacqwspsajbnya"; depends=[]; };
   COSMIC_67 = derive2 { name="COSMIC.67"; version="1.17.0"; sha256="0qd0xbc8hy25hyy8bilim2w5inhwz88rypbqc8vjlg54r2yl12nh"; depends=[GenomicRanges SummarizedExperiment VariantAnnotation]; };
-  CRCL18 = derive2 { name="CRCL18"; version="0.115.0"; sha256="0y2v5fmlfj7hzkvw1l116vnczjnmhxd77gvdqjjynl9cgvlx0smq"; depends=[Biobase]; };
+  CRCL18 = derive2 { name="CRCL18"; version="1.1.0"; sha256="1hxh7fldfy2v9sii5clwi9i568dcc742nd4da0048p4pm87qxcsv"; depends=[Biobase]; };
   CardinalWorkflows = derive2 { name="CardinalWorkflows"; version="1.13.0"; sha256="1rjp3ybc0yx8sjqp4ahadgymlld2l2hn3dxxvpng06qpp5jch0zq"; depends=[Cardinal]; };
   CellMapperData = derive2 { name="CellMapperData"; version="1.7.0"; sha256="0zjssdm2z7i6bcp781x9lz09dmh5krvvxg5a0la79dj5vvs72cjp"; depends=[CellMapper ExperimentHub]; };
-  ChIC_data = derive2 { name="ChIC.data"; version="1.1.0"; sha256="07gyyv7bjfxa978c40lkh65m0x2zi855mapvwgpazqgq5qhxyfya"; depends=[caret]; };
+  ChAMPdata = derive2 { name="ChAMPdata"; version="2.13.0"; sha256="1xa5lcxf7npb8mykqpx84vpjavl9xzwl24nlsaaw3gk75cfrhpkx"; depends=[BiocGenerics GenomicRanges]; };
+  ChIC_data = derive2 { name="ChIC.data"; version="1.1.4"; sha256="0s8nm65kwk2cbs8g66zc46q31nd66fdm0kk0d6gxl6zhv0p3d8dv"; depends=[caret]; };
+  ChIPXpressData = derive2 { name="ChIPXpressData"; version="1.19.0"; sha256="1f32hzqgpiclby25223ksp63xlhdk7d52sf2xc97hpjig0571630"; depends=[bigmemory]; };
   ChIPexoQualExample = derive2 { name="ChIPexoQualExample"; version="1.5.0"; sha256="0y2s4hw7hbfspy1hjsqkaw72pm26k911699k6sw4jhvjh7mkvjbf"; depends=[]; };
   ChimpHumanBrainData = derive2 { name="ChimpHumanBrainData"; version="1.19.0"; sha256="1i2aj1vxak6b53mpcd36q2xwgpddllqpqz3wii7rrsa9mg2gaaza"; depends=[affy hexbin limma qvalue statmod]; };
   ConnectivityMap = derive2 { name="ConnectivityMap"; version="1.17.0"; sha256="1zz0vq192jfnp494mp61xmkxyd94bbh9xs268jd7ynnlpjp9phsx"; depends=[]; };
-  CopyhelpeR = derive2 { name="CopyhelpeR"; version="1.13.0"; sha256="131yanjrw3zsp3ly9i3s2fla7v97wdrrcajsqw38fi8nrln24qbf"; depends=[]; };
-  DAPARdata = derive2 { name="DAPARdata"; version="1.11.0"; sha256="0hf2ijncpsjyyvdwnpfb8agsz3w6ph8ga844cdf5q18l51iyprb4"; depends=[knitr MSnbase]; };
+  CopyNeutralIMA = derive2 { name="CopyNeutralIMA"; version="0.99.14"; sha256="1lvdacdazpp071grc75gjxmhwjzkm22lhwzjvf6baclq9qfjgqp2"; depends=[ExperimentHub Rdpack]; };
+  CopyhelpeR = derive2 { name="CopyhelpeR"; version="1.13.1"; sha256="014jissvpkj2d0sz3r1dr5c5qs29hbvs9jvm8bl86mld8ff3nlkc"; depends=[]; };
+  DAPARdata = derive2 { name="DAPARdata"; version="1.11.4"; sha256="06qwja8qkbix6ial81yv1q3bxrdmqrgridina094p1xrxbfrn5sb"; depends=[knitr MSnbase]; };
   DLBCL = derive2 { name="DLBCL"; version="1.21.0"; sha256="0advvjkd6skynjjnz4s9mdnh0l9l2zhn4n9x0kg23dmsg4r8vqm7"; depends=[Biobase]; };
   DMRcatedata = derive2 { name="DMRcatedata"; version="1.17.0"; sha256="1a669jjvkjjklbh2kxrv3y2clfps067w6w19y1yr2a8wc7crbl4a"; depends=[GenomicRanges]; };
   DREAM4 = derive2 { name="DREAM4"; version="1.17.0"; sha256="0s3y3wgg487p5fswbin4237mrm9kzbq12a84jiixhql1j2ysbhcs"; depends=[SummarizedExperiment]; };
-  DeSousa2013 = derive2 { name="DeSousa2013"; version="1.17.0"; sha256="0ahldh3d6phm20ljnyx0hz7q0zk8r3i7i39wy1arqz0rqgmgzfql"; depends=[affy AnnotationDbi Biobase cluster ConsensusClusterPlus frma frmaTools gplots hgu133plus2_db hgu133plus2frmavecs pamr rgl ROCR siggenes survival sva]; };
-  DmelSGI = derive2 { name="DmelSGI"; version="1.13.0"; sha256="1drs5gp2vh7m61wj6ypa9bpyn8igmzsql0ddyzpgp8sa99w0w7kd"; depends=[abind gplots igraph knitr limma rhdf5 TSP]; };
-  DonaPLLP2013 = derive2 { name="DonaPLLP2013"; version="1.19.0"; sha256="04gphwyic256x2wzapr9kqzq1z10yl9a2s64m4dn3bwy4613b6rv"; depends=[EBImage]; };
+  DeSousa2013 = derive2 { name="DeSousa2013"; version="1.17.2"; sha256="1xz1l83my34kwr4wk6vq3q5yzd3i0ky5qm44wx65f4d92hn7k3v5"; depends=[affy AnnotationDbi Biobase cluster ConsensusClusterPlus frma frmaTools gplots hgu133plus2_db hgu133plus2frmavecs pamr rgl ROCR siggenes survival sva]; };
+  DmelSGI = derive2 { name="DmelSGI"; version="1.13.1"; sha256="0v25rb5myhki1vvmmzyhpa8n0vv623zj6lh26a10iq4i5bvda9c5"; depends=[abind gplots igraph knitr limma rhdf5 TSP]; };
+  DonaPLLP2013 = derive2 { name="DonaPLLP2013"; version="1.19.1"; sha256="1sbhq0m67v5swyafrn74cjz4h3r6d1qmn2skkz3xwjgm70qpbjrb"; depends=[EBImage]; };
   DrugVsDiseasedata = derive2 { name="DrugVsDiseasedata"; version="1.17.0"; sha256="05xykgmiakw6n8f1b86wbyjzs9v6b7qz8119pwvbfjgncgwqmcx9"; depends=[]; };
+  DuoClustering2018 = derive2 { name="DuoClustering2018"; version="0.99.2"; sha256="0f4ps36wd1yll9w4zkx6n4kz0svqfajmb11a5c51b55572siq203"; depends=[dplyr ExperimentHub ggplot2 ggthemes magrittr mclust purrr reshape2 tidyr viridis]; };
   DvDdata = derive2 { name="DvDdata"; version="1.17.0"; sha256="0x5crrym68rw2r9nmb33j1n1f5rxpj5rzn8b5j403ikxywfwxblh"; depends=[]; };
   EGSEAdata = derive2 { name="EGSEAdata"; version="1.9.0"; sha256="1bmxm535h9ilnpbm196rf40543kh1yf5ldqxilhiyx5k0qaaihmz"; depends=[]; };
   ELMER_data = derive2 { name="ELMER.data"; version="2.5.5"; sha256="192jdmxl17m8s1r95c2lizh2r5zpazvx0az8xj22dva0mrazql9c"; depends=[GenomicRanges]; };
@@ -53,30 +58,32 @@ in with self; {
   Fletcher2013a = derive2 { name="Fletcher2013a"; version="1.17.0"; sha256="05kvsbr46yjpkdnn7rwxhj3wnlrgz92fgg35b8i781131vpy4lzh"; depends=[Biobase gplots limma VennDiagram]; };
   Fletcher2013b = derive2 { name="Fletcher2013b"; version="1.17.0"; sha256="1rfsb49fcn127nzykwndzp7gapd36j3r01dvvhn87w6ryy9yc98c"; depends=[Fletcher2013a igraph RColorBrewer RedeR RTN]; };
   FlowSorted_Blood_450k = derive2 { name="FlowSorted.Blood.450k"; version="1.19.0"; sha256="0ngh5zwikm83rzv9aykhxijf7nj345nnak2207jn4frdq8qahh3l"; depends=[minfi]; };
-  FlowSorted_Blood_EPIC = derive2 { name="FlowSorted.Blood.EPIC"; version="0.99.36"; sha256="1yyrcg1zzq9mv6zx9an4bpszh7r9vacwrbcpdza5ihi8w4pcfw9y"; depends=[ExperimentHub genefilter IlluminaHumanMethylationEPICanno_ilm10b4_hg19 minfi nlme quadprog S4Vectors SummarizedExperiment]; };
+  FlowSorted_Blood_EPIC = derive2 { name="FlowSorted.Blood.EPIC"; version="0.99.37"; sha256="1kfh6x69r3vc7v3in1q1n8frbsha5z8gmds7dcgy39wvry16c6lm"; depends=[ExperimentHub genefilter IlluminaHumanMethylationEPICanno_ilm10b4_hg19 minfi nlme quadprog S4Vectors SummarizedExperiment]; };
   FlowSorted_CordBlood_450k = derive2 { name="FlowSorted.CordBlood.450k"; version="1.9.0"; sha256="1ib9g4zy3zwk7m6hl9ggi030qwrjch9jnip6d7a4b27cjzlf0sdq"; depends=[minfi]; };
   FlowSorted_CordBloodNorway_450k = derive2 { name="FlowSorted.CordBloodNorway.450k"; version="1.7.0"; sha256="04i701nl8w8sdc85z1y8gzg076n3znnd9fkp35a7pq7sczkfih90"; depends=[minfi]; };
   FlowSorted_DLPFC_450k = derive2 { name="FlowSorted.DLPFC.450k"; version="1.17.0"; sha256="1d9xq8ha0p1injk8l16vggfkzk7xlsgaqb227gvl6xc49q8dmh5m"; depends=[minfi]; };
   FunciSNP_data = derive2 { name="FunciSNP.data"; version="1.17.0"; sha256="1vp55zd2ifamxm248jskvf2y29cgjyx98jw41h2pbly31qxq4h49"; depends=[IRanges rtracklayer]; };
   GGdata = derive2 { name="GGdata"; version="1.19.0"; sha256="0mr6l11bgg8ncga9ivwdps6jp6zbcjs5jxvcpf834qaj92h63mrg"; depends=[AnnotationDbi Biobase GGBase illuminaHumanv1_db snpStats]; };
-  GSBenchMark = derive2 { name="GSBenchMark"; version="0.115.0"; sha256="1kpkn05a0r6wf1cv1q9gprgzgjaj8b2ig3apkaydjilcjykbr3vg"; depends=[]; };
+  GIGSEAdata = derive2 { name="GIGSEAdata"; version="0.99.11"; sha256="1rn6dmji5ja1p83gai18bcmdc9vi0fm4pq4yk7wdsbv6p334cqlq"; depends=[]; };
+  GSBenchMark = derive2 { name="GSBenchMark"; version="1.1.0"; sha256="1a9hlgcz9m36gzkmxkq4i308hsm617hmsxmwq09yd5cxq8dl80g4"; depends=[]; };
   GSE62944 = derive2 { name="GSE62944"; version="1.9.0"; sha256="1s28rkr5nm91vnl6cx0gifib4nw70gs8bhmv003f9kbpiq420i8k"; depends=[Biobase GEOquery]; };
   GSVAdata = derive2 { name="GSVAdata"; version="1.17.0"; sha256="1gjc9psmx0i25bwki6l74d8jg3mrvfzjdnxs5bhbqnzab6fzdfh0"; depends=[Biobase GSEABase hgu95a_db]; };
   GWASdata = derive2 { name="GWASdata"; version="1.19.0"; sha256="0i09njrq0fzwvzj6lqsa7kdnwi35lm7z0akywh0mr87i6dlqj8sq"; depends=[GWASTools]; };
   GeuvadisTranscriptExpr = derive2 { name="GeuvadisTranscriptExpr"; version="1.9.0"; sha256="1h6ghr75h1i87lbarsganiw6mgjyiha4zv4hbjdjljc464s11b0d"; depends=[]; };
-  HDCytoData = derive2 { name="HDCytoData"; version="1.1.0"; sha256="1nlalaccb5y6vsl5k63qz2mcjr6k6syciv95l18962acgnlqbpq1"; depends=[ExperimentHub flowCore SummarizedExperiment]; };
+  HD2013SGI = derive2 { name="HD2013SGI"; version="1.21.1"; sha256="1m3q08m21vim5j520wgiwszrp6nnkrsfqf6wac8cyzw1qs3cp1s6"; depends=[EBImage geneplotter gplots limma LSD RColorBrewer splots vcd]; };
+  HDCytoData = derive2 { name="HDCytoData"; version="1.1.2"; sha256="1ay7r0aya0b6rxwscg3lwzlgl9iaj9ykii52lmzpxx40yc6szpnv"; depends=[ExperimentHub flowCore SummarizedExperiment]; };
   HEEBOdata = derive2 { name="HEEBOdata"; version="1.19.0"; sha256="1z8qb5xrzadg6fxg8cx04dpad3qiab5m8vhgdqw4xs8xdaqd4g1m"; depends=[]; };
   HIVcDNAvantWout03 = derive2 { name="HIVcDNAvantWout03"; version="1.21.0"; sha256="0pgb0r6zp6v0wq16c5zjxzjjwb6cjjp3cn8jnh4p91rwf43za4rh"; depends=[]; };
-  HMP16SData = derive2 { name="HMP16SData"; version="1.1.0"; sha256="1a5plpx6fcdn924gpfqnw6ykqrc9m62rdkzwwgwfmzj1pl4585qn"; depends=[AnnotationHub assertthat dplyr ExperimentHub kableExtra knitr magrittr readr S4Vectors SummarizedExperiment tibble]; };
-  HSMMSingleCell = derive2 { name="HSMMSingleCell"; version="0.115.0"; sha256="0v5ks29280bybzhi5sfsrbrdajh8a29jkrr2c44ld2qchs9qhgmm"; depends=[]; };
+  HMP16SData = derive2 { name="HMP16SData"; version="1.1.4"; sha256="0qjqf7ipczv3rs4r4l5ynagi46ksb98b8mylgvbclrqp7ny2wcbq"; depends=[AnnotationHub assertthat dplyr ExperimentHub kableExtra knitr magrittr readr S4Vectors SummarizedExperiment tibble]; };
+  HSMMSingleCell = derive2 { name="HSMMSingleCell"; version="1.1.0"; sha256="0fl3r3sdnnn3s9h5sn0bmgpi0hj965cwgca51qkwcvll4rjamyq2"; depends=[]; };
   HarmanData = derive2 { name="HarmanData"; version="1.9.0"; sha256="1c6avjny0fasj99q0a2dm8p3h68jalcglx51b90fnyjgvqgx3h2g"; depends=[]; };
   HarmonizedTCGAData = derive2 { name="HarmonizedTCGAData"; version="1.3.0"; sha256="07fvdf6kzipa42r5dmmld7p2chbi074d248da0xmlm8lm1i0wkc9"; depends=[ExperimentHub]; };
   HelloRangesData = derive2 { name="HelloRangesData"; version="1.7.0"; sha256="05yr2mklxwfij6yzmhpk83mlrq7zfcn8finf2m4lrvdbdzl1bkki"; depends=[]; };
-  HiCDataHumanIMR90 = derive2 { name="HiCDataHumanIMR90"; version="0.115.0"; sha256="1498q13fd190cnn6rh1m796zpalfwxfw275r33k8dnjfqiw5c4mc"; depends=[]; };
+  HiCDataHumanIMR90 = derive2 { name="HiCDataHumanIMR90"; version="1.1.0"; sha256="0nmd7iqa6cg74xvz1a2x9ahyzs3kwd4fnhz5nkh62sgndj1pv62l"; depends=[]; };
   HiCDataLymphoblast = derive2 { name="HiCDataLymphoblast"; version="1.17.0"; sha256="0hjhlq7vx71lwv37vidwlb819hm617dx7g39hgf20ggccmp310rh"; depends=[]; };
   Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.17.0"; sha256="17mnwnpsam62mc8bqdwjfh9fiayasbkx1gd3bbp0k82w3az9yzbf"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; };
   HumanAffyData = derive2 { name="HumanAffyData"; version="1.7.0"; sha256="02hp2a7h0ivzdfql3vsrvxrn4answlr7hrhw5azdjw8jh895dd1j"; depends=[Biobase ExperimentHub]; };
-  IHWpaper = derive2 { name="IHWpaper"; version="1.9.2"; sha256="1ah85aim6mfjiv08pxr11d9x84ymki2kvnncx1iidkqd81h97ifk"; depends=[Biobase BiocGenerics BiocParallel cowplot DESeq2 dplyr fdrtool genefilter ggplot2 IHW qvalue Rcpp SummarizedExperiment]; };
+  IHWpaper = derive2 { name="IHWpaper"; version="1.9.6"; sha256="19fg4ca9hhlh4as0nyd3qkkgqphghgvlcs57279pl42nphzz1hw0"; depends=[Biobase BiocGenerics BiocParallel cowplot DESeq2 dplyr fdrtool genefilter ggplot2 IHW qvalue Rcpp SummarizedExperiment]; };
   ITALICSData = derive2 { name="ITALICSData"; version="2.19.0"; sha256="0i09g3dj3rz0yr4n35g9fhc5df957i928vbinsx2bl3jsj7xrf6f"; depends=[]; };
   Illumina450ProbeVariants_db = derive2 { name="Illumina450ProbeVariants.db"; version="1.17.0"; sha256="1y219yqipskv3mzf7g75rmzwsp5sq2r9cqacbpyc2gk28z6dfnix"; depends=[]; };
   IlluminaDataTestFiles = derive2 { name="IlluminaDataTestFiles"; version="1.19.0"; sha256="0b6zhvkhpjhz9wr3cfcvyy16l1kvd6aq9p58y78ql9rgpbhz7dcz"; depends=[]; };
@@ -84,7 +91,7 @@ in with self; {
   JASPAR2014 = derive2 { name="JASPAR2014"; version="1.17.0"; sha256="13hrxj4q2r9bdzwnl0qm5ap92051483876rwq73bz6hy5xg73abx"; depends=[Biostrings]; };
   JASPAR2016 = derive2 { name="JASPAR2016"; version="1.9.0"; sha256="1gx14sjv9v5705h1763p5js37jrvvlkiqdm7nrawjs4n6y4cpsdf"; depends=[]; };
   JctSeqData = derive2 { name="JctSeqData"; version="1.11.0"; sha256="1zrnmvs1mmg07s5fi8m5yqb975kb1nkx98j0shpk9xi5jdbf7x0d"; depends=[]; };
-  KEGGandMetacoreDzPathwaysGEO = derive2 { name="KEGGandMetacoreDzPathwaysGEO"; version="0.115.0"; sha256="1y7nnqxaqv9khgy58wq4mflgl0nmk589bcc76chjx7cijq88v09r"; depends=[Biobase BiocGenerics]; };
+  KEGGandMetacoreDzPathwaysGEO = derive2 { name="KEGGandMetacoreDzPathwaysGEO"; version="1.1.0"; sha256="1d4qg0svrmfc6v7dhgxbsn0xfhyplizfh113n26z64y97nfhc21p"; depends=[Biobase BiocGenerics]; };
   KEGGdzPathwaysGEO = derive2 { name="KEGGdzPathwaysGEO"; version="1.19.0"; sha256="0w2a3yjp5xhbxq0vhzyka8sx17a095ddnpm4jhac65s6zmndgqr3"; depends=[Biobase BiocGenerics]; };
   KOdata = derive2 { name="KOdata"; version="1.7.0"; sha256="0grvn2pc38zv133v60hvjh1jx9dsbrwxrz9c6fb977z1rznrkzz8"; depends=[]; };
   LiebermanAidenHiC2009 = derive2 { name="LiebermanAidenHiC2009"; version="0.19.0"; sha256="1i6rl8mziv8apxxa2hlmsg6ramq4aasbg9nxj963lsk9b6gnrzlf"; depends=[IRanges KernSmooth]; };
@@ -101,15 +108,16 @@ in with self; {
   MMDiffBamSubset = derive2 { name="MMDiffBamSubset"; version="1.17.0"; sha256="1bjkdyf0knkdbzdmlas81dhnm5k7yslq6km3yzffrvn1kssml47i"; depends=[]; };
   MSBdata = derive2 { name="MSBdata"; version="0.99.1"; sha256="1bgzzrynb4066xps7wagawb2pjd64qab7n9il2znsidfprm03bxj"; depends=[]; };
   MSstatsBioData = derive2 { name="MSstatsBioData"; version="1.3.0"; sha256="10i3gg9fbhcj6fz4fz1jzmqmabdf9c39ys8yp40qs60glv9gj3qa"; depends=[]; };
-  MUGAExampleData = derive2 { name="MUGAExampleData"; version="0.115.0"; sha256="1ls2rhjx9ksdlz28dw3rm59rh6k17xyilda92ib48p7898njgf1c"; depends=[]; };
-  MetaGxBreast = derive2 { name="MetaGxBreast"; version="1.1.0"; sha256="03k4ddgjvrpgg9xikjhy1ayampr8v18ncm57jpnn9wrijvyinpfj"; depends=[AnnotationHub Biobase ExperimentHub impute lattice]; };
-  MetaGxOvarian = derive2 { name="MetaGxOvarian"; version="1.1.0"; sha256="0d7kpm9cqxkwnnickk0hcc2y0x4ah3mh8ajpdrhrylvffbmx4r38"; depends=[AnnotationHub Biobase ExperimentHub impute lattice]; };
-  MetaGxPancreas = derive2 { name="MetaGxPancreas"; version="1.1.0"; sha256="0mpspppz8bmq90aq9jvvqs5700n0dkiqcd5pdrsija8ycp2gbxc9"; depends=[AnnotationHub Biobase ExperimentHub impute lattice]; };
+  MUGAExampleData = derive2 { name="MUGAExampleData"; version="1.1.0"; sha256="18y2ljddzk0g7cn5v8cpc151mrdfzhvj0ah4c988lmc6xlqcyjsv"; depends=[]; };
+  MetaGxBreast = derive2 { name="MetaGxBreast"; version="1.1.1"; sha256="1lzqv8alxccmfp6s4ylyam9ljwga9p9q5ndnhsljnfiyw820md78"; depends=[AnnotationHub Biobase ExperimentHub impute lattice]; };
+  MetaGxOvarian = derive2 { name="MetaGxOvarian"; version="1.1.1"; sha256="1djqlmms5a24g8n6mimp4fib3h6qd17p1cl9anzmvl3zscz23p8y"; depends=[AnnotationHub Biobase ExperimentHub impute lattice]; };
+  MetaGxPancreas = derive2 { name="MetaGxPancreas"; version="1.1.1"; sha256="17vjfnlxrkmdxifmbpfq81zqzzpdhkm5s1aagcnrhgzkv9prszms"; depends=[AnnotationHub Biobase ExperimentHub impute lattice]; };
   MethylAidData = derive2 { name="MethylAidData"; version="1.13.0"; sha256="157qvzvw8hhw25qnzv7xax3vzmq38bw4fp0k34jfwgq944srv0h5"; depends=[MethylAid]; };
-  Mulder2012 = derive2 { name="Mulder2012"; version="0.21.0"; sha256="10mciqb0vh32hx1590r99zyr0pbx84hrssdpjz6i8g9hzlp69wvm"; depends=[HTSanalyzeR igraph KEGG_db MASS org_Hs_eg_db PANR pvclust RedeR]; };
+  Mulder2012 = derive2 { name="Mulder2012"; version="0.21.1"; sha256="1ypxdys24g8k98jd50sldqggy28fmjy1cq7gc3pxa10rww6g9h57"; depends=[HTSanalyzeR igraph KEGG_db MASS org_Hs_eg_db PANR pvclust RedeR]; };
   NCIgraphData = derive2 { name="NCIgraphData"; version="1.17.0"; sha256="090s04iwbnhdbgprcy15hl596vmgq8x97v34w2xvmsdld5b8z58d"; depends=[]; };
-  NGScopyData = derive2 { name="NGScopyData"; version="0.115.0"; sha256="1l949sqfywpa5rqxh8h6wq5i8cqmf9ly1ghcrb0gmxv2rcazbn87"; depends=[]; };
+  NGScopyData = derive2 { name="NGScopyData"; version="1.1.0"; sha256="13dlsznbg3kk7pi0gdzwnh9i3qdk538qh4rnjbpxr6iw61hwl0zd"; depends=[]; };
   Neve2006 = derive2 { name="Neve2006"; version="0.19.0"; sha256="0fn77ic133wfdjrnh5vdk95rwx51nigfmznb7i94n8h5hddmpnbc"; depends=[annotate Biobase hgu133a_db]; };
+  OMICsPCAdata = derive2 { name="OMICsPCAdata"; version="0.99.11"; sha256="1w38ii5wsaiar4lbn5428pyinzg07zvw4c7fac6a3nx70mhpnxn5"; depends=[MultiAssayExperiment]; };
   OnassisJavaLibs = derive2 { name="OnassisJavaLibs"; version="1.3.0"; sha256="0ih472qrzx183pyk0k8agwybn5bycx3hx1j2amjkp42p7hml4iqj"; depends=[rJava]; };
   PCHiCdata = derive2 { name="PCHiCdata"; version="1.9.0"; sha256="19cmbyhsi84pi89fy623f7r5yld7qifnqfpvwcb3n7ads5idq1qm"; depends=[Chicago]; };
   PGPC = derive2 { name="PGPC"; version="1.9.0"; sha256="10z8r98lp92dh14wpf2hs5n3jzw9y3dw6mf5ssx469368hhaypma"; depends=[ChemmineR EBImage geneplotter ggplot2 gplots imageHTS limma plyr RColorBrewer reshape2 SearchTrees splots]; };
@@ -120,7 +128,7 @@ in with self; {
   PasillaTranscriptExpr = derive2 { name="PasillaTranscriptExpr"; version="1.9.0"; sha256="1lkqz0kp1jfsi1bvkqhvlqapp658qfm7b1p9kiwk9qakfl0nm7x6"; depends=[]; };
   PathNetData = derive2 { name="PathNetData"; version="1.17.0"; sha256="02wdp23y583p9sinhaqkv6lxp836m6kh7na8b2wv6qajanibzhl1"; depends=[]; };
   ProData = derive2 { name="ProData"; version="1.19.0"; sha256="0idv9icfzr52k96gij5mlyqyd48mjwka7jg1nhawiaj7g4c005yc"; depends=[Biobase]; };
-  PtH2O2lipids = derive2 { name="PtH2O2lipids"; version="1.7.0"; sha256="1dql2jfvsqn2r1cq1bfg7nfs7gimim6jgsvz7b9pqk1zdh02jhkm"; depends=[CAMERA LOBSTAHS xcms]; };
+  PtH2O2lipids = derive2 { name="PtH2O2lipids"; version="1.7.1"; sha256="1ypwwrk643shfng4nqs7jpy25058ni2fqq4jhx2yc1j73bx8k834"; depends=[CAMERA LOBSTAHS xcms]; };
   QDNAseq_hg19 = derive2 { name="QDNAseq.hg19"; version="1.11.0"; sha256="134mzg2r3bpzcpag5vf2fq8g0xczb5qxyvqqcjzqw654mbafgczr"; depends=[QDNAseq]; };
   QDNAseq_mm10 = derive2 { name="QDNAseq.mm10"; version="1.11.0"; sha256="1j5qzwbc7a9h9hlda6c6f53pm6vqm4kdja4z144j4snyac88xclm"; depends=[QDNAseq]; };
   QUBICdata = derive2 { name="QUBICdata"; version="1.9.0"; sha256="1r1wcmd7s17gm5q682siy8ld65w6ylch9jamqjlbp8qiqqvfmzdd"; depends=[]; };
@@ -128,28 +136,30 @@ in with self; {
   RIPSeekerData = derive2 { name="RIPSeekerData"; version="1.17.0"; sha256="11hrk3cf86jgc7vf14wlyarar2vsnjs0i9wyzvmk76draq9frg30"; depends=[RIPSeeker]; };
   RITANdata = derive2 { name="RITANdata"; version="1.5.0"; sha256="0yn8nfvni9h4k9ngzccsqgbjrjvql5gp3haqyg9x334sjsi212c8"; depends=[]; };
   RMassBankData = derive2 { name="RMassBankData"; version="1.19.0"; sha256="172x6x7fnzjczi76ibmscbb51l8185lqgiypyyvlisp145mxssdn"; depends=[]; };
-  RNAinteractMAPK = derive2 { name="RNAinteractMAPK"; version="1.19.0"; sha256="01sf7pbcsibdm5dhh9zv2gg2g58z6vswhdz227qfd6cvbpnpqr7b"; depends=[fields gdata genefilter MASS RNAinteract sparseLDA]; };
+  RNASeqRData = derive2 { name="RNASeqRData"; version="0.99.8"; sha256="0mfgfmbngx87h9ymbqcdabla5rb26p1kh4rvp3g307rp3hraivcp"; depends=[]; };
+  RNAinteractMAPK = derive2 { name="RNAinteractMAPK"; version="1.19.1"; sha256="1c90s1vjp4w065zldlzrn64qakwnhfg3s6w3ddmx6hynbrc8lk8j"; depends=[fields gdata genefilter MASS RNAinteract sparseLDA]; };
   RNAseqData_HNRNPC_bam_chr14 = derive2 { name="RNAseqData.HNRNPC.bam.chr14"; version="0.19.0"; sha256="0z1b986jvinzh3c1yl9q8wa66wgq8hp8rjbs23glxna77znvkp87"; depends=[]; };
-  RRBSdata = derive2 { name="RRBSdata"; version="0.115.0"; sha256="0i33fm60lcjczzc4xx6y1gg5jsxlq0v9bz46hym7aq59zlpbqh6p"; depends=[BiSeq]; };
-  RTCGA_CNV = derive2 { name="RTCGA.CNV"; version="1.9.0"; sha256="0an39dgcapfn7i5h1inbjihl224l945g0rax5h33bmpnzlry1a8a"; depends=[RTCGA]; };
-  RTCGA_PANCAN12 = derive2 { name="RTCGA.PANCAN12"; version="1.9.0"; sha256="1lh2ij6x796rn39j1awn461jc0snswp14x6z338gqz58dahjfr1x"; depends=[RTCGA]; };
-  RTCGA_RPPA = derive2 { name="RTCGA.RPPA"; version="1.9.0"; sha256="0micdaglaqfbg2pg9b0jpnvfi91adms8lg7sq7k9srgyjx2dsdid"; depends=[RTCGA]; };
+  RRBSdata = derive2 { name="RRBSdata"; version="1.1.0"; sha256="18xm228jlpvv5z5r5k3nyjnnmizsyg5lkml4kdrkw8mv7gljgcyb"; depends=[BiSeq]; };
+  RTCGA_CNV = derive2 { name="RTCGA.CNV"; version="1.9.2"; sha256="19lwjkzs0wrvrgm5a81wq2qcqv2xa1irfnqbv6yrx9c3g3sk6zqi"; depends=[RTCGA]; };
+  RTCGA_PANCAN12 = derive2 { name="RTCGA.PANCAN12"; version="1.9.2"; sha256="1ain3wscy6n1jjcb8wajpn9h7flhppih01mjjv6y3dxyyiqqchim"; depends=[RTCGA]; };
+  RTCGA_RPPA = derive2 { name="RTCGA.RPPA"; version="1.9.2"; sha256="0fisrp4mgl035lcwg4pj1zcrmfafsc0kgc6788h9nx9b1vh6s7w9"; depends=[RTCGA]; };
   RTCGA_clinical = derive2 { name="RTCGA.clinical"; version="20151101.11.0"; sha256="1y63vnj59sv73zcrnwqd4ikdjx45y9sqb2pj1lnsrhvfbmjazi5z"; depends=[RTCGA]; };
-  RTCGA_mRNA = derive2 { name="RTCGA.mRNA"; version="1.9.0"; sha256="094yh17af0x4zb97dcmrfxqviylqmr3zii3jya6iwwr2jay5a8wh"; depends=[RTCGA]; };
-  RTCGA_methylation = derive2 { name="RTCGA.methylation"; version="1.9.0"; sha256="0m3i7srvdjjkynnizh7jq8d70rm7cq0wi6182iafdgyaxip2qxgk"; depends=[RTCGA]; };
-  RTCGA_miRNASeq = derive2 { name="RTCGA.miRNASeq"; version="1.9.0"; sha256="1nw57daaf3z5k2m52rw72ncxj68bkjmpq158z59v8zm5cpm8z33f"; depends=[RTCGA]; };
+  RTCGA_mRNA = derive2 { name="RTCGA.mRNA"; version="1.9.2"; sha256="1bb9b83y3f9012gnr19c2wacj1fkqvbqnymdv3qyc2pn6qhzid93"; depends=[RTCGA]; };
+  RTCGA_methylation = derive2 { name="RTCGA.methylation"; version="1.9.2"; sha256="1a97cdwm7rn9mipw3v904r4j4ay6p26rv3f8lx2znhz5hg44gnaq"; depends=[RTCGA]; };
+  RTCGA_miRNASeq = derive2 { name="RTCGA.miRNASeq"; version="1.9.2"; sha256="1lkywq2nvpil8wi8nv73hfxs3hsi71d85n9if7ra4c6ib3frwiwb"; depends=[RTCGA]; };
   RTCGA_mutations = derive2 { name="RTCGA.mutations"; version="20151101.11.0"; sha256="1wyiz22rw400hiqqnw41mqpvy8bbj1vxwx3v4vnz6x81drv2sc1n"; depends=[RTCGA]; };
   RTCGA_rnaseq = derive2 { name="RTCGA.rnaseq"; version="20151101.11.0"; sha256="0z2k651pd0m9lxl3n62xf41xhk65n33cgf7d5zfwd03hbc07d0gq"; depends=[RTCGA]; };
-  RUVnormalizeData = derive2 { name="RUVnormalizeData"; version="0.115.0"; sha256="0vyy1sarkb64vjq1c3mrd0d04hnfy4aigi7zgvaniv31ab6hpb05"; depends=[Biobase]; };
+  RUVnormalizeData = derive2 { name="RUVnormalizeData"; version="1.1.0"; sha256="002q9rc6d0cr6gip9irlafi67ds4jlvxfnil2if30aw4h6l4apkn"; depends=[Biobase]; };
   RcisTarget_hg19_motifDBs_cisbpOnly_500bp = derive2 { name="RcisTarget.hg19.motifDBs.cisbpOnly.500bp"; version="1.1.1"; sha256="08p1r5vpz92i7nmgdjsp0i5wzypb46lsdnlykci21nzf9ip12mc9"; depends=[data_table]; };
-  RforProteomics = derive2 { name="RforProteomics"; version="1.19.1"; sha256="1dy4d1wyf8ifdhy8psy533yy8liwgb26gbwqv1rdzjxgzai8f3jr"; depends=[AnnotationDbi Biobase BiocInstaller biocViews DT interactiveDisplay MSnbase R_utils rpx shiny]; };
-  RnBeads_hg19 = derive2 { name="RnBeads.hg19"; version="1.13.0"; sha256="1p3b97f8kmilpwgf61p4kwkizdn8a07ai9a2x3hy4igzw21fcgz5"; depends=[GenomicRanges]; };
+  RegParallel = derive2 { name="RegParallel"; version="0.99.9"; sha256="0n0qyiz2bqw5wi35f8rszrx668dl6hqw054lqakb2dpfpjlzz57y"; depends=[arm data_table doParallel foreach iterators MASS stringr survival]; };
+  RforProteomics = derive2 { name="RforProteomics"; version="1.19.4"; sha256="1mm1cfsazajkhaim4grz2zi7ar4x2ljn5vq4rlv20gra3d4b82ca"; depends=[BiocManager biocViews MSnbase R_utils shiny]; };
+  RnBeads_hg19 = derive2 { name="RnBeads.hg19"; version="1.13.1"; sha256="1l3za4hbrg38p9sh38qsj17hgg03cbgqga4zg0c4lcipifrpbbfj"; depends=[GenomicRanges]; };
   RnBeads_hg38 = derive2 { name="RnBeads.hg38"; version="1.13.0"; sha256="1wyy4m3p40i12hlwvz9ixqps8i4d5703gl0pcgl4i2485d78yv9v"; depends=[GenomicRanges]; };
   RnBeads_mm10 = derive2 { name="RnBeads.mm10"; version="1.13.0"; sha256="1kjvy1v0dbdm959cmsf2d5mnrbnisjpff12wl5gn44n2cg7bb65g"; depends=[GenomicRanges]; };
   RnBeads_mm9 = derive2 { name="RnBeads.mm9"; version="1.13.0"; sha256="1s1iy8x1x53ny1pyfgwwkiwc3jpjhdkcd9vpwyv2ix5g22jf8ag7"; depends=[GenomicRanges]; };
   RnBeads_rn5 = derive2 { name="RnBeads.rn5"; version="1.13.0"; sha256="1pp9y94rdk5wwapc4jbvs35x1z2agv4xvzxy3fl3h7hp22gaqr9p"; depends=[GenomicRanges]; };
   RnaSeqSampleSizeData = derive2 { name="RnaSeqSampleSizeData"; version="1.13.1"; sha256="1cqannbgpr0s9qr1cx4d23rwjy6k63x25khdr7qx5939chz0r21a"; depends=[edgeR]; };
-  SCLCBam = derive2 { name="SCLCBam"; version="1.13.0"; sha256="1ynibzjlyfscg5b1lxa5nvfznp106vb4h7ia6n847h3n5s6ndasv"; depends=[]; };
+  SCLCBam = derive2 { name="SCLCBam"; version="1.13.1"; sha256="1b6da5i20w7w08jv3s2xdpp71qf7y1nxyv3qj3fz5jkw2aavds5f"; depends=[]; };
   SNAData = derive2 { name="SNAData"; version="1.27.0"; sha256="182pramjd14g1p0aawcjrv51xlyqkp9mhm84v3gnd9gnmkb69b31"; depends=[graph]; };
   SNAGEEdata = derive2 { name="SNAGEEdata"; version="1.17.0"; sha256="15l23gw5ckxgr6pscl07jqwb1lz58g5893wnlzz4zpk3sd46d2p6"; depends=[]; };
   SNPhoodData = derive2 { name="SNPhoodData"; version="1.11.0"; sha256="1zm0zhf2987hls15b47jv6krn1cc8kp6jm64k4wqhp4dsjxwbaqd"; depends=[]; };
@@ -162,21 +172,23 @@ in with self; {
   TBX20BamSubset = derive2 { name="TBX20BamSubset"; version="1.17.0"; sha256="15521vpi6h1ydl8vw43h0plrgy7baj5bprzg8rs50yxgkphh9nns"; depends=[Rsamtools xtable]; };
   TCGAMethylation450k = derive2 { name="TCGAMethylation450k"; version="1.17.0"; sha256="090y4vyipnlxxg78yxva7q5y81gawfpmkgjrsqiqr1smfalvx9yw"; depends=[]; };
   TCGAWorkflowData = derive2 { name="TCGAWorkflowData"; version="1.5.0"; sha256="0kbab7fjy7waq5r6k2w0c8x811xd62v39p17acd5gk8gbw9gy919"; depends=[SummarizedExperiment]; };
-  TCGAbiolinksGUI_data = derive2 { name="TCGAbiolinksGUI.data"; version="1.1.0"; sha256="0l65f933xxngfm6z5576disj60xasm386x8balsrymcvjkpksr7q"; depends=[]; };
-  TCGAcrcmRNA = derive2 { name="TCGAcrcmRNA"; version="0.115.0"; sha256="1bmn0r5bx2vc4cpv48mbhr57gpidr42mgaxliwmkyj0dqbjnzmqd"; depends=[Biobase]; };
-  TCGAcrcmiRNA = derive2 { name="TCGAcrcmiRNA"; version="0.115.0"; sha256="1n7qq2gc3mcfh4c1y2myrb1pj6bq8l7m7nwhlk0ps90zlj064isp"; depends=[Biobase]; };
-  TENxBrainData = derive2 { name="TENxBrainData"; version="1.1.0"; sha256="032z307qh7idxkzqc8b5gngysmw8iy1s3z1r8747n495dy85ippz"; depends=[AnnotationHub ExperimentHub HDF5Array SingleCellExperiment]; };
+  TCGAbiolinksGUI_data = derive2 { name="TCGAbiolinksGUI.data"; version="1.1.1"; sha256="0lg2xmf9crcd3328sikjynicrapm32ffq8ay9p0r484rx0m5yvbp"; depends=[]; };
+  TCGAcrcmRNA = derive2 { name="TCGAcrcmRNA"; version="1.1.0"; sha256="160gj5q4n08l3llfqd0iim2054v8jd3a2pvvd7454amangnrrjd1"; depends=[Biobase]; };
+  TCGAcrcmiRNA = derive2 { name="TCGAcrcmiRNA"; version="1.1.0"; sha256="1njy5ab0a8p97gi8ci0bad1byl5k42a5shjrss8z9k3a0n9jzpxm"; depends=[Biobase]; };
+  TENxBrainData = derive2 { name="TENxBrainData"; version="1.1.2"; sha256="1m4cajmp1h5mahlxbvyfvslqq3yfbcy8k46m5p0b73phvnw44846"; depends=[AnnotationHub ExperimentHub HDF5Array SingleCellExperiment]; };
+  TENxPBMCData = derive2 { name="TENxPBMCData"; version="0.99.3"; sha256="00xjm8xr5f1dzghmr6p3mcjcir6a81gd99kgzznj5k90assggr45"; depends=[AnnotationHub ExperimentHub HDF5Array SingleCellExperiment]; };
+  TabulaMurisData = derive2 { name="TabulaMurisData"; version="0.99.2"; sha256="185y3cxdkgj4gl4ai0nc0684nz357qscfsah559wdvvvqny25dmk"; depends=[ExperimentHub]; };
   TargetScoreData = derive2 { name="TargetScoreData"; version="1.17.0"; sha256="12bmw3qmkw9blmr5ikgx0qyfv1x6hda8d41fiy8gsb74fa4nifsv"; depends=[]; };
-  TargetSearchData = derive2 { name="TargetSearchData"; version="1.19.0"; sha256="024av13qimrl55dwkw46rfx9gr6kdghnf1n5qcr4q7h5i9frdfxg"; depends=[]; };
+  TargetSearchData = derive2 { name="TargetSearchData"; version="1.19.1"; sha256="1hwfqsz1rivqq14x5z9d8nphxajfxhm70mgbi0pjzlzsravg487w"; depends=[]; };
   TimerQuant = derive2 { name="TimerQuant"; version="1.11.0"; sha256="1a49jaxgjhwl756a7wijswa90z03fz61ffp6w5h00v9qfzgnyf79"; depends=[deSolve dplyr ggplot2 gridExtra locfit shiny]; };
   VariantToolsData = derive2 { name="VariantToolsData"; version="1.5.0"; sha256="1kkz3zvba4mc237pxwj6z0c2jvbrgfaz3n5vm55bz6j47aas3i4j"; depends=[BiocGenerics GenomicRanges VariantAnnotation]; };
   WES_1KG_WUGSC = derive2 { name="WES.1KG.WUGSC"; version="1.13.0"; sha256="0f3llqwkc5d4av47871d45lfqghmncww9g5rgf58pydrnw7n93xv"; depends=[]; };
   XhybCasneuf = derive2 { name="XhybCasneuf"; version="1.19.0"; sha256="1kac43fvng1pwa8hlbivd8pxan7agp9csp0nmh062x4kwamny3hm"; depends=[affy ath1121501cdf RColorBrewer tinesath1cdf]; };
   affycompData = derive2 { name="affycompData"; version="1.19.0"; sha256="14ss2b854dj36rzhx1z854r5hkxy0yqzlm5k0690gn5bwlah6rk6"; depends=[affycomp Biobase]; };
   affydata = derive2 { name="affydata"; version="1.29.0"; sha256="0sv5q59xfvlyk97ihki5sqdzy9nldjccxiscx3ii1xpp4xk44i3c"; depends=[affy]; };
-  airway = derive2 { name="airway"; version="0.115.0"; sha256="1h823q96za4jrzf680bp651blh5giqwx660nhp7xhl3drxpzf1ir"; depends=[SummarizedExperiment]; };
-  allenpvc = derive2 { name="allenpvc"; version="0.99.1"; sha256="1g0bk3v2gmhr2ck4kdc2pb6xj8abk9kgk0h5f0hdfbaxjdrhwpx3"; depends=[AnnotationHub ExperimentHub SingleCellExperiment]; };
-  alpineData = derive2 { name="alpineData"; version="1.7.0"; sha256="18llr6pssxmrvw3qzxw4f77bpv8g3akz3kbsn9xsdsij364q33am"; depends=[AnnotationHub ExperimentHub]; };
+  airway = derive2 { name="airway"; version="1.1.0"; sha256="0daywdjalqbqx6gxrg4fwiasa62h9jh8ibg9kh0vrd35mdazh7b4"; depends=[SummarizedExperiment]; };
+  allenpvc = derive2 { name="allenpvc"; version="0.99.2"; sha256="04f6y2zk7c8prk22yl15qp9xf81dickn2ida8b5jdhzby6a4p1d1"; depends=[AnnotationHub ExperimentHub SingleCellExperiment]; };
+  alpineData = derive2 { name="alpineData"; version="1.7.1"; sha256="1gdj474nc2s92i2m1f02ganr5vsv93315mk3dqdyyk05xr9banbw"; depends=[AnnotationHub ExperimentHub GenomicAlignments]; };
   antiProfilesData = derive2 { name="antiProfilesData"; version="1.17.0"; sha256="0wyjfc02wm5x5d61fs6cs7g3s0j4aibpqkdiwx0d8cbbkl38ih3f"; depends=[Biobase]; };
   aracne_networks = derive2 { name="aracne.networks"; version="1.7.0"; sha256="1acngnqvg7vl402yfcw65rqs27a7sncl1xfz2893abfli2ccpbzx"; depends=[viper]; };
   bcellViper = derive2 { name="bcellViper"; version="1.17.0"; sha256="0rzzj4pla57z9825jcs2kx177xrcqfnh7jai41m8dwfxln6ccz25"; depends=[Biobase]; };
@@ -184,7 +196,9 @@ in with self; {
   beta7 = derive2 { name="beta7"; version="1.19.0"; sha256="1gd1l8rh73k27sm1cjfy9rmsplrkji3zhzrzcldjmaaixl5nfjql"; depends=[marray]; };
   biotmleData = derive2 { name="biotmleData"; version="1.5.0"; sha256="0ccx398761qdnnsrjwrrg6qjrq01fv88999f2llyq9gpd3f43lgs"; depends=[]; };
   bladderbatch = derive2 { name="bladderbatch"; version="1.19.0"; sha256="0n9vwbj8cii67rhxvb1ps72k99rv251zcdr4w3r1jkbvcd61nvh0"; depends=[Biobase]; };
-  blimaTestingData = derive2 { name="blimaTestingData"; version="0.115.0"; sha256="1hzmwjmyi6qnkqnq2x6ml8yvzn1sr33lwc6nhz2k2mx6s2l4ajbb"; depends=[]; };
+  blimaTestingData = derive2 { name="blimaTestingData"; version="1.1.0"; sha256="0r51zz7kh16zgadr2vzgrm5fywfs03mk2jk5qywb27agqbw5y40s"; depends=[]; };
+  brainImageRdata = derive2 { name="brainImageRdata"; version="0.99.6"; sha256="0wbj8y1qskc23gqdwc815racv7kqplmh1v12y5y094fcgs6cq62p"; depends=[ExperimentHub]; };
+  breakpointRdata = derive2 { name="breakpointRdata"; version="0.99.2"; sha256="13mfnd2ms1fnk6zmyz8l10qw8xhfmb8qjyc2r7hn1qmap6ld578f"; depends=[]; };
   breastCancerMAINZ = derive2 { name="breastCancerMAINZ"; version="1.19.0"; sha256="0pn48n81vx2wq425q5wnga6n32apgajk0bwq78ri983plh7ik2b1"; depends=[]; };
   breastCancerNKI = derive2 { name="breastCancerNKI"; version="1.19.0"; sha256="0b6z16m6kqkd8rfrdvjp6p4fbqs78s25fbiswnw0k8jzvz5yw5x7"; depends=[]; };
   breastCancerTRANSBIG = derive2 { name="breastCancerTRANSBIG"; version="1.19.0"; sha256="0slagz3x2q1qykvjcfnh7k3ggpn2g34j4iqvnv7j3mdcc085hn1d"; depends=[]; };
@@ -196,7 +210,9 @@ in with self; {
   bsseqData = derive2 { name="bsseqData"; version="0.19.1"; sha256="0gqwyx0l0xmd2aa46shq4kr11nfi1imj2pwfjc9026r47af5b84h"; depends=[bsseq]; };
   cMap2data = derive2 { name="cMap2data"; version="1.17.0"; sha256="11973w3gjz0qayxacx41mlbf4ji345js8jgjkn2aba0ahnyzb6vw"; depends=[]; };
   cancerdata = derive2 { name="cancerdata"; version="1.19.0"; sha256="02zi60lh6jsg6hlyyq6wzg9lzxjr8m9418kywlk3x3c6kkgkrh69"; depends=[Biobase]; };
-  ccTutorial = derive2 { name="ccTutorial"; version="1.19.0"; sha256="0xd3zrcia312h947nvah3ksx9kxzhqzc9c2nm5q6ssvx15s6f6d6"; depends=[affy Biobase Ringo topGO]; };
+  ccTutorial = derive2 { name="ccTutorial"; version="1.19.3"; sha256="1bghwfpdm2xzh6w1z2pinv9wxy3f5vx8aabyl5vj9smfmplgcmxx"; depends=[affy Biobase Ringo topGO]; };
+  ccdata = derive2 { name="ccdata"; version="1.7.0"; sha256="1vdsldxl1xnjdi9ai346a1zx9jp6kw33884vwwy86xmj7799j3y1"; depends=[]; };
+  celarefData = derive2 { name="celarefData"; version="0.99.0"; sha256="118rdgkz4vlhk5n5c683sl28xsjqds6m08w3nfsw8z7ki6kng9sx"; depends=[]; };
   ceu1kg = derive2 { name="ceu1kg"; version="0.19.0"; sha256="0vs60mflfc1pnc7s725wsyq2jrj44jrvxwzpw4bhlj0qbs602s8l"; depends=[Biobase GGBase GGtools]; };
   ceu1kgv = derive2 { name="ceu1kgv"; version="0.23.0"; sha256="10jnbc8y386racq3ac1hf1dp76wvzlfm8p66c94pk3f2m0w45psv"; depends=[Biobase GGBase]; };
   ceuhm3 = derive2 { name="ceuhm3"; version="0.19.0"; sha256="1qdp85ps5xrlx1pl769j91aig2rgxcix4pdzrsa249nyyq1avdym"; depends=[Biobase GGBase GGtools]; };
@@ -209,11 +225,11 @@ in with self; {
   curatedBladderData = derive2 { name="curatedBladderData"; version="1.17.0"; sha256="14xwq55g83pvwyxm7kl6hq9c4j2bd6vp63afir619d5binl6i7ln"; depends=[affy]; };
   curatedBreastData = derive2 { name="curatedBreastData"; version="2.9.0"; sha256="024sx3am50vsaaixmj8gfp3f905rf7g7qyn47sdakpv6sx48k1zl"; depends=[Biobase BiocStyle ggplot2 impute XML]; };
   curatedCRCData = derive2 { name="curatedCRCData"; version="2.13.0"; sha256="1f6m6sllbxzca27lwyvav2d4si65w7fs9mh4mksw2sn8n8x5452v"; depends=[BiocGenerics nlme]; };
-  curatedMetagenomicData = derive2 { name="curatedMetagenomicData"; version="1.11.1"; sha256="1gdnp5m8d3lz88hvsm3j2jq9w1di14ifls5l9q51jxm045yg0yjj"; depends=[AnnotationHub Biobase dplyr ExperimentHub magrittr S4Vectors tidyr]; };
+  curatedMetagenomicData = derive2 { name="curatedMetagenomicData"; version="1.11.5"; sha256="1rcznh6h7vrwicf545jfxabrjwqf1npxqpp6hdfnf5bylkfrc1d9"; depends=[AnnotationHub Biobase dplyr ExperimentHub magrittr S4Vectors tidyr]; };
   curatedOvarianData = derive2 { name="curatedOvarianData"; version="1.19.0"; sha256="0yvc1kpy4ql2sd467dggi6kpwxrvvqyasr0mgc61s1snmakvm06y"; depends=[affy BiocGenerics]; };
-  curatedTCGAData = derive2 { name="curatedTCGAData"; version="1.3.3"; sha256="0khdg080c5ivirh84w1w6pvl9g4yi8i8f4sl82q3a2nwldqswghz"; depends=[AnnotationHub ExperimentHub MultiAssayExperiment S4Vectors]; };
+  curatedTCGAData = derive2 { name="curatedTCGAData"; version="1.3.5"; sha256="01m4kld5cp0ff5wlwk2wln15vyjxgahzbk3xkzlg81yvs67ai2vr"; depends=[AnnotationHub ExperimentHub MultiAssayExperiment S4Vectors]; };
   davidTiling = derive2 { name="davidTiling"; version="1.21.0"; sha256="18ivz1z0il8s9sk6c5mzgipsbs8xswbq7swwm422ji1yp75lkd9p"; depends=[Biobase GO_db tilingArray]; };
-  derfinderData = derive2 { name="derfinderData"; version="0.115.0"; sha256="1xvvcbsbmrkri2nl7g1wpbbsa7wn49dj85xwxbsf8yffmisxb09k"; depends=[]; };
+  derfinderData = derive2 { name="derfinderData"; version="1.99.0"; sha256="1dv6j91c9xs19pynza54gs127qqf5xk66rwin6rby0dcv58ng6s4"; depends=[]; };
   diffloopdata = derive2 { name="diffloopdata"; version="1.9.0"; sha256="12a5338djyhg94q7wdahij4c9dnrx5qx04a1g9304wpk5z6cmxni"; depends=[]; };
   diggitdata = derive2 { name="diggitdata"; version="1.13.0"; sha256="09b1mk68mg3jqf63c54xdh805vd79hbnnh02rf6qb3pq6w9b6z64"; depends=[Biobase viper]; };
   dressCheck = derive2 { name="dressCheck"; version="0.19.0"; sha256="0k3h5i86345xx0d31qim1d1aw25axwy48hiq717fbnz2mpwsggj7"; depends=[Biobase]; };
@@ -224,11 +240,11 @@ in with self; {
   etec16s = derive2 { name="etec16s"; version="1.9.0"; sha256="0ljn90gf4sm7615xw25dil15kgf81gl0hvbp24snx4nbflnhns4q"; depends=[Biobase metagenomeSeq]; };
   faahKO = derive2 { name="faahKO"; version="1.21.0"; sha256="19dxcf3yfgy8h8xn76h7x2ihvgy90923a28j3b2k972r84zzy7gk"; depends=[xcms]; };
   fabiaData = derive2 { name="fabiaData"; version="1.19.0"; sha256="104c70pp9cnkx3y2mm6yxj4vj6k2mqrhw1n2cibhxnnqnl2lnwnr"; depends=[Biobase]; };
-  facopy_annot = derive2 { name="facopy.annot"; version="0.115.0"; sha256="0aribb9b0rjd2xlxchbsjq3darg6klhsc8ajpa34m0rldkp3nzrl"; depends=[]; };
+  facopy_annot = derive2 { name="facopy.annot"; version="1.1.0"; sha256="0snc9v8jy3dnxidk7g9lppxcp35flgdgp132sap8qkh6d1qc2rwd"; depends=[]; };
   facsDorit = derive2 { name="facsDorit"; version="1.23.0"; sha256="0xxdz1xfb661pnrqji6vxsmmr90h1v1i195k9gb4dll6hwbq0n11"; depends=[prada]; };
   ffpeExampleData = derive2 { name="ffpeExampleData"; version="1.19.0"; sha256="0jjaj492k4akc30yvr4q8y31wdi152iq5s3pl5i10sl9xrbg80hj"; depends=[lumi]; };
   fibroEset = derive2 { name="fibroEset"; version="1.23.0"; sha256="1g22av8zj4nq9prnps7zgrzvva9d5a6h016llg0brpf9qjpg58p3"; depends=[Biobase]; };
-  fission = derive2 { name="fission"; version="0.115.0"; sha256="1wx3ama4pdklyrjb54ww69ig554iv2c7j568zpxdywclg38z6pms"; depends=[SummarizedExperiment]; };
+  fission = derive2 { name="fission"; version="1.1.0"; sha256="04rwbx0dd6fjyg76jw62vimllq40lb432bzmpf051x9gjqfyx0v2"; depends=[SummarizedExperiment]; };
   flowFitExampleData = derive2 { name="flowFitExampleData"; version="1.17.0"; sha256="1ahg5g9ypxbhm7jrsbq1hjk5r5fmgvirawfd2xqfiaw5x9pkmrai"; depends=[flowCore]; };
   flowPloidyData = derive2 { name="flowPloidyData"; version="1.7.0"; sha256="0f3cnq2s215a6wrz2cbp90219smvhr4zsvl02wbd40xb8902zhdc"; depends=[]; };
   flowQBData = derive2 { name="flowQBData"; version="1.7.0"; sha256="1xla98i06j1qi2w88x1v8agvqcljzwxfcxakw0fl6phwl07hz9na"; depends=[]; };
@@ -245,8 +261,8 @@ in with self; {
   geuvStore2 = derive2 { name="geuvStore2"; version="1.11.0"; sha256="1ggac70x9pblbnzm6wg6rpmbgrkf802b2vgnfah1516grx0dwrkd"; depends=[BatchJobs GenomicRanges gQTLBase]; };
   golubEsets = derive2 { name="golubEsets"; version="1.23.0"; sha256="1h45rwz6z4wgibbyafv8946vfs303km7ixcradml4ymbpwibp4ib"; depends=[Biobase]; };
   grndata = derive2 { name="grndata"; version="1.13.0"; sha256="1ybgk5nf9nqrmw4mchpf183zyik6szzsm2cxh619fv27f0i3hjzk"; depends=[]; };
-  gskb = derive2 { name="gskb"; version="1.13.0"; sha256="0gac903pldny2p1fv3rhxr9v24iznnrz17xhdd8z01rsy0yvxdql"; depends=[]; };
-  h5vcData = derive2 { name="h5vcData"; version="1.115.0"; sha256="0viw7na4wqscaj0vijharvdj8mvwm0mxw0b2gm3slb9crkmksra7"; depends=[]; };
+  gskb = derive2 { name="gskb"; version="1.13.1"; sha256="1jpl7vm2r28bf70mv2sy0dkdn6yn27w96ja2a0yynbpd509v8fwg"; depends=[]; };
+  h5vcData = derive2 { name="h5vcData"; version="2.1.0"; sha256="036bvqd8glpk2armbv42wxv28k6rqg301l7i04wp85d94ipgn6yk"; depends=[]; };
   hapmap100khind = derive2 { name="hapmap100khind"; version="1.23.0"; sha256="07r1nsl92awkkw41midkb9iv4c93my7c222li2f4mym8hn4ahn8p"; depends=[]; };
   hapmap100kxba = derive2 { name="hapmap100kxba"; version="1.23.0"; sha256="0dvb3b2ls7g66vsv9qzl29kkjmdd6mwrhqxzj0a1d7qnkg48kgy1"; depends=[]; };
   hapmap500knsp = derive2 { name="hapmap500knsp"; version="1.23.0"; sha256="0jqyvd1khz84l1qw31xk2szb9ycsp76yrs1h81ahg64sslygnfg0"; depends=[]; };
@@ -256,12 +272,12 @@ in with self; {
   harbChIP = derive2 { name="harbChIP"; version="1.19.0"; sha256="1566kxfblk6z4dia4f3gl3v0dsz8lx343nlflbp2wfb6gd314dl6"; depends=[Biobase Biostrings IRanges]; };
   healthyFlowData = derive2 { name="healthyFlowData"; version="1.19.0"; sha256="052kvg8gvfbqc4fpr8np1q9li7f52daq1rndpg7zmc5zn4nqjzrn"; depends=[flowCore]; };
   hgu133abarcodevecs = derive2 { name="hgu133abarcodevecs"; version="1.19.0"; sha256="1c113f0aj51mdvdizi6m2wmm0v7zxsa3pkp3bjq2426v449qr3ls"; depends=[]; };
-  hgu133plus2CellScore = derive2 { name="hgu133plus2CellScore"; version="1.1.0"; sha256="05y00zzwflkkqblf811k5pxdcc9ivmvv9znlvsa232dkk4f1fnvy"; depends=[Biobase]; };
+  hgu133plus2CellScore = derive2 { name="hgu133plus2CellScore"; version="1.1.1"; sha256="1h1n76j6l0nqqf18a5w5c8vmjd579jdh2ix84j70s30nkzbyxhyw"; depends=[Biobase]; };
   hgu133plus2barcodevecs = derive2 { name="hgu133plus2barcodevecs"; version="1.19.0"; sha256="005llh7vpfc01qbq1wnq1nribqgh1kj7mw0rz59dsmr92czm7lbi"; depends=[]; };
   hgu2beta7 = derive2 { name="hgu2beta7"; version="1.21.0"; sha256="1d80nxbf8ffmh7ipvxw2smvhgq4xvjhnhmwpwmkwn30yghrm46wj"; depends=[]; };
   hmyriB36 = derive2 { name="hmyriB36"; version="1.17.0"; sha256="1s1gsysv8wsk9fzd34fjw2rp6jk8nysg1wd6dhay5mqphv92abkh"; depends=[Biobase GGBase]; };
   humanStemCell = derive2 { name="humanStemCell"; version="0.21.0"; sha256="02y71ydwlygn6yickjx3gjsmrhp6dnvqk5319is70gwd214466r1"; depends=[Biobase hgu133plus2_db]; };
-  iontreeData = derive2 { name="iontreeData"; version="1.17.1"; sha256="171gx10sfmpvwlv8ww5ckgc71y10lips3ws6v566amsdysafy82y"; depends=[]; };
+  iontreeData = derive2 { name="iontreeData"; version="1.17.2"; sha256="1y3jawc5rs1fhv90yygkjghp1ir4zw540hi2ncml4lm003d42ghq"; depends=[]; };
   kidpack = derive2 { name="kidpack"; version="1.23.0"; sha256="1ib24nbvqgids10k1glvpswavnv0qd14nvx9bw13bk09vndagkyi"; depends=[Biobase]; };
   leeBamViews = derive2 { name="leeBamViews"; version="1.17.0"; sha256="1mldlpdpnivfi60rnsbz7466jf9ssyfgb2xv9ipwc8nlmszd6g45"; depends=[Biobase BSgenome GenomicAlignments GenomicRanges Rsamtools]; };
   leukemiasEset = derive2 { name="leukemiasEset"; version="1.17.0"; sha256="15c31vzfn83pfjj8bmvg4sl0hynlvaz2wcg3fzlxmlpbf6b5rqd7"; depends=[Biobase]; };
@@ -270,8 +286,9 @@ in with self; {
   lydata = derive2 { name="lydata"; version="1.7.0"; sha256="0lq17l0klsn081m2nd9hrx50nxksvf7186drby66qvq6bhw3vhms"; depends=[]; };
   mAPKLData = derive2 { name="mAPKLData"; version="1.13.0"; sha256="1h4x00a7rziqm3cqkddpp7ahrb36045yq71lskdjyp43k066jplw"; depends=[]; };
   mCSEAdata = derive2 { name="mCSEAdata"; version="1.1.0"; sha256="0rcfyk6mwlxgkk7q40djbcbd4kx4vyy79h6dxb37zd7mpzxj03nx"; depends=[]; };
-  mammaPrintData = derive2 { name="mammaPrintData"; version="1.17.0"; sha256="0gfhiz8wqdxx56an3yp5jagsr7bx131lia86yycvhyaylsj0pv7i"; depends=[]; };
+  mammaPrintData = derive2 { name="mammaPrintData"; version="1.17.2"; sha256="0015cz3czxzzrx7ba8lqr1a5i4nh1mns114br660y9d32j1nsw0f"; depends=[]; };
   maqcExpression4plex = derive2 { name="maqcExpression4plex"; version="1.25.0"; sha256="14m82492wb7jmqwjllnqak9rivyky1prcqgp1yn0g05c406fj0r9"; depends=[]; };
+  mcsurvdata = derive2 { name="mcsurvdata"; version="0.99.4"; sha256="0kv2gq9vr0z2sg8v7mv0ky66gvwf2hbaisw2g02a81bzhjvyjky8"; depends=[AnnotationHub Biobase ExperimentHub]; };
   metaMSdata = derive2 { name="metaMSdata"; version="1.17.0"; sha256="0j6h0s75w50jp3lcfs5cilqaqhhinlfn9c6zlpki6906fj1q6dxx"; depends=[]; };
   methyvimData = derive2 { name="methyvimData"; version="1.3.0"; sha256="0jacj9jyqs5x11xds6bindab6q96br95r37dxmgxw5gxl9lcn6ql"; depends=[minfi]; };
   miRNATarget = derive2 { name="miRNATarget"; version="1.19.0"; sha256="05x4vl8x2brm3bj04kddzcqjnm72jw29prmcwr1ildbaadmzh3fg"; depends=[Biobase]; };
@@ -284,12 +301,12 @@ in with self; {
   mosaicsExample = derive2 { name="mosaicsExample"; version="1.19.0"; sha256="17xvlaxlw6jn7w81dyg74n84nny6apaxv8b7qbv7gcyil3h2xr7f"; depends=[]; };
   mouse4302barcodevecs = derive2 { name="mouse4302barcodevecs"; version="1.19.0"; sha256="1y7vkiqp4mkf16mpl5yl1jzmh1fv67d6k4i8qfi1lm68q2av9ggv"; depends=[]; };
   msPurityData = derive2 { name="msPurityData"; version="1.9.0"; sha256="0z7gs75bci301mhhp9j8lxpivjns2bmr51vsz04d4k308j19w1wv"; depends=[]; };
-  msd16s = derive2 { name="msd16s"; version="0.115.0"; sha256="1gspbva55x3bz2xzgdm9yfif0rgbd9gz9alswh1cy1kj99b0qk54"; depends=[Biobase metagenomeSeq]; };
+  msd16s = derive2 { name="msd16s"; version="1.1.0"; sha256="09zjzad3blq6i1m6fnkfjpllnvjn9vlrlc075gcm2gpwcx4w775a"; depends=[Biobase metagenomeSeq]; };
   msdata = derive2 { name="msdata"; version="0.21.0"; sha256="1srm1djnzfrj6klzxm2s721glk75lakb2428arqn3bm8vzvqw5vy"; depends=[]; };
-  msqc1 = derive2 { name="msqc1"; version="1.9.0"; sha256="0qdn1n6nisabv1iq8xqv3h14vyjwpc8576gl88km0kfd6pwwyij2"; depends=[lattice]; };
+  msqc1 = derive2 { name="msqc1"; version="1.9.1"; sha256="041fz9md3q95p1cwc7bcqam2z555sin2ib7ryssp79hp8iibx50g"; depends=[lattice]; };
   mtbls2 = derive2 { name="mtbls2"; version="1.11.0"; sha256="1ismd5yp3vgj1cqp4y92gy5z856bs6sy3fgbigjjba2rrb3m4k1z"; depends=[]; };
   mvoutData = derive2 { name="mvoutData"; version="1.17.0"; sha256="13kakn04xrngx9m80m1gqwdx3f75qixy6h9y0jvh16jk49kdnxcd"; depends=[affy Biobase lumi]; };
-  pRolocdata = derive2 { name="pRolocdata"; version="1.19.1"; sha256="1bh5qq8q0ar380nbci4y2bij19imgb5b7q5yf71mmlsxbk3284fz"; depends=[Biobase MSnbase]; };
+  pRolocdata = derive2 { name="pRolocdata"; version="1.19.5"; sha256="0gci5k1wxmnwy76nhnpjm9hysxpzjz29xw8j8srp96zn1bskaayi"; depends=[Biobase MSnbase]; };
   parathyroidSE = derive2 { name="parathyroidSE"; version="1.19.0"; sha256="1dmnm348yxa9p6lnia4iiil1s4jkxj1n83frhml06brnqymbb9wn"; depends=[SummarizedExperiment]; };
   pasilla = derive2 { name="pasilla"; version="1.9.0"; sha256="09rzh3w8nki9gqsk3pznk867ipg7s7imz7ma67cl0rh8pz2vg05i"; depends=[]; };
   pasillaBamSubset = derive2 { name="pasillaBamSubset"; version="0.19.0"; sha256="0d2b4qav1m0whr7gwn2h2962qd72i3fc0y9c36k6nxr7jyfmv1jj"; depends=[]; };
@@ -299,7 +316,7 @@ in with self; {
   pcaGoPromoter_Rn_rn4 = derive2 { name="pcaGoPromoter.Rn.rn4"; version="1.17.0"; sha256="1qz6saflpsa9naj536k7ciqks95hb6l1z2v6srclqq7b45465h1b"; depends=[]; };
   pcxnData = derive2 { name="pcxnData"; version="2.3.0"; sha256="1whw0wrfq1dfbxpfcz9z749dh27fadxmwp3dln945qh0nrjli6zc"; depends=[]; };
   pd_atdschip_tiling = derive2 { name="pd.atdschip.tiling"; version="0.19.0"; sha256="1rfp34332p0fbx9yfb87rlhwwzjy1pm3zf372pvhv1r7qm8w3dyh"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
-  pepDat = derive2 { name="pepDat"; version="0.115.0"; sha256="0rzwyq7aj3rf6sghybsn27vimlqv8z78bq5xs5jibjvwy697xczn"; depends=[GenomicRanges]; };
+  pepDat = derive2 { name="pepDat"; version="1.1.0"; sha256="0yqlsdzjqwdvjfy7p6rls2xy5bph75pivkvizj575pmagdviv882"; depends=[GenomicRanges]; };
   plasFIA = derive2 { name="plasFIA"; version="1.9.0"; sha256="0ivyvrx2wmr9wsi852h3fdkbc8qrxhx1gf21aiazlygz3x796fml"; depends=[proFIA]; };
   ppiData = derive2 { name="ppiData"; version="0.19.0"; sha256="0hglfcyzlz7j090qylilqxx9jhivk3ipkq6q0zn2grydrj0g0xib"; depends=[AnnotationDbi graph]; };
   prebsdata = derive2 { name="prebsdata"; version="1.17.0"; sha256="1jccx76j7xqbl4660f0akh6bnvhcvpn1wkn2hchbv9w1s9ywy9pi"; depends=[]; };
@@ -310,37 +327,40 @@ in with self; {
   prostateCancerVarambally = derive2 { name="prostateCancerVarambally"; version="1.9.0"; sha256="02vg37vllda3yvw6lq7xggil6l3n7v4y37s2cqixqrrmnczzqb2z"; depends=[Biobase]; };
   pumadata = derive2 { name="pumadata"; version="2.17.0"; sha256="0ag7kv1k9jaj943l0szxlk2qfx5mlpspwsrnnyxxcpi3s8r8nyn4"; depends=[affy Biobase oligo puma]; };
   qPLEXdata = derive2 { name="qPLEXdata"; version="0.99.1"; sha256="05v19rlbskvy15504ys8x3s2hhbdzwnyz3dwjas6h0b7rs3d51p7"; depends=[dplyr knitr MSnbase qPLEXanalyzer]; };
-  rRDPData = derive2 { name="rRDPData"; version="0.115.0"; sha256="1z334hpwrl3f23r7cyr6zr7niwmccmxpwzhydgwlimvkdg8yn2gv"; depends=[rRDP]; };
-  rcellminerData = derive2 { name="rcellminerData"; version="2.3.0"; sha256="1qms5v7jpvncdkllcan0xnqxhbxsh3kij4hcin8m4xd470vnf0xs"; depends=[Biobase]; };
+  rRDPData = derive2 { name="rRDPData"; version="1.1.0"; sha256="16xk33bry0203sr79lzs89pwzbqds29894fc2hjr9qs624wrzvnk"; depends=[rRDP]; };
+  rcellminerData = derive2 { name="rcellminerData"; version="2.3.1"; sha256="1i149vpfm873nzykbxf93rkrmyjshri5xi7awmxf60yiwacbafkk"; depends=[Biobase]; };
   restfulSEData = derive2 { name="restfulSEData"; version="1.3.0"; sha256="01vbzdx354qpl58lznn9938jn93rf9nikwjfmy1w33z5cmirc7ad"; depends=[ExperimentHub SummarizedExperiment]; };
   rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.19.0"; sha256="1bcn3s36w3asb2di8851wg67dpx3rwalw9php1sklzrbh2f7jazs"; depends=[]; };
   sampleClassifierData = derive2 { name="sampleClassifierData"; version="1.5.0"; sha256="06p4cq30diwx5flxc31lw3k6z66y6villf99qq99f4ab5x3gad94"; depends=[SummarizedExperiment]; };
   scRNAseq = derive2 { name="scRNAseq"; version="1.7.0"; sha256="15cxr52qakxhsbjnm8vl33qlwbvl3lghkrk4l2v0dih4mw4g65nb"; depends=[SummarizedExperiment]; };
   seq2pathway_data = derive2 { name="seq2pathway.data"; version="1.13.0"; sha256="0z9dspkjvjn20q542bjq7xyc7fpy76y3ic01h14cvql42m0vhl53"; depends=[]; };
   seqCNA_annot = derive2 { name="seqCNA.annot"; version="1.17.0"; sha256="0hz9vf8fplqm3gfrfiiirm0w6g9x6bjq7l96275aizbx3g6a80kb"; depends=[]; };
-  seqc = derive2 { name="seqc"; version="1.15.0"; sha256="0xkc712swyr9w267vsbnyhpjif47mjbgkj52f0y4b2s7vs521h0s"; depends=[]; };
+  seqc = derive2 { name="seqc"; version="1.15.2"; sha256="1bc4ibhb7wr08c794m1ljy3hz4fy0vikavg7g7y6l3rjfvlns7lk"; depends=[Biobase]; };
   serumStimulation = derive2 { name="serumStimulation"; version="1.17.0"; sha256="153zq6qpk02mkk31v5sl129j50wiw9n8c7n28f39w0mzg93yjyv5"; depends=[]; };
-  sesameData = derive2 { name="sesameData"; version="0.99.3"; sha256="0q9j82m0b9vpl7an4kqbbzlpj50qv47fbi7anj7kkxdk8w2ck0l3"; depends=[AnnotationHub curl ExperimentHub]; };
-  seventyGeneData = derive2 { name="seventyGeneData"; version="1.17.0"; sha256="00fmvpvp2bi2cv0441bzchir91iz8ip077m350jhp99nzcj6khg3"; depends=[]; };
-  shinyMethylData = derive2 { name="shinyMethylData"; version="0.115.0"; sha256="0d1sm0bcfwd7q644jdxp069q4qjbzrg44srm60knxhp1kbf2ll5i"; depends=[]; };
+  sesameData = derive2 { name="sesameData"; version="0.99.5"; sha256="0y2xkxrbj5fla75rq4iysa5ckmvv6fnbi06nk372n0gyvi0v5w8d"; depends=[AnnotationHub curl ExperimentHub]; };
+  seventyGeneData = derive2 { name="seventyGeneData"; version="1.17.3"; sha256="1aq5pzj70alv4kmi79kdyc9v0441gvfgibzf5j06zh6b2bc409x6"; depends=[]; };
+  shinyMethylData = derive2 { name="shinyMethylData"; version="1.1.0"; sha256="1qd8193vvs22x8hfy70ih2m5gx4s46hd0fas9ann198vv4rhygxz"; depends=[]; };
   simpIntLists = derive2 { name="simpIntLists"; version="1.17.0"; sha256="1cgr86ibyz4xmhsrmrr0qx8f1xhclw7q4mrrbr5znvy4nvhbzpz6"; depends=[]; };
   stemHypoxia = derive2 { name="stemHypoxia"; version="1.17.0"; sha256="076h70m11z178q1v58rbb1731nskck64sr4w29x1jby8h87rqkvk"; depends=[]; };
   stjudem = derive2 { name="stjudem"; version="1.21.0"; sha256="1ccr0zcqwffizqbd624j980kn40hmic2497mj2ws19chwqxaz24j"; depends=[]; };
   synapterdata = derive2 { name="synapterdata"; version="1.19.0"; sha256="1yppixbw3pxsaag1zfsd39p78d5l8702ysxxjgnmi50ak0lrwb2w"; depends=[synapter]; };
-  systemPipeRdata = derive2 { name="systemPipeRdata"; version="1.9.1"; sha256="0hix85s3m17f7xlj4n4qdhff799r4hf78bc5gbpi8djykmbg3glq"; depends=[BiocGenerics]; };
+  systemPipeRdata = derive2 { name="systemPipeRdata"; version="1.9.4"; sha256="0k8nybycswz78l0v61nidnirw3i9k41f1150ssglxyhqsvxpn8xd"; depends=[BiocGenerics]; };
+  tcgaWGBSData_hg19 = derive2 { name="tcgaWGBSData.hg19"; version="0.99.3"; sha256="16p36sailxw14f051c3k89gz2i9blky0vx961s36mmnd5sqn6skn"; depends=[bsseq ExperimentHub knitr]; };
   tinesath1cdf = derive2 { name="tinesath1cdf"; version="1.19.0"; sha256="0mpj8j8s9380lf830b862k2rj1mpfa3vflkai5bacwnx9i3dbmnz"; depends=[]; };
   tinesath1probe = derive2 { name="tinesath1probe"; version="1.19.0"; sha256="07fyj1vdpzkz8iw6d9bqxgi4482rvq0r945p3rxa5a0cvwcsh1xi"; depends=[AnnotationDbi]; };
   tissueTreg = derive2 { name="tissueTreg"; version="1.1.0"; sha256="1whm1a9r5bmrdzqchv7qzgnxnclq1qbzqjv0p6f6d6y7mw3rr6f6"; depends=[]; };
   tofsimsData = derive2 { name="tofsimsData"; version="1.9.0"; sha256="17pwxdik4phg1cc10ycp2j38n63l1rfna8pzz16j05858ig24lif"; depends=[]; };
-  topdownrdata = derive2 { name="topdownrdata"; version="1.3.0"; sha256="095mhjpni166p351k50y0605gb3ydsrhdnf8i92w6q84qnl9dapw"; depends=[]; };
+  topdownrdata = derive2 { name="topdownrdata"; version="1.3.0"; sha256="095mhjpni166p351k50y0605gb3ydsrhdnf8i92w6q84qnl9dapw"; depends=[topdownr]; };
   tweeDEseqCountData = derive2 { name="tweeDEseqCountData"; version="1.19.0"; sha256="1gby12vp7b88h3g86r5r01lj86chs30q505qijv3zq769px7fd2g"; depends=[Biobase]; };
-  tximportData = derive2 { name="tximportData"; version="1.9.0"; sha256="06jmawmj6sssjjp2jhfzwbzhp8lv2jwbgaaz9qfwbxhnscxzj3cj"; depends=[]; };
-  vulcandata = derive2 { name="vulcandata"; version="1.3.0"; sha256="1b7wn4kvqlb4fww98505nwnwfj5knsivx9fzli5fda2k4vzf6d4x"; depends=[]; };
+  tximportData = derive2 { name="tximportData"; version="1.9.2"; sha256="0j7nwkfrvli8wx3jvrfn1qygvzyzvmzlp5vq529ssqf6mka8i2r3"; depends=[]; };
+  vulcandata = derive2 { name="vulcandata"; version="1.3.1"; sha256="1jgiryn6cpmbipaif5d5yhwrl692hc6nac5abjip31l0rqmf4qig"; depends=[]; };
   waveTilingData = derive2 { name="waveTilingData"; version="1.17.0"; sha256="1w0wvnk4r7vvg9xvqmpmwzbp1sr7plg214d6wgdwgmp9bm785vxf"; depends=[]; };
   yeastCC = derive2 { name="yeastCC"; version="1.21.0"; sha256="1kbhbqcab7p3p160xvgwka8gfhxnjl05p9hxb7jjixi4yr30dzvj"; depends=[Biobase]; };
   yeastExpData = derive2 { name="yeastExpData"; version="0.27.0"; sha256="13vz99brk9bb10swlrisiiwilyjn6pl1z3arw47sahm7grw4sgpc"; depends=[graph]; };
   yeastGSData = derive2 { name="yeastGSData"; version="0.19.0"; sha256="06gnrh6kll5rmdvhigrf7blyyap6dz517gkhx2ljvlbwwz1hd35l"; depends=[]; };
   yeastNagalakshmi = derive2 { name="yeastNagalakshmi"; version="1.17.0"; sha256="0xq65383vmh1jnfxnfhrzfdhr5s0qzy0xb844d8lvmsn77mq7jpr"; depends=[]; };
+  yeastRNASeq = derive2 { name="yeastRNASeq"; version="0.19.0"; sha256="0sy72a0dvqq75hg599nfq6rv9frjwmvzqyissksa4dpbm8n3q086"; depends=[]; };
+  yri1kgv = derive2 { name="yri1kgv"; version="0.23.0"; sha256="08i7iz0shrhh3pnn88x3fnkpqrics4nq43fcwzkk1582j1spg8yr"; depends=[Biobase GGBase]; };
   yriMulti = derive2 { name="yriMulti"; version="0.11.0"; sha256="0gsr2y94hfmjmpz37y7q80wnkhlz8q028qn7dwm15a5rvzvs8ccv"; depends=[dsQTL GenomeInfoDb GenomicFiles GenomicRanges geuvPack gQTLBase Homo_sapiens MultiAssayExperiment SummarizedExperiment VariantAnnotation]; };
-  zebrafishRNASeq = derive2 { name="zebrafishRNASeq"; version="0.115.0"; sha256="11lmhpd94vywkir5m02qb7j278k7hjlp085xq9wgaxmr07vxzyy6"; depends=[]; };
+  zebrafishRNASeq = derive2 { name="zebrafishRNASeq"; version="1.1.0"; sha256="1sfdzs0s0jjrm36v016zf4xbw2rl2gfibzbzvgj7vark30f8w960"; depends=[]; };
 }
diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
index 78823c4f468..05715a99922 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -6,11 +6,12 @@
 { self, derive }:
 let derive2 = derive { biocVersion = "3.8"; };
 in with self; {
-  ABAEnrichment = derive2 { name="ABAEnrichment"; version="1.11.3"; sha256="08rrz6binj0hilji6gkdmqvwj0hp1b9rk6jx10gvn6wi3hg1nv4n"; depends=[ABAData data_table GOfuncR gplots gtools Rcpp]; };
+  ABAEnrichment = derive2 { name="ABAEnrichment"; version="1.11.7"; sha256="0gzv8nphchispdrlmbx28ps6k7g8ylqldf7p25pimjba700ydjdd"; depends=[ABAData data_table GOfuncR gplots gtools Rcpp]; };
   ABSSeq = derive2 { name="ABSSeq"; version="1.35.2"; sha256="0x86y1j8h9ad4vyzadb4xngzfihz73jcy2qrn5d2bpigv3m3rar5"; depends=[limma locfit]; };
   ABarray = derive2 { name="ABarray"; version="1.49.0"; sha256="1rnsk81lhybj612rb2b886al567m58ax77kng4ip43ivzd3yssil"; depends=[Biobase multtest]; };
+  ACE = derive2 { name="ACE"; version="0.99.10"; sha256="1a2mkw04fdvdfdva0gwsh0d7xkg49gi7dhsxz8ban9g1kn1g5w6z"; depends=[Biobase ggplot2 QDNAseq]; };
   ACME = derive2 { name="ACME"; version="2.37.0"; sha256="1ihpzaxhpdg8lvd30g9xhjhsil34s7w8w06cy04dp7zv117yda55"; depends=[Biobase BiocGenerics]; };
-  ADaCGH2 = derive2 { name="ADaCGH2"; version="2.21.0"; sha256="107hm5klybm8lp12bjir6gjcka8a5q4c54nvq3sn0avvzcj5caf4"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; };
+  ADaCGH2 = derive2 { name="ADaCGH2"; version="2.21.1"; sha256="0ph0glq1ngmhgh8vv1zdm0m6flfkp576fk7qdyb3prc5rc730yxr"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; };
   AGDEX = derive2 { name="AGDEX"; version="1.29.0"; sha256="0bidzm02g5f4ivnrymg9m7kpmjlg93zv1alpcsjx6ssbaix42r33"; depends=[Biobase GSEABase]; };
   AIMS = derive2 { name="AIMS"; version="1.13.0"; sha256="15ch50fw03q66d7x0asri8ff5xr82r8rxd46i80zij1fg27avkxa"; depends=[Biobase e1071]; };
   ALDEx2 = derive2 { name="ALDEx2"; version="1.13.0"; sha256="01c4bjbybivjqq1hl9dpmndn3mfk595yyjjkljcxbza6wax99rd0"; depends=[BiocParallel GenomicRanges IRanges multtest S4Vectors SummarizedExperiment]; };
@@ -20,679 +21,728 @@ in with self; {
   ASAFE = derive2 { name="ASAFE"; version="1.7.0"; sha256="0p6q9zpfqf7cz1lb0cm75ddhhcrdf90dpblrxhn8hkh5wgn3yp0m"; depends=[]; };
   ASEB = derive2 { name="ASEB"; version="1.25.0"; sha256="00wwdg07zgqbaparqail1pnffx5r63007rq65shlxda483f3ywr1"; depends=[]; };
   ASGSCA = derive2 { name="ASGSCA"; version="1.15.0"; sha256="0f9mih8bhv4ibwqni7z94n4v3kz5cm2paqdp5c0y7hvg9i836gyl"; depends=[MASS Matrix]; };
-  ASICS = derive2 { name="ASICS"; version="1.1.0"; sha256="0a81s0yhn4zb8jyq889sz94rf22mrmsnpika0j1hs1sc3h2li3v2"; depends=[BiocParallel ggplot2 gridExtra plyr quadprog ropls speaq SummarizedExperiment zoo]; };
+  ASICS = derive2 { name="ASICS"; version="1.1.1"; sha256="18arka0aj4y82ngdx458ilnvxrv45bfjj6dz1wz28frsz7bzhry2"; depends=[BiocParallel ggplot2 gridExtra plyr quadprog ropls speaq SummarizedExperiment zoo]; };
   ASSET = derive2 { name="ASSET"; version="1.99.0"; sha256="1c43xdlgqpmq192cxfbpsq6f767zlcmpm7am539673yr6fc8ql7i"; depends=[MASS msm rmeta]; };
-  ASSIGN = derive2 { name="ASSIGN"; version="1.17.1"; sha256="06rzdkdq66sl0lxbr3mvw6ybgs2laxyx7iaqgmjwf96b2j869jqb"; depends=[ggplot2 gplots msm Rlab sva]; };
-  ASpli = derive2 { name="ASpli"; version="1.7.0"; sha256="19i2says6d2sl160537vzvj9iz5zmrv6xlyprv0787n7yswssy6s"; depends=[AnnotationDbi BiocGenerics BiocStyle edgeR GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges Rsamtools S4Vectors]; };
-  ATACseqQC = derive2 { name="ATACseqQC"; version="1.5.1"; sha256="15spnf3a5hangks4k07gyjcnr6cjzxim4zjrjjilyx6jmfc7wiib"; depends=[BiocGenerics Biostrings BSgenome ChIPpeakAnno GenomeInfoDb GenomicAlignments GenomicRanges GenomicScores IRanges KernSmooth limma motifStack preseqR randomForest Rsamtools rtracklayer S4Vectors]; };
-  AUCell = derive2 { name="AUCell"; version="1.3.4"; sha256="1v53cq58jj3nvgrj7xrypmw0g4882yma950yc7k9189sdbbxxdm6"; depends=[data_table GSEABase mixtools R_utils shiny SummarizedExperiment]; };
+  ASSIGN = derive2 { name="ASSIGN"; version="1.17.4"; sha256="01ly4vislijmaa6vfs4nsawhf3jv7xb5jaa7iaizl7gpm7jnv7bp"; depends=[ggplot2 gplots msm Rlab sva yaml]; };
+  ASpli = derive2 { name="ASpli"; version="1.7.2"; sha256="1x30c1srl6sgjpl2milsc06ix5b8ds3kgz2h5wzg9wl4jsfswml3"; depends=[AnnotationDbi BiocGenerics BiocStyle edgeR GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges Rsamtools S4Vectors]; };
+  ATACseqQC = derive2 { name="ATACseqQC"; version="1.5.7"; sha256="06aq30lj97xpxxm5f46qlnl2pik44hh4jr7wcbsvjyf3xx99k3za"; depends=[BiocGenerics Biostrings BSgenome ChIPpeakAnno GenomeInfoDb GenomicAlignments GenomicRanges GenomicScores IRanges KernSmooth limma motifStack preseqR randomForest Rsamtools rtracklayer S4Vectors]; };
+  AUCell = derive2 { name="AUCell"; version="1.3.6"; sha256="1i88w2jkydspgiw6vdpi1bspajr1y8jwmlxakydm7ww8azib4cwl"; depends=[data_table GSEABase mixtools R_utils shiny SummarizedExperiment]; };
+  AffiXcan = derive2 { name="AffiXcan"; version="0.99.15"; sha256="0d5y1s2d30rkwmnr206xjf9rdzn099kirh9pxn0qddjhxl6n6d6c"; depends=[BiocParallel MultiAssayExperiment SummarizedExperiment]; };
   AffyCompatible = derive2 { name="AffyCompatible"; version="1.41.0"; sha256="1gxk7kggb29hhfqz2a1g6yqy8mbg0x7gvajnnqgamdggylg7zz32"; depends=[Biostrings RCurl XML]; };
   AffyExpress = derive2 { name="AffyExpress"; version="1.47.0"; sha256="1ph5vgm6hxifdyg8v3vgcqwm7k1fh4d3jnf10i4p7x4gi00xycan"; depends=[affy limma]; };
   AffyRNADegradation = derive2 { name="AffyRNADegradation"; version="1.27.0"; sha256="17m0sn1rb6485lvrpn677z3y540pc93ykbyjg1plrl3qby6nxc5q"; depends=[affy]; };
   AgiMicroRna = derive2 { name="AgiMicroRna"; version="2.31.0"; sha256="1hxvi9hdx8shikljwbh60k4ylir2hdibkccqd5wr4hb08spnam4j"; depends=[affy affycoretools Biobase limma preprocessCore]; };
-  AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.19.0"; sha256="13cw6k6xgkillkj7jfgflgb42nfb85hj919yd1i0css4zi9gxd2w"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridExtra Gviz IRanges lattice latticeExtra nlme Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; };
+  AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.19.1"; sha256="14wh237bkzkczvbsqfv4fsgd1plc7nn2p77a6gcb7pgwz1lbq9is"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gridExtra Gviz IRanges lattice latticeExtra nlme Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; };
+  AnalysisPageServer = derive2 { name="AnalysisPageServer"; version="1.15.3"; sha256="1xq8cp8yhjnvrr7wp16zi24qjrwchx3l95w4302qh5hfngr3c8xn"; depends=[Biobase graph log4r rjson]; };
   Anaquin = derive2 { name="Anaquin"; version="2.5.0"; sha256="1cqrm7pmirdd23dw8lvrdjfkjp6rgx15s8h88jbilcv7qajg32jc"; depends=[DESeq2 ggplot2 knitr locfit plyr qvalue ROCR]; };
-  AneuFinder = derive2 { name="AneuFinder"; version="1.9.0"; sha256="1b0rrnxb8ldw9mxva42m0jj6r2xjn91rnrw409dmk365j8nxva2f"; depends=[AneuFinderData bamsignals Biostrings cowplot DNAcopy doParallel ecp foreach GenomeInfoDb GenomicAlignments GenomicRanges ggdendro ggplot2 ggrepel IRanges mclust ReorderCluster reshape2 Rsamtools S4Vectors]; };
+  AneuFinder = derive2 { name="AneuFinder"; version="1.9.1"; sha256="0grk4npv8lkf71s9nacmz29g87f7avrfsyb7lpljpg8ndq9cddx3"; depends=[AneuFinderData bamsignals Biostrings cowplot DNAcopy doParallel ecp foreach GenomeInfoDb GenomicAlignments GenomicRanges ggdendro ggplot2 ggrepel IRanges mclust ReorderCluster reshape2 Rsamtools S4Vectors]; };
   AnnotationDbi = derive2 { name="AnnotationDbi"; version="1.43.1"; sha256="150mxlr5fcid4vnv8gh0imr9y9lzgyxrmvzmah4l8kg7r5rllm6k"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; };
   AnnotationFilter = derive2 { name="AnnotationFilter"; version="1.5.2"; sha256="12lkv4dg25r5p77s84xzyh3aw8pybcdrkvqf21n8xv41gxpycdkq"; depends=[GenomicRanges lazyeval]; };
-  AnnotationForge = derive2 { name="AnnotationForge"; version="1.23.0"; sha256="07b8m6g4zm1lj6pxscjyg7b39km8wx68jiqimdd7ddkzj9xqyvg8"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl RSQLite S4Vectors XML]; };
+  AnnotationForge = derive2 { name="AnnotationForge"; version="1.23.4"; sha256="1q0j4nn6hb9h22cnqdgqb89710j86kiayyaf98n47pcdyb96024d"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl RSQLite S4Vectors XML]; };
   AnnotationFuncs = derive2 { name="AnnotationFuncs"; version="1.31.0"; sha256="1sf2afh9s94k1j9xx7csv7k1cah52s8ks7bhjr13m5c2dad3df1f"; depends=[AnnotationDbi DBI]; };
-  AnnotationHub = derive2 { name="AnnotationHub"; version="2.13.1"; sha256="1zhnadp24h7hxjgdgp4x4c2iwnciw6gvi6ycxbql1yilqr3ip6w0"; depends=[AnnotationDbi BiocGenerics BiocInstaller curl httr interactiveDisplayBase RSQLite S4Vectors yaml]; };
-  AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.11.1"; sha256="1s7bfmynwx6y555bsxp3cgkfa3gnc0ll476qydszw4agspp8wyn9"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller biocViews Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery IRanges jsonlite OrganismDbi rBiopaxParser RCurl Rsamtools RSQLite rtracklayer S4Vectors XML]; };
-  ArrayExpress = derive2 { name="ArrayExpress"; version="1.41.0"; sha256="1xac01vhc8cdx7cp32qw4cfqyl20my5wdw3jf9mwb6qybjk557w7"; depends=[Biobase limma oligo XML]; };
+  AnnotationHub = derive2 { name="AnnotationHub"; version="2.13.10"; sha256="087nk0wmkl3k7i00v9lbxq44gzj7dnyjahbhrq3zjx6qmg4l8dia"; depends=[AnnotationDbi BiocGenerics BiocManager curl httr interactiveDisplayBase RSQLite S4Vectors yaml]; };
+  AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.11.14"; sha256="0056p06iyw81pzyy52ydgzibqin84xrmsn5jyaa9a6qs3agm62h6"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocManager biocViews Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges IRanges jsonlite OrganismDbi rBiopaxParser RCurl Rsamtools RSQLite rtracklayer S4Vectors XML]; };
+  ArrayExpress = derive2 { name="ArrayExpress"; version="1.41.1"; sha256="0x5fvbp959x0pczb8qmy70npdx6p8km5aq6jbfmna5d5l8azd11q"; depends=[Biobase limma oligo XML]; };
   ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.31.0"; sha256="16j2a1qyhykzyqggfwaxvp4ay6l9ckimd4djh1qdp3ayqaign04r"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; };
   ArrayTV = derive2 { name="ArrayTV"; version="1.19.0"; sha256="1swim5w679hskgwfdm9fbfdwhlra7wp4fgsl38vmainayna90xw9"; depends=[DNAcopy foreach IRanges oligoClasses S4Vectors]; };
   ArrayTools = derive2 { name="ArrayTools"; version="1.41.0"; sha256="1pkv72pkiqxjb0f642p7gdc0gfr7xg9vc96awi149a5z71bbykli"; depends=[affy Biobase limma xtable]; };
+  AssessORF = derive2 { name="AssessORF"; version="0.99.21"; sha256="1k2b3psllayv8rwgc7jhhyr73apd51wbwgfhn1lawfvpn2k07gqr"; depends=[Biostrings DECIPHER GenomicRanges IRanges]; };
   BAC = derive2 { name="BAC"; version="1.41.0"; sha256="0jk4drgs8w1fvarkhm4sbkm9ls6vh67vja9f2f29p4n0ykgf06y2"; depends=[]; };
   BADER = derive2 { name="BADER"; version="1.19.0"; sha256="1y2lw5f6l32q3p3bral7bz2h57fvd7mpj00q4ds6l3y8j8grp3vf"; depends=[]; };
-  BAGS = derive2 { name="BAGS"; version="2.21.0"; sha256="1j4284wvpabpzvb3khslfraz6wz5yznv9gsly5xaskximq1i1h74"; depends=[Biobase breastCancerVDX]; };
-  BASiCS = derive2 { name="BASiCS"; version="1.3.3"; sha256="0rljf429zjglh7an6m09m0d8skykciksh2k8vjc6jm3rbsl4j1k5"; depends=[BiocGenerics coda data_table ggplot2 KernSmooth MASS matrixStats Rcpp RcppArmadillo S4Vectors scran SingleCellExperiment SummarizedExperiment testthat]; };
-  BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.11.0"; sha256="0nma095v38ysx0gjjrp6xslwmi78kgqqzqlmcvbf61qgbpggnqbj"; depends=[Biostrings GenomicRanges IRanges Rsamtools SummarizedExperiment VariantAnnotation]; };
+  BAGS = derive2 { name="BAGS"; version="2.21.2"; sha256="14h103ycmxwpa02binhla0ys5fls2whdgjqj4g40pv96nj5kpwav"; depends=[Biobase breastCancerVDX]; };
+  BASiCS = derive2 { name="BASiCS"; version="1.3.24"; sha256="0rxvwpnfvw3nbr8rbrm64hzxx1vzq7rq9jaq20x1nrkkx46gj5s7"; depends=[BiocGenerics coda data_table ggplot2 KernSmooth MASS matrixStats Rcpp RcppArmadillo S4Vectors scran SingleCellExperiment SummarizedExperiment testthat]; };
+  BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.11.1"; sha256="1gzivdxz02d27pkad6h6k0n1damph0vncslx70s3h6ypcb3g731j"; depends=[Biostrings GenomicRanges IRanges Rsamtools SummarizedExperiment VariantAnnotation]; };
   BCRANK = derive2 { name="BCRANK"; version="1.43.0"; sha256="06082ki14mb4xrbx32lpi7q06bsnmjsc08ggx0si0fxdbf0584r5"; depends=[Biostrings]; };
-  BEARscc = derive2 { name="BEARscc"; version="1.1.0"; sha256="169n512vaa23l3qaxxxa8x6zhy7jqmflsr43dn3k8qncwk1q7pml"; depends=[data_table ggplot2 SingleCellExperiment]; };
+  BEARscc = derive2 { name="BEARscc"; version="1.1.1"; sha256="180r40a5f7fmck4jly7d4qrjpyb1xqgp8w6aasvx7qfd9vwqbfbx"; depends=[data_table ggplot2 SingleCellExperiment]; };
   BEAT = derive2 { name="BEAT"; version="1.19.0"; sha256="1c3csghkdbqmaj36bg75fnx626rp2myykwc4hpxlij1sy8a9pjra"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; };
-  BEclear = derive2 { name="BEclear"; version="1.13.0"; sha256="0swsrlf6rdxkdbncf5f18zxfimmgiay42i12lg5apb5rk9in890c"; depends=[Matrix snowfall]; };
+  BEclear = derive2 { name="BEclear"; version="1.13.11"; sha256="1c7bgnpj9wx839dhal4rlfamaxngqxdq2pm3paykqf2cjg278d37"; depends=[BiocParallel data_table futile_logger Matrix Rdpack]; };
   BGmix = derive2 { name="BGmix"; version="1.41.0"; sha256="1v6rpn322g4qp3q3hisvi419nnslzpfqdp37bdc1spmsh88inb1j"; depends=[KernSmooth]; };
   BHC = derive2 { name="BHC"; version="1.33.0"; sha256="18jpic1xk5gnxfw7r4hw0591lmrcncv412qd1q08l2nqw0a24895"; depends=[]; };
   BLMA = derive2 { name="BLMA"; version="1.5.0"; sha256="1cpy2dx1da1bn0wc43fwva2akq473ww4nz241dq5xfrk2hwwkz91"; depends=[Biobase graph GSA limma PADOG ROntoTools]; };
-  BPRMeth = derive2 { name="BPRMeth"; version="1.7.13"; sha256="1ypinfv1z6gw73whx0fjkz9h6sl6lzwfcsnfpjrwy94q59rpzyw0"; depends=[assertthat BiocStyle cowplot data_table doParallel e1071 earth foreach GenomicRanges ggplot2 IRanges kernlab magrittr MASS matrixcalc mvtnorm randomForest Rcpp RcppArmadillo S4Vectors truncnorm]; };
-  BRAIN = derive2 { name="BRAIN"; version="1.27.0"; sha256="1pssh10b8pqy7f4hs1akws8lvikd0j9rwblrzsymvnnl5qf8rdqm"; depends=[Biostrings lattice PolynomF]; };
-  BSgenome = derive2 { name="BSgenome"; version="1.49.1"; sha256="1i0qrm065407zvi454gjdx3rykabf5zwl18l23d7zvl5d9cwcpv2"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
+  BPRMeth = derive2 { name="BPRMeth"; version="1.7.14"; sha256="0gbklnxs0g236f839yq9p3x8yacgv4248yyp1fgazr6q9gcgqqdf"; depends=[assertthat BiocStyle cowplot data_table doParallel e1071 earth foreach GenomicRanges ggplot2 IRanges kernlab magrittr MASS matrixcalc mvtnorm randomForest Rcpp RcppArmadillo S4Vectors truncnorm]; };
+  BRAIN = derive2 { name="BRAIN"; version="1.27.1"; sha256="04an1yqsfwkpwr31l4l21p09yr3jbdm4v7m89vg4q0rvlmha31ss"; depends=[Biostrings lattice PolynomF]; };
+  BSgenome = derive2 { name="BSgenome"; version="1.49.5"; sha256="18z80kskhgmhar2njmpxba5fg4d6fz651n3bc4lvfxpvn3j2nh9f"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
   BUMHMM = derive2 { name="BUMHMM"; version="1.5.0"; sha256="0qs117jr903zyr55xql7793nr8scyqhfn9acnw4d29im2jwfhclq"; depends=[Biostrings devtools gtools IRanges stringi SummarizedExperiment]; };
   BUS = derive2 { name="BUS"; version="1.37.0"; sha256="0rd0d1wm65q1x821l74y96w48dbqdlbd8gzz04fwz2lbpp4x6645"; depends=[infotheo minet]; };
+  BUScorrect = derive2 { name="BUScorrect"; version="0.99.13"; sha256="1cbmr2xq1246cypjkf0l05h077bbrhigdhxx6fqkvzrgixw742r3"; depends=[gplots SummarizedExperiment]; };
   BaalChIP = derive2 { name="BaalChIP"; version="1.7.0"; sha256="18jvr700mqfqalby53jhjskz2wrfbyl3x6bgx28yxzzg0hk7d897"; depends=[coda doBy doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges reshape2 Rsamtools scales]; };
-  BadRegionFinder = derive2 { name="BadRegionFinder"; version="1.9.0"; sha256="0piq8lc4p23q2y3606kk9y52iwg7nc8jbnmicq44m2gnmp5b9r0m"; depends=[biomaRt GenomicRanges Rsamtools S4Vectors VariantAnnotation]; };
-  BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.25.0"; sha256="14p570w1ld2va2xjzk4aq64brx25h8mizcicyrvmlnppj7cwbpmm"; depends=[RCurl RJSONIO]; };
+  BadRegionFinder = derive2 { name="BadRegionFinder"; version="1.9.1"; sha256="07m2lj91nk88rjjlqgrqvfwdmvvhsk406bq7wbd3a18hawljrcr6"; depends=[biomaRt GenomicRanges Rsamtools S4Vectors VariantAnnotation]; };
+  BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.25.1"; sha256="0636123345m2hgip2l7wpbppkav6nryskq3r8sdby09yw3xf8yny"; depends=[RCurl RJSONIO]; };
   Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.17.0"; sha256="0ynfj4x0hkjxxza8v85kda2a5rrmwzjh1am3ffnv1mvpi3dnb95l"; depends=[Biostrings BSgenome_Ecoli_NCBI_20080805 caTools GenomicAlignments GenomicRanges RCircos]; };
   BasicSTARRseq = derive2 { name="BasicSTARRseq"; version="1.9.0"; sha256="074zndzd7dbz31khkn73a3jqfyacl56dd8b82zq5lykirw647zp4"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges S4Vectors]; };
-  BatchQC = derive2 { name="BatchQC"; version="1.9.0"; sha256="1vcpjbalsvlcmrg2wxckpkk1qczwhs5c9yzp7wyk0jff9ayccd7w"; depends=[corpcor d3heatmap ggvis gplots knitr limma Matrix matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; };
+  BatchQC = derive2 { name="BatchQC"; version="1.9.2"; sha256="0cg9ymwq08a3jxzpzwqgazz98868swp4ijiaz0h1msp8v30bqydd"; depends=[corpcor d3heatmap ggvis gplots knitr limma Matrix matrixStats MCMCpack moments pander reshape2 rmarkdown shiny sva]; };
   BayesKnockdown = derive2 { name="BayesKnockdown"; version="1.7.0"; sha256="0ikq8bk4viw9kj55cci37cdicbmyq9p5fa0vxw0bsa9ichj47cl5"; depends=[Biobase]; };
   BayesPeak = derive2 { name="BayesPeak"; version="1.33.0"; sha256="0grhyp7i834sj1j2kavpk2ydy0970gjcvllxy05l9vs9cilhczgp"; depends=[IRanges]; };
   BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.33.0"; sha256="0asbgmcidblxj82w5bv0g0c5l9w2nzyr7qparbxg2inxcqimsa37"; depends=[]; };
-  BgeeDB = derive2 { name="BgeeDB"; version="2.7.0"; sha256="07y8jh5r6rvx083gdcy7hdlpazmaj17mrbcqi6ysj8j0ipjxsrgv"; depends=[Biobase data_table digest dplyr graph RCurl tidyr topGO]; };
-  BiFET = derive2 { name="BiFET"; version="1.1.5"; sha256="0rghzii29k5sqm4bnf86mncly5gln9kn14nzjxb9ycpmls33nfx0"; depends=[GenomicRanges poibin]; };
-  BiGGR = derive2 { name="BiGGR"; version="1.17.0"; sha256="1nsjg5lk87i0mrby23jzfxs80cipq2dra4gx2v3mxphiqixrn92i"; depends=[hyperdraw hypergraph LIM limSolve rsbml stringr]; };
-  BiRewire = derive2 { name="BiRewire"; version="3.13.0"; sha256="10wgsw38774a6fzwhr98hxiangna3s1rb0i7dw2bvmkx9c6ldmbh"; depends=[igraph Matrix slam tsne]; };
+  BgeeDB = derive2 { name="BgeeDB"; version="2.7.2"; sha256="0rk6kfy78xxsd8zbvs2gdklncz5dzr6wayndf3bh7nm575d8jnrd"; depends=[Biobase data_table digest dplyr graph RCurl tidyr topGO]; };
+  BiFET = derive2 { name="BiFET"; version="1.1.8"; sha256="0h7lrhfjgxfchk4i1i6y65znr2dxh9zkiy9n6clvrby6aqrswgr3"; depends=[GenomicRanges poibin]; };
+  BiGGR = derive2 { name="BiGGR"; version="1.17.1"; sha256="18d57ia7vzgrwc8nzqjp368s7a6hqckcskp807xmk239ggrk9iii"; depends=[hyperdraw hypergraph LIM limSolve rsbml stringr]; };
+  BiRewire = derive2 { name="BiRewire"; version="3.13.3"; sha256="09i4mvpbfvnljvg87zgwawv5ahj7kaiqvwx7mlsqkrdzijclfqq3"; depends=[igraph Matrix slam tsne]; };
   BiSeq = derive2 { name="BiSeq"; version="1.21.0"; sha256="12wnihb693dk6ri3hqcm7cjyy0r3dffvjcfybypl75zsj42k7zb7"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; };
   BicARE = derive2 { name="BicARE"; version="1.39.0"; sha256="1gdglclrkrsxw7lks9rczhjy3ldsrl18qbk6h4f10d3rf6b147b1"; depends=[Biobase GSEABase multtest]; };
-  BioCor = derive2 { name="BioCor"; version="1.5.1"; sha256="0wfd7sapzxj135wp6kga0xb8z5ycvvhwdwh1307sh0k8k8wb5pd9"; depends=[BiocParallel GSEABase Matrix]; };
+  BioCor = derive2 { name="BioCor"; version="1.5.6"; sha256="1zy4yxwgx70f6sz09kva97p2gby4yjyrqn4zshrdr89npnk5h5rz"; depends=[BiocParallel GSEABase Matrix]; };
   BioMVCClass = derive2 { name="BioMVCClass"; version="1.49.0"; sha256="01v6bzq8jsqd3p2cpg0hlfccqzkr9fk9zkby2dg1npwrf27x6j4g"; depends=[Biobase graph MVCClass Rgraphviz]; };
   BioNet = derive2 { name="BioNet"; version="1.41.0"; sha256="039mzwvfamlxkqn9ipn7vab7qnnn0153sg7dcp4g5glfxgmqnngh"; depends=[AnnotationDbi Biobase graph igraph RBGL]; };
-  BioNetStat = derive2 { name="BioNetStat"; version="1.1.1"; sha256="1jr1z0shh0cspqmg0dqwwqhsljvl53aay19qpss5a64ifas8mzmr"; depends=[BiocParallel ggplot2 Hmisc igraph knitr pathview pheatmap plyr psych RColorBrewer RJSONIO shiny shinyBS whisker yaml]; };
+  BioNetStat = derive2 { name="BioNetStat"; version="1.1.2"; sha256="17iyf5k9mm3mqvw7vskk7vcmadrs4qxq69sx024j63ihiq6divkb"; depends=[BiocParallel ggplot2 Hmisc igraph knitr pathview pheatmap plyr psych RColorBrewer RJSONIO shiny shinyBS whisker yaml]; };
   BioQC = derive2 { name="BioQC"; version="1.9.0"; sha256="0v9czgv6n57nczg2ijz78dfknvmlbxbdrsi8c90wiyxr888gkb3m"; depends=[Biobase Rcpp]; };
-  BioSeqClass = derive2 { name="BioSeqClass"; version="1.39.0"; sha256="1390g5saw7jf6q7k5kavql595jw8xd8y53lwlfmxfgiapf2nvg36"; depends=[Biobase Biostrings class e1071 foreign ipred klaR nnet party randomForest rpart scatterplot3d tree]; };
-  Biobase = derive2 { name="Biobase"; version="2.41.1"; sha256="0hfi88z32ma74mc2h0d8xx2m9pqwcwr77f6mfh21sqnkb5mqwsdm"; depends=[BiocGenerics]; };
+  BioSeqClass = derive2 { name="BioSeqClass"; version="1.39.2"; sha256="1j9mbp6xdnm24a1vzwq3327dhm9nglydib73nrwcw1jn0am78yqv"; depends=[Biobase Biostrings class e1071 foreign ipred klaR nnet party randomForest rpart scatterplot3d tree]; };
+  Biobase = derive2 { name="Biobase"; version="2.41.2"; sha256="11wda45crjk2v7zscrhrh0w30qdqvkxf6zcqyg7jqk833327ci0r"; depends=[BiocGenerics]; };
   BiocCaseStudies = derive2 { name="BiocCaseStudies"; version="1.43.0"; sha256="0xdn0zrd034mxzc6khqfnsp0rynfpd7zbxhmcmj5j0h83m9kyfnw"; depends=[Biobase]; };
-  BiocCheck = derive2 { name="BiocCheck"; version="1.17.15"; sha256="06wzf7j170bf9msnv61da70hlhv08k5lykwzachij1396514ypr6"; depends=[BiocInstaller biocViews codetools graph httr knitr optparse stringdist]; };
-  BiocFileCache = derive2 { name="BiocFileCache"; version="1.5.2"; sha256="170dyswpaxwg8jhw99797n5haixk7pm657dj09ydv8zjb5jaqhz0"; depends=[DBI dbplyr dplyr httr rappdirs RSQLite]; };
+  BiocCheck = derive2 { name="BiocCheck"; version="1.17.25"; sha256="1h1lwjpzmwiygfrh4gjh3mw7fjk0ync3xbvw5bl39ykgq9b1dw7h"; depends=[BiocManager biocViews codetools graph httr knitr optparse stringdist]; };
+  BiocFileCache = derive2 { name="BiocFileCache"; version="1.5.9"; sha256="1prwqr9xrl47knyx1jddw5in1casj7xyz787qqqlf7xfp8z5kqyf"; depends=[curl DBI dbplyr dplyr httr rappdirs RSQLite]; };
   BiocGenerics = derive2 { name="BiocGenerics"; version="0.27.1"; sha256="1v2vqhixnn4caanpnmd0pw7jnczfkc79wlb9c7v0kwpz9h79h023"; depends=[]; };
-  BiocInstaller = derive2 { name="BiocInstaller"; version="1.31.1"; sha256="1cprnjbymb2r1z228nyg6bbnridazw6bh6yh0mcfxq6h0cd0ig8y"; depends=[]; };
-  BiocOncoTK = derive2 { name="BiocOncoTK"; version="1.1.6"; sha256="01g7drd8c9082kvpw5xyxmans8mksw0rm1s6rv6ml6ibzbxjrz2z"; depends=[bigrquery ComplexHeatmap dplyr DT GenomicRanges httr IRanges magrittr rjson S4Vectors shiny]; };
-  BiocParallel = derive2 { name="BiocParallel"; version="1.15.6"; sha256="1ifav2pl6szvs6a5nkkgsf7j70i496q2lsj73gb3li4krm6yslvf"; depends=[BH futile_logger snow]; };
-  BiocSklearn = derive2 { name="BiocSklearn"; version="1.3.0"; sha256="1dh0w9h81ydnnwf7dx19an7pja3n511pw16yl0bgmqr8ng51lvwn"; depends=[BBmisc HDF5Array knitr reticulate SummarizedExperiment]; };
-  BiocStyle = derive2 { name="BiocStyle"; version="2.9.3"; sha256="1ggbx5c94fr20mykkj3ghsia91c2jdi4yyhrm9jfwxdaxy9k8kfl"; depends=[bookdown knitr rmarkdown yaml]; };
+  BiocInstaller = derive2 { name="BiocInstaller"; version="1.31.3"; sha256="10b20kbp8gqfq7fsdcgfpkghndn5aw8c1cj1l67a8a5qibbfq89x"; depends=[]; };
+  BiocNeighbors = derive2 { name="BiocNeighbors"; version="0.99.22"; sha256="006map9pk5q4qk2zardgxgirlil4hhvw7vjs4js426qrxqqmhlxn"; depends=[BiocParallel Rcpp RcppAnnoy S4Vectors]; };
+  BiocOncoTK = derive2 { name="BiocOncoTK"; version="1.1.22"; sha256="10dnfzxhhvnmkcpdrzwv8810ss3yljfbq0lswa1149ndqyanhdvj"; depends=[bigrquery ComplexHeatmap DBI dplyr DT GenomicFeatures GenomicRanges ggplot2 httr IRanges magrittr rjson S4Vectors shiny SummarizedExperiment]; };
+  BiocParallel = derive2 { name="BiocParallel"; version="1.15.15"; sha256="0iqgcmgq1jzayalkym2s1zvblfrwvgp2rc7v09a6mm0hzgbxvh9y"; depends=[BH futile_logger snow]; };
+  BiocPkgTools = derive2 { name="BiocPkgTools"; version="0.99.16"; sha256="1lw8llvhfp8vpy72y3dc8dy6xiq3yl71zfry4h1ag3kxh9c4snvh"; depends=[BiocManager dplyr DT htmltools htmlwidgets httr igraph jsonlite readr rex rvest stringr tibble tidyr xml2]; };
+  BiocSklearn = derive2 { name="BiocSklearn"; version="1.3.2"; sha256="0zdakw0yrjkxvspc2sb0z70ipx7jrqcnf0br80nrkvg5sxkm5nd0"; depends=[BBmisc knitr reticulate SummarizedExperiment]; };
+  BiocStyle = derive2 { name="BiocStyle"; version="2.9.6"; sha256="1b123p3id4ljqcg3xj9lr5x05k1wa67gcl5v2bfi7nv8i6221bn3"; depends=[BiocManager bookdown knitr rmarkdown yaml]; };
   BiocVersion = derive2 { name="BiocVersion"; version="3.8.0"; sha256="1kyqzca8n7wggz6lfx7xj0i1h1s3rma15v11iycgkdka58443qqr"; depends=[]; };
-  BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.7.1"; sha256="04nxl3idhy3smyvp246vc28509i7hf5qv24zn366q012zdykywzr"; depends=[BiocStyle bookdown devtools git2r httr knitr rmarkdown rstudioapi stringr]; };
-  Biostrings = derive2 { name="Biostrings"; version="2.49.0"; sha256="015yg11649nz6w0c8a6jsrjynh047phixssziid64rsff0gf13fv"; depends=[BiocGenerics IRanges S4Vectors XVector]; };
-  BitSeq = derive2 { name="BitSeq"; version="1.25.0"; sha256="0ffqwdd5zjwcd819h3rg554c2drvi05l40ffg30p380azk0xkksp"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; };
+  BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.7.5"; sha256="1k39zcfdwzddrfaakh3nchwc3xlq63x2dzybj7xj0xhjj14klyr1"; depends=[BiocStyle bookdown devtools git2r httr knitr rmarkdown rstudioapi stringr]; };
+  Biostrings = derive2 { name="Biostrings"; version="2.49.2"; sha256="0fm0vfi5s7d0xzwanq5rrdh0fp394qnd7jcmlsib6naqjch0zqaf"; depends=[BiocGenerics IRanges S4Vectors XVector]; };
+  BitSeq = derive2 { name="BitSeq"; version="1.25.2"; sha256="05vkx8wr53qfsyjcmfp31768qycmrcbanqfwh1x0l7456v0hmbcv"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; };
   BrainStars = derive2 { name="BrainStars"; version="1.25.0"; sha256="0svlrnd131m2lrpafxcpzbjqj3pvzcsi6azk1f4l2f21yimmx2iq"; depends=[Biobase RCurl RJSONIO]; };
-  BridgeDbR = derive2 { name="BridgeDbR"; version="1.15.1"; sha256="0fd6v87qhv7mjmsw5xs6r3bs52h1axm150jp6vng4ph20jq8gicg"; depends=[RCurl rJava]; };
+  BridgeDbR = derive2 { name="BridgeDbR"; version="1.15.2"; sha256="1rmdyh16qkhqad0xdhqi2vxzi1ga3gmxfl81nqnb5pm1vp0rr4ns"; depends=[RCurl rJava]; };
   BrowserViz = derive2 { name="BrowserViz"; version="2.3.0"; sha256="0f4hayj2iinfqiwpl53nmnw0cfv9p6sz25ggwpz1pyib24n2n9b6"; depends=[BiocGenerics httpuv jsonlite]; };
   BubbleTree = derive2 { name="BubbleTree"; version="2.11.0"; sha256="0a69azv8v67jfdyg9mfaf58g1v3b09brhr2fvgl2lq7d48gi0cbh"; depends=[Biobase BiocGenerics BiocStyle biovizBase dplyr e1071 GenomicRanges ggplot2 gridExtra gtable gtools IRanges limma magrittr plyr RColorBrewer WriteXLS]; };
   BufferedMatrix = derive2 { name="BufferedMatrix"; version="1.45.0"; sha256="0qr9dsdh04msxva28n37shjk4j6a4m0i5v4plkk7qpvb6ccbvrf8"; depends=[]; };
   BufferedMatrixMethods = derive2 { name="BufferedMatrixMethods"; version="1.45.0"; sha256="1v2yh5pvjc3x25nq6cdqazm1x80ir2qz4jlmssgd31n1bz8r4x48"; depends=[BufferedMatrix]; };
-  CAFE = derive2 { name="CAFE"; version="1.17.0"; sha256="1rgb3wk41q1079i959fjr81jwqd8r3rj0n781hfxbn9b5kia5inq"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; };
-  CAGEfightR = derive2 { name="CAGEfightR"; version="1.1.0"; sha256="09hf2xla5dl9gh59aa024z23j5lnqdrnamf34fw0r2p394qfz9gz"; depends=[assertthat BiocGenerics BiocParallel GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges grr Gviz IRanges Matrix Matrix_utils pryr rtracklayer S4Vectors SummarizedExperiment]; };
+  CAFE = derive2 { name="CAFE"; version="1.17.1"; sha256="057pw96g13h5sak0scqyn2qsfm3dqz7qmqrasjf4vnp2zz059blp"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; };
+  CAGEfightR = derive2 { name="CAGEfightR"; version="1.1.5"; sha256="0604b35q82x6brwmg31ks3k77r9f287fr4azgl0bcphj71g9ijc3"; depends=[assertthat BiocGenerics BiocParallel GenomeInfoDb GenomicFeatures GenomicFiles GenomicInteractions GenomicRanges grr Gviz InteractionSet IRanges Matrix Matrix_utils pryr rtracklayer S4Vectors SummarizedExperiment]; };
+  CAGEr = derive2 { name="CAGEr"; version="1.23.5"; sha256="181vj5kmny36vdvyzvjpxvj7n0q35cq1nv28ph5v6i5xf6ymyj47"; depends=[beanplot BiocGenerics BiocParallel BSgenome data_table DelayedArray formula_tools GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gtools IRanges KernSmooth memoise MultiAssayExperiment plyr reshape Rsamtools rtracklayer S4Vectors som stringdist stringi SummarizedExperiment vegan VGAM]; };
   CALIB = derive2 { name="CALIB"; version="1.47.0"; sha256="1j486knj1l7chda7gdlkkzrrs7vwi39brzkshj1zcsn87r9j1j09"; depends=[limma]; };
   CAMERA = derive2 { name="CAMERA"; version="1.37.0"; sha256="0n0xvhcy3y84cq6q45ms56z4nrs6q762iqgxp266kpl93z16rw4v"; depends=[Biobase graph Hmisc igraph RBGL xcms]; };
-  CAMTHC = derive2 { name="CAMTHC"; version="0.99.6"; sha256="02gv6vqahyy7fqy0vihqsvd811d65znfjz5jmshn03qp27av11wk"; depends=[apcluster Biobase BiocParallel corpcor DMwR geometry NMF pcaPP rJava SummarizedExperiment]; };
-  CATALYST = derive2 { name="CATALYST"; version="1.5.3"; sha256="1b2gfqzb9bp4k830lyn9d87xhzcdqb2vrykihp36r96gj1g6hdg4"; depends=[Biobase circlize ComplexHeatmap ConsensusClusterPlus dplyr drc DT flowCore FlowSOM ggplot2 ggrepel gridExtra htmltools limma magrittr matrixStats nnls plotly RColorBrewer reshape2 Rtsne S4Vectors scales shiny shinyBS shinydashboard shinyjs SummarizedExperiment tidyr]; };
+  CAMTHC = derive2 { name="CAMTHC"; version="0.99.7"; sha256="1m2qpf3ssn7h7qj96021kbg3h8sfkbggq4dfxd4xz3px8vra5q82"; depends=[apcluster Biobase BiocParallel corpcor DMwR geometry NMF pcaPP rJava SummarizedExperiment]; };
+  CATALYST = derive2 { name="CATALYST"; version="1.5.9"; sha256="1xxa2sv7a75wr2py7ah8lwqhgrbbic25cq9lf3gb73iaid994fy9"; depends=[Biobase circlize ComplexHeatmap ConsensusClusterPlus dplyr drc DT flowCore FlowSOM ggplot2 ggrepel ggridges gridExtra htmltools limma magrittr Matrix matrixStats nnls plotly RColorBrewer reshape2 Rtsne S4Vectors scales shiny shinyBS shinydashboard shinyjs SummarizedExperiment tidyr]; };
   CAnD = derive2 { name="CAnD"; version="1.13.0"; sha256="07ypm7zz4hf64q478b7s2q46m3imcs0kjc77gkwxky3ymsvid07y"; depends=[ggplot2 reshape]; };
   CCPROMISE = derive2 { name="CCPROMISE"; version="1.7.0"; sha256="1yb8idgdka7psnwa7w94lsld8ghphhdz8kcyvp1na6l88lyc2iyi"; depends=[Biobase CCP GSEABase PROMISE]; };
-  CEMiTool = derive2 { name="CEMiTool"; version="1.5.0"; sha256="0h45vf64fg0pkh73k2wplfi26w3j4rnh7gyfnx9ia5bkm0z7l2fj"; depends=[clusterProfiler data_table DT fgsea ggdendro ggplot2 ggpmisc ggrepel ggthemes gRbase gridExtra gtable htmltools igraph intergraph knitr matrixStats network pracma rmarkdown scales sna stringr WGCNA]; };
+  CEMiTool = derive2 { name="CEMiTool"; version="1.5.1"; sha256="1jvnpinmyjcpss3wm7kchdksjc5a5a64vdymj9ada38q3j9ni3fd"; depends=[clusterProfiler data_table DT fgsea ggdendro ggplot2 ggpmisc ggrepel ggthemes gRbase gridExtra gtable htmltools igraph intergraph knitr matrixStats network pracma rmarkdown scales sna stringr WGCNA]; };
   CFAssay = derive2 { name="CFAssay"; version="1.15.0"; sha256="06xq5rwbbgxknymn061ck1vyqlb8l715cpf7k40w3l4v95h02jiz"; depends=[]; };
   CGEN = derive2 { name="CGEN"; version="3.17.0"; sha256="1i31ckwfw6nx0fpfg2g8zq83r6zykvkxfrqkib9kj4wvxx24kvcx"; depends=[mvtnorm survival]; };
-  CGHbase = derive2 { name="CGHbase"; version="1.41.0"; sha256="0yvg2jjqs98lrrybpygc77npfj27h5mkdrh3y5mfd5s6jzvyc8pz"; depends=[Biobase marray]; };
+  CGHbase = derive2 { name="CGHbase"; version="1.41.2"; sha256="1ncy4lxvzpbs3nrwdyk56scmirgi2a3byi6dcja35syqpw2hdqip"; depends=[Biobase marray]; };
   CGHcall = derive2 { name="CGHcall"; version="2.43.0"; sha256="1r8df0xvnhzwhbg1l1wp474f85j6l1g2ivvzmqxcqr5va1clz6g9"; depends=[Biobase CGHbase DNAcopy impute snowfall]; };
   CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.35.0"; sha256="0bas6wmdw9h8ablm85ggbb776nfxrf4lpfvv5rkahd10b35y3x4b"; depends=[Biobase CGHbase CGHcall]; };
   CGHregions = derive2 { name="CGHregions"; version="1.39.0"; sha256="0r3gvrinr7f5qn89v6rs5bxx4sjalsjl0f2cf6vzbzgnmdysarns"; depends=[Biobase CGHbase]; };
   CHARGE = derive2 { name="CHARGE"; version="1.1.0"; sha256="05zqkiqnc82bmb580f16v6d02kfq55sdrm0nxk86h5kp1cs8fryk"; depends=[cluster diptest factoextra FactoMineR GenomicRanges IRanges matrixStats modes plyr SummarizedExperiment]; };
-  CHRONOS = derive2 { name="CHRONOS"; version="1.9.0"; sha256="17zxbbdy1ibsj4991iazm6rny2x4xx7rzknkc6z348fzxk2m7g0x"; depends=[biomaRt circlize doParallel foreach graph openxlsx RBGL RCurl XML]; };
-  CINdex = derive2 { name="CINdex"; version="1.9.0"; sha256="1rixd0fylffc77hlc7cig7viwdhdy9r68cb3qba16sd5ywbg74gs"; depends=[bitops dplyr GenomeInfoDb GenomicRanges gplots gridExtra IRanges png S4Vectors som stringr]; };
+  CHRONOS = derive2 { name="CHRONOS"; version="1.9.2"; sha256="01r3zd0vq4qp40sxvcp7h23713addck5d463b3vyimz7y1x07cqv"; depends=[biomaRt circlize doParallel foreach graph openxlsx RBGL RCurl XML]; };
+  CINdex = derive2 { name="CINdex"; version="1.9.1"; sha256="1g24rbbhpq90c6cqjx96pxz4vlj3kyxvc9ad3hibbkljr705rs77"; depends=[bitops dplyr GenomeInfoDb GenomicRanges gplots gridExtra IRanges png S4Vectors som stringr]; };
   CMA = derive2 { name="CMA"; version="1.39.0"; sha256="05yx2rwnrzdsgbyv86iyy17qiz6sy91bl6y3qf29aid3yndawc1s"; depends=[Biobase]; };
   CNAnorm = derive2 { name="CNAnorm"; version="1.27.0"; sha256="152cwha5mg66vc1ax6k2mwnahwj0cgcs3khii747y3xxn4p8m0z5"; depends=[DNAcopy]; };
-  CNEr = derive2 { name="CNEr"; version="1.17.3"; sha256="0gf354j2vynrjl3afbifqkd276q2qz2ywwc7661gqxcjz26jirxq"; depends=[annotate BiocGenerics Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 GO_db IRanges KEGGREST poweRlaw R_utils readr reshape2 RSQLite rtracklayer S4Vectors XVector]; };
-  CNORdt = derive2 { name="CNORdt"; version="1.23.0"; sha256="14iadllrhjc1jp4njlr88bhjyb84f3gnbwjzld4n5v8s8ra8xj3a"; depends=[abind CellNOptR]; };
-  CNORfeeder = derive2 { name="CNORfeeder"; version="1.21.0"; sha256="1l1ij3r0rdywm0k47iy66v3sy0i23pr8zly1blyzpbxaqhmks3h1"; depends=[CellNOptR graph]; };
-  CNORfuzzy = derive2 { name="CNORfuzzy"; version="1.23.0"; sha256="1z1fs64kd575hmmzxa7hx0lxkvd93mzdygw3h4g1sa2fyr9xycfb"; depends=[CellNOptR nloptr]; };
-  CNORode = derive2 { name="CNORode"; version="1.23.0"; sha256="1r8sv5rdfpc1qjhdmz05p6gny03r1rxzayiwwbkh0xj6iwswbqdz"; depends=[CellNOptR genalg]; };
+  CNEr = derive2 { name="CNEr"; version="1.17.4"; sha256="1pyv4j04ls6l5b1y80rrwjygyp2bii8psxvswyb70flpi18gs0jp"; depends=[annotate BiocGenerics Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 GO_db IRanges KEGGREST poweRlaw R_utils readr reshape2 RSQLite rtracklayer S4Vectors XVector]; };
+  CNORdt = derive2 { name="CNORdt"; version="1.23.1"; sha256="044sgjrziy70b4xdlyl56y90p5cddcp5iwfbfcwbzfpz9hbqas4l"; depends=[abind CellNOptR]; };
+  CNORfeeder = derive2 { name="CNORfeeder"; version="1.21.1"; sha256="1dvwj9q37hx6jrvzvlnkzqs3gl7abhm5b9v4xghp8ak00cwx19n6"; depends=[CellNOptR graph]; };
+  CNORfuzzy = derive2 { name="CNORfuzzy"; version="1.23.1"; sha256="13dn4lnm5z0j817hxp513yas96918nvk363bwqy4gd6aps5nhi6k"; depends=[CellNOptR nloptr]; };
+  CNORode = derive2 { name="CNORode"; version="1.23.1"; sha256="0f5lfyfvch8bp0prl5q3i8zmj0dbw50v6i48padgq3ajyszp86dx"; depends=[CellNOptR genalg]; };
+  CNPBayes = derive2 { name="CNPBayes"; version="1.11.8"; sha256="007r98f177iw6qbsrz33pa6jsr236j45pdm6h4alg7c813blhiq3"; depends=[BiocGenerics coda combinat dplyr GenomeInfoDb GenomicRanges ggplot2 gtools IRanges magrittr matrixStats mclust purrr RColorBrewer Rcpp reshape2 S4Vectors scales SummarizedExperiment tibble tidyr]; };
   CNTools = derive2 { name="CNTools"; version="1.37.0"; sha256="1hzdyjkbwv5iwapkf7a04r55gi1m0bg2ckjkmj4v94kfc5031nwc"; depends=[genefilter]; };
-  CNVPanelizer = derive2 { name="CNVPanelizer"; version="1.13.0"; sha256="1pjmrdxg56gjwzbzvs38pdziymhsny9wnj4f5xqkmnkw6ps7v0m1"; depends=[exomeCopy foreach GenomeInfoDb GenomicRanges ggplot2 gplots IRanges NOISeq openxlsx plyr reshape2 Rsamtools S4Vectors shiny shinyFiles shinyjs stringr testthat]; };
+  CNVPanelizer = derive2 { name="CNVPanelizer"; version="1.13.2"; sha256="0mzssf1w9yal8z9lg6b6wjhr3wgs7r03k2rsdi9baiwaiwvqjca5"; depends=[exomeCopy foreach GenomeInfoDb GenomicRanges ggplot2 gplots IRanges NOISeq openxlsx plyr reshape2 Rsamtools S4Vectors shiny shinyFiles shinyjs stringr testthat]; };
   CNVrd2 = derive2 { name="CNVrd2"; version="1.19.0"; sha256="0xdkckwys2963ylj2mid10k9dwwwmsks29pdp5z4266z0z3r9x9b"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; };
   CNVtools = derive2 { name="CNVtools"; version="1.75.0"; sha256="1x70y389szy3b6vimlpzjsqdg4kykmx01wfw8aks5hxq9z23vaik"; depends=[survival]; };
-  CODEX = derive2 { name="CODEX"; version="1.13.0"; sha256="1zfg0ka7cvrd1pp4qv8a25crkq78v0qm73z8x4246rlyzvnnxds5"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb IRanges Rsamtools S4Vectors]; };
-  COHCAP = derive2 { name="COHCAP"; version="1.27.1"; sha256="0a241dbwj6q0x7r3af252dvdv9i07vbslz0nc532gwv8r56426pw"; depends=[BH COHCAPanno gplots RColorBrewer Rcpp RcppArmadillo WriteXLS]; };
-  COMPASS = derive2 { name="COMPASS"; version="1.19.0"; sha256="025gd220j77l4w55k9kmpr3438ffbjhq93ivc124jq3yr7qmpfgc"; depends=[abind BiocStyle clue data_table dplyr knitr magrittr pdist plyr RColorBrewer Rcpp reshape2 rlang rmarkdown scales tidyr]; };
-  CONFESS = derive2 { name="CONFESS"; version="1.9.0"; sha256="03rdyklmk31pzg4q6gn8j501gx5hh7awbx4xbvgnw0hzk8753lbb"; depends=[changepoint cluster contrast data_table EBImage ecp flexmix flowClust flowCore flowMeans flowMerge flowPeaks foreach ggplot2 limma MASS moments outliers plotrix raster readbitmap reshape2 SamSPECTRAL waveslim wavethresh zoo]; };
+  COCOA = derive2 { name="COCOA"; version="0.99.8"; sha256="07r7lv3kaf4lq4mgbgp5yym373mm949qs6wiwc5zvkkaka3rm6zx"; depends=[Biobase BiocGenerics ComplexHeatmap data_table GenomicRanges ggplot2 IRanges MIRA S4Vectors tidyr]; };
+  CODEX = derive2 { name="CODEX"; version="1.13.1"; sha256="0mrr40660358n2f31phzmagwfg7fxdmmyhmcaqf17cdcyp9cnslb"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb IRanges Rsamtools S4Vectors]; };
+  COHCAP = derive2 { name="COHCAP"; version="1.27.5"; sha256="13b7ms1j1p6qfyvipzipm2qnr50rhzf0hm9h6h8g6rwvkxxqbvci"; depends=[BH COHCAPanno gplots RColorBrewer Rcpp RcppArmadillo WriteXLS]; };
+  COMPASS = derive2 { name="COMPASS"; version="1.19.4"; sha256="061jy33qvsvadi3a8ccwqh02nmnhhs8khy7vixf9akndl2jqbzqz"; depends=[abind BiocStyle clue data_table dplyr knitr magrittr pdist plyr RColorBrewer Rcpp reshape2 rlang rmarkdown scales tidyr]; };
+  CONFESS = derive2 { name="CONFESS"; version="1.9.1"; sha256="0v334w2252mvc4qmpz5wnwz7xk99nj2izj61qhaafiaqq9wk3f5i"; depends=[changepoint cluster contrast data_table EBImage ecp flexmix flowClust flowCore flowMeans flowMerge flowPeaks foreach ggplot2 limma MASS moments outliers plotrix raster readbitmap reshape2 SamSPECTRAL waveslim wavethresh zoo]; };
   CORREP = derive2 { name="CORREP"; version="1.47.0"; sha256="061hyv2jxhjpwycv9c0s0881nsq1z3pm0jcn9simdha55hzb20hs"; depends=[e1071]; };
   COSNet = derive2 { name="COSNet"; version="1.15.0"; sha256="0irkzh1rm430y5a67rx0rzc4bgb9zg9jyh768bgl1mcf3hjdqsgl"; depends=[]; };
-  CRISPRseek = derive2 { name="CRISPRseek"; version="1.21.0"; sha256="1jnwr3jy0ak9nv4x6n9n5zfggmrr849y4rw8qq819ig6a3swafqz"; depends=[BiocGenerics BiocParallel Biostrings BSgenome data_table hash IRanges S4Vectors seqinr]; };
+  CRISPRseek = derive2 { name="CRISPRseek"; version="1.21.4"; sha256="1ck8pqwm2g4fwibd5lbj9r04ryqhw93r7rn1djp7mfxp829asfl7"; depends=[BiocGenerics BiocParallel Biostrings BSgenome data_table hash IRanges S4Vectors seqinr]; };
   CRImage = derive2 { name="CRImage"; version="1.29.0"; sha256="1b5giadnwi8h4x8bmkw5064grhaijmnkidbbd8fi2pc1pz406fli"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; };
   CSAR = derive2 { name="CSAR"; version="1.33.0"; sha256="1i2amxpka75l91bhvfdwzs85hcl9c11rz82l2xsjybj0ff3v0m91"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
   CSSP = derive2 { name="CSSP"; version="1.19.0"; sha256="1ic79b6cg68ylwj9r7ak21m1fbwrys3kwcllmhpdf8v0fldk6qld"; depends=[]; };
-  CTDquerier = derive2 { name="CTDquerier"; version="1.1.0"; sha256="00y2cm7sbzkb7q8xn4jqh1478v6jhjrcmhgc2y3h13abb0v93xl0"; depends=[BiocFileCache ggplot2 gridExtra igraph rappdirs RCurl S4Vectors stringdist stringr]; };
-  CVE = derive2 { name="CVE"; version="1.7.12"; sha256="0v39bkic6wxhh2asj0sf1cb0amvrli56ni5dxy6ilnka8437ywyw"; depends=[ape ConsensusClusterPlus ggplot2 gplots jsonlite plyr RColorBrewer shiny tidyverse WGCNA]; };
+  CTDquerier = derive2 { name="CTDquerier"; version="1.1.2"; sha256="1sy46i32ylyny88992x6l9csn9aji7vjki6i47wdp6a0zi2s9q23"; depends=[BiocFileCache ggplot2 gridExtra igraph rappdirs RCurl S4Vectors stringdist stringr]; };
+  CVE = derive2 { name="CVE"; version="1.7.13"; sha256="1sw0kiivd411hbr3jhvdpgl8b56f7w8vlxykyjgr47dbyn6nwbcd"; depends=[ape ConsensusClusterPlus ggplot2 gplots jsonlite plyr RColorBrewer shiny tidyverse WGCNA]; };
   CancerInSilico = derive2 { name="CancerInSilico"; version="2.1.0"; sha256="1rpphiy5bda3gpfscgyzci5dynyqdia5nb720pdjzxbz9xkr87f5"; depends=[BH Rcpp]; };
   CancerMutationAnalysis = derive2 { name="CancerMutationAnalysis"; version="1.23.0"; sha256="1dxw34fbr25q20k7z9isl4r0w5gz8jj1a0hd9kb4nqhm1yzilpai"; depends=[AnnotationDbi limma qvalue]; };
   CancerSubtypes = derive2 { name="CancerSubtypes"; version="1.7.0"; sha256="09c7k5789i4afsgk1vxbz036s5gyxlnwmmwwpcgq0v4y920s37w3"; depends=[cluster ConsensusClusterPlus iCluster impute limma NMF sigclust SNFtool survival]; };
-  Cardinal = derive2 { name="Cardinal"; version="1.13.0"; sha256="0iq9b3357c0drhy0yh1rk71z9bh7g6dxh4wwjvwig1bnd3wy506d"; depends=[Biobase BiocGenerics irlba lattice matter ProtGenerics signal sp]; };
-  Category = derive2 { name="Category"; version="2.47.0"; sha256="0nrac7r5f13byc68h38ii1jld3m7w63qr340mnaylc2vc2ics6jz"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI genefilter graph GSEABase Matrix RBGL]; };
+  Cardinal = derive2 { name="Cardinal"; version="1.99.1"; sha256="0pd5b3bvgcpylml6fkw5zr6kalzjqzkdyygrj2jcqyr73ln2hvxg"; depends=[Biobase BiocGenerics BiocParallel dplyr EBImage irlba lattice magrittr matter ProtGenerics S4Vectors signal sp]; };
+  Category = derive2 { name="Category"; version="2.47.1"; sha256="1lg7adkrj3gsvbzkwdvrrpqv911p7ysqwimgj8silrk1vb21pghv"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI genefilter graph GSEABase Matrix RBGL]; };
   CausalR = derive2 { name="CausalR"; version="1.13.0"; sha256="0npjg5zg4ckqhgjayb0rxvaaggbd52n61bs7mba6f20dnq1x0q5j"; depends=[igraph]; };
-  CellMapper = derive2 { name="CellMapper"; version="1.7.0"; sha256="0jxanbmhi4004kilhdd19fp12yyjx8dcy91iify4ivrhp9c4xwr0"; depends=[S4Vectors]; };
-  CellNOptR = derive2 { name="CellNOptR"; version="1.27.0"; sha256="0ig7g50lmy8z3b00adkanmr7nz56nf35ayfbxby2phpxirqf15wj"; depends=[ggplot2 graph hash RBGL RCurl Rgraphviz XML]; };
-  CellScore = derive2 { name="CellScore"; version="1.1.0"; sha256="11hsyz15b8kfmb8vjgpwy5hgkmcizlv4ygnw0ffmkvpnjmlib4rm"; depends=[Biobase gplots lsa RColorBrewer squash]; };
-  CellTrails = derive2 { name="CellTrails"; version="0.99.12"; sha256="10fn3vkkvjva6np8nkb39dxwkybac567rc0xxn09wlnxpqmfh8i7"; depends=[Biobase BiocGenerics cba dendextend dtw EnvStats ggplot2 ggrepel igraph maptree mgcv reshape2 Rtsne SingleCellExperiment SummarizedExperiment]; };
-  CexoR = derive2 { name="CexoR"; version="1.19.1"; sha256="1yga6kc562ginzzb0cq8icyjkbj599j9q4hxzgd6hhf5590nfjfy"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; };
-  ChIC = derive2 { name="ChIC"; version="1.1.0"; sha256="1nh1dcqzf3m5gpkgblf7lx599c8dxm7gk53d7y12a7mdlrnzsh5j"; depends=[BiocGenerics caret caTools ChIC_data GenomicRanges IRanges S4Vectors spp]; };
+  CellMapper = derive2 { name="CellMapper"; version="1.7.1"; sha256="18w6mxmx58rh93alrxfvqnkg3m28wrycvm5pcm5zr7kvckgd9zlr"; depends=[S4Vectors]; };
+  CellNOptR = derive2 { name="CellNOptR"; version="1.27.1"; sha256="1rbn2dbch4mf7ckgbh16zv85imz3wrv97gc618m3q0swp03589ay"; depends=[ggplot2 graph hash RBGL RCurl Rgraphviz XML]; };
+  CellScore = derive2 { name="CellScore"; version="1.1.1"; sha256="1fwnzggm0kldackdcr8ssb0g9448gkddv632aipp6ksqw609qn52"; depends=[Biobase gplots lsa RColorBrewer squash]; };
+  CellTrails = derive2 { name="CellTrails"; version="0.99.15"; sha256="0pg0wqcfwwq7y8xqm0dcpkmn7j1vd3c0ivcyij11li2znmhamsm9"; depends=[Biobase BiocGenerics cba dendextend dtw EnvStats ggplot2 ggrepel igraph maptree mgcv reshape2 Rtsne SingleCellExperiment SummarizedExperiment]; };
+  CexoR = derive2 { name="CexoR"; version="1.19.3"; sha256="1cia3bhplk559pz1znmqnfxy3zpzbg55489gadankpz3kz7n73xd"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; };
+  ChAMP = derive2 { name="ChAMP"; version="2.11.5"; sha256="1m6br9h75j9c659a4zhadghwf7aisc3sm2mz9s67fy3hlncmlska"; depends=[bumphunter ChAMPdata combinat dendextend DMRcate DNAcopy doParallel FEM GenomicRanges globaltest goseq Hmisc Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest illuminaio impute isva limma marray matrixStats minfi missMethyl plotly plyr preprocessCore prettydoc quadprog qvalue RColorBrewer rmarkdown RPMM shiny shinythemes sva wateRmelon]; };
+  ChIC = derive2 { name="ChIC"; version="1.1.09"; sha256="1730yssk9ig84mbzbvs0rhszscp00sbqqhhvl559gfacajs5gv85"; depends=[BiocGenerics caret caTools ChIC_data GenomicRanges IRanges progress S4Vectors spp]; };
   ChIPComp = derive2 { name="ChIPComp"; version="1.11.0"; sha256="0lia22xjj1w8m7hwpfcyaf6cldk05f78v93x3p947xdrkymx6lgc"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; };
-  ChIPQC = derive2 { name="ChIPQC"; version="1.17.0"; sha256="0d68nizvlp9gx9s33s5ll4pmrp7rhpjd3xqc8pngc3zvwa4sjg96"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors TxDb_Celegans_UCSC_ce6_ensGene TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; };
+  ChIPQC = derive2 { name="ChIPQC"; version="1.17.1"; sha256="0cpii7sxp1vab5wnnm00kifqnmxxr8hc4rnb8l4wmk5ib4ijqpra"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors TxDb_Celegans_UCSC_ce6_ensGene TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; };
   ChIPSeqSpike = derive2 { name="ChIPSeqSpike"; version="1.1.0"; sha256="15w26zchxjggz8236afgykdncdzim9n3lyr4bm5p7qxzqs8aigbv"; depends=[BiocGenerics corrplot GenomicRanges ggplot2 IRanges LSD Rsamtools rtracklayer S4Vectors seqplots stringr]; };
-  ChIPanalyser = derive2 { name="ChIPanalyser"; version="1.3.0"; sha256="08cwdrafzq4ilvck21dc49nf0mjb27vbxrb8i860pfdd77i08hz4"; depends=[Biostrings BSgenome GenomicRanges IRanges RcppRoll rtracklayer S4Vectors]; };
-  ChIPexoQual = derive2 { name="ChIPexoQual"; version="1.5.0"; sha256="17w5qibbn4gpvmzndmh3igzbkvzljk88nkz7imld01n8wp4f0kni"; depends=[BiocParallel biovizBase broom data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 hexbin IRanges RColorBrewer rmarkdown Rsamtools S4Vectors scales viridis]; };
-  ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.15.0"; sha256="0hck74qkrg4m9w30lag9jfv0ikh2q9d95fa73zjcbdil7n792l7k"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller biomaRt Biostrings BSgenome DBI DelayedArray ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GO_db graph idr IRanges limma matrixStats multtest RBGL regioneR Rsamtools S4Vectors seqinr SummarizedExperiment VennDiagram]; };
-  ChIPseeker = derive2 { name="ChIPseeker"; version="1.17.0"; sha256="0002vn7kw83c8lzyrdkwi5c3vpkld3xihfa8zlx6hz41221im2vb"; depends=[AnnotationDbi BiocGenerics boot dplyr enrichplot GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix RColorBrewer rtracklayer S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene UpSetR]; };
-  ChIPseqR = derive2 { name="ChIPseqR"; version="1.35.0"; sha256="0q5s9pzdmiv2z6cjvy24nzpqsblr2p60qrd8kdgkh8hxx6wq79f1"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
-  ChIPsim = derive2 { name="ChIPsim"; version="1.35.0"; sha256="1rz89zn383j8pa3g3rgabiw6zcg9h1nfbrmln4vwbbk6yk877l5l"; depends=[Biostrings IRanges ShortRead XVector]; };
-  ChemmineOB = derive2 { name="ChemmineOB"; version="1.19.0"; sha256="0w9pr4k12a8c8h69ycn231igd74a8m72v1icii11jiijl3i9hfg3"; depends=[BH BiocGenerics Rcpp zlibbioc]; };
-  ChemmineR = derive2 { name="ChemmineR"; version="3.33.1"; sha256="1dzm3cw6i3k38p9i0yzf0bcad8zqvkip434k11ppplk5ch923rzi"; depends=[base64enc BH BiocGenerics DBI digest DT ggplot2 gridExtra png Rcpp RCurl rjson rsvg]; };
+  ChIPXpress = derive2 { name="ChIPXpress"; version="1.25.0"; sha256="0px8vpyiay60fb2qvjax7mkijkmix41vaa34g9s6ahzp7mxxhwyz"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; };
+  ChIPanalyser = derive2 { name="ChIPanalyser"; version="1.3.7"; sha256="0lrpymicyi3fphw7vj1bcrgl00fpld7436kfffdwrmjla7m6539w"; depends=[BiocManager Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges RcppRoll ROCR rtracklayer S4Vectors]; };
+  ChIPexoQual = derive2 { name="ChIPexoQual"; version="1.5.1"; sha256="1691808rn2jw08aivd2vsys279kbzs9ndf7brlgyaxaii3lxm2hc"; depends=[BiocParallel biovizBase broom data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 hexbin IRanges RColorBrewer rmarkdown Rsamtools S4Vectors scales viridis]; };
+  ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.15.2"; sha256="1b5kg8vh37pslj5ckavz401pxpy1xgak9jsanfjb76wjbpyadzm0"; depends=[AnnotationDbi Biobase BiocGenerics BiocManager biomaRt Biostrings BSgenome DBI DelayedArray ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GO_db graph idr IRanges limma matrixStats multtest RBGL regioneR Rsamtools S4Vectors seqinr SummarizedExperiment VennDiagram]; };
+  ChIPseeker = derive2 { name="ChIPseeker"; version="1.17.2"; sha256="0gnb451jh6fscpgywbclk0plfmha4zxpzpf3lq6y9kyvxk9v2cqp"; depends=[AnnotationDbi BiocGenerics boot dplyr enrichplot GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix RColorBrewer rtracklayer S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene UpSetR]; };
+  ChIPseqR = derive2 { name="ChIPseqR"; version="1.35.2"; sha256="11pw2265qni3j20jn7kmxmw5gjf01x34vzsfnv6j4cn8k4hpl6l7"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
+  ChIPsim = derive2 { name="ChIPsim"; version="1.35.2"; sha256="0nrwi9xy224g9r923gwkmmcq7ld4vnfwsgafiw7i1n20vsj85gyj"; depends=[Biostrings IRanges ShortRead XVector]; };
+  ChemmineOB = derive2 { name="ChemmineOB"; version="1.19.3"; sha256="0c2xlkf1y15lqp7yibzp1wlknyf4l5wm8zwqf0s2grp3snc3zcv0"; depends=[BH BiocGenerics Rcpp zlibbioc]; };
+  ChemmineR = derive2 { name="ChemmineR"; version="3.33.5"; sha256="0ydl1hz4hjiln4kpym7kdswbn7rddafpvsanblqbivy58p8vxkhk"; depends=[base64enc BH BiocGenerics DBI digest DT ggplot2 gridExtra png Rcpp RCurl rjson rsvg]; };
   Chicago = derive2 { name="Chicago"; version="1.9.0"; sha256="0b3j250w0piasfs3jbyycy9w4snvrn7vbaq31hhj150gjvphsgzk"; depends=[data_table Delaporte Hmisc MASS matrixStats]; };
   ChromHeatMap = derive2 { name="ChromHeatMap"; version="1.35.0"; sha256="18xgngy77rj8q91bj9v8kpzqijz15ax5w9db0xiyrspvi39z4fx4"; depends=[annotate AnnotationDbi Biobase BiocGenerics GenomicRanges IRanges rtracklayer]; };
-  ClassifyR = derive2 { name="ClassifyR"; version="2.1.6"; sha256="0xnayr0w00nwmg9j6x6kl6i66l46ai734ifmgvdpgg18d6zi7zhr"; depends=[BiocParallel locfit MultiAssayExperiment plyr S4Vectors]; };
-  Clomial = derive2 { name="Clomial"; version="1.17.2"; sha256="0kl6fbgrihbz2qk7gzpdjclh9x874kb0wsk3615b21ra9qdfl3va"; depends=[matrixStats permute]; };
+  ClassifyR = derive2 { name="ClassifyR"; version="2.1.32"; sha256="1v82c9s3g7j6da528571nsw1d4yjl502zw5q7zfjdd23nz6kppzz"; depends=[BiocParallel locfit MultiAssayExperiment plyr S4Vectors]; };
+  Clomial = derive2 { name="Clomial"; version="1.17.4"; sha256="0w0qnl7ihmkgl568wimx13cc4lhpxb1ll68iwkibnihz604rcnq6"; depends=[matrixStats permute]; };
   Clonality = derive2 { name="Clonality"; version="1.29.0"; sha256="0hlrj9rl7d0wzyk6a95p68gx76m34bfgxvpz68r3qhdzi0z0lxbn"; depends=[DNAcopy]; };
   ClusterJudge = derive2 { name="ClusterJudge"; version="1.3.0"; sha256="1zc019s15skjnzjm0vb5y3z4rd5cnk1awnvwxwj062y3pzr5kp62"; depends=[httr infotheo jsonlite lattice latticeExtra]; };
-  ClusterSignificance = derive2 { name="ClusterSignificance"; version="1.9.0"; sha256="18j2jscwgmv2hcsi00182n03rvcqyaxbazzplxx5jqrgmqqzngmz"; depends=[pracma princurve RColorBrewer scatterplot3d]; };
+  ClusterSignificance = derive2 { name="ClusterSignificance"; version="1.9.2"; sha256="13mgd8sxj65f7lv4jlbslq27zj3hsqd57fg34xkrvgvir2a7jcmp"; depends=[pracma princurve RColorBrewer scatterplot3d]; };
   CoCiteStats = derive2 { name="CoCiteStats"; version="1.53.0"; sha256="0xy1zy4951r9xpjmhia8krrc429azbfg22nqzd9p0jcqflfj2sq7"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  CoGAPS = derive2 { name="CoGAPS"; version="3.1.0"; sha256="1ra3p9dqgpyfn3f4jq0jhamiiais0y2pli4qpyq3k3x510810mkd"; depends=[BH cluster doParallel foreach ggplot2 gplots RColorBrewer Rcpp reshape2 shiny]; };
-  CoRegNet = derive2 { name="CoRegNet"; version="1.19.0"; sha256="1m532i7r1bz3dg5p2h8cfgligds95v6a57kv0xzan1gn37pys9g1"; depends=[arules igraph shiny]; };
+  CoGAPS = derive2 { name="CoGAPS"; version="3.1.6"; sha256="15x5pp83i1wzzs5h9gdllzb4qffi6ciw1kf63h1x6b42sk37kzia"; depends=[BH cluster doParallel foreach ggplot2 gplots RColorBrewer Rcpp reshape2 shiny]; };
+  CoRegNet = derive2 { name="CoRegNet"; version="1.19.1"; sha256="0ywa8d80vgk222161ks0mgxi0ahswm3mil0lxgxanny8ad1vxvx2"; depends=[arules igraph shiny]; };
   CompGO = derive2 { name="CompGO"; version="1.17.0"; sha256="04f22n17b4cyv1mapimkmc913d22cpvifdznfgqgbmrkjsyygg2k"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer TxDb_Mmusculus_UCSC_mm9_knownGene]; };
-  ComplexHeatmap = derive2 { name="ComplexHeatmap"; version="1.19.1"; sha256="1wdbffj94jycbg95gpj8c5bdll2697v9rhqanv075373qa8f1miq"; depends=[circlize colorspace GetoptLong GlobalOptions RColorBrewer]; };
+  ComplexHeatmap = derive2 { name="ComplexHeatmap"; version="1.19.3"; sha256="1pczcx26i30izg7iwi7ljnwqzf2k8mfw09dhmgbrcvy5siv7vn03"; depends=[circlize colorspace GetoptLong GlobalOptions RColorBrewer]; };
   ConsensusClusterPlus = derive2 { name="ConsensusClusterPlus"; version="1.45.0"; sha256="1ypfclg252j9d7v78r81n14f0gsaxgzk6n1509rdv010h0xbaw2q"; depends=[ALL Biobase cluster]; };
-  CopywriteR = derive2 { name="CopywriteR"; version="2.13.0"; sha256="11gls7dh4n4kd6dijvly5r3x918ivbpyriyz0y50333vpafm4swr"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; };
+  CopywriteR = derive2 { name="CopywriteR"; version="2.13.1"; sha256="1w3raf6756lnf1fmarcwsr10808ggih71v0gzky4xcbhgy5d9dkh"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; };
   CorMut = derive2 { name="CorMut"; version="1.23.0"; sha256="0y0sbnz3rlv98b87i7qcqv7zy1js180hmpy45fw55kmzjvd4j6vq"; depends=[igraph seqinr]; };
   Cormotif = derive2 { name="Cormotif"; version="1.27.0"; sha256="0spl1qg0p8za8w6ikiwsf4d1spx55g1b73vcbpxbipmjymwc408i"; depends=[affy limma]; };
-  CountClust = derive2 { name="CountClust"; version="1.9.0"; sha256="12f2bazvyz0xvd9a67qxwii30441nsnmxd89706h4k1ba1zgp436"; depends=[cowplot flexmix ggplot2 gtools limma maptpx picante plyr reshape2 slam SQUAREM]; };
+  CountClust = derive2 { name="CountClust"; version="1.9.1"; sha256="06vqcmb53h7h329kvq51gka8gzbz811wnrbi92wr9p0vy2pwm3hy"; depends=[cowplot flexmix ggplot2 gtools limma maptpx picante plyr reshape2 slam SQUAREM]; };
   CoverageView = derive2 { name="CoverageView"; version="1.19.0"; sha256="0alj0908pfih5z5zyi5szkimcm73sfsbqwpg6w594iglgyvbfbck"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
-  CrispRVariants = derive2 { name="CrispRVariants"; version="1.9.0"; sha256="18ww7xjykyrn0fh07b341pzg7zypd4hmq2adpn6m331v7v91m3dw"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; };
-  CytoDx = derive2 { name="CytoDx"; version="1.1.0"; sha256="02zh10icpc0iv0bcyayr6bcvbjsvgbq9whg7mnlqlnf8x4hx6mk2"; depends=[doParallel dplyr flowCore glmnet rpart rpart_plot]; };
-  CytoML = derive2 { name="CytoML"; version="1.7.7"; sha256="0qr52pq6l04w2y0dqkh3vmyyxjd3jc0yh8yvx1hxy2yglvdb9mpw"; depends=[base64enc Biobase data_table flowCore flowUtils flowWorkspace ggcyto graph jsonlite ncdfFlow openCyto plyr RBGL Rgraphviz XML]; };
-  DAPAR = derive2 { name="DAPAR"; version="1.13.0"; sha256="1qv5hgwcxpxjy5p0rbsr12wcplqvhyr2qwa1yr26ga7wqspbqg5g"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr foreach ggplot2 gplots graph highcharter imp4p impute imputeLCMD knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes stringr tidyr tidyverse tmvtnorm vioplot]; };
+  CrispRVariants = derive2 { name="CrispRVariants"; version="1.9.2"; sha256="09ilj21fr59kw51msyazl3lcypla5dd0sc3z60jrr4ygs3fyw91q"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; };
+  CytoDx = derive2 { name="CytoDx"; version="1.1.2"; sha256="1d2kdsiarfz9hpr87qq94ybiyg8cg40j6p2pryw6qnkkj43qdmgj"; depends=[doParallel dplyr flowCore glmnet rpart rpart_plot]; };
+  CytoML = derive2 { name="CytoML"; version="1.7.14"; sha256="0xflcjjzigq08xpjjsyz67v80x0qmxnrkjq9h4241f7s0vxx7pl2"; depends=[base64enc Biobase data_table flowCore flowUtils flowWorkspace ggcyto graph jsonlite ncdfFlow openCyto plyr RBGL Rgraphviz XML]; };
+  DAPAR = derive2 { name="DAPAR"; version="1.13.15"; sha256="1yxkipp01zdx5xlj479a6f2hzrhs72fh8qyk5b5nbqvbrb2jipfh"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr factoextra FactoMineR foreach ggplot2 gplots graph highcharter imp4p impute knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes stringr tidyr tidyverse tmvtnorm vioplot vsn]; };
   DART = derive2 { name="DART"; version="1.29.0"; sha256="1akgln0w3xbvis0pcgjdm07jbbfsg0yn732gkvh1hzkpg26iwgfr"; depends=[igraph]; };
   DBChIP = derive2 { name="DBChIP"; version="1.25.0"; sha256="1c3s5ffbdbhsr35q5mxs1vhl3glrjfwnpng11xlrcsj9h3jpxhva"; depends=[DESeq edgeR]; };
-  DChIPRep = derive2 { name="DChIPRep"; version="1.11.0"; sha256="00r70fvr49fy4xmyyspgwiqphz96xcq9pz5c0srprrf4az71fl96"; depends=[assertthat ChIPpeakAnno DESeq2 fdrtool GenomicRanges ggplot2 plyr purrr reshape2 S4Vectors smoothmest soGGi SummarizedExperiment tidyr]; };
-  DECIPHER = derive2 { name="DECIPHER"; version="2.9.1"; sha256="1b09amzwvchh56wy0bs2f6hgjrsa09hdpqql6ywkj7n7abg022vf"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; };
-  DEComplexDisease = derive2 { name="DEComplexDisease"; version="1.1.0"; sha256="0swqxmyqlh05albirm8n32wl31s4gbv45qn9c5mpdpvr6zsldylg"; depends=[BiocParallel ComplexHeatmap DESeq2 edgeR Rcpp SummarizedExperiment]; };
+  DChIPRep = derive2 { name="DChIPRep"; version="1.11.1"; sha256="1kp0lsqlrnr815rp0g7jcppbrp1h62pa60j1jgav78bwh51l4dpq"; depends=[assertthat ChIPpeakAnno DESeq2 fdrtool GenomicRanges ggplot2 plyr purrr reshape2 S4Vectors smoothmest soGGi SummarizedExperiment tidyr]; };
+  DECIPHER = derive2 { name="DECIPHER"; version="2.9.2"; sha256="0lvg0kcv6rryb39aini5s9b4aacbld67z7427w9gvpsj7zcapgvz"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; };
+  DEComplexDisease = derive2 { name="DEComplexDisease"; version="1.1.1"; sha256="007wgj3kpdk7nvx8qribm6vqfca4vp7n1ih8y866xlqgdcr5ad61"; depends=[BiocParallel ComplexHeatmap DESeq2 edgeR Rcpp SummarizedExperiment]; };
   DEDS = derive2 { name="DEDS"; version="1.55.0"; sha256="0823ycm0j30dh1pbpxbcfwqglpff72675cr4h18rk0fx0v742vhy"; depends=[]; };
-  DEFormats = derive2 { name="DEFormats"; version="1.9.0"; sha256="1vd3dnc38mmgkw07qbazra8928c6r8wcxcizq05bwgjqhwfjdyxs"; depends=[checkmate data_table DESeq2 edgeR GenomicRanges S4Vectors SummarizedExperiment]; };
-  DEGraph = derive2 { name="DEGraph"; version="1.33.0"; sha256="1xmawr15c8nxw8hgh3ijq2cp6ynkb8xana6zfidcibwmgfs7zlw6"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; };
-  DEGreport = derive2 { name="DEGreport"; version="1.17.2"; sha256="1zf1fryw0h1kh8hwi0v6xkvr22gi7qbynn1j2fmx9n5n2246n3ad"; depends=[Biobase BiocGenerics circlize cluster ComplexHeatmap ConsensusClusterPlus cowplot DESeq2 dplyr edgeR ggdendro ggplot2 ggrepel knitr logging magrittr Nozzle_R1 psych RColorBrewer reshape rlang S4Vectors scales stringr SummarizedExperiment tibble tidyr]; };
-  DEGseq = derive2 { name="DEGseq"; version="1.35.0"; sha256="0kynaqbzlsldxjkqxd396xs5gfzmkvrkxhn14ihv651iviarwb8b"; depends=[qvalue samr]; };
-  DEP = derive2 { name="DEP"; version="1.3.2"; sha256="0yy70j6ng0cdg16s3nmly2447857h0ks71q16c7vp2xgxjlqbipd"; depends=[assertthat circlize cluster ComplexHeatmap dplyr DT fdrtool ggplot2 ggrepel gridExtra imputeLCMD limma MSnbase purrr RColorBrewer readr rmarkdown shiny shinydashboard SummarizedExperiment tibble tidyr vsn]; };
+  DEFormats = derive2 { name="DEFormats"; version="1.9.1"; sha256="1hcxamc82wyp8xgrx4mxhw3q15g32y8z66qgv1gbm7h17wykssih"; depends=[checkmate data_table DESeq2 edgeR GenomicRanges S4Vectors SummarizedExperiment]; };
+  DEGraph = derive2 { name="DEGraph"; version="1.33.1"; sha256="19fcsjz6bgc1bvnympvq0ms5d7mvj2681jbnq5inrr4pxq2qz0p0"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; };
+  DEGreport = derive2 { name="DEGreport"; version="1.17.8"; sha256="02z93g0fy594dhj7dk16fglw4jakyb44zcn22k1c64d8wvhq8rfa"; depends=[Biobase BiocGenerics broom circlize cluster ComplexHeatmap ConsensusClusterPlus cowplot DESeq2 dplyr edgeR ggdendro ggplot2 ggrepel knitr lasso2 logging magrittr Nozzle_R1 psych RColorBrewer reshape rlang S4Vectors scales stringr SummarizedExperiment tibble tidyr]; };
+  DEGseq = derive2 { name="DEGseq"; version="1.35.1"; sha256="1mb9chwazmsj9j4dz92kw2mhc3b5lx5v2y3xgdcc9s4bjmb21xrz"; depends=[qvalue]; };
+  DEP = derive2 { name="DEP"; version="1.3.3"; sha256="0wmzinv369svfwfmgv2gsz471bnh5vz77p5w1q4ycgd6lj5l2ckn"; depends=[assertthat circlize cluster ComplexHeatmap dplyr DT fdrtool ggplot2 ggrepel gridExtra imputeLCMD limma MSnbase purrr RColorBrewer readr rmarkdown shiny shinydashboard SummarizedExperiment tibble tidyr vsn]; };
   DEScan2 = derive2 { name="DEScan2"; version="1.1.2"; sha256="04xla8cr3f3r1dwvahs55l93bzlnds04c42kx93lgyn5r2ksqr8n"; depends=[BiocGenerics BiocParallel ChIPpeakAnno data_table DelayedArray GenomeInfoDb GenomicAlignments GenomicRanges glue IRanges plyr Rcpp RcppArmadillo rtracklayer S4Vectors SummarizedExperiment]; };
   DESeq = derive2 { name="DESeq"; version="1.33.0"; sha256="1h56v3d1kj8inh3xy08k6kfc31czyq9a2zwy1v2kibcaa79z4zrn"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; };
-  DESeq2 = derive2 { name="DESeq2"; version="1.21.6"; sha256="02libh2lsna118na2lbc8hmd11dm9lia6gcnb59jqp69w9mmmpyk"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
-  DEXSeq = derive2 { name="DEXSeq"; version="1.27.0"; sha256="113dircdkngrrsb50mk3pp4x4nis2b27j020blxra3i9n3g2zrq7"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; };
-  DEsingle = derive2 { name="DEsingle"; version="1.1.4"; sha256="0nzm9nw9rqmk13vz7vyqjiy096m1vka51pqrs830yyf4vq69g457"; depends=[bbmle BiocParallel gamlss MASS Matrix maxLik pscl VGAM]; };
-  DEsubs = derive2 { name="DEsubs"; version="1.7.1"; sha256="0wj89308s4rq2d1i1f6y79wj2fpk0gk2gzpfam0x5pfppzz83cx8"; depends=[circlize DESeq DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL samr]; };
+  DESeq2 = derive2 { name="DESeq2"; version="1.21.25"; sha256="1ll8fdpqyml171vsxsnggsx09963jz15rivvn32xihwas9dxwksv"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
+  DEXSeq = derive2 { name="DEXSeq"; version="1.27.1"; sha256="0jppj3yl1jibxj2ci07sf4lbbx9rbjlx172ynp2vg3ic7j7y6z61"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; };
+  DEqMS = derive2 { name="DEqMS"; version="0.99.44"; sha256="01754m7rwrc1in1ls8vd0c94p2p4jyspb0nwx42scb8kjpnmcbdq"; depends=[ggplot2 limma]; };
+  DEsingle = derive2 { name="DEsingle"; version="1.1.5"; sha256="0biail9qfp0sp7f2sp4mx55ajba2waqsfllx2sndjls0673pv215"; depends=[bbmle BiocParallel gamlss MASS Matrix maxLik pscl VGAM]; };
+  DEsubs = derive2 { name="DEsubs"; version="1.7.4"; sha256="0v4yd63zzd0k7y19pcx5mb7iq17dijjldf64c6nwlf69d8gv5lp9"; depends=[circlize DESeq DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL]; };
   DFP = derive2 { name="DFP"; version="1.39.0"; sha256="10yamzm28gnayrjc58jvj6mjg2j6gr266f65i9rrz5shnz9244wl"; depends=[Biobase]; };
-  DMCHMM = derive2 { name="DMCHMM"; version="1.3.0"; sha256="0076i6d9qpphbxrkz0maqi6qsviix0sxckz6hg5mwrymsawssh48"; depends=[BiocParallel calibrate fdrtool GenomicRanges IRanges multcomp rtracklayer S4Vectors SummarizedExperiment]; };
-  DMRScan = derive2 { name="DMRScan"; version="1.7.4"; sha256="1gdnn3kzlfhj3vp4j1r7q8ggfqq5jmcx1jyrpd8wc9pn0nhnamiv"; depends=[GenomeInfoDb GenomicRanges IRanges MASS Matrix mvtnorm RcppRoll]; };
-  DMRcaller = derive2 { name="DMRcaller"; version="1.13.1"; sha256="01ip1xgyr1jjmrg85agbxxg4b6ihy9jkxfrf1hjkpmi1qkzw8pxz"; depends=[betareg GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; };
-  DMRcate = derive2 { name="DMRcate"; version="1.17.0"; sha256="19k6cl4a154hgasqk3nycb0wxra0yg1nvn3ywbsikn17pa6qiyzc"; depends=[DMRcatedata DSS GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors]; };
+  DMCHMM = derive2 { name="DMCHMM"; version="1.3.1"; sha256="01r9kzyjsk43ncw7xbr95r4apxchpkfjl4qilxvgsq8icg0mhqx4"; depends=[BiocParallel calibrate fdrtool GenomicRanges IRanges multcomp rtracklayer S4Vectors SummarizedExperiment]; };
+  DMRScan = derive2 { name="DMRScan"; version="1.7.5"; sha256="1x6nv3688p4lh8bsv3brg35xpn4pk6i1fks2zfdfspvagbq4bqvp"; depends=[GenomeInfoDb GenomicRanges IRanges MASS Matrix mvtnorm RcppRoll]; };
+  DMRcaller = derive2 { name="DMRcaller"; version="1.13.8"; sha256="0lp27mbx6sqh4b7fwsbm0gxk5ng9qabdimxhw4f8dqhsza6mp73p"; depends=[betareg GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; };
+  DMRcate = derive2 { name="DMRcate"; version="1.17.6"; sha256="0ynh5q7shl6as7vafg0z7z4ld2ikk785vhw656viipix4q71k1iv"; depends=[DMRcatedata DSS GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors]; };
   DMRforPairs = derive2 { name="DMRforPairs"; version="1.17.0"; sha256="0094pw863dnc57kfif490fabcsggplfdr5xh41asldydp2x1pwcy"; depends=[GenomicRanges Gviz R2HTML]; };
   DNABarcodes = derive2 { name="DNABarcodes"; version="1.11.0"; sha256="1hpsdybpj3dszjxvlh7x2j5xdrgyhx03sv15hlg2bn4jj6am4iiy"; depends=[BH Matrix Rcpp]; };
   DNAcopy = derive2 { name="DNAcopy"; version="1.55.0"; sha256="1bmd22nmfbrcwvz9qk6rh4f81faxh7f71fk2pgvgdcz97kzl4g8w"; depends=[]; };
-  DNAshapeR = derive2 { name="DNAshapeR"; version="1.9.5"; sha256="1am9mcfr1fab29p06ppyl74qsdpvbq716vbys0dx8r9j1bf7x36x"; depends=[Biostrings fields GenomicRanges Rcpp]; };
+  DNAshapeR = derive2 { name="DNAshapeR"; version="1.9.6"; sha256="1v29k18l3wqrnhfzgj3lff5pzzgwn5n9956xlx94nbblh01x96lc"; depends=[Biostrings fields GenomicRanges Rcpp]; };
+  DOQTL = derive2 { name="DOQTL"; version="1.17.5"; sha256="1z1qbzg0fw6ygskk1p339dlkmbm6nj8wmwng9izhmipfn6jpfzfv"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt BSgenome_Mmusculus_UCSC_mm10 corpcor doParallel foreach fpc GenomicRanges hwriter IRanges iterators mclust QTLRel regress rhdf5 Rsamtools RUnit VariantAnnotation XML]; };
   DOSE = derive2 { name="DOSE"; version="3.7.1"; sha256="0dldsqs807hgnfx59vl1q90hh1lv9x2dbxndbfi97yvzlkhnar55"; depends=[AnnotationDbi BiocParallel DO_db fgsea ggplot2 GOSemSim qvalue reshape2 S4Vectors]; };
-  DRIMSeq = derive2 { name="DRIMSeq"; version="1.9.0"; sha256="1q3zff7wrk9hflz1jzrs1g0pacsv62rgif0bhglsk1877iqj8nip"; depends=[BiocGenerics BiocParallel edgeR GenomicRanges ggplot2 IRanges limma MASS reshape2 S4Vectors]; };
+  DRIMSeq = derive2 { name="DRIMSeq"; version="1.9.2"; sha256="0kpfvphzighq7iryxbn7s6v7k3mi09cv49r2c9gsyklqypv5cvsq"; depends=[BiocGenerics BiocParallel edgeR GenomicRanges ggplot2 IRanges limma MASS reshape2 S4Vectors]; };
   DSS = derive2 { name="DSS"; version="2.29.0"; sha256="1jwjyfx1356j0jxryf8f3mnl764fd5bz5p395z6ax8xsafzkabq1"; depends=[Biobase bsseq DelayedArray]; };
   DTA = derive2 { name="DTA"; version="2.27.0"; sha256="129hvbvdgq7whh1f63gdh28w0g5avl3xqwvjm61makyyqyx47ipf"; depends=[LSD scatterplot3d]; };
-  DaMiRseq = derive2 { name="DaMiRseq"; version="1.5.1"; sha256="0zli040zjbgphlg2f0bxcb69nlhzzfzjr91cs8999p8hb80dml7l"; depends=[arm caret corrplot DESeq2 e1071 EDASeq FactoMineR FSelector ggplot2 Hmisc ineq kknn limma lubridate MASS pheatmap pls plsVarSel randomForest RColorBrewer reshape2 RSNNS SummarizedExperiment sva]; };
-  DeMAND = derive2 { name="DeMAND"; version="1.11.0"; sha256="1fmswncd9jp49ni7rpg7xkcrnz2nh58xj9nyig1098hib00y70ml"; depends=[KernSmooth]; };
+  DaMiRseq = derive2 { name="DaMiRseq"; version="1.5.3"; sha256="0zxw6ls834cizk6nw8kpbi7p9c2xr2s0892qmizzqbgag8d0mjif"; depends=[arm caret corrplot DESeq2 e1071 EDASeq edgeR FactoMineR FSelector ggplot2 Hmisc ineq kknn limma lubridate MASS pheatmap pls plsVarSel randomForest RColorBrewer reshape2 RSNNS SummarizedExperiment sva]; };
+  DeMAND = derive2 { name="DeMAND"; version="1.11.1"; sha256="00rbd5mwrh9g2ppx0z0kaf1245l7r5rgiyzhrhkrkp6vvbjrhd4i"; depends=[KernSmooth]; };
   DeconRNASeq = derive2 { name="DeconRNASeq"; version="1.23.0"; sha256="0hnnw6k246a0dsj0ppfrj40ddrl3czpdq28gvkahyig64ljwfrbm"; depends=[ggplot2 limSolve pcaMethods]; };
   DeepBlueR = derive2 { name="DeepBlueR"; version="1.7.0"; sha256="198apfr10nfnk82zhmsnk9vpq2ykfi6yh79gwdnnkls8h2r5nqz9"; depends=[data_table diffr dplyr filehash foreach GenomeInfoDb GenomicRanges R_utils RCurl rjson rtracklayer settings stringr withr XML]; };
-  DelayedArray = derive2 { name="DelayedArray"; version="0.7.18"; sha256="1a2a558xc638prbb96xfkd97m40cf3hdv3g40r8a1xfw0vk9669k"; depends=[BiocGenerics BiocParallel IRanges matrixStats S4Vectors]; };
-  DelayedMatrixStats = derive2 { name="DelayedMatrixStats"; version="1.3.4"; sha256="12ljlbk01p9cv8vwjapq1nknvsqf3qp44qh4yyq1j5cr8l8rg2xx"; depends=[DelayedArray IRanges Matrix matrixStats S4Vectors]; };
+  DelayedArray = derive2 { name="DelayedArray"; version="0.7.49"; sha256="0nkpnxa91prhfnd0dwfmfr0g3r8i93gy6xcw403s81zw74imn1jk"; depends=[BiocGenerics BiocParallel IRanges matrixStats S4Vectors]; };
+  DelayedMatrixStats = derive2 { name="DelayedMatrixStats"; version="1.3.11"; sha256="0m3dx01ibmxqn4syv5cw88m7b30qlby6fiwjhd3927zmfi3jwl2s"; depends=[BiocParallel DelayedArray HDF5Array IRanges Matrix matrixStats S4Vectors]; };
   DiffBind = derive2 { name="DiffBind"; version="2.9.0"; sha256="0ka72zizphm2sphr8gm53602wgm7rkfc6hx0fql3cb34yjg11wi1"; depends=[amap BiocParallel DESeq2 dplyr edgeR GenomicAlignments GenomicRanges ggplot2 ggrepel gplots IRanges lattice limma locfit RColorBrewer Rcpp Rsamtools S4Vectors SummarizedExperiment systemPipeR zlibbioc]; };
   DiffLogo = derive2 { name="DiffLogo"; version="2.5.0"; sha256="00vk5qj0byh8ggg5nmaa94ddbi42rl59y049bxx37qr98qyw79yj"; depends=[cba]; };
-  Director = derive2 { name="Director"; version="1.7.0"; sha256="0xd8fviwd59smfzvrvwszpv69a74606w8iwds9gq8yi8s38288bs"; depends=[htmltools]; };
+  Director = derive2 { name="Director"; version="1.7.3"; sha256="1yin749xl3v3h01gccvlgkb91l2dn1rkm7asb3q9bxnr389sm4yr"; depends=[htmltools]; };
   DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.23.0"; sha256="1wxb094p90628bbkm4vzjrpxcagcpm17iqa0f1hjfy7b8a1my9wh"; depends=[BiocGenerics IRanges S4Vectors]; };
-  DominoEffect = derive2 { name="DominoEffect"; version="1.1.0"; sha256="1n2hr24izsd3zvxc795zw7678kwz4glaz09r49s0wr1lp70rgzb0"; depends=[AnnotationDbi biomaRt Biostrings data_table GenomeInfoDb GenomicRanges IRanges SummarizedExperiment VariantAnnotation]; };
+  DominoEffect = derive2 { name="DominoEffect"; version="1.1.2"; sha256="1ri0224my8imjjd95ccdg3gmpq4npji67f01skvycn7j2z5illq8"; depends=[AnnotationDbi biomaRt Biostrings data_table GenomeInfoDb GenomicRanges IRanges SummarizedExperiment VariantAnnotation]; };
   Doscheda = derive2 { name="Doscheda"; version="1.3.0"; sha256="1yfywqzxjj88wwnwmrm3yd9z1al74w2xzijzk1zqdjy5lg8vc1qn"; depends=[affy calibrate corrgram d3heatmap drc DT ggplot2 gridExtra httr jsonlite limma matrixStats prodlim readxl reshape2 shiny shinydashboard stringr vsn]; };
   DriverNet = derive2 { name="DriverNet"; version="1.21.0"; sha256="0ja7jpnh2rh4gkcv0h99mma19rk07y1vmh4hpkyxg1m1mb1q4vyv"; depends=[]; };
-  DropletUtils = derive2 { name="DropletUtils"; version="1.1.5"; sha256="1yq3ijm3g71gh9gp72lwr7dzq395j548xvp11vrn0bp867rx4b5s"; depends=[beachmat BiocParallel edgeR Matrix Rcpp rhdf5 Rhdf5lib S4Vectors SingleCellExperiment]; };
+  DropletUtils = derive2 { name="DropletUtils"; version="1.1.13"; sha256="1qpds9drjvxwjdlv844lsv081iyp4syzvhpkm90skd5wpsfiriy7"; depends=[beachmat BiocParallel edgeR HDF5Array Matrix Rcpp rhdf5 Rhdf5lib S4Vectors SingleCellExperiment]; };
   DrugVsDisease = derive2 { name="DrugVsDisease"; version="2.23.0"; sha256="01hrd65q8h9r09y91vnl7x8gczgi3q8vlxihyingxjdc09qn86xd"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt cMap2data DrugVsDiseasedata GEOquery hgu133a_db hgu133a2_db hgu133plus2_db limma qvalue RUnit xtable]; };
-  DupChecker = derive2 { name="DupChecker"; version="1.19.0"; sha256="03bfyg1h08ya41svmvnyd0mxs4qakrk7xwpyv2m51cn3rk2cgacl"; depends=[R_utils RCurl]; };
+  DupChecker = derive2 { name="DupChecker"; version="1.19.1"; sha256="0a8vaamkpqwir3w3clfihpwcbjfmaaccwb86b6i6lydglkbdhnpq"; depends=[R_utils RCurl]; };
   DynDoc = derive2 { name="DynDoc"; version="1.59.0"; sha256="1cdyv6ylgdz7fyj8dnndy5y0khg0na8r7sss5p1pja73idxdqpvf"; depends=[]; };
-  EBImage = derive2 { name="EBImage"; version="4.23.0"; sha256="1v9lnyc5x3xwrabqgr4l9mx67bgwbq4gyyimq87pm1id5p3vpb9d"; depends=[abind BiocGenerics fftwtools htmltools htmlwidgets jpeg locfit png RCurl tiff]; };
+  EBImage = derive2 { name="EBImage"; version="4.23.2"; sha256="0q91m78i1s5ds5971rbdgrlv6d4mj30ljssbg75gw1gxzhlhaczg"; depends=[abind BiocGenerics fftwtools htmltools htmlwidgets jpeg locfit png RCurl tiff]; };
   EBSEA = derive2 { name="EBSEA"; version="1.9.0"; sha256="14bgrkfx93gcr0j9fj48krnfvhnbjxnqanvnx85n5x48bk40s2jr"; depends=[edgeR limma plyr]; };
   EBSeq = derive2 { name="EBSeq"; version="1.21.0"; sha256="0nbw3mkqgify3yijwizdznafvfyd4qizfqaj5f3w04nx0h8m8b2h"; depends=[blockmodeling gplots testthat]; };
   EBSeqHMM = derive2 { name="EBSeqHMM"; version="1.15.0"; sha256="067fi2vy35y3n6a5264a7af3j03jg46fp7vzl80ca7x8vqji4xvy"; depends=[EBSeq]; };
   EBarrays = derive2 { name="EBarrays"; version="2.45.0"; sha256="1wvim2qldy74qccgqkj6hwqxjhwm3sgj2gsr88qqh16gvfqy1w9z"; depends=[Biobase cluster lattice]; };
   EBcoexpress = derive2 { name="EBcoexpress"; version="1.25.0"; sha256="1xpihh3pxm492kqrf7pnz6sarz98hqhrgw3ybicja3cvn5ihlk1j"; depends=[EBarrays mclust minqa]; };
-  EDASeq = derive2 { name="EDASeq"; version="2.15.2"; sha256="1d7dq3fl9qmv5bll4vkbj4zvd9md44grpr4vdxk29wcjm6dzjyma"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DESeq GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; };
-  EDDA = derive2 { name="EDDA"; version="1.19.0"; sha256="1q15lj4sa76yhjgyzng1sr60aa1dbfyw51dphvg7n1c1jngqib0n"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; };
-  EGAD = derive2 { name="EGAD"; version="1.9.0"; sha256="1k1bv3z5dvgiid0vdfc3kkx9b37qbafybqxvdc188685nfkkkr03"; depends=[affy arrayQualityMetrics Biobase GEOquery gplots igraph impute limma MASS Matrix plyr RColorBrewer RCurl zoo]; };
-  EGSEA = derive2 { name="EGSEA"; version="1.9.0"; sha256="1qasrnfmrnvk05v4w4yyj0wyp02jcg0ww8svjnmhhlqpyj256s99"; depends=[AnnotationDbi Biobase DT edgeR EGSEAdata gage ggplot2 Glimma globaltest gplots GSVA HTMLUtils htmlwidgets hwriter limma metap org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db PADOG pathview plotly RColorBrewer safe stringi topGO]; };
-  ELBOW = derive2 { name="ELBOW"; version="1.17.0"; sha256="0g4ss21apdp6zsg70fl79f2xz4gwdl0ygyp03a636xpg2y6hbrx3"; depends=[]; };
-  ELMER = derive2 { name="ELMER"; version="2.5.4"; sha256="0qzivgb21y1g7y7j7dm0y2w7w2wdvxsfxblp8q21rh5z1wxr696x"; depends=[biomaRt circlize ComplexHeatmap doParallel downloader dplyr ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel gridExtra Gviz IRanges lattice magrittr Matrix MultiAssayExperiment plotly plyr readr reshape rmarkdown rvest S4Vectors stringr SummarizedExperiment TCGAbiolinks xml2]; };
+  EDASeq = derive2 { name="EDASeq"; version="2.15.4"; sha256="0lsp0cgix7qkqry6hk2a6wqp8cfqcr3apdsi31jgjnxqz7fn7jlj"; depends=[AnnotationDbi aroma_light Biobase BiocGenerics biomaRt Biostrings DESeq GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; };
+  EDDA = derive2 { name="EDDA"; version="1.19.1"; sha256="0cs962g60shzywbp4q33hxv03qwrkr6cn12c63i8wfp49kz1g7h1"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; };
+  EGAD = derive2 { name="EGAD"; version="1.9.2"; sha256="0xb1lcrzivadfnwl2v0x0aldsqzilcg7ygy6mizbijpfr79g8y42"; depends=[affy arrayQualityMetrics Biobase GEOquery gplots igraph impute limma MASS Matrix plyr RColorBrewer RCurl zoo]; };
+  EGSEA = derive2 { name="EGSEA"; version="1.9.2"; sha256="1mphjnwvwnphq2iby76w49rlwflxvhm72488gv0ls5pyvvj68r32"; depends=[AnnotationDbi Biobase DT edgeR EGSEAdata gage ggplot2 Glimma globaltest gplots GSVA HTMLUtils htmlwidgets hwriter limma metap org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db PADOG pathview plotly RColorBrewer safe stringi topGO]; };
+  ELBOW = derive2 { name="ELBOW"; version="1.17.1"; sha256="1wz4msw03g9c6732zciqpcabq8q3arxng5cbzpfgym22n0gsri82"; depends=[]; };
+  ELMER = derive2 { name="ELMER"; version="2.5.7"; sha256="0a987d542rgydny6fwpvgrhjr0729b8mpr2nyv3j7ic65c1hzibf"; depends=[biomaRt circlize ComplexHeatmap doParallel downloader dplyr ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel gridExtra Gviz IRanges lattice magrittr Matrix MultiAssayExperiment plotly plyr readr reshape rmarkdown rvest S4Vectors stringr SummarizedExperiment TCGAbiolinks xml2]; };
   EMDomics = derive2 { name="EMDomics"; version="2.11.0"; sha256="0snk2fcikj34s2hhfg9i5di92nd8lbg26ypvc1b1zcf7rj5yy07p"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; };
   ENCODExplorer = derive2 { name="ENCODExplorer"; version="2.7.0"; sha256="01sjpf4s0gdsiv6pqjmh0jq582wax9za47qf619igyzhwy2crvp1"; depends=[data_table dplyr DT jsonlite RCurl shiny shinythemes stringi stringr tidyr]; };
   ENVISIONQuery = derive2 { name="ENVISIONQuery"; version="1.29.0"; sha256="1pj6r1sb3izyr2ilv95j3nl92297zxiypjipl1x3nrqpnjn7k032"; depends=[rJava XML]; };
   ENmix = derive2 { name="ENmix"; version="1.17.0"; sha256="0hk2qj8y976ybz2pxj5ldnr13z3l64s8z7na18ry85yvbv90xzs3"; depends=[doParallel foreach geneplotter impute MASS minfi preprocessCore SummarizedExperiment sva wateRmelon]; };
+  ERSSA = derive2 { name="ERSSA"; version="0.99.8"; sha256="0l56mvag5y1svm18l093037ilarna51zz56bxnbidzgvqgw1cdfc"; depends=[BiocParallel DESeq2 edgeR ggplot2 plyr RColorBrewer]; };
   EasyqpcR = derive2 { name="EasyqpcR"; version="1.23.2"; sha256="1fdfhclpyv6ls6misnwa4kvm9qlgnv65pqg58q2rqd2w012kic02"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; };
   EmpiricalBrownsMethod = derive2 { name="EmpiricalBrownsMethod"; version="1.9.0"; sha256="131xg14zp0kqxwk1y2yfxb0sysf4ad97klrgsrnqkdbvjfz8wfa0"; depends=[]; };
-  EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.11.2"; sha256="1rfls2xz7v7bj27f07rzvlq4d12ajzbcpza11wq6jy73snvb29p4"; depends=[circlize ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats Rcpp]; };
-  EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.11.4"; sha256="0lwlwpm1rjycj8nwiyiiv061bhchgvk231l3l4wrw3x1zif7rwhc"; depends=[AnnotationDbi BiocFileCache biocGraph ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph graphite GSEABase hwriter KEGGgraph KEGGREST limma MASS pathview rappdirs ReportingTools Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; };
+  EnhancedVolcano = derive2 { name="EnhancedVolcano"; version="0.99.16"; sha256="0r5v611wckw7i6qyd5zhdi7m98hqvypn3zxqy4gbis2khmblnhq0"; depends=[ggplot2 ggrepel]; };
+  EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.11.3"; sha256="1y0w504rvh9zrr8dr57zdrlm8pjv34jcvlvd8d20f11yxc9c82yx"; depends=[circlize ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats Rcpp]; };
+  EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.11.19"; sha256="15jcfandrlihhiw12w4akdhavr8z1pkg9cd6jb5n88dhm4hb7f72"; depends=[AnnotationDbi BiocFileCache biocGraph BiocManager ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph graphite GSEABase hwriter KEGGgraph KEGGREST limma MASS pathview rappdirs ReportingTools Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; };
   EpiDISH = derive2 { name="EpiDISH"; version="1.3.0"; sha256="07ln6hyq2lfil1xwackvhb2biay3ig6bvsyf2ll5n3glk938x02d"; depends=[e1071 MASS quadprog]; };
-  EventPointer = derive2 { name="EventPointer"; version="1.5.0"; sha256="1fa6xq8kwwbp39whm2xp8si3kz5hfpndlga8mf2jjlj2gd3nf3xj"; depends=[affxparser doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges graph igraph limma MASS Matrix matrixStats nnls prodlim RBGL S4Vectors SGSeq stringr SummarizedExperiment]; };
+  EventPointer = derive2 { name="EventPointer"; version="1.99.3"; sha256="01fbip59zzhy5fg5vr1yw36dbfzcmfr23rfxz7f0r6ymihz892m3"; depends=[affxparser cobs doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges graph igraph IRanges limma MASS Matrix matrixStats nnls prodlim qvalue RBGL rhdf5 S4Vectors SGSeq stringr SummarizedExperiment]; };
+  ExCluster = derive2 { name="ExCluster"; version="0.99.13"; sha256="1f9qw645bir2sxb3h3pzswhjm6p1fd2dlj6bmlsqlb9awxsj8r47"; depends=[GenomicRanges IRanges matrixStats Rsubread rtracklayer]; };
   ExiMiR = derive2 { name="ExiMiR"; version="2.23.0"; sha256="01syzl0q719fif0pdhn31hrwpbq14idwpyppcwl0b0156aid7lwv"; depends=[affy affyio Biobase limma preprocessCore]; };
-  ExperimentHub = derive2 { name="ExperimentHub"; version="1.7.1"; sha256="0jy93f8dy5mmmc0hdd97h4di4660878gfi7mhjwk7rhldrcsm8jh"; depends=[AnnotationHub BiocGenerics BiocInstaller curl S4Vectors]; };
-  ExperimentHubData = derive2 { name="ExperimentHubData"; version="1.7.0"; sha256="0gwv7zjdwhsxi992qxhds7rbha3xlqfix6cxnipx53gi72cl5plm"; depends=[AnnotationHubData BiocCheck BiocGenerics BiocInstaller curl DBI ExperimentHub httr S4Vectors]; };
+  ExperimentHub = derive2 { name="ExperimentHub"; version="1.7.7"; sha256="002wzd5nll3vxncqqq95slsadj40gdj6bd59qhdhz4v6gz005h60"; depends=[AnnotationHub BiocGenerics BiocManager curl S4Vectors]; };
+  ExperimentHubData = derive2 { name="ExperimentHubData"; version="1.7.5"; sha256="1q6pc9hl5q7r8vmpk1ixb95xjh6lbikab76yhjp89xzapiprd1sl"; depends=[AnnotationHubData BiocCheck BiocGenerics BiocManager biocViews curl DBI ExperimentHub graph httr S4Vectors]; };
   ExpressionAtlas = derive2 { name="ExpressionAtlas"; version="1.9.1"; sha256="0pg30fbiz2q45b06p5jmav4gncbl01003m9m8lk2ifi0sxvx4jn6"; depends=[Biobase httr limma S4Vectors SummarizedExperiment XML xml2]; };
   ExpressionView = derive2 { name="ExpressionView"; version="1.33.0"; sha256="14h6jgdaikyjpf5bqban0ixscw3k28pczh0bsvnkhyb5916qfxch"; depends=[AnnotationDbi bitops caTools eisa GO_db isa2 KEGG_db]; };
-  FELLA = derive2 { name="FELLA"; version="1.1.1"; sha256="0vqq9bzdy691c11rb2dbgvv0nwqqy8wdd397wjh991lfk3f4n3bz"; depends=[igraph KEGGREST Matrix plyr]; };
-  FEM = derive2 { name="FEM"; version="3.9.0"; sha256="0nb9gp6x1crzrj9jgz7s6mq639iqp7zdf1q7qqv0ri3gcgw758jw"; depends=[AnnotationDbi BiocGenerics corrplot graph igraph impute limma marray Matrix org_Hs_eg_db]; };
+  FCBF = derive2 { name="FCBF"; version="0.99.3"; sha256="0drpbnx5sampabr17rwjj7biw5bpngdmrrma2p3h5yq5llb409jr"; depends=[ggplot2 gridExtra SummarizedExperiment]; };
+  FELLA = derive2 { name="FELLA"; version="1.1.6"; sha256="1d284qaz74d7lgxl3gn0c9i6a33x6j0xf9sbjbpm8bpl0kbhr0ln"; depends=[igraph KEGGREST Matrix plyr]; };
+  FEM = derive2 { name="FEM"; version="3.9.2"; sha256="0nbg1rbx7gszbqf0xjibsgwapjrv8lniiv7kw0j50ppab69qxiqq"; depends=[AnnotationDbi BiocGenerics corrplot graph igraph impute limma marray Matrix org_Hs_eg_db]; };
+  FGNet = derive2 { name="FGNet"; version="3.15.4"; sha256="1pnadm9c3ckdd5k9jgq3jmfny8mfc3w7j5w08vn0khnqlq9cp3x8"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; };
   FISHalyseR = derive2 { name="FISHalyseR"; version="1.15.0"; sha256="0izn77dhzhsg69i893r9sy6qalw4qr120m6k5x5k6z9w01dgq47x"; depends=[abind EBImage]; };
-  FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.17.0"; sha256="1m3vcffnbyf27x481gx4xmxrknb70dk0ll08zd14kfvn6lf3cgf4"; depends=[fda MASS]; };
+  FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.17.1"; sha256="17qmq5mgqhfzw3v4gl9waa1ni6h8llz2hz63p3mwrx1yixinsn20"; depends=[fda MASS]; };
   FamAgg = derive2 { name="FamAgg"; version="1.9.0"; sha256="1vqkaa1cpzd2cdyql66skz3jkrnp5ibdbhwipkj82dgww9zwwkbx"; depends=[BiocGenerics gap igraph kinship2 Matrix survey]; };
-  FastqCleaner = derive2 { name="FastqCleaner"; version="0.99.39"; sha256="18zklgacbk8iv8i6rlmip8bcfwn9v18jpf4xb9p7pkadldphjnfc"; depends=[Biostrings DT htmltools IRanges Rcpp S4Vectors shiny shinyBS ShortRead]; };
-  FindMyFriends = derive2 { name="FindMyFriends"; version="1.11.0"; sha256="0ij596qkpn4y5m9zmj6hcamrmjjm8nwqjm9d2g1wq28i5xrmra0w"; depends=[Biobase BiocGenerics BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; };
-  FitHiC = derive2 { name="FitHiC"; version="1.7.0"; sha256="071246cfl4iqy3nnl2c24n8sd9dkmjjj8cna74dh1km3cc6xb0vz"; depends=[data_table fdrtool Rcpp]; };
-  FlowRepositoryR = derive2 { name="FlowRepositoryR"; version="1.13.0"; sha256="09kqhj41w7snkr1m29wmjj4n7acy821mv8kbb49f1mljaxz0v94q"; depends=[jsonlite RCurl XML]; };
+  FastqCleaner = derive2 { name="FastqCleaner"; version="0.99.40"; sha256="1hfrlr3lwcqvb1c5w6n5ffml5znjil4dchhcz4jwm2qnf6zcha0n"; depends=[Biostrings DT htmltools IRanges Rcpp S4Vectors shiny shinyBS ShortRead]; };
+  FindMyFriends = derive2 { name="FindMyFriends"; version="1.11.2"; sha256="0mxpv5c2fyvcxwzaiig9qy8lg78fd8ms35nchd86nj1n4265kkx2"; depends=[Biobase BiocGenerics BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; };
+  FitHiC = derive2 { name="FitHiC"; version="1.7.1"; sha256="07d3lywhc665qm3kp6f89dnvjvkgsdsvqk0ms6b3w402j12jvxsb"; depends=[data_table fdrtool Rcpp]; };
+  FlowRepositoryR = derive2 { name="FlowRepositoryR"; version="1.13.1"; sha256="1vbc2bl5afa2zvqj8xp4ajdij44732689n1c28i1s32y92wzgjng"; depends=[jsonlite RCurl XML]; };
   FlowSOM = derive2 { name="FlowSOM"; version="1.13.0"; sha256="0vw98kxlcyd9rwa2r9rgjwfp5f5pmb122w2xk1gfhsf9kqh7db7g"; depends=[BiocGenerics ConsensusClusterPlus flowCore flowUtils igraph tsne XML]; };
+  FoldGO = derive2 { name="FoldGO"; version="0.99.10"; sha256="0df75rvpc0031rjrx5pwfwprm1nrli2l2yafa8jbqnycz02z0dz4"; depends=[ggplot2 tidyr topGO]; };
   FourCSeq = derive2 { name="FourCSeq"; version="1.15.0"; sha256="0d8qnalv97a37l0xqxi4qi7s03zxs81122h4rw6rpi03pn5h7i10"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; };
   FunChIP = derive2 { name="FunChIP"; version="1.7.0"; sha256="15pfl68yynvidx9r69xxf3zavn79savabam5yjjwqq7g9yvhzjw5"; depends=[doParallel fda foreach GenomeInfoDb GenomicAlignments GenomicRanges RColorBrewer Rcpp Rsamtools shiny]; };
-  FunciSNP = derive2 { name="FunciSNP"; version="1.25.0"; sha256="0dl63s5f8s82www9maf10bbmss7ddbflq820lcq1zgrfcdr9a484"; depends=[Biobase BiocGenerics ChIPpeakAnno FunciSNP_data GenomicRanges ggplot2 IRanges plyr reshape Rsamtools rtracklayer S4Vectors scales snpStats TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; };
+  FunciSNP = derive2 { name="FunciSNP"; version="1.25.3"; sha256="0w9wqlkj52dwzrhxwq193435camj12kjv1a70rdnzdlvi3y849hm"; depends=[Biobase BiocGenerics ChIPpeakAnno FunciSNP_data GenomicRanges ggplot2 IRanges plyr reshape Rsamtools rtracklayer S4Vectors scales snpStats TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; };
   GA4GHclient = derive2 { name="GA4GHclient"; version="1.5.0"; sha256="1bcskcxcmv47rdgrw0i8rm4cn27jqy86rx8z83qnanbzqp4g7kgg"; depends=[BiocGenerics Biostrings dplyr GenomeInfoDb GenomicRanges httr IRanges jsonlite S4Vectors VariantAnnotation]; };
   GA4GHshiny = derive2 { name="GA4GHshiny"; version="1.3.0"; sha256="031p9qa6cp4gxlgp8whswl7b11d24d4zl3m9fkqg3i461kjyswxj"; depends=[AnnotationDbi BiocGenerics dplyr DT GA4GHclient GenomeInfoDb GenomicFeatures openxlsx purrr S4Vectors shiny shinyjs shinythemes tidyr]; };
-  GARS = derive2 { name="GARS"; version="1.1.0"; sha256="0qczfvlywnqiz06ggvndmq32sg61qm7njg77fzml5v66anqsqmhq"; depends=[cluster DaMiRseq ggplot2 MLSeq SummarizedExperiment]; };
+  GARS = derive2 { name="GARS"; version="1.1.1"; sha256="004i5nkmdi61fkkxps1frlhs4gd8ix6s3yypzrl6s4afvm05hw4p"; depends=[cluster DaMiRseq ggplot2 MLSeq SummarizedExperiment]; };
   GAprediction = derive2 { name="GAprediction"; version="1.7.0"; sha256="04bxpyc13mq7klkpkyw574cbk6xsjn9n91za7hvmzg5xfzgdr2rg"; depends=[glmnet Matrix]; };
-  GDCRNATools = derive2 { name="GDCRNATools"; version="1.1.0"; sha256="0i8gyq3rk79ph099bivgrvl33c73vhrlqss0ms61zv8r392prvjh"; depends=[BiocParallel biomaRt clusterProfiler DESeq2 DOSE DT edgeR GenomicDataCommons ggplot2 gplots jsonlite limma org_Hs_eg_db pathview rjson shiny survival survminer XML]; };
-  GDSArray = derive2 { name="GDSArray"; version="1.1.0"; sha256="0jn3jjpr5z3nrhral7bphlxnc5mhg2nllpzf73j2i4q7dbyhjxic"; depends=[BiocGenerics DelayedArray gdsfmt IRanges S4Vectors SeqArray SNPRelate]; };
-  GEM = derive2 { name="GEM"; version="1.7.0"; sha256="01vyj5nhzs6g3drnybl5i5wj2n2x50wjfnb2q62r053rz7r4xpwj"; depends=[ggplot2]; };
-  GENESIS = derive2 { name="GENESIS"; version="2.11.5"; sha256="1vkxb4ry8ghl9c38lr5dkwkf5kjak0h0vq18k69fpj94dfkkn91y"; depends=[Biobase BiocGenerics dplyr gdsfmt GenomicRanges graph GWASTools IRanges Matrix S4Vectors SeqArray SeqVarTools]; };
+  GDCRNATools = derive2 { name="GDCRNATools"; version="1.1.9"; sha256="134f9264b1br2s2d99dlad1r8nwzkv78qkr7iqym8s1anl7xsh9j"; depends=[BiocParallel biomaRt clusterProfiler DESeq2 DOSE DT edgeR GenomicDataCommons ggplot2 gplots jsonlite limma org_Hs_eg_db pathview rjson shiny survival survminer XML]; };
+  GDSArray = derive2 { name="GDSArray"; version="1.1.1"; sha256="0cgs1fhzqax8nbihifhmgd6clk4wf3586x85cmg06ydxdh9yyzlv"; depends=[BiocGenerics DelayedArray gdsfmt S4Vectors SeqArray SNPRelate]; };
+  GEM = derive2 { name="GEM"; version="1.7.1"; sha256="0sxlqkd2rhi511jmi2c82ib0krx9pynssvw0gcr2mrrxj5gy2vcz"; depends=[ggplot2]; };
+  GENESIS = derive2 { name="GENESIS"; version="2.11.17"; sha256="1czvvmqnmpx9wpq6hw4xfwhj1vjrwdrwbj8b4zcs1x7dv8qkvyb5"; depends=[Biobase BiocGenerics data_table dplyr foreach gdsfmt GenomicRanges GWASTools igraph IRanges Matrix reshape2 S4Vectors SeqArray SeqVarTools SNPRelate]; };
   GENIE3 = derive2 { name="GENIE3"; version="1.3.1"; sha256="0zp1g97xmigjarpbmfnay1gac5fjhcslrdp656gzafdah32k2nzl"; depends=[reshape2]; };
   GEOmetadb = derive2 { name="GEOmetadb"; version="1.43.0"; sha256="05ad0h84vqkcp9b9966dsmgwl4r2xsg9wjjgwcfx00yc9jgg94lj"; depends=[GEOquery RSQLite]; };
-  GEOquery = derive2 { name="GEOquery"; version="2.49.0"; sha256="0ylny4lni33hj1qspqig7iw9g3h9mz4yc9bj8cdf13w2qj4sjysz"; depends=[Biobase dplyr httr limma magrittr readr tidyr xml2]; };
+  GEOquery = derive2 { name="GEOquery"; version="2.49.1"; sha256="1vxhz9drmj90j67ga7jflzb602bs1b9qdamz7vgazlpl0xj7ls5s"; depends=[Biobase dplyr httr limma magrittr readr tidyr xml2]; };
   GEOsubmission = derive2 { name="GEOsubmission"; version="1.33.0"; sha256="17qck1a7szkgaixkjzq2c4vw7kb7cy8sv609z3i8h0pljrprvx07"; depends=[affy Biobase]; };
   GEWIST = derive2 { name="GEWIST"; version="1.25.0"; sha256="0dr7vz9v8cfjg8vxxqs0c7i4vzvfdnp741b82radwb0ya4crfml0"; depends=[car]; };
   GGBase = derive2 { name="GGBase"; version="3.43.2"; sha256="1kwh6di0kgw821mh0gmgrm8b0mlbcyji5yc0pn4v836w0wc0amqb"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; };
-  GGtools = derive2 { name="GGtools"; version="5.17.0"; sha256="06qldw101w7syy1m9ynq9rpxs2546yzn8zdmsp416aawn3qw2xjb"; depends=[AnnotationDbi biglm Biobase BiocGenerics Biostrings bit data_table ff GenomeInfoDb GenomicRanges GGBase ggplot2 Gviz hexbin Homo_sapiens IRanges iterators reshape2 ROCR Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; };
+  GGtools = derive2 { name="GGtools"; version="5.17.1"; sha256="1p7wczch0nnb5ax5g1889iz3qr5ffwyhgvlrln19ypb20c454cnk"; depends=[AnnotationDbi biglm Biobase BiocGenerics Biostrings bit data_table ff GenomeInfoDb GenomicRanges GGBase ggplot2 Gviz hexbin Homo_sapiens IRanges iterators reshape2 ROCR Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; };
   GIGSEA = derive2 { name="GIGSEA"; version="0.99.25"; sha256="0k6njipzq9r6g9gkn9g2blkmhq752yv4n2127wxvxfi4kkwf8nfc"; depends=[locfdr MASS Matrix]; };
   GISPA = derive2 { name="GISPA"; version="1.5.0"; sha256="1030cwbkccj2scjmszlzbxd28qgwga26hf86jly8xmw9qvpa77y1"; depends=[Biobase changepoint data_table genefilter GSEABase HH lattice latticeExtra plyr scatterplot3d]; };
   GLAD = derive2 { name="GLAD"; version="2.45.1"; sha256="1cpjai8dxqb35xf2933rf4z08zmli760scz6s1zdzbgpc92dl2zl"; depends=[aws]; };
   GMRP = derive2 { name="GMRP"; version="1.9.0"; sha256="06q87139z5dgl0c4i8jhry15q9ah9k19kgjmadkb55lfsb3akazn"; depends=[diagram GenomicRanges plotrix]; };
-  GOFunction = derive2 { name="GOFunction"; version="1.29.0"; sha256="08xyzk6hs3v263k949l94g6xq9lg5k86yzgqr89bmcyinsxlqk1j"; depends=[AnnotationDbi Biobase DBI GO_db graph Rgraphviz SparseM]; };
-  GOSemSim = derive2 { name="GOSemSim"; version="2.7.0"; sha256="1qxvx4mk49k5d51xnvxn8wsw6dsidskpx6qddnm42ls9a4d9cypd"; depends=[AnnotationDbi GO_db Rcpp]; };
+  GOFunction = derive2 { name="GOFunction"; version="1.29.1"; sha256="05yz8kl6m3ypdvi5mb813nvc8s75ybbc16ppdza6pkrf5cdawy55"; depends=[AnnotationDbi Biobase DBI GO_db graph Rgraphviz SparseM]; };
+  GOSemSim = derive2 { name="GOSemSim"; version="2.7.1"; sha256="1q1h4ak6ki9hn9psrx17psf7kmcn2c7jy5q428qvwk4raq5fhdh0"; depends=[AnnotationDbi GO_db Rcpp]; };
   GOSim = derive2 { name="GOSim"; version="1.19.0"; sha256="0irpycjkzzdymg50zf2szgf7v4s2s0skfpjf5ckdrzskkjr2jzc1"; depends=[annotate AnnotationDbi cluster corpcor flexmix GO_db graph Matrix org_Hs_eg_db RBGL Rcpp topGO]; };
-  GOTHiC = derive2 { name="GOTHiC"; version="1.17.0"; sha256="0n0h9k190p1glmvlrdpa5xdxj797mfdzb109yj5wy981s5q11gpb"; depends=[BiocGenerics Biostrings BSgenome data_table GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors ShortRead]; };
+  GOTHiC = derive2 { name="GOTHiC"; version="1.17.1"; sha256="00na8sn5fszb9z0z58xwlrxzwvxsahhisn2sc8g6xqcfld231pfr"; depends=[BiocGenerics Biostrings BSgenome data_table GenomicRanges ggplot2 IRanges Rsamtools rtracklayer S4Vectors ShortRead]; };
   GOexpress = derive2 { name="GOexpress"; version="1.15.0"; sha256="0k1hiinzn4553gh6app0kvd84md0g3jydv1y2rlzrcasamba7xvv"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer RCurl stringr]; };
-  GOfuncR = derive2 { name="GOfuncR"; version="1.1.2"; sha256="0w2f866j82qcyvjj2cn9cqmaxx0sijywbxhsqfkvrsr8vbkhbmgi"; depends=[AnnotationDbi GenomicRanges gtools IRanges mapplots Rcpp vioplot]; };
-  GOpro = derive2 { name="GOpro"; version="1.7.0"; sha256="07qpvf17w1cq8qxdg0xdygdgnk9dc15ar7422q0y54kcgnfq0zj4"; depends=[AnnotationDbi BH dendextend doParallel foreach GO_db IRanges MultiAssayExperiment org_Hs_eg_db Rcpp S4Vectors]; };
+  GOfuncR = derive2 { name="GOfuncR"; version="1.1.6"; sha256="10bvn7hq8igd1wj4izg6nb06v4dn88gc65r7pq02z29dz1n5rbnv"; depends=[AnnotationDbi GenomicRanges gtools IRanges mapplots Rcpp vioplot]; };
+  GOpro = derive2 { name="GOpro"; version="1.7.1"; sha256="0np0df5nfgcr435ngs8bbfiklp8b3v01842jkfdf2wwasx7c4mlw"; depends=[AnnotationDbi BH dendextend doParallel foreach GO_db IRanges MultiAssayExperiment org_Hs_eg_db Rcpp S4Vectors]; };
   GOstats = derive2 { name="GOstats"; version="2.47.0"; sha256="1dxzr3xnn60iy2xv8k0j1r9bz1lq1g1n792gzl308dsy35p25cim"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category GO_db graph RBGL Rgraphviz]; };
+  GOsummaries = derive2 { name="GOsummaries"; version="2.17.2"; sha256="1ndpqr43rs3wrsrm5i0bn4xhcjylpddf95vnmyzq3rn3vc0y89sd"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; };
   GRENITS = derive2 { name="GRENITS"; version="1.33.0"; sha256="1jgsk0wcrkcvf6cgypmdyj6zjfxwxan5xm88l1ycdrilfrx1g582"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; };
-  GRmetrics = derive2 { name="GRmetrics"; version="1.7.0"; sha256="1vbnbn7r4fjv2p2qn5681kg0yqj5s1k4hf5jj52qgzjrp2qs4s6l"; depends=[drc ggplot2 plotly S4Vectors SummarizedExperiment]; };
-  GRridge = derive2 { name="GRridge"; version="1.5.0"; sha256="10kz82nj90ilkj6wlsfvqlqrikgm5qw95m02xn99vghs4bj3yh0d"; depends=[glmnet graph Iso mvtnorm penalized survival]; };
+  GRmetrics = derive2 { name="GRmetrics"; version="1.7.3"; sha256="1xnbfqqw63inh1fyfclb369b6j3ihn6jnvglkmrvp609x104sakb"; depends=[drc ggplot2 plotly S4Vectors SummarizedExperiment]; };
+  GRridge = derive2 { name="GRridge"; version="1.5.3"; sha256="1bdv13j5vk38mrj06dms6xgyl21xqf5rzp8f5y8p7a0q36npflcr"; depends=[glmnet graph Iso mvtnorm penalized survival]; };
   GSALightning = derive2 { name="GSALightning"; version="1.9.0"; sha256="1qwq8yawf0llik4880y9j3qzbl9py404wrp6p2738qjb1mxyx9nr"; depends=[data_table Matrix]; };
-  GSAR = derive2 { name="GSAR"; version="1.15.0"; sha256="0i1rapjvdyw596vaqvsk49qbbrjnz1pam34559ws767r70vp0nng"; depends=[igraph]; };
-  GSCA = derive2 { name="GSCA"; version="2.11.0"; sha256="1w3028l6bj92phwhnxs71vxc1wn1bbqac37f4anr8wrxw1bvngid"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; };
-  GSEABase = derive2 { name="GSEABase"; version="1.43.0"; sha256="0f1rh227kx0wxndvgc283jfml5v2zmf184ajghflpq2crhv0sj7j"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; };
-  GSEABenchmarkeR = derive2 { name="GSEABenchmarkeR"; version="1.1.0"; sha256="1ykpinxwz9hqpb8wjrv8jwcq4gmnjkmxg4b8akgdwlypv766smgj"; depends=[AnnotationDbi AnnotationHub Biobase BiocFileCache BiocParallel edgeR EnrichmentBrowser ExperimentHub GEOquery KEGGandMetacoreDzPathwaysGEO KEGGdzPathwaysGEO rappdirs S4Vectors SummarizedExperiment]; };
+  GSAR = derive2 { name="GSAR"; version="1.15.1"; sha256="185ywirc49x7dy3vzy346avzsc16xjzsdr4njfr7f5bc421xkyxz"; depends=[igraph]; };
+  GSCA = derive2 { name="GSCA"; version="2.11.1"; sha256="1ahkd5ivr38c4igmwdr5fk5kaysw3128a4y15ydz2ab2488vgsd4"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; };
+  GSEABase = derive2 { name="GSEABase"; version="1.43.2"; sha256="1zhzvcjv9m9d0qmhf5csafq5inb1czkmwxm1ivyh2zrn2a66f8kl"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; };
+  GSEABenchmarkeR = derive2 { name="GSEABenchmarkeR"; version="1.1.1"; sha256="102hvayxljl0nk4593aw0hdpdr929v5yhknyppnxyqrnmply8vqp"; depends=[AnnotationDbi AnnotationHub Biobase BiocFileCache BiocParallel edgeR EnrichmentBrowser ExperimentHub GEOquery KEGGandMetacoreDzPathwaysGEO KEGGdzPathwaysGEO rappdirs S4Vectors SummarizedExperiment]; };
   GSEAlm = derive2 { name="GSEAlm"; version="1.41.0"; sha256="1di0d7zpsigi6k4bxfnq0yniyssxrmzdih3xayg6facpwgyhkp6n"; depends=[Biobase]; };
   GSRI = derive2 { name="GSRI"; version="2.29.0"; sha256="0g3nncckasyx3n6nq5aihahzk73h6xb1m8xmq3m046vz245ny76x"; depends=[Biobase fdrtool genefilter GSEABase les]; };
   GSReg = derive2 { name="GSReg"; version="1.15.0"; sha256="1qazhsx6gfnywwkhxip962v4jr5njbf97k36nbnq20q0yavwgzhz"; depends=[AnnotationDbi GenomicFeatures Homo_sapiens org_Hs_eg_db]; };
-  GSVA = derive2 { name="GSVA"; version="1.29.0"; sha256="1yay4qw83jfpg1sskh8aizwblj1cxvjb974s7hbrc9a8z0dlkcnn"; depends=[Biobase BiocGenerics geneplotter GSEABase shiny shinythemes]; };
+  GSVA = derive2 { name="GSVA"; version="1.29.3"; sha256="12x52iq2c9y7y3hfza849754xf8z8ysh41dk0id7dy9mbjawvz7d"; depends=[Biobase BiocGenerics geneplotter GSEABase shiny shinythemes]; };
   GUIDEseq = derive2 { name="GUIDEseq"; version="1.11.0"; sha256="1qxb0mrrldyac16zfzkqcy11750hakr4hgqm8ai1cabr6xd5yna1"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table GenomeInfoDb GenomicAlignments GenomicRanges hash IRanges limma matrixStats Rsamtools S4Vectors]; };
-  GWASTools = derive2 { name="GWASTools"; version="1.27.1"; sha256="1w0magisa8rv0s1kppppas3lacrkmkg7finjc3bja1dh3npd1v5j"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf quantsmooth RSQLite sandwich survival]; };
+  GWASTools = derive2 { name="GWASTools"; version="1.27.3"; sha256="0snjz7vqfq5izfk68z3r7d0356almksxbsc79m2ryk7mkfjfw5bx"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf quantsmooth RSQLite sandwich survival]; };
   GateFinder = derive2 { name="GateFinder"; version="1.1.0"; sha256="1blj8407nl6nsn8dyg31xj4ii8rr2rfkg35g1hf97j60dk53bmwf"; depends=[diptest flowCore flowFP mvoutlier splancs]; };
   GenRank = derive2 { name="GenRank"; version="1.9.0"; sha256="05g9mram44zs76m48rvplwdhdlhkygfxrzgdsd43was2xvyj6nvb"; depends=[matrixStats reshape2 survcomp]; };
   GenVisR = derive2 { name="GenVisR"; version="1.13.2"; sha256="1ca47n9ddnm20vjj7070wfmmd9ff8w58d5rd79sq23hszmzwyzlf"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome data_table DBI FField GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales VariantAnnotation viridis]; };
-  GeneAnswers = derive2 { name="GeneAnswers"; version="2.23.0"; sha256="08fgg33yls55357a45zfcghk87z7z2lqzh8wfiina122yg29c7ss"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; };
-  GeneBreak = derive2 { name="GeneBreak"; version="1.11.0"; sha256="1nw97k4cxd7l35r14jq5mf46wa4rlfm2zg28x176z6wh0jlz4gba"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; };
+  GeneAccord = derive2 { name="GeneAccord"; version="0.99.13"; sha256="1rw3wrgvqxznia7p0vm55dkq5rfks1gq5nixcf4ljzd9kcwc4ggs"; depends=[biomaRt caTools dplyr ggplot2 ggpubr gtools magrittr maxLik RColorBrewer reshape2 tibble]; };
+  GeneAnswers = derive2 { name="GeneAnswers"; version="2.23.1"; sha256="0nxilnnhb48jwbplwhndwd8y5rlmhyjfjywc1whcij3hz9f6yzp9"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; };
+  GeneBreak = derive2 { name="GeneBreak"; version="1.11.1"; sha256="0pyvj6grznl5qjki857zfhqcn05xwhicm6l1jxa1jc0aav91y764"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; };
   GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.27.0"; sha256="0bmhxzrg5d7v4lv4k2igl7ah8fncrggyziwqyhawavig17i1iqzc"; depends=[Biobase PGSEA]; };
   GeneGA = derive2 { name="GeneGA"; version="1.31.0"; sha256="0fdfb6x7rjg4ak5xbikwj6fmmrnr3hnsi97amn69w81087228b5g"; depends=[hash seqinr]; };
   GeneGeneInteR = derive2 { name="GeneGeneInteR"; version="1.7.0"; sha256="03kkfv7vj717brzdw346yapxfg414v84wncqqrv3si03q4w450mz"; depends=[data_table FactoMineR GenomicRanges GGtools igraph IRanges kernlab mvtnorm plspm rioja Rsamtools snpStats]; };
   GeneMeta = derive2 { name="GeneMeta"; version="1.53.0"; sha256="18f1nca21drjpv55b4d92zkgqr3zqhzp98slq6xfqvsj3rip6y5v"; depends=[Biobase genefilter]; };
-  GeneNetworkBuilder = derive2 { name="GeneNetworkBuilder"; version="1.23.0"; sha256="1076pgsykk88dswza9m1bbh1nzvb5l1680h0q971vdvy1z1sks4c"; depends=[graph htmlwidgets plyr Rcpp Rgraphviz rjson XML]; };
+  GeneNetworkBuilder = derive2 { name="GeneNetworkBuilder"; version="1.23.2"; sha256="1nikjknsfy99i3b3r384gjlw8rzk4wv1wqflwpnrnffvzxh3sr5d"; depends=[graph htmlwidgets plyr Rcpp Rgraphviz rjson XML]; };
   GeneOverlap = derive2 { name="GeneOverlap"; version="1.17.0"; sha256="0dqsq1sd1ly6gvnpq3xcv9idr30kazx97jha9icv1g64d337l289"; depends=[gplots RColorBrewer]; };
   GeneRegionScan = derive2 { name="GeneRegionScan"; version="1.37.0"; sha256="1672nriz5r0gpgb6c9bsa864ap3ap68n1igvpf9q8mf3sw659m3b"; depends=[affxparser Biobase Biostrings RColorBrewer S4Vectors]; };
   GeneSelectMMD = derive2 { name="GeneSelectMMD"; version="2.25.0"; sha256="1lwszjpxp9bj0hd5z1kasq2qv49swji3ib1ljlph22wh0j9jimid"; depends=[Biobase limma MASS survival]; };
-  GeneSelector = derive2 { name="GeneSelector"; version="2.31.0"; sha256="134l462i60mym5k4z46nfx1f7r2r0fa069v1jddrjfmcv3v0gbs8"; depends=[Biobase limma multtest samr siggenes]; };
+  GeneSelector = derive2 { name="GeneSelector"; version="2.31.2"; sha256="1z346x227rs0nlyzf1idmcb2s05fhp68i3cjiib2d2328fs0yzyw"; depends=[Biobase limma multtest samr siggenes]; };
   GeneStructureTools = derive2 { name="GeneStructureTools"; version="1.1.0"; sha256="0w8ydly5qi8cvdhhda2q3k8fj9k9v1sg3c45h4ki02vx19j2kap0"; depends=[Biostrings BSgenome_Mmusculus_UCSC_mm10 data_table GenomicRanges Gviz IRanges plyr rtracklayer S4Vectors stringdist stringr]; };
   GeneticsDesign = derive2 { name="GeneticsDesign"; version="1.49.0"; sha256="1n9d1i45dcmp2irnsc5ak9pk33r68nzd84iixylwaj302l7yphjs"; depends=[gmodels gtools mvtnorm]; };
   GeneticsPed = derive2 { name="GeneticsPed"; version="1.43.1"; sha256="0agd99r4jhp4y2ix5qrbwrycy3r8pc1cwa09ib3mhg5jdszm6jr8"; depends=[gdata genetics MASS]; };
-  GenoGAM = derive2 { name="GenoGAM"; version="1.9.0"; sha256="02f7xvsv4l27dqj6cxm363n67kkbyz26z36gl4mybcgivvdvmi6h"; depends=[BiocParallel Biostrings data_table DESeq2 futile_logger GenomeInfoDb GenomicAlignments GenomicRanges IRanges mgcv reshape2 Rsamtools S4Vectors SummarizedExperiment]; };
+  GenoGAM = derive2 { name="GenoGAM"; version="1.99.0"; sha256="18s3hh2gis61sakld098ffpihy2fd11sia94cxxq9cy0wl49bzci"; depends=[BiocParallel Biostrings data_table DelayedArray DESeq2 futile_logger GenomeInfoDb GenomicAlignments GenomicRanges HDF5Array IRanges Matrix Rcpp RcppArmadillo rhdf5 Rsamtools S4Vectors sparseinv SummarizedExperiment]; };
   GenomeGraphs = derive2 { name="GenomeGraphs"; version="1.41.0"; sha256="07vwj2pbrxgj3k673m8xrf3cpqc1g753fvj950qwmy4jmz6s8w04"; depends=[biomaRt]; };
-  GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.17.1"; sha256="1ck578vgv3ya4kgdacxspiqrx8150zic0va745f98gafx2cv7b66"; depends=[BiocGenerics GenomeInfoDbData IRanges RCurl S4Vectors]; };
-  GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.17.2"; sha256="0n3rl6mlyn1q4rjbjh8dlbq7sy192jc2zy3y4qlaacmmfrw4sv5h"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
-  GenomicDataCommons = derive2 { name="GenomicDataCommons"; version="1.5.3"; sha256="0nagrdckv853kfqrajs8jr2zhmmipnw36nsa8nr796y6q7ldq492"; depends=[dplyr GenomicRanges httr IRanges jsonlite lazyeval magrittr rappdirs readr S4Vectors SummarizedExperiment xml2]; };
-  GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.33.0"; sha256="1dnj1drlly4ac6q29zycvyjaw50fl6l1iqwhsn5syvywb5ccmgh5"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; };
-  GenomicFiles = derive2 { name="GenomicFiles"; version="1.17.0"; sha256="08zjr3x7sn5fpqfl021vc8imdprd18hanyq7c2gwn5r0y30cyxrp"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
-  GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.15.0"; sha256="0p2nsfwfxkl16iwv5apaikd6abbi21czdy7wh9kkyb4frh2938yd"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; };
-  GenomicRanges = derive2 { name="GenomicRanges"; version="1.33.6"; sha256="07allayr8aflgra393xikfd5zs1s8b2yrsw308dqdxjyc0i3497i"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
-  GenomicScores = derive2 { name="GenomicScores"; version="1.5.1"; sha256="1pkisnqp2rwdyxxm5504107scc0kds0ry07xmx451bn1i52lg3n1"; depends=[AnnotationHub Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors XML]; };
-  GenomicTuples = derive2 { name="GenomicTuples"; version="1.15.1"; sha256="1xin5m11q94w64kcb6aqsi422cgbcagb0g45ir90dqf9d79v8vjz"; depends=[BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
+  GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.17.4"; sha256="1kma1ywai2l8lknng1hpp5nxgv45rwiih0ac9nxmg5ydb910m2z0"; depends=[BiocGenerics GenomeInfoDbData IRanges RCurl S4Vectors]; };
+  GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.17.3"; sha256="17kdllb2griy85qdk8nkx1qislc424kpibsrfb2pirf6xjm82rxn"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
+  GenomicDataCommons = derive2 { name="GenomicDataCommons"; version="1.5.8"; sha256="0gp8izsk2kb2adv8ykmsjzba39lbkw02061f5j82ysvgzmb2gh16"; depends=[dplyr GenomicRanges httr IRanges jsonlite lazyeval magrittr rappdirs readr S4Vectors SummarizedExperiment xml2]; };
+  GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.33.6"; sha256="0qq5yh524qxd3qa9i10niqk3aw4ff7b6xfr10041gk1r94l7apyv"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; };
+  GenomicFiles = derive2 { name="GenomicFiles"; version="1.17.4"; sha256="160mnxz41wzlqigc9r40pkn5jc0raa84y1yjiyhj1406fv2aaj6n"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
+  GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.15.1"; sha256="0jga57bna3fbfrzp9525mzp9c6amy8i6i1j65vf3l7hw75d8q20z"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; };
+  GenomicRanges = derive2 { name="GenomicRanges"; version="1.33.14"; sha256="1vmvmrd65dxhm06r879kqmncs9f4sg5z70fi0409b2078ia4qiyp"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
+  GenomicScores = derive2 { name="GenomicScores"; version="1.5.6"; sha256="1fyich4fdz3pfxi95mdz6mmnva9kb7ak5wslzlh6sar62cfk17mx"; depends=[AnnotationHub Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors XML]; };
+  GenomicTuples = derive2 { name="GenomicTuples"; version="1.15.2"; sha256="0hgnz5f5d3wh54icj36v6j06q87w19acnyd696aw78fk590mkvs5"; depends=[BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
   Genominator = derive2 { name="Genominator"; version="1.35.0"; sha256="0qvzw9r8hn19gzkj6r94v4787h9lbw8y2s9k7zasn2cdyx55074i"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; };
   Glimma = derive2 { name="Glimma"; version="1.9.2"; sha256="1njcjla1az23lrg5j93s1hxjrrjsf808plmvdhiai14fdlgzfb8w"; depends=[edgeR jsonlite S4Vectors]; };
-  GlobalAncova = derive2 { name="GlobalAncova"; version="3.49.0"; sha256="0y71r0biivxpyrjkl2132ngnz1fl5byi7rbig9g0j5svsmh9kk48"; depends=[annotate AnnotationDbi corpcor globaltest]; };
-  GoogleGenomics = derive2 { name="GoogleGenomics"; version="2.3.0"; sha256="10iwh4z3zpv8x239y8i5qpp88ygyg4fiyhsgpyld11fg3d1qkn4h"; depends=[Biobase Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; };
+  GlobalAncova = derive2 { name="GlobalAncova"; version="3.99.3"; sha256="1d38kp53qw25g2pdsiz4g38nm5hjr537i6ly7lvabvh5zim7h0bn"; depends=[annotate AnnotationDbi Biobase corpcor dendextend globaltest GSEABase VGAM]; };
+  GoogleGenomics = derive2 { name="GoogleGenomics"; version="2.3.2"; sha256="00qf7zadaryylkkizfdaapdppzxkfwdzwkv4qxkvwz1pkvr1yc5r"; depends=[Biobase Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; };
   GraphAT = derive2 { name="GraphAT"; version="1.53.0"; sha256="0wsn0nfj4qds2kxm3gxfx8wwyf00l0ifvk660czm7zc6ppfj1sb8"; depends=[graph MCMCpack]; };
   GraphAlignment = derive2 { name="GraphAlignment"; version="1.45.0"; sha256="0mdy8g3i4b7wy9zqfbb1zia1h84kv2av4yl6japzz5ymiipjaimy"; depends=[]; };
-  GraphPAC = derive2 { name="GraphPAC"; version="1.23.0"; sha256="1wy20xjw6ikdjd66pk654dj5zcaxm2mn8vnwxr6s628x9c70rh0w"; depends=[igraph iPAC RMallow TSP]; };
+  GraphPAC = derive2 { name="GraphPAC"; version="1.23.1"; sha256="1xr4ys2ckzyc8w5c3pmywp341viac9xv9hz691lgm61krafyh370"; depends=[igraph iPAC RMallow TSP]; };
   GreyListChIP = derive2 { name="GreyListChIP"; version="1.13.0"; sha256="0m9qvb3rw1hr119vq2k5fdbywq8vfgfhxwm6r9nfmxdhdir6178j"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; };
   Guitar = derive2 { name="Guitar"; version="1.19.0"; sha256="0khy7vhr8r56r14kiqz83py227jaji46aqlqs8yhj7kh6cgh59c5"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer]; };
   Gviz = derive2 { name="Gviz"; version="1.25.0"; sha256="0c64bn8dqvcwi3jdfx0yg2jc7x1v41h4py7ily9z82ms8lfv7jh8"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; };
-  HDF5Array = derive2 { name="HDF5Array"; version="1.9.4"; sha256="1ld8fm7zvd3kzrqynx3q8vzcbn1k82lim1fnhz449x4gxi6gddpg"; depends=[BiocGenerics DelayedArray IRanges rhdf5 S4Vectors]; };
-  HDTD = derive2 { name="HDTD"; version="1.15.0"; sha256="00zrdmpscbycmlli7qvx6vdy7nyckxfazylrx83qaffg9d7a9wc4"; depends=[Rcpp RcppArmadillo]; };
+  HDF5Array = derive2 { name="HDF5Array"; version="1.9.19"; sha256="01421q7hz1kmj4s4iwzb01ibq3ssz3sh67smg0ap52d1ykqqx8mx"; depends=[BiocGenerics DelayedArray IRanges rhdf5 S4Vectors]; };
+  HDTD = derive2 { name="HDTD"; version="1.15.1"; sha256="08h1wnsacr74ynjwn4aw98lwf9pjf081g1yi4557xb7cfzf4l6pn"; depends=[Rcpp RcppArmadillo]; };
   HELP = derive2 { name="HELP"; version="1.39.0"; sha256="1sb43vndrk5qbazxwx3n0lmkb43525vmarj3hbkqplid5bppcddp"; depends=[Biobase]; };
   HEM = derive2 { name="HEM"; version="1.53.0"; sha256="090k94d4bfmf1fqbxhlp2vb70x7934xwq8fjmgc2wlrq5d1iqjff"; depends=[Biobase]; };
-  HIBAG = derive2 { name="HIBAG"; version="1.17.1"; sha256="1raldjan5w9fvvk0hrwydyb1j6rs3566ks07nhym16f7bzrml85b"; depends=[]; };
+  HIBAG = derive2 { name="HIBAG"; version="1.17.2"; sha256="08fdgnrzx113cqk7v6wv7kfj13lhg2j4f86ap4ily1wirbb0q8y2"; depends=[]; };
+  HIREewas = derive2 { name="HIREewas"; version="0.99.8"; sha256="1df575f0fld051il5cpz27syvfmm70idvhr2af82r2lqbzz4ik8v"; depends=[gplots quadprog]; };
   HMMcopy = derive2 { name="HMMcopy"; version="1.23.0"; sha256="1ciawdh971fwfa60lb1469pqgmw9giyqksqk5zkfbal967pia1ck"; depends=[geneplotter IRanges]; };
+  HPAanalyze = derive2 { name="HPAanalyze"; version="0.99.19"; sha256="1s5inkcpsga791ranlf7c3bbdq42s05h4q7ba465lym685gpz18l"; depends=[cowplot dplyr ggplot2 hpar magrittr readr reshape2 tibble tidyr XLConnect xml2]; };
   HTSFilter = derive2 { name="HTSFilter"; version="1.21.0"; sha256="1c85v66fax6h00dkny5308mv1vsdinj590x6w4aghd6b4nb16qgr"; depends=[Biobase BiocParallel DESeq DESeq2 edgeR]; };
   HTSanalyzeR = derive2 { name="HTSanalyzeR"; version="2.33.0"; sha256="10agvn6dcmzczj5xdpviisnamfs6642xskh7zgh14c0p13gv76xs"; depends=[AnnotationDbi biomaRt BioNet cellHTS2 graph GSEABase igraph RankProd]; };
   HTSeqGenie = derive2 { name="HTSeqGenie"; version="4.11.0"; sha256="0k6ql5pkn2yjvmf13g4lzrqb0jcnp0rqsvakkqmirpj2b40wynj1"; depends=[BiocGenerics BiocParallel Biostrings Cairo chipseq GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gmapR hwriter IRanges Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment VariantAnnotation VariantTools]; };
   HTqPCR = derive2 { name="HTqPCR"; version="1.35.0"; sha256="09wc412znd92fi3lm909mrz3xd9cjiwiw6b0ncki1yc186faizr4"; depends=[affy Biobase gplots limma RColorBrewer]; };
-  Harman = derive2 { name="Harman"; version="1.9.0"; sha256="1kcv48g1fwh36xdw8cx0v28n4dl9s4414vwa0alnwdy2j0b9n8qk"; depends=[Rcpp]; };
+  Harman = derive2 { name="Harman"; version="1.9.1"; sha256="1nk5szn0zgw1301m6jn9kr6qp3z1766a2nzp8sp9x6fnigc7zmsi"; depends=[Rcpp]; };
   Harshlight = derive2 { name="Harshlight"; version="1.53.0"; sha256="0nlghc13lmhvsy06spvzhc7cihpzayli1iyid7h7ifa8zik6dz72"; depends=[affy altcdfenvs Biobase]; };
   Heatplus = derive2 { name="Heatplus"; version="2.27.0"; sha256="1fyz7272w2ixisvg0gsv30svppd6xd47r79xg1r1y2qy62q04bca"; depends=[RColorBrewer]; };
   HelloRanges = derive2 { name="HelloRanges"; version="1.7.0"; sha256="1h88zrvx3h4s7jsadyf3f3x6p0hbkn2f6smnkdmm7fva4lhlg7hl"; depends=[BiocGenerics Biostrings BSgenome docopt GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
-  HiCcompare = derive2 { name="HiCcompare"; version="1.3.0"; sha256="1kj8aqq4ddlsh3xnrzbj3hid67ai7p7d4hk2avxscicyrrskkq8w"; depends=[BiocParallel data_table dplyr GenomicRanges ggplot2 gridExtra gtools InteractionSet IRanges KernSmooth mgcv pheatmap QDNAseq S4Vectors]; };
+  HiCBricks = derive2 { name="HiCBricks"; version="0.99.16"; sha256="11rafxnh91mgl73xvqw83q9fhvm1gy6ma3c6r1xrwbjkwib5iam5"; depends=[BiocFileCache curl data_table digest GenomeInfoDb GenomicRanges ggplot2 IRanges R6 rappdirs RColorBrewer reshape2 rhdf5 S4Vectors scales stringr viridis]; };
+  HiCcompare = derive2 { name="HiCcompare"; version="1.3.2"; sha256="0mqslkc98yz8hhil6fapxwzs4qy5v784knnakkm01rz0sjpb8jbp"; depends=[BiocParallel data_table dplyr GenomicRanges ggplot2 gridExtra gtools InteractionSet IRanges KernSmooth mgcv pheatmap QDNAseq S4Vectors]; };
   HiTC = derive2 { name="HiTC"; version="1.25.0"; sha256="1mryn42bsvswb0gf027aw4qbrk57w8859zyvicymdi3d78pw8rmv"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; };
-  HilbertCurve = derive2 { name="HilbertCurve"; version="1.11.1"; sha256="0mv3ijx5506wng7zs556k2ljb11si73f9109hg3i8jl5qcn5zdn9"; depends=[circlize GenomicRanges HilbertVis IRanges png]; };
-  HilbertVis = derive2 { name="HilbertVis"; version="1.39.0"; sha256="068jm0ls9ix06w4argkaldfrsx6fynywh0776ygn0iaxmcjm2fpb"; depends=[lattice]; };
+  HilbertCurve = derive2 { name="HilbertCurve"; version="1.11.2"; sha256="0kxl5ihmgvsafiwi576kgyz1g60a25w6r8m4g9w6pzdwcxzp871d"; depends=[circlize GenomicRanges HilbertVis IRanges png]; };
+  HilbertVis = derive2 { name="HilbertVis"; version="1.39.2"; sha256="1qmnv0m4ywcjwqljvs9kbif63cyr842lzsj2flh5f3bf7pha1s7f"; depends=[lattice]; };
   HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.39.0"; sha256="1jq70si8q74jg22zg4gx4c6nbi8zszgiqrbc6cavn4v578fam3z1"; depends=[HilbertVis]; };
   HybridMTest = derive2 { name="HybridMTest"; version="1.25.0"; sha256="0g667li0fhf085ha9210xwj3r0sy7ks9lj5v8lpiyz48yi8w2nfn"; depends=[Biobase fdrtool MASS survival]; };
-  IHW = derive2 { name="IHW"; version="1.9.1"; sha256="0h7gpmcnlahclhplfmi89s3ai3syg1cdvv2mc6nrx9kq7dckl3xv"; depends=[BiocGenerics fdrtool lpsymphony slam]; };
-  IMAS = derive2 { name="IMAS"; version="1.5.0"; sha256="0lwn1kp5z488yryx8zzi0b5kdm5kzycdbpnn6lbx6ixjkhs26fkl"; depends=[AnnotationDbi BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggfortify ggplot2 gridExtra IRanges IVAS lattice lme4 Matrix Rsamtools S4Vectors survival]; };
+  IHW = derive2 { name="IHW"; version="1.9.2"; sha256="10lwbvr33xsxxs0sy8skyym81gw4328xxwdkhhmz0cyqgy23k3jr"; depends=[BiocGenerics fdrtool lpsymphony slam]; };
+  IMAS = derive2 { name="IMAS"; version="1.5.1"; sha256="0p5rhnvkzms8bvwc5lhkgi8hyqsm82mdwmsk245xxrrjdn6ir6ff"; depends=[AnnotationDbi BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggfortify ggplot2 gridExtra IRanges IVAS lattice lme4 Matrix Rsamtools S4Vectors survival]; };
   IMMAN = derive2 { name="IMMAN"; version="1.1.0"; sha256="0sgyiq7wif4imq81qqgwhbrx54dr26gb22j79mzzjyprv8yxgdkj"; depends=[BiocFileCache Biostrings igraph seqinr STRINGdb]; };
   IMPCdata = derive2 { name="IMPCdata"; version="1.17.0"; sha256="0r5j70i1mdrpxjznmb6i561076n1vk1h371kvlxkb8y343ajz7sq"; depends=[rjson]; };
+  INDEED = derive2 { name="INDEED"; version="0.99.17"; sha256="0v9vx1zb3r6861h7zb2bg15a541q04v8k2pf3j0i8vd5az32knlv"; depends=[devtools glasso]; };
   INPower = derive2 { name="INPower"; version="1.17.0"; sha256="1ilqffcbaxwk54m297f4znhbphjjipjfd82554z4mwdrkf0cz2lw"; depends=[mvtnorm]; };
   INSPEcT = derive2 { name="INSPEcT"; version="1.11.0"; sha256="1na92547w6qn6dkhy3zp3gj1g3vr2y3kx6j78hnq0ch9l8k9s2c7"; depends=[Biobase BiocGenerics BiocParallel deSolve GenomicAlignments GenomicFeatures GenomicRanges IRanges preprocessCore pROC rootSolve Rsamtools S4Vectors]; };
   IONiseR = derive2 { name="IONiseR"; version="2.5.0"; sha256="0gn75w73ahyk3vm70vq003rlg1wsazfy7qygdp4dnq0g9qpz8dyy"; depends=[BiocGenerics BiocParallel Biostrings bit64 dplyr ggplot2 magrittr rhdf5 ShortRead stringr tibble tidyr XVector]; };
-  IPO = derive2 { name="IPO"; version="1.7.0"; sha256="096a1c2ybmki12kqj2y1njpjbsia4qqd3rmj851cmks9h33mxk8m"; depends=[BiocParallel CAMERA rsm xcms]; };
+  IPO = derive2 { name="IPO"; version="1.7.1"; sha256="0hgflvvy840y822bk3bm2sj8yqc8q3nipxxqa5j6if17w10icvvn"; depends=[BiocParallel CAMERA rsm xcms]; };
   IPPD = derive2 { name="IPPD"; version="1.29.0"; sha256="1gwsq17ipba4q7jby4hj7bwrpbfzach5spsvnb4571x7nr6yx7qg"; depends=[bitops digest MASS Matrix XML]; };
-  IRanges = derive2 { name="IRanges"; version="2.15.14"; sha256="1w12vvyfi53hr45xhl1vzsygig9vdzlxkkyjsylbwc9ny595pam7"; depends=[BiocGenerics S4Vectors]; };
+  IRanges = derive2 { name="IRanges"; version="2.15.19"; sha256="096d7hil68zhy2l2vhd0q5prkrzybbwl28fa00k7rbail5vh8r8v"; depends=[BiocGenerics S4Vectors]; };
   ISoLDE = derive2 { name="ISoLDE"; version="1.9.0"; sha256="111p1wxyn3kqx6gdnrl55jwnlnqfa98wljkiw4wqqf2cdrykb7pr"; depends=[]; };
   ITALICS = derive2 { name="ITALICS"; version="2.41.0"; sha256="1lj5n1xgq49xn8yv8q6lfg01hw8l4yc5ffc98falzhlcvqxhkvzc"; depends=[affxparser DBI GLAD ITALICSData oligo oligoClasses pd_mapping50k_xba240]; };
   IVAS = derive2 { name="IVAS"; version="2.1.0"; sha256="0ipw8834ag1j2qg3i5nnfcncrjpzhd2m5hzhn1bjpvhd357r1gn1"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges ggfortify ggplot2 IRanges lme4 Matrix S4Vectors]; };
-  IWTomics = derive2 { name="IWTomics"; version="1.5.0"; sha256="0v5q1ywvgvcwlfh7a9krh06b1ad4i5kpnm67az81znliz3s2m60y"; depends=[fda GenomicRanges gtable IRanges KernSmooth S4Vectors]; };
+  IWTomics = derive2 { name="IWTomics"; version="1.5.2"; sha256="1rmlr66mgg5nfm2b50g0a83ahs0xkkji1is930vjprrfcn6clmn2"; depends=[fda GenomicRanges gtable IRanges KernSmooth S4Vectors]; };
   Icens = derive2 { name="Icens"; version="1.53.0"; sha256="16cxm1i6ir74l2x80wsp544ykffy91m4fv8v283nki0hx434pkn7"; depends=[survival]; };
   IdMappingAnalysis = derive2 { name="IdMappingAnalysis"; version="1.25.0"; sha256="025zqjc36whlraq3hjz0p5dzj5m19y50clrlgrimrz4ag5bfmf2q"; depends=[Biobase boot mclust R_oo rChoiceDialogs RColorBrewer]; };
   IdMappingRetrieval = derive2 { name="IdMappingRetrieval"; version="1.29.0"; sha256="0fn8xp7ybpg0z3bnk9sab53y7kflzys0r1cvikyp5n8pfkrr95g2"; depends=[AffyCompatible biomaRt ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; };
   IdeoViz = derive2 { name="IdeoViz"; version="1.17.0"; sha256="0yr7yisb9hr2jsdlv7m59p9kiaxssv6rj8x4rqzraaipd7cn0gcy"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; };
   Imetagene = derive2 { name="Imetagene"; version="1.11.0"; sha256="1zswp6h2c9nn4p73knp4wsnbqv77gp86njzpxjvgqjmvfj57y8nc"; depends=[d3heatmap ggplot2 metagene shiny shinyBS shinyFiles shinythemes]; };
-  ImmuneSpaceR = derive2 { name="ImmuneSpaceR"; version="1.9.0"; sha256="00v2dfzcxwffpss873j1i74vl1qgimdqamyx4gj4cqjv76qcdrqc"; depends=[Biobase data_table ggplot2 gplots gtools heatmaply httr pheatmap plotly preprocessCore R6 reshape2 rjson Rlabkey rmarkdown scales]; };
+  ImmuneSpaceR = derive2 { name="ImmuneSpaceR"; version="1.9.3"; sha256="1dlb8dklkizcbmy7kc8mgr8d60k59j1zwgdfs9lf2zlxmzqz44zv"; depends=[Biobase curl data_table ggplot2 gplots gtools heatmaply httr pheatmap plotly preprocessCore R6 reshape2 rjson Rlabkey rmarkdown scales]; };
   ImpulseDE = derive2 { name="ImpulseDE"; version="1.7.0"; sha256="0g34jfff5lsvzak21fdi2fdx9a2v0n1f2cmjsk62jkjzr9jpyp2f"; depends=[amap boot]; };
   ImpulseDE2 = derive2 { name="ImpulseDE2"; version="1.5.0"; sha256="1f9nymih6fwq6p53x9f7zjblkdrrj0f89w1lv9f8bdz1y4icn1y4"; depends=[Biobase BiocParallel circlize ComplexHeatmap cowplot DESeq2 ggplot2 knitr Matrix S4Vectors SummarizedExperiment]; };
-  InPAS = derive2 { name="InPAS"; version="1.13.0"; sha256="0hk6lr9sk4yvgj9pw0w48936lmgz478k5jfbh1jmybixgx9cnl7k"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; };
+  InPAS = derive2 { name="InPAS"; version="1.13.1"; sha256="0wj459bay4ywq9aymdp2snw6fzhbrdfg80ya96z8kgprxvp2r21z"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; };
   InTAD = derive2 { name="InTAD"; version="1.1.0"; sha256="0pm720gl7apzbcqxd53gj4ynkglv4bb0xrzibcwbpwgsmi75g55c"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 ggpubr IRanges mclust MultiAssayExperiment qvalue rtracklayer S4Vectors SummarizedExperiment]; };
-  IntEREst = derive2 { name="IntEREst"; version="1.5.1"; sha256="1drlpx96rfdr94i3aqvwb839ivwb6y4kg1qqip6hh33shrh7hzf0"; depends=[BiocGenerics BiocParallel Biostrings DBI DESeq2 DEXSeq edgeR GenomicAlignments GenomicFeatures GenomicRanges IRanges RMySQL Rsamtools S4Vectors seqinr seqLogo SummarizedExperiment]; };
-  InterMineR = derive2 { name="InterMineR"; version="1.3.0"; sha256="0rsf9ssnzcsfynk3ifsn2g5hk8g8nlkli0x7b7p5x60w8pvawss4"; depends=[Biostrings GenomicRanges httr igraph IRanges RCurl RJSONIO S4Vectors sqldf SummarizedExperiment XML xml2]; };
-  InteractionSet = derive2 { name="InteractionSet"; version="1.9.1"; sha256="0zdsdqmym0s09fp724xfa53bfy5isnj4gpxwaircl6js44rdp0f2"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix Rcpp S4Vectors SummarizedExperiment]; };
-  IntramiRExploreR = derive2 { name="IntramiRExploreR"; version="1.3.0"; sha256="015mjy0fcch4z3nsy5jvyl6jcc6zigvfh4s35nm3yjw2plg06jm4"; depends=[igraph knitr]; };
+  IntEREst = derive2 { name="IntEREst"; version="1.5.2"; sha256="0vm9bp8cp8igmxcsd8n8s9y5nmcm98fsj1albcn8p87iq2jgkvix"; depends=[BiocGenerics BiocParallel Biostrings DBI DESeq2 DEXSeq edgeR GenomicAlignments GenomicFeatures GenomicRanges IRanges RMySQL Rsamtools S4Vectors seqinr seqLogo SummarizedExperiment]; };
+  InterMineR = derive2 { name="InterMineR"; version="1.3.3"; sha256="0x8nlvffa4i4rnk7ib11a29f5cr4vmvc4hspm0gir186zqcg7dw8"; depends=[Biostrings GenomicRanges httr igraph IRanges RCurl RJSONIO S4Vectors sqldf SummarizedExperiment XML xml2]; };
+  InteractionSet = derive2 { name="InteractionSet"; version="1.9.5"; sha256="1dmk08y0416ffljinh16qvvnm7hifdbbfzpg59r9l0lqwgpkligk"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges Matrix Rcpp S4Vectors SummarizedExperiment]; };
+  IntramiRExploreR = derive2 { name="IntramiRExploreR"; version="1.3.0"; sha256="015mjy0fcch4z3nsy5jvyl6jcc6zigvfh4s35nm3yjw2plg06jm4"; depends=[FGNet igraph knitr]; };
+  IsoCorrectoR = derive2 { name="IsoCorrectoR"; version="0.99.3"; sha256="11py0fpn0lz62my2zfs1p5aahjjda259gnfwsa47jid6dx9lghw4"; depends=[dplyr magrittr pracma quadprog readr readxl stringr tibble WriteXLS]; };
   IsoGeneGUI = derive2 { name="IsoGeneGUI"; version="2.17.0"; sha256="0fx9zkvg8471kcyda3hvp7zjv6d1z1pr2sq5882xn1amhcjpwws1"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust orQA RColorBrewer Rcpp relimp tkrplot xlsx]; };
-  IsoformSwitchAnalyzeR = derive2 { name="IsoformSwitchAnalyzeR"; version="1.3.1"; sha256="19pzz6airm4jghr699g2sx8d0m8sxplmgyy09508npwxq5kkw4rw"; depends=[Biostrings BSgenome cummeRbund DBI DRIMSeq edgeR futile_logger GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges plyr RColorBrewer reshape2 rtracklayer tximport VennDiagram]; };
-  JunctionSeq = derive2 { name="JunctionSeq"; version="1.11.0"; sha256="1pq098zb6ynsrxmvppjvh4ws642sry12hz1rsc53ph5n375blxga"; depends=[Biobase BiocGenerics BiocParallel DESeq2 genefilter geneplotter GenomicRanges Hmisc IRanges locfit plotrix Rcpp RcppArmadillo S4Vectors statmod stringr SummarizedExperiment]; };
+  IsoformSwitchAnalyzeR = derive2 { name="IsoformSwitchAnalyzeR"; version="1.3.10"; sha256="1r1y2fzhiv1r86jrd1miij164lq5pa6425shcd8jfza9igpnlmz6"; depends=[Biostrings BSgenome DBI DEXSeq dplyr DRIMSeq edgeR futile_logger GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges limma magrittr plyr RColorBrewer readr reshape2 rtracklayer stringr tximport VennDiagram]; };
+  JunctionSeq = derive2 { name="JunctionSeq"; version="1.11.2"; sha256="1hhfam0yfrwyjvkzsn5pnx2564zggzw2y9163g4sxjxr5a0y5ggb"; depends=[Biobase BiocGenerics BiocParallel DESeq2 genefilter geneplotter GenomicRanges Hmisc IRanges locfit plotrix Rcpp RcppArmadillo S4Vectors statmod stringr SummarizedExperiment]; };
   KCsmart = derive2 { name="KCsmart"; version="2.39.0"; sha256="1y5lrcl4inkdmbr9bma02j7g4r0my49jvc434mzgvjmv6zfilm4k"; depends=[BiocGenerics KernSmooth multtest siggenes]; };
-  KEGGREST = derive2 { name="KEGGREST"; version="1.21.1"; sha256="1kk89li0nzp0g8p3v69c8b8ijqia9rz45139f56kl7vfvrr8l7yd"; depends=[Biostrings httr png]; };
+  KEGGREST = derive2 { name="KEGGREST"; version="1.21.2"; sha256="1xbs8c2p4y0igwazh0iy7g0bsjqvrp76gdn3bfgvyig75x7fkiv0"; depends=[Biostrings httr png]; };
   KEGGgraph = derive2 { name="KEGGgraph"; version="1.41.0"; sha256="0sd2m80q2igal5qh03qcdjpcyi6rxk8w3mxgd9rjars6ykcj0g84"; depends=[graph XML]; };
-  KEGGprofile = derive2 { name="KEGGprofile"; version="1.23.0"; sha256="0y1whzp0q1hlrcg9qhba6fh5iimnqp6phvd7kl8phkyhi5zzsv9a"; depends=[AnnotationDbi biomaRt KEGG_db KEGGREST png RCurl TeachingDemos XML]; };
+  KEGGlincs = derive2 { name="KEGGlincs"; version="1.7.3"; sha256="0mrzrcg0327hgp11i704qiyc53pplzmjdwbjxx12pqwaxrrkfijf"; depends=[AnnotationDbi gtools hgu133a_db httr igraph KEGGgraph KEGGREST KOdata org_Hs_eg_db plyr RJSONIO XML]; };
+  KEGGprofile = derive2 { name="KEGGprofile"; version="1.23.2"; sha256="02yqlbav775sx6cipc93rnz2qrhay93k4vrgs9h4gcz949rchhwh"; depends=[AnnotationDbi biomaRt KEGG_db KEGGREST png RCurl TeachingDemos XML]; };
+  KinSwingR = derive2 { name="KinSwingR"; version="0.99.10"; sha256="1mj7bdqlg7rsxpha7x1wcjkkavcmnb9bdz92xigksip5qsdcs2r1"; depends=[BiocParallel data_table sqldf]; };
   LBE = derive2 { name="LBE"; version="1.49.0"; sha256="07r55w9f7a5fdp183rjx5f15jzkw73q6r7ra7drk887xylzmxvd0"; depends=[]; };
   LEA = derive2 { name="LEA"; version="2.3.0"; sha256="1k7zxl6aa09kr2gmh6lhg1hdb332fqggdi8hk4gbjcgsa533sqcc"; depends=[]; };
   LINC = derive2 { name="LINC"; version="1.9.0"; sha256="1295829apimwfiyhxzyl61wlabd7j18zdycrrai2f3d42005pfjw"; depends=[ape Biobase clusterProfiler DOSE ggplot2 ggtree gridExtra org_Hs_eg_db png Rcpp ReactomePA reshape2 sva]; };
   LMGene = derive2 { name="LMGene"; version="2.37.0"; sha256="1pkgkn12bgmamfcbdi5c352v92q31rzwcq69kh00z7wb07flcmf2"; depends=[affy Biobase multtest survival]; };
-  LOBSTAHS = derive2 { name="LOBSTAHS"; version="1.7.1"; sha256="16agj2lk871hqnwjrwg59qxsblr7gb2pd5y5h734c2san34y09r3"; depends=[CAMERA xcms]; };
-  LOLA = derive2 { name="LOLA"; version="1.11.0"; sha256="1pgxwcbd0sdb9npq6sjvbjjlqq13750795m9ycjz3mg2989y4rn5"; depends=[BiocGenerics data_table GenomicRanges IRanges reshape2 S4Vectors]; };
+  LOBSTAHS = derive2 { name="LOBSTAHS"; version="1.7.2"; sha256="1j14x79xmzxc64jr3k4mxhfsv20pwvzr253jnchywfagky8ad3a5"; depends=[CAMERA xcms]; };
+  LOLA = derive2 { name="LOLA"; version="1.11.1"; sha256="1dk4b0cc1kgqd0b171pigvk445hl82bsx8izxwlg86zgrgmsb0sx"; depends=[BiocGenerics data_table GenomicRanges IRanges reshape2 S4Vectors]; };
   LPE = derive2 { name="LPE"; version="1.55.0"; sha256="08pghdnq4l4zj21q3jz77x2hryjps1jk0rpdlv9kr207f535ww9l"; depends=[]; };
   LPEadj = derive2 { name="LPEadj"; version="1.41.0"; sha256="0sjhx44m1rfkhpq87996wc7n8axz2k8c4ni818rx78cqpha5ybjl"; depends=[LPE]; };
+  LRBaseDbi = derive2 { name="LRBaseDbi"; version="0.99.22"; sha256="0yvsj66hdxmw9nqysb0a7jih5fi8jp1fdaccrkjs7mkp3zz6hzpp"; depends=[AnnotationDbi Biobase DBI RSQLite]; };
   LVSmiRNA = derive2 { name="LVSmiRNA"; version="1.31.0"; sha256="0wgjvy0r0p254kr686nnvjdwbqhbq06q1izy2idh9aaa043swaqn"; depends=[affy Biobase BiocGenerics limma MASS quantreg SparseM vsn zlibbioc]; };
-  LedPred = derive2 { name="LedPred"; version="1.15.0"; sha256="1jbwxs9hcwqcm1dpn24jkq0xi8jyja9mq347frpn8vc1m08w4bjx"; depends=[akima e1071 ggplot2 irr jsonlite plot3D plyr RCurl ROCR testthat]; };
+  LedPred = derive2 { name="LedPred"; version="1.15.1"; sha256="0h2rw9mx67ilcm61z1m2ddwpvq53rzvn1kbsgzqdszx0r63gfkxm"; depends=[akima e1071 ggplot2 irr jsonlite plot3D plyr RCurl ROCR testthat]; };
   LineagePulse = derive2 { name="LineagePulse"; version="1.1.0"; sha256="00y0xcw89c1kdmcdj4pw620szrhxy2sykb7iblfbxz04cbj7vygs"; depends=[BiocParallel circlize ComplexHeatmap ggplot2 gplots knitr Matrix RColorBrewer SingleCellExperiment SummarizedExperiment]; };
   Linnorm = derive2 { name="Linnorm"; version="2.5.0"; sha256="013i53zmjgrkb4icgzp9mdmn7wqfm8r24izm6vifigczqphm0g0i"; depends=[amap apcluster ellipse fastcluster fpc ggdendro ggplot2 gmodels igraph limma MASS mclust Rcpp RcppArmadillo Rtsne statmod vegan zoo]; };
   LiquidAssociation = derive2 { name="LiquidAssociation"; version="1.35.0"; sha256="0ggrhgdlw44k0q5nddn60m91225xx4c58ydjgd98b4rz4a0l9qjy"; depends=[Biobase geepack org_Sc_sgd_db yeastCC]; };
-  Logolas = derive2 { name="Logolas"; version="1.5.0"; sha256="0h6pq0mp935ygm8pcnk4g9wxg9hcqnbssw6ar1kw59kcama062fs"; depends=[Biostrings ggplot2 gridBase LaplacesDemon SQUAREM]; };
+  Logolas = derive2 { name="Logolas"; version="1.5.1"; sha256="14db1h5caklijdn0g4hk89n6h82fd932j9sxfzw2smhkg3k71xhw"; depends=[Biostrings ggplot2 gridBase LaplacesDemon SQUAREM]; };
   LowMACA = derive2 { name="LowMACA"; version="1.11.2"; sha256="1ir6vfjiwjhi6hj6pzksh2wfrcsmhkd80zwc135md0gmxr5bhhw8"; depends=[BiocParallel Biostrings cgdsr data_table httr LowMACAAnnotation motifStack RColorBrewer reshape2 stringr]; };
-  LymphoSeq = derive2 { name="LymphoSeq"; version="1.9.0"; sha256="0s0hwgbxdmkpdp6mnvd181idg0n3z87wf4w0arjih1205n1hqsyw"; depends=[Biostrings circlize data_table dplyr ggplot2 ggtree ineq LymphoSeqDB msa phangorn plyr RColorBrewer reshape stringdist UpSetR VennDiagram]; };
-  M3C = derive2 { name="M3C"; version="1.3.3"; sha256="1h9f5syg4r435w5p5azgmyfmfaycqx0mmbs8jgz2hp3m04f8a967"; depends=[cluster dendextend doParallel doSNOW foreach ggplot2 Matrix matrixcalc NMF RColorBrewer Rtsne sigclust]; };
+  LymphoSeq = derive2 { name="LymphoSeq"; version="1.9.2"; sha256="1q0xs2d7lgg0vz2ca84kv1igaf48y42g94xxdxmi1nmpz901pr8a"; depends=[Biostrings circlize data_table dplyr ggplot2 ggtree ineq LymphoSeqDB msa phangorn plyr RColorBrewer reshape stringdist UpSetR VennDiagram]; };
+  M3C = derive2 { name="M3C"; version="1.3.991"; sha256="0wzg8rsfc1xgfdyl3l1y87cqvicpmj30ng45wfwp0d4vkd1llvqp"; depends=[cluster dendextend doParallel doSNOW foreach ggplot2 Matrix matrixcalc NMF RColorBrewer Rtsne sigclust survival]; };
   M3D = derive2 { name="M3D"; version="1.15.0"; sha256="1fdfahbdfx3csn27q61djp27a2w6jr9yl9hw6rakjnj7mk5s1xrj"; depends=[BiocGenerics BiSeq GenomicRanges IRanges Rcpp S4Vectors SummarizedExperiment]; };
-  M3Drop = derive2 { name="M3Drop"; version="1.7.0"; sha256="0w4vwlbaz68if7vanhr79nqg84cq9r60drrawc9c5c6gfcfzzjmz"; depends=[bbmle gplots numDeriv RColorBrewer statmod]; };
-  MADSEQ = derive2 { name="MADSEQ"; version="1.7.0"; sha256="00x1nbvf375nik8v12hwpbnn84l70j5jycv8kp37fn18909100lh"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 coda GenomeInfoDb GenomicAlignments GenomicRanges IRanges preprocessCore rjags Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation vcfR VGAM zlibbioc]; };
-  MAGeCKFlute = derive2 { name="MAGeCKFlute"; version="1.1.2"; sha256="03inn8i0pragrph3nia1zvkjd5kr3iz5ggj2i1fm6ir9259c7n01"; depends=[Category clusterProfiler data_table DOSE ggExtra ggplot2 ggrepel ggsci GOstats gridExtra pathological pathview pheatmap png RColorBrewer reshape sva]; };
+  M3Drop = derive2 { name="M3Drop"; version="1.7.1"; sha256="1gscdkrnyk2qghkpidwj6abbxc53ivyxyc43297yja6hj73nz8mw"; depends=[bbmle gplots numDeriv RColorBrewer statmod]; };
+  MACPET = derive2 { name="MACPET"; version="1.1.4"; sha256="0g9adhig02s6r45ax7335i2zsq8r2319111c0ijp6c6y5z52rcrp"; depends=[BH bigmemory BiocParallel Biostrings futile_logger GenomeInfoDb GenomicAlignments GenomicRanges GEOquery gtools InteractionSet intervals IRanges knitr plyr rbamtools Rbowtie Rcpp Rsamtools rtracklayer S4Vectors ShortRead]; };
+  MADSEQ = derive2 { name="MADSEQ"; version="1.7.1"; sha256="1x8cfif8var04bdfgdws8zql33a67lf7r0kkalansy5w64wkjm8n"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 coda GenomeInfoDb GenomicAlignments GenomicRanges IRanges preprocessCore rjags Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation vcfR VGAM zlibbioc]; };
+  MAGeCKFlute = derive2 { name="MAGeCKFlute"; version="1.1.9"; sha256="1bx9nawmjf2bsnk8iilplph90hdipyqf8mw24cbaaivajnsk6cz0"; depends=[biomaRt clusterProfiler data_table DOSE ggExtra ggplot2 ggrepel ggsci gridExtra pathview pheatmap png RColorBrewer sva]; };
   MAIT = derive2 { name="MAIT"; version="1.15.0"; sha256="0z1wl9hxqcfy7nlwqccz244kljdjra58drlhjfvc38kiy4q7nsyg"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; };
   MANOR = derive2 { name="MANOR"; version="1.53.2"; sha256="1ss77yxivvgv2nswdp5qbbjc21ghrnwvj3w33xj4zv79bdb92qga"; depends=[GLAD]; };
   MAST = derive2 { name="MAST"; version="1.7.2"; sha256="07v6gjlh645w60c5fq206lmm2qpld1qqirdszrnrz00zrxzrnpz0"; depends=[abind Biobase BiocGenerics data_table ggplot2 plyr reshape2 S4Vectors SingleCellExperiment stringr SummarizedExperiment]; };
   MBASED = derive2 { name="MBASED"; version="1.15.0"; sha256="19zn2xmarpiszs3jfmmlgc5nflc2gafbby3x68l38sich2jn1kix"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; };
   MBAmethyl = derive2 { name="MBAmethyl"; version="1.15.0"; sha256="19lgv7lcy5qc6xbsngqvfxbaqcyk3rz907983ngqa9magr7xy2r1"; depends=[]; };
   MBCB = derive2 { name="MBCB"; version="1.35.0"; sha256="0cmmyj0c13b47apdk04qqqfg35rywh5fa0d2inhi31lfvbfd8bcx"; depends=[preprocessCore tcltk2]; };
-  MBttest = derive2 { name="MBttest"; version="1.9.1"; sha256="1m99zma2zg070sr759y8gkmm1qwnswqapbhl175xf8kxma1gh4cb"; depends=[gplots gtools]; };
+  MBttest = derive2 { name="MBttest"; version="1.9.3"; sha256="1g443ynnk46blficdzygnksirfnwwgggl6d2j0jw0qfvkdsks2bz"; depends=[gplots gtools]; };
   MCRestimate = derive2 { name="MCRestimate"; version="2.37.0"; sha256="1b1cp4aan1wnzspihjm2snp16qjd3flr3ixx19mvsqzy5p38pf69"; depends=[Biobase e1071 golubEsets pamr randomForest RColorBrewer]; };
   MCbiclust = derive2 { name="MCbiclust"; version="1.5.0"; sha256="1zkxh6gax7rnp6n5dd6kwcljwds33fv5ps4crn41hzndllpbbc93"; depends=[AnnotationDbi BiocParallel cluster GGally ggplot2 GO_db org_Hs_eg_db scales WGCNA]; };
   MDTS = derive2 { name="MDTS"; version="1.1.2"; sha256="0q3v06za1wdkrzp711gs7awpk4dvrxj0xy6m5lzjyjz5qdd2nym5"; depends=[Biostrings DNAcopy GenomicAlignments GenomicRanges IRanges Rsamtools stringr]; };
-  MEAL = derive2 { name="MEAL"; version="1.11.3"; sha256="04s5gqmn2gd399ba7gj9968d5ryisi6hl7n75mrgns5zq7mb3q7s"; depends=[Biobase BiocGenerics DMRcate GenomicRanges ggplot2 Gviz IRanges isva limma matrixStats minfi missMethyl permute S4Vectors SmartSVA SummarizedExperiment vegan]; };
-  MEDIPS = derive2 { name="MEDIPS"; version="1.33.0"; sha256="0c37ns7z4wgir91lhz36035nvp1vc886fardjn2p74bz5w90w16x"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; };
+  MEAL = derive2 { name="MEAL"; version="1.11.7"; sha256="11l3rbfwnh8yrbi33ii0mcmi63wgmhdwyffx8790gm3dj99l1626"; depends=[Biobase BiocGenerics DMRcate GenomicRanges ggplot2 Gviz IRanges isva limma matrixStats minfi missMethyl MultiDataSet permute S4Vectors SmartSVA SummarizedExperiment vegan]; };
+  MEDIPS = derive2 { name="MEDIPS"; version="1.33.3"; sha256="0a2jypw2k9kpdh86gvgchvqlww72gb55aw9vhz67dkd7mfwnsqyc"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; };
   MEDME = derive2 { name="MEDME"; version="1.41.0"; sha256="1l0i3vz1zp9lmvvfn5h6baf9kzvdyb9m1qffwlg3dvzdzdqadx0l"; depends=[Biostrings drc MASS]; };
-  MEIGOR = derive2 { name="MEIGOR"; version="1.15.0"; sha256="0ch31d8g993ikz7dklzfh9mfn1cv8wv7k3nihdspqvbm37m8c0v1"; depends=[CNORode deSolve Rsolnp snowfall]; };
-  MGFM = derive2 { name="MGFM"; version="1.15.0"; sha256="08qgxz6aglxgzrbmxmay1xg402vw0a4yp86ifb5p0bwaniiv6k72"; depends=[annotate AnnotationDbi]; };
+  MEIGOR = derive2 { name="MEIGOR"; version="1.15.1"; sha256="1vfklcm9yppy3rr2l5ddnp20r368hsr08vy26agr5jqharw7qik9"; depends=[CNORode deSolve Rsolnp snowfall]; };
+  MGFM = derive2 { name="MGFM"; version="1.15.1"; sha256="1pd7c9d66c4b1bz6l24mhrwxwdivl47kc57c7mp79z1h9hf66ipf"; depends=[annotate AnnotationDbi]; };
   MGFR = derive2 { name="MGFR"; version="1.7.0"; sha256="11vw9yyv6j2pjj4cmlw0f3blxz4iwx3p9r0xpzis5zs12x7pn17f"; depends=[annotate biomaRt]; };
-  MIGSA = derive2 { name="MIGSA"; version="1.5.0"; sha256="1n4gh139cp05ahqjd3hyj2pzj9p0pyqhbwhsyg208mlm1arkdyxg"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel data_table edgeR futile_logger ggdendro ggplot2 GO_db GOstats graph GSEABase ismev limma matrixStats org_Hs_eg_db RBGL reshape2 Rgraphviz RJSONIO vegan]; };
+  MIGSA = derive2 { name="MIGSA"; version="1.5.2"; sha256="02yqj1srxh41wmda686y0nh88rnvmffr5f6p46h7vmz8kb1pi9cf"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel data_table edgeR futile_logger ggdendro ggplot2 GO_db GOstats graph GSEABase ismev limma matrixStats org_Hs_eg_db RBGL reshape2 Rgraphviz RJSONIO vegan]; };
   MIMOSA = derive2 { name="MIMOSA"; version="1.19.0"; sha256="1z3hj0ivv4zw4sprzr5bhxp5fpzkg37m1sk1y90cfm42p4vyqagg"; depends=[Biobase coda data_table Formula ggplot2 MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
-  MIRA = derive2 { name="MIRA"; version="1.3.0"; sha256="0wsgpmig3vz0iy7395a8091n5w5s5xmi709bd5pppdqw2zwhnmn6"; depends=[Biobase BiocGenerics bsseq data_table GenomicRanges ggplot2 IRanges S4Vectors]; };
+  MIRA = derive2 { name="MIRA"; version="1.3.1"; sha256="139wlx2c0bpgljjxrzrcn7s8kvqrs53lrw6nsdnb3v4y7wx2fc8y"; depends=[Biobase BiocGenerics bsseq data_table GenomicRanges ggplot2 IRanges S4Vectors]; };
   MLInterfaces = derive2 { name="MLInterfaces"; version="1.61.1"; sha256="1nmcxaa3r34xhzcs063pwggck2yhwvc1ckzyhqabbb41jflnnw3g"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rpart sfsmisc shiny threejs]; };
   MLP = derive2 { name="MLP"; version="1.29.0"; sha256="0fqrpnqb9031f3y1qgmvxr0ynygp1rzjg2dsy4g2z98jzwbncznk"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; };
-  MLSeq = derive2 { name="MLSeq"; version="1.99.8"; sha256="1h72lhvrvkpbl5dil3gk2kw6ax3xpycp87511a5ndzagnl2499js"; depends=[Biobase caret DESeq2 edgeR foreach ggplot2 limma plyr sSeq SummarizedExperiment xtable]; };
+  MLSeq = derive2 { name="MLSeq"; version="1.99.9"; sha256="0bjgj44j6xxipp6wskd1cq3kj2j9g3jl8365r9rv5m8vp58nvkl2"; depends=[Biobase caret DESeq2 edgeR foreach ggplot2 limma plyr sSeq SummarizedExperiment xtable]; };
   MMDiff2 = derive2 { name="MMDiff2"; version="1.9.0"; sha256="1l3frx6myj4jglypv5il3pgjpm3szq5xfp5p8k8xilahmg98ykh1"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; };
   MODA = derive2 { name="MODA"; version="1.7.0"; sha256="0wm5sc2fh5j191128xlxdqmfsh8ix8k33gkcz6yn8rfpj3rdfhzg"; depends=[AMOUNTAIN cluster dynamicTreeCut igraph RColorBrewer WGCNA]; };
   MPFE = derive2 { name="MPFE"; version="1.17.0"; sha256="1jalc9ny5lv3h7awrkg5mmagjh15js5rmpqfl7pn15499186fajp"; depends=[]; };
-  MSGFgui = derive2 { name="MSGFgui"; version="1.15.0"; sha256="198lczhpgjlv0mq1k4rch4fm0gjm7g65j108ib69n5zbzkcqgbri"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; };
-  MSGFplus = derive2 { name="MSGFplus"; version="1.15.0"; sha256="19b61p8ihxni4psfrc7akgrq6aq28wzf73zp0bizwqfkv4lphm7l"; depends=[mzID ProtGenerics]; };
-  MSnID = derive2 { name="MSnID"; version="1.15.0"; sha256="167hjrp9zsa84swbrkmjaxc0haza02qzzfg64855rrf0m319g0v0"; depends=[Biobase data_table doParallel dplyr foreach iterators MSnbase mzID mzR ProtGenerics R_cache Rcpp reshape2]; };
-  MSnbase = derive2 { name="MSnbase"; version="2.7.1"; sha256="0gc1hysdd3ng6a0n3fqidrwgm2b3x4mlrccrxba5ank312i6f5iq"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant MASS mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp S4Vectors scales vsn XML]; };
-  MSstats = derive2 { name="MSstats"; version="3.13.4"; sha256="0vc36h2s1xmird1ghadw0v9r12gxh73xjmgbclfydg0q4i0x6762"; depends=[data_table doSNOW dplyr foreach ggplot2 ggrepel gplots limma lme4 marray MASS minpack_lm preprocessCore randomForest reshape2 snow stringr survival tidyr]; };
-  MSstatsQC = derive2 { name="MSstatsQC"; version="1.3.0"; sha256="1sp72cpks1cw3h6j9lzscs9lf9s9gl092h3jnxixkzf44cjlbxah"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics RecordLinkage]; };
-  MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.1.0"; sha256="1cr6l6axi7cqqb547dhsha7zdn85grgvvq2436skxws172pl0pv3"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly RecordLinkage shiny]; };
+  MPRAnalyze = derive2 { name="MPRAnalyze"; version="0.99.11"; sha256="0vqy590j0jfx00lifmavdvl6bd93k85kpm67575z3hd7lffrmawm"; depends=[BiocParallel progress SummarizedExperiment]; };
+  MSGFgui = derive2 { name="MSGFgui"; version="1.15.1"; sha256="01mdpd0ph49zjvhynb4cq8m60k1bd4xw72bay2ly19akp72lwcpz"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; };
+  MSGFplus = derive2 { name="MSGFplus"; version="1.15.1"; sha256="15ljj766719690mb37alih2001vcm8az92j0qgyfdb80c9gm8my6"; depends=[mzID ProtGenerics]; };
+  MSnID = derive2 { name="MSnID"; version="1.15.1"; sha256="08z17czddqlfj6hppqg43s45ldh3ck6qay14iyrpsa809xqda1yw"; depends=[Biobase data_table doParallel dplyr foreach iterators MSnbase mzID mzR ProtGenerics R_cache Rcpp reshape2]; };
+  MSnbase = derive2 { name="MSnbase"; version="2.7.12"; sha256="15vs3dca3ml859005wpwk84c0d1si0h65g9hnkvd0nw05wsp7g81"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant MASS mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp S4Vectors scales vsn XML]; };
+  MSstats = derive2 { name="MSstats"; version="3.13.5"; sha256="06rhwn9fk5dr52p73mxi04x86s1c8ixvw3kw01qxygd6x0acshy4"; depends=[data_table doSNOW dplyr foreach ggplot2 ggrepel gplots limma lme4 marray MASS minpack_lm preprocessCore randomForest reshape2 snow stringr survival tidyr]; };
+  MSstatsQC = derive2 { name="MSstatsQC"; version="1.99.3"; sha256="1rbkn12pgy8g6s15lizaymkbc5k5cb07gndzy65w0zsbm2w5vaz4"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics RecordLinkage]; };
+  MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.1.1"; sha256="0s3invrc3601y8hai3pxbd1k0v6vvr7n95zpbxj5cjqdv3yn52ir"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly RecordLinkage shiny]; };
+  MSstatsTMT = derive2 { name="MSstatsTMT"; version="0.99.9"; sha256="08plgvwwhrjyby45gq5s4b3nxb53az6dayhgsk96fhxa3q7dbmds"; depends=[data_table dplyr ggplot2 limma lme4 matrixStats MSstats nlme reshape2 tidyr]; };
   MVCClass = derive2 { name="MVCClass"; version="1.55.0"; sha256="0xkwwvq66cnmac52ik95siq78ny9nfbgp4xncdamq7gmn7wasacr"; depends=[]; };
-  MWASTools = derive2 { name="MWASTools"; version="1.5.1"; sha256="015zdbmxlpv9y2qsg6ny59ljy8cn2vz4grmwa8dragr7pmivqikf"; depends=[boot car ComplexHeatmap ggplot2 glm2 gridExtra igraph KEGGgraph KEGGREST ppcor qvalue RCurl SummarizedExperiment]; };
+  MWASTools = derive2 { name="MWASTools"; version="1.5.6"; sha256="1axhfzvinhg8lfgn703rl76bxj0b1dz0rmiapssqvzzm6bg8lgmf"; depends=[boot car ComplexHeatmap ggplot2 glm2 gridExtra igraph KEGGgraph KEGGREST ppcor qvalue RCurl SummarizedExperiment]; };
   MantelCorr = derive2 { name="MantelCorr"; version="1.51.0"; sha256="03sqqfi06hcprya25aj3p9sa35x9n2m9ffnplnh6gqmcv22fj75k"; depends=[]; };
   MassArray = derive2 { name="MassArray"; version="1.33.0"; sha256="1ni7dw8lk73n3b19m0rnd8cszb4p6la6msld0z63lgvih4m3z805"; depends=[]; };
   MassSpecWavelet = derive2 { name="MassSpecWavelet"; version="1.47.0"; sha256="0mq6xfdj11m49xi6x14lp6kh9idfbrmy9kx7jpjm90hwdjnl48ym"; depends=[waveslim]; };
   MatrixRider = derive2 { name="MatrixRider"; version="1.13.0"; sha256="0plcabv6wc7s4q7ippi7i9ckc3lg4pwxdm32gpsmmssff37jx41c"; depends=[Biostrings IRanges S4Vectors TFBSTools XVector]; };
-  MaxContrastProjection = derive2 { name="MaxContrastProjection"; version="1.5.0"; sha256="10hdj1kb9ywwgzf7nj7hzmh2hr5si6ps0h120nkdjmjscyd2sw26"; depends=[EBImage]; };
-  MeSHDbi = derive2 { name="MeSHDbi"; version="1.17.0"; sha256="1m73m7dgcl1n2rgb8c8qar65w18b1qq42n458yw3di88xly6wmb3"; depends=[AnnotationDbi Biobase BiocGenerics RSQLite]; };
+  MaxContrastProjection = derive2 { name="MaxContrastProjection"; version="1.5.1"; sha256="1ybz5ij152pdbnn47p5sprlm8lzdgzazv0h890dbh9z3k9b7vbli"; depends=[EBImage]; };
+  MeSHDbi = derive2 { name="MeSHDbi"; version="1.17.1"; sha256="1qxbpvl97j187bl9nqib6z580f692apdrsdw8qlpk1lw197sv7np"; depends=[AnnotationDbi Biobase BiocGenerics RSQLite]; };
   MeasurementError_cor = derive2 { name="MeasurementError.cor"; version="1.53.0"; sha256="0j6v368naid00b1igibjp94yxyz0sqhsr8lxgxv0xwy85ivsqlbi"; depends=[]; };
   MergeMaid = derive2 { name="MergeMaid"; version="2.53.0"; sha256="1dn5shrkyhph13x5qyygvp10jd8acs6rka9vr3g9dh0rq4mx4114"; depends=[Biobase MASS survival]; };
-  Mergeomics = derive2 { name="Mergeomics"; version="1.9.0"; sha256="1qs7jcgg5ah2iw6lcfwnp9lag5cah0d0gg9jk2qhrnqi22cjrymf"; depends=[]; };
-  MetCirc = derive2 { name="MetCirc"; version="1.11.0"; sha256="1v37sbd1c3m5mqyqlm7jcv1dascwwb1m9fm1cr2rn8r2whi9yfib"; depends=[amap circlize scales shiny]; };
-  MetaCyto = derive2 { name="MetaCyto"; version="1.3.2"; sha256="19kvmrzfakyjavd0y6j2ixzmlm070fdz6sygn0vczpdkqmir5vqd"; depends=[cluster fastcluster flowCore FlowSOM ggplot2 metafor tidyr]; };
+  Mergeomics = derive2 { name="Mergeomics"; version="1.9.1"; sha256="0gz7vx1gvng7dlkwfz45i1cpsdhazv9w5idbxjsh3rxwpll4yvd5"; depends=[]; };
+  MetCirc = derive2 { name="MetCirc"; version="1.11.3"; sha256="12f9cj5wzavd51kbyiz380fhb2zrlybakm4z7rnpvcx0g8q7l3y3"; depends=[amap circlize scales shiny]; };
+  MetID = derive2 { name="MetID"; version="0.99.8"; sha256="196ha93x99p7dhhwnr4b4xddkjjw2m1q30bn238msndz4l5chmri"; depends=[ChemmineR devtools igraph Matrix stringr]; };
+  MetNet = derive2 { name="MetNet"; version="0.99.24"; sha256="15gqzi23r7g43awk67qnqxlpgyq0zb9z06gq60kd0j05pwhfpgqz"; depends=[BiocParallel bnlearn mpmi parmigene ppcor rfPermute sna stabs WGCNA]; };
+  MetaCyto = derive2 { name="MetaCyto"; version="1.3.4"; sha256="0j97f77ailb5ih6ky3svcf7lmr6qk352p59mbx7rcxgg7fdajc0l"; depends=[cluster fastcluster flowCore FlowSOM ggplot2 metafor tidyr]; };
   MetaNeighbor = derive2 { name="MetaNeighbor"; version="1.1.0"; sha256="1jj4jh27ysl3ilhw20pf1srw0n47c0dbc3s760blwbf5qnrlhivv"; depends=[beanplot gplots RColorBrewer SummarizedExperiment]; };
   Metab = derive2 { name="Metab"; version="1.15.0"; sha256="12l43jyrsq1dcbbrkr6k66hrcwkx8ynyniz3cfs17im09nrj20jz"; depends=[pander svDialogs xcms]; };
-  MetaboSignal = derive2 { name="MetaboSignal"; version="1.11.0"; sha256="0cpmbq55d7bf9mky0m0ydg1qs60sxq8wl2apkhvnyfhifv3f316q"; depends=[AnnotationDbi biomaRt EnsDb_Hsapiens_v75 hpar igraph KEGGgraph KEGGREST MWASTools org_Hs_eg_db RCurl]; };
-  MethPed = derive2 { name="MethPed"; version="1.9.0"; sha256="0xi7s75ph09xi8f57hnmlfzr4xazj875wqc98dr198r5985sl99v"; depends=[Biobase randomForest]; };
+  MetaboSignal = derive2 { name="MetaboSignal"; version="1.11.0"; sha256="0cpmbq55d7bf9mky0m0ydg1qs60sxq8wl2apkhvnyfhifv3f316q"; depends=[AnnotationDbi biomaRt EnsDb_Hsapiens_v75 hpar igraph KEGGgraph KEGGREST MWASTools mygene org_Hs_eg_db RCurl]; };
+  MethPed = derive2 { name="MethPed"; version="1.9.1"; sha256="0x83lz61vn74z9nps99a0f8jh34impkm1523wzp0gr24gcmikb8y"; depends=[Biobase randomForest]; };
   MethTargetedNGS = derive2 { name="MethTargetedNGS"; version="1.13.0"; sha256="02kc184ql68rqll95sza94qnzjgh8wvg76h3z5r3lqmxdd7bblz9"; depends=[Biostrings gplots seqinr stringr]; };
   MethylAid = derive2 { name="MethylAid"; version="1.15.0"; sha256="15xkcbjj7mcmbm5di1bxslfiipnbdarsfsg16kmd530v9lmll331"; depends=[Biobase BiocGenerics BiocParallel ggplot2 gridBase hexbin matrixStats minfi RColorBrewer shiny SummarizedExperiment]; };
-  MethylMix = derive2 { name="MethylMix"; version="2.11.0"; sha256="1lm88i5b03i08s4dydmw7jjxp5qpn5nz72by74nqzc36m6ignk8k"; depends=[data_table digest foreach ggplot2 impute limma R_matlab RColorBrewer RCurl RPMM]; };
-  MethylSeekR = derive2 { name="MethylSeekR"; version="1.21.0"; sha256="0zpd930n3vyv94yic8zjfgl68m3kr4z35ab5lzprjmpyy8hg7szn"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; };
+  MethylMix = derive2 { name="MethylMix"; version="2.11.2"; sha256="02wsil0s5jp6lh4jlh9sppz9ir8lk849jlxagj48s9napxbw65fc"; depends=[data_table digest foreach ggplot2 impute limma R_matlab RColorBrewer RCurl RPMM]; };
+  MethylSeekR = derive2 { name="MethylSeekR"; version="1.21.1"; sha256="18hcd43z15949vsd7s02zg85dpyf9gkc7dky70xz8jv8gbmizl56"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; };
   Mfuzz = derive2 { name="Mfuzz"; version="2.41.0"; sha256="0hdjkg90kk7igjx26hfm9wfh7lymm0cgxsn263a7sy1cb6ld7nx8"; depends=[Biobase e1071 tkWidgets]; };
   MiChip = derive2 { name="MiChip"; version="1.35.0"; sha256="19w0kzyg6s950g0p4a4gdkkblsz30zv57rs3dqzqh1rgcrcb4gpf"; depends=[Biobase]; };
   MiPP = derive2 { name="MiPP"; version="1.53.0"; sha256="0ii5vlx5gwkz01ivg0qjml8q5zqdvz21rrxgqhx2zdqwi6cbfww0"; depends=[Biobase e1071 MASS]; };
-  MiRaGE = derive2 { name="MiRaGE"; version="1.23.0"; sha256="1inywp84lh8qwairxrb8cvql171mg4jrg66aqg0nhihqm0mjwnn5"; depends=[AnnotationDbi Biobase BiocGenerics S4Vectors]; };
+  MiRaGE = derive2 { name="MiRaGE"; version="1.23.3"; sha256="02nrjckzywcfm0b34f076qkpsaa9n6p57pjd9chhcnns0i7kl2ji"; depends=[AnnotationDbi Biobase BiocGenerics BiocManager S4Vectors]; };
   MineICA = derive2 { name="MineICA"; version="1.21.0"; sha256="1n711vz5g1rrz6hnm88w3ycm0yczq4a0h2rg635g7x33sszjr3dk"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt cluster colorspace fastICA foreach fpc ggplot2 GOstats graph gtools Hmisc igraph JADE lumi lumiHumanAll_db marray mclust plyr RColorBrewer Rgraphviz scales xtable]; };
+  MinimumDistance = derive2 { name="MinimumDistance"; version="1.25.2"; sha256="1pv6h2p0y6r32dz99b61bdgyd86nnmzs7dph9xk7a5rrgzaj1bb8"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; };
   Mirsynergy = derive2 { name="Mirsynergy"; version="1.17.0"; sha256="0n8vspalfwisnfk486i90pxi2hd2xi32b36pfl3ifrpqyr2rylix"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; };
   MmPalateMiRNA = derive2 { name="MmPalateMiRNA"; version="1.31.0"; sha256="10cdaprs899j3fswds8vx4gm2xp5kcx11l53ymxlyjr5592887fm"; depends=[Biobase lattice limma statmod vsn xtable]; };
-  MoPS = derive2 { name="MoPS"; version="1.15.0"; sha256="0bmxwf1i2szan2wn4gxmf4qskrsaydkkrbg7agmgzgbzhvb47dgs"; depends=[Biobase]; };
-  MoonlightR = derive2 { name="MoonlightR"; version="1.7.1"; sha256="040hkp66mr432762wkwyyhxpsqqrhkri06szl7wyfpmf3gmydj9i"; depends=[Biobase circlize clusterProfiler doParallel DOSE foreach GEOquery gplots HiveR limma parmigene randomForest RColorBrewer RISmed SummarizedExperiment TCGAbiolinks]; };
+  MoPS = derive2 { name="MoPS"; version="1.15.1"; sha256="0nmk4iapypdak2z4zmlwv2crvgzh10l8vvajkiszwakdpsc734fd"; depends=[Biobase]; };
+  MoonlightR = derive2 { name="MoonlightR"; version="1.7.2"; sha256="1j2k09hcg5z65yxaml6yhxffsz3dmh56j64w625rqxmfk0b1zyii"; depends=[Biobase circlize clusterProfiler doParallel DOSE foreach GEOquery gplots HiveR limma parmigene randomForest RColorBrewer RISmed SummarizedExperiment TCGAbiolinks]; };
   MotIV = derive2 { name="MotIV"; version="1.37.0"; sha256="0wzf7dzw063i613gx8pa3sf1hvqc52yhb8dqpy87g3smalfj3qr3"; depends=[BiocGenerics Biostrings IRanges lattice rGADEM S4Vectors]; };
-  MotifDb = derive2 { name="MotifDb"; version="1.23.0"; sha256="1s0191bn7418bkl5zha6a99wnznznrndk13z8jhzjcpp4kk6m1f7"; depends=[BiocGenerics Biostrings IRanges rtracklayer S4Vectors splitstackshape]; };
+  MotifDb = derive2 { name="MotifDb"; version="1.23.14"; sha256="0v7n0682w9gsnp7vknhwfc6baimsjcqb5gm3bglnsp6kr4khjhkx"; depends=[BiocGenerics Biostrings IRanges rtracklayer S4Vectors splitstackshape]; };
   Mulcom = derive2 { name="Mulcom"; version="1.31.0"; sha256="0l8wn2ma3s55w86wv3779y39vsp45rfa5nkjj1cjn26qc2ay0r0f"; depends=[Biobase fields]; };
-  MultiAssayExperiment = derive2 { name="MultiAssayExperiment"; version="1.7.14"; sha256="1wwi9dgf41zvkv2zkrx6wvk15zhml618mz3ki7gzshzp3p9wxwr7"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors SummarizedExperiment tidyr]; };
+  MultiAssayExperiment = derive2 { name="MultiAssayExperiment"; version="1.7.22"; sha256="1pw80vr48jii32mxd8rwshi3q6ccr4c3x3fr0bxdkbf9ypa2l57j"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors SummarizedExperiment tidyr]; };
+  MultiDataSet = derive2 { name="MultiDataSet"; version="1.9.1"; sha256="19j4jd5gh363l6p3jmjfcp14y1vmixg20lcpqjs78zxk1saalhz3"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 ggrepel IRanges limma qqman S4Vectors SummarizedExperiment]; };
   MultiMed = derive2 { name="MultiMed"; version="2.3.0"; sha256="085vmkq1hd9x1za5c21gvndyl46ymd7w5hwixvhnsclzb4r7gav7"; depends=[]; };
-  MutationalPatterns = derive2 { name="MutationalPatterns"; version="1.7.0"; sha256="1iy96za3b31sm9kkbg6vf17a88pyhdk580yrhl580ggwjjkn3fz6"; depends=[BiocGenerics Biostrings cowplot GenomeInfoDb GenomicRanges ggdendro ggplot2 IRanges NMF plyr pracma reshape2 S4Vectors SummarizedExperiment VariantAnnotation]; };
-  NADfinder = derive2 { name="NADfinder"; version="1.5.0"; sha256="0wjnfi09d686ypifgqrn191hh8xgv7m87fnak84ss5ka9lwhii54"; depends=[ATACseqQC baseline BiocGenerics corrplot csaw EmpiricalBrownsMethod GenomeInfoDb GenomicAlignments GenomicRanges IRanges limma metap Rsamtools rtracklayer S4Vectors signal SummarizedExperiment trackViewer]; };
+  MutationalPatterns = derive2 { name="MutationalPatterns"; version="1.7.3"; sha256="1krq37chmnqzl9dlk6dwjy6kasa511s2qc8hndg5l0am12lmn5bg"; depends=[BiocGenerics Biostrings cowplot GenomeInfoDb GenomicRanges ggdendro ggplot2 IRanges NMF plyr pracma reshape2 S4Vectors SummarizedExperiment VariantAnnotation]; };
+  NADfinder = derive2 { name="NADfinder"; version="1.5.4"; sha256="0qgnpq9ci3344kjba8jfs6lbnrdhsyjvb5vxrd0p4v08j3fg4q55"; depends=[ATACseqQC baseline BiocGenerics corrplot csaw EmpiricalBrownsMethod GenomeInfoDb GenomicAlignments GenomicRanges IRanges limma metap rbamtools Rsamtools rtracklayer S4Vectors signal SummarizedExperiment trackViewer]; };
+  NBSplice = derive2 { name="NBSplice"; version="0.99.9"; sha256="181msya2wpcqsn3xyiqzghl58r394ilw5khmzihyq5b1bq3x7rmr"; depends=[BiocParallel car edgeR ggplot2 MASS mppa reshape2]; };
   NCIgraph = derive2 { name="NCIgraph"; version="1.29.0"; sha256="06jmifga56d9cnqp4wb9hm6g32fhsk6n0g70qqw1k4l5k7m2v5wv"; depends=[graph KEGGgraph R_methodsS3 RBGL RCy3]; };
-  NGScopy = derive2 { name="NGScopy"; version="1.15.0"; sha256="1b8190zyq3sixmvg9kw7jshxsyb2zicfm0w6qfgah0aq9jgb9gxz"; depends=[changepoint rbamtools Xmisc]; };
-  NOISeq = derive2 { name="NOISeq"; version="2.25.0"; sha256="18hz9g1p1kacb1f4b3sxfrp1gl6wk87p20d5580krrqk9a69al2n"; depends=[Biobase Matrix]; };
+  NGScopy = derive2 { name="NGScopy"; version="1.15.1"; sha256="0azw7zq7bz7haifmng9y59jbhh7nfhz6k886gffdvlnbrn3k4kbr"; depends=[changepoint rbamtools Xmisc]; };
+  NOISeq = derive2 { name="NOISeq"; version="2.25.1"; sha256="094jrp87nhjyi31qbg719ny0dqki5blf6k86d4sbh3vqngakcjg3"; depends=[Biobase Matrix]; };
   NTW = derive2 { name="NTW"; version="1.31.0"; sha256="183y8sqf3h4ik1cm6zhvzmijc8kanmv3lvqh4v4cb7qhvgrgb3ln"; depends=[mvtnorm]; };
   NanoStringDiff = derive2 { name="NanoStringDiff"; version="1.11.0"; sha256="0sl0chkrx8s4625ch43x9r8n5k7cd0y18cinafrligqfrwnc5yx0"; depends=[Biobase matrixStats Rcpp]; };
   NanoStringQCPro = derive2 { name="NanoStringQCPro"; version="1.13.0"; sha256="1km8i428rn4q5b89d56bcnwkrpvhf67bzmxwzxfdwm1qr956vab2"; depends=[AnnotationDbi Biobase knitr NMF org_Hs_eg_db png RColorBrewer]; };
   NarrowPeaks = derive2 { name="NarrowPeaks"; version="1.25.1"; sha256="1lqs0rcx52c3hnx89wngmyyhn02a7nf007x95z85rqzrclgy27ki"; depends=[BiocGenerics CSAR fda GenomeInfoDb GenomicRanges ICSNP IRanges S4Vectors]; };
-  NetPathMiner = derive2 { name="NetPathMiner"; version="1.17.0"; sha256="0p6syyn31nfx3qgw8yv6m7jry2prnjnf6pc9qf889407438q11cf"; depends=[igraph]; };
-  NetSAM = derive2 { name="NetSAM"; version="1.21.0"; sha256="15crfdd8a7wlmn3vmwqxzfihaph64lay7k75dx5mjwswp01w5g37"; depends=[graph igraph seriation]; };
-  NormqPCR = derive2 { name="NormqPCR"; version="1.27.0"; sha256="1481sv255pq76scmbwvw66blknww2w8d9c4md4gmsgkifwnwvqjf"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; };
+  NeighborNet = derive2 { name="NeighborNet"; version="0.99.5"; sha256="1xwpzkfmhgiswwyls5q9cm8qnz7xvp3axhm95cvwfqxwbp8j81mc"; depends=[graph]; };
+  NetPathMiner = derive2 { name="NetPathMiner"; version="1.17.1"; sha256="0hfdi6359vl27m5fa8fr9pr4xw8pqdx3qjbw6laigylapn8vwy6n"; depends=[igraph]; };
+  NetSAM = derive2 { name="NetSAM"; version="1.21.1"; sha256="0h1wld8p7pvyf7jfgcdgykg34dccf7ykrfc7jqv0i5aip4zjxpd0"; depends=[graph igraph seriation]; };
+  NormalyzerDE = derive2 { name="NormalyzerDE"; version="0.99.25"; sha256="00x86np9265klpvzv72xcdnnqfkaa1ygja4hrlpx3iaz9r2x3k4z"; depends=[ape Biobase car ggplot2 limma MASS matrixStats preprocessCore raster RcmdrMisc SummarizedExperiment vsn]; };
+  NormqPCR = derive2 { name="NormqPCR"; version="1.27.2"; sha256="18bsw0hp7m48vh85ajyxhp447agrzhs5x0jy4684p77xrlhqfmqz"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; };
   NuPoP = derive2 { name="NuPoP"; version="1.31.0"; sha256="1sfv98q0z3x5lzmvhbjh1k65flxhsjfx5nqhlhhihcs5rjx8pa3h"; depends=[]; };
   OCplus = derive2 { name="OCplus"; version="1.55.0"; sha256="0nn2adv9v0j0dhz93kd2d3bh1fx31vg3qk9sygrf1xbwqppmcyp9"; depends=[akima multtest]; };
   OGSA = derive2 { name="OGSA"; version="1.11.0"; sha256="063y4bzxiwjb0nvh3lkkgd39p59sy9drzcckpkxm5yxm3scrdy2f"; depends=[Biobase gplots limma]; };
   OLIN = derive2 { name="OLIN"; version="1.59.0"; sha256="0q0cr7yfprvzl01dgb4mwpbwnj1yfpn4myf8jksckiy0s2cwinra"; depends=[limma locfit marray]; };
   OLINgui = derive2 { name="OLINgui"; version="1.55.0"; sha256="1wjsb9h443d82x6vq70plhv7cgc3n7imvjlian1a0hd9dbcx9ss3"; depends=[marray OLIN tkWidgets widgetTools]; };
-  OPWeight = derive2 { name="OPWeight"; version="1.3.0"; sha256="1jjpz8inwfwpky316l61lka8g0dp69qr8kbgi6g54f0y0kjcq5fa"; depends=[MASS qvalue tibble]; };
-  ORFik = derive2 { name="ORFik"; version="1.1.0"; sha256="03fv9dr9jpzavrnbjd1pp6jlbi5i3sbg6zbi3p7z95rm8j1cds6x"; depends=[Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rcpp Rsamtools rtracklayer S4Vectors]; };
+  OMICsPCA = derive2 { name="OMICsPCA"; version="0.99.17"; sha256="1na9swmy7z5xnbvp7h2x6s1jgdhifwdh36ad7g7jlhfc7v8a3kqh"; depends=[cluster clValid corrplot cowplot data_table factoextra FactoMineR fpc GenomeInfoDb ggplot2 HelloRanges IRanges kableExtra magick MASS MultiAssayExperiment NbClust OMICsPCAdata pdftools PerformanceAnalytics reshape2 rgl rmarkdown rtracklayer tidyr]; };
+  OPWeight = derive2 { name="OPWeight"; version="1.3.1"; sha256="17xrv1ad4wv20q4lwgxpr58sn73klx165h2pvjwly8v68hx1713s"; depends=[MASS qvalue tibble]; };
+  ORFik = derive2 { name="ORFik"; version="1.1.14"; sha256="1cq43ha9brllyn1p72978xcvb45iapkz2hsfh6anbh4xdhv9pbxg"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rcpp Rsamtools rtracklayer S4Vectors]; };
   OSAT = derive2 { name="OSAT"; version="1.29.0"; sha256="174jna1bl6vkbr3zypyfnhakfm7bm6llfcgghr4m9bvc8a6hxq6b"; depends=[]; };
   OTUbase = derive2 { name="OTUbase"; version="1.31.0"; sha256="0p86dn54pipqy3v74iwgvs2xqxypq6iq58y9m0pqbncryrszcs0p"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; };
-  OmaDB = derive2 { name="OmaDB"; version="1.1.1"; sha256="1y2xflz6cbdhxsyd0nx131amxmq4jjfcgma34vrl6jzl9y9l96ga"; depends=[ape Biostrings GenomicRanges httr IRanges plyr topGO]; };
+  OUTRIDER = derive2 { name="OUTRIDER"; version="0.99.31"; sha256="1wihfldpj8hq86z9ln5c06rr5kv8cjx5bmcqz5cx58vxg3sr86h4"; depends=[BBmisc Biobase BiocGenerics BiocParallel data_table DESeq2 GenomicFeatures GenomicRanges ggplot2 ggpubr gplots IRanges matrixStats pcaMethods plotly plyr PRROC RColorBrewer Rcpp RcppArmadillo reticulate S4Vectors scales SummarizedExperiment]; };
+  OmaDB = derive2 { name="OmaDB"; version="1.1.4"; sha256="192wpb9f7vwkrlq2y2r7kicppqc5c9hb7nk00im06588mdldbp4p"; depends=[ape Biostrings GenomicRanges httr IRanges jsonlite plyr topGO]; };
   OmicCircos = derive2 { name="OmicCircos"; version="1.19.0"; sha256="03laa1vjjxgrpcz2sxdq9dq0fa2s04jvf56q03h5gx8hkfn4rv7v"; depends=[GenomicRanges]; };
-  OmicsMarkeR = derive2 { name="OmicsMarkeR"; version="1.13.0"; sha256="1fqmyfpjmpx3ihbvf5w15v48w2zbkx8iyyajc9gpsb033abzl3fm"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; };
-  Onassis = derive2 { name="Onassis"; version="1.3.0"; sha256="1smj5ii8mblmkg1p8ssi5xq5aqa13nl7fc0nlpbflv3cpssimzjs"; depends=[AnnotationDbi data_table GEOmetadb OnassisJavaLibs RCurl rJava RSQLite]; };
-  OncoScore = derive2 { name="OncoScore"; version="1.9.0"; sha256="0ckcnhr5f6lcarg6zjyszmf5yl6gw1g09j6jnqq87pk9g7nsi3n6"; depends=[biomaRt]; };
-  OncoSimulR = derive2 { name="OncoSimulR"; version="2.11.0"; sha256="02kbkpjkpi3srxgz8jcyk1dhsc2q19ghbd3p160v2sf966g1286d"; depends=[car data_table dplyr ggplot2 ggrepel graph gtools igraph nem RColorBrewer Rcpp Rgraphviz smatr]; };
+  OmicsMarkeR = derive2 { name="OmicsMarkeR"; version="1.13.1"; sha256="0fx2jjyn196344indfpdiaf63abvxm1rw7ris378rzpl282kch2m"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; };
+  Onassis = derive2 { name="Onassis"; version="1.3.7"; sha256="11ifi7bsdy6yrgs54pglaqhgw86zndn98qhygzkw7sxgb8b7ly18"; depends=[AnnotationDbi data_table DT GEOmetadb knitr OnassisJavaLibs RCurl rJava RSQLite]; };
+  OncoScore = derive2 { name="OncoScore"; version="1.9.3"; sha256="07pvd6alsbvm4wjlz3m3dnl0hyzv33fvznzxhcsgh1sz2kv92aya"; depends=[biomaRt]; };
+  OncoSimulR = derive2 { name="OncoSimulR"; version="2.11.1"; sha256="1nkwfc2gcmfn8pnz6zk7bywr1n75jrrfyhmbj0mzzhp4cjxsrj8d"; depends=[car data_table dplyr ggplot2 ggrepel graph gtools igraph nem RColorBrewer Rcpp Rgraphviz smatr]; };
   OrderedList = derive2 { name="OrderedList"; version="1.53.0"; sha256="1pdv3pih594x3bkrzmm7ab418mxjsa17qbv0dpmw4w1yyvrlyz5m"; depends=[Biobase twilight]; };
-  Organism_dplyr = derive2 { name="Organism.dplyr"; version="1.9.0"; sha256="196ispr6m2r1fc4l4jm985njh8xz7qxcsr8w0kvffv63zx0zy807"; depends=[AnnotationDbi AnnotationFilter BiocFileCache DBI dbplyr dplyr GenomeInfoDb GenomicFeatures GenomicRanges IRanges RSQLite S4Vectors]; };
-  OrganismDbi = derive2 { name="OrganismDbi"; version="1.23.0"; sha256="0mjav9c9w5mwmkdisci9c7i993xyvqbmsa8nw9kyhqirsxf0p7cc"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller DBI GenomicFeatures GenomicRanges graph IRanges RBGL S4Vectors]; };
+  Organism_dplyr = derive2 { name="Organism.dplyr"; version="1.9.2"; sha256="1n87ajas2wrrpkpmy0n9zim6f1by9vvqk9wh25kk4rxp3500d8gh"; depends=[AnnotationDbi AnnotationFilter BiocFileCache DBI dbplyr dplyr GenomeInfoDb GenomicFeatures GenomicRanges IRanges RSQLite S4Vectors]; };
+  OrganismDbi = derive2 { name="OrganismDbi"; version="1.23.2"; sha256="18l7ki8vaavzy0380gw1bhpjf5xs3naaq44xfam307pl5h7xr8c0"; depends=[AnnotationDbi Biobase BiocGenerics BiocManager DBI GenomicFeatures GenomicRanges graph IRanges RBGL S4Vectors]; };
   Oscope = derive2 { name="Oscope"; version="1.11.0"; sha256="1x8z5i3v42787iv9hddp65cggnlvr7xa9kippi0sn0wr7gd79zcw"; depends=[BiocParallel cluster EBSeq testthat]; };
   OutlierD = derive2 { name="OutlierD"; version="1.45.0"; sha256="085nk41icxzx8halczi4kjd262y8dfxq6lrhwiy8qjb216hbrln6"; depends=[Biobase quantreg]; };
-  PAA = derive2 { name="PAA"; version="1.15.0"; sha256="06slcqrpcvz713ga5vl2w0dyswqb78nnqvvf0dxi5cdw8g3h58gs"; depends=[e1071 gplots gtools limma MASS mRMRe randomForest Rcpp ROCR sva]; };
+  PAA = derive2 { name="PAA"; version="1.15.2"; sha256="16w6xc05gs9ynj01xkrk7gf0qvqknfpicayik5qlm7gmm1k43hm8"; depends=[e1071 gplots gtools limma MASS mRMRe randomForest Rcpp ROCR sva]; };
   PADOG = derive2 { name="PADOG"; version="1.23.0"; sha256="10libml1j14yy70s22yf8i4mh8awmnx5a94b3krmh6py2xlw41nj"; depends=[AnnotationDbi Biobase doRNG foreach GSA hgu133a_db hgu133plus2_db KEGG_db KEGGdzPathwaysGEO limma nlme]; };
   PANR = derive2 { name="PANR"; version="1.27.0"; sha256="0zr55whhmqyic41chlzxhrn081ray8gl90llb6rwigvmzhfjabyr"; depends=[igraph MASS pvclust RedeR]; };
   PAPi = derive2 { name="PAPi"; version="1.21.0"; sha256="1qnbqa72w1734j6rbdbays1f4ysl2b1r65p2hi580zwwi6isaa3i"; depends=[KEGGREST svDialogs]; };
   PCAN = derive2 { name="PCAN"; version="1.9.0"; sha256="14ph4mk4svinwpy0rw2b3n96dswahw6273lggw2blp9s24a56a1h"; depends=[BiocParallel]; };
   PCpheno = derive2 { name="PCpheno"; version="1.43.0"; sha256="004qx7rclh2q9bbrqf4d54jlzpha8vg0lbaf67gf42ivav0fl908"; depends=[annotate AnnotationDbi Biobase Category GO_db graph GSEABase KEGG_db ppiData ppiStats ScISI SLGI]; };
   PECA = derive2 { name="PECA"; version="1.17.0"; sha256="0p4vg0kcrypxm4g8al50rcvrk10lqs23mc00hrd1s8ydycvgd26a"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore ROTS]; };
-  PGA = derive2 { name="PGA"; version="1.11.2"; sha256="08ksqsrpx8mj3mbdbvnbx9bnwxqskkyd340a13r76f5d1p44086m"; depends=[AnnotationDbi biomaRt Biostrings data_table GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap RCurl Rsamtools RSQLite rTANDEM rtracklayer S4Vectors stringr VariantAnnotation]; };
+  PGA = derive2 { name="PGA"; version="1.11.4"; sha256="1dcig05dglia3ixymm1s7hzxf5fa7p6bgcwlf66qdx72iagr9ivp"; depends=[AnnotationDbi biomaRt Biostrings customProDB data_table GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap RCurl Rsamtools RSQLite rTANDEM rtracklayer S4Vectors stringr VariantAnnotation]; };
   PGSEA = derive2 { name="PGSEA"; version="1.55.0"; sha256="07ynkcxppvm8s525y10ly6jcc0ga93a8sqihdxhs1yg092pcbx64"; depends=[annaffy AnnotationDbi Biobase GO_db KEGG_db]; };
   PICS = derive2 { name="PICS"; version="2.25.0"; sha256="1qfv4ddkym5s7171i0c4s5v3x8liaxngpv40y362cr895wa63mwm"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; };
   PING = derive2 { name="PING"; version="2.25.0"; sha256="1lgvn09a1frb6cqrnrvmyzlwm7rgis61wd1gqv5y6pf0w6m6ya9k"; depends=[BiocGenerics BSgenome chipseq fda GenomicRanges Gviz IRanges PICS S4Vectors]; };
   PLPE = derive2 { name="PLPE"; version="1.41.0"; sha256="11a1wsgzssn5nqbmxxrfqk7js6h3y0zcxgfyqr5hvfz6licl2q3v"; depends=[Biobase LPE MASS]; };
   POST = derive2 { name="POST"; version="1.5.0"; sha256="099q5w5sgpamgncga096szl40i3lzjnphki2kfby0svkkvjiyrhl"; depends=[Biobase CompQuadForm GSEABase Matrix survival]; };
   PPInfer = derive2 { name="PPInfer"; version="1.7.0"; sha256="0pvhfc3qyxx6vxww6fx7jx8hb72sl4jna1c3bnyw6z7lvp7a8cxw"; depends=[biomaRt fgsea ggplot2 igraph kernlab STRINGdb yeastExpData]; };
-  PREDA = derive2 { name="PREDA"; version="1.27.0"; sha256="15ndnwf3f1cj2h0vrh71gs7xdvy97nncbxrlwk6yisvgndjbdmsb"; depends=[annotate Biobase lokern multtest]; };
+  PREDA = derive2 { name="PREDA"; version="1.27.1"; sha256="00wwfvcahrhyxylcg5wjsbv3aqsvw230lcggkk3jrwdyb5x902p2"; depends=[annotate Biobase lokern multtest]; };
   PROMISE = derive2 { name="PROMISE"; version="1.33.0"; sha256="1gkbpj9cd5fbrrp2zmffnckynbn81kqyg5wvy2g88spa1zxsx6vp"; depends=[Biobase GSEABase]; };
   PROPER = derive2 { name="PROPER"; version="1.13.0"; sha256="1w77rishajj0azrcf0cfsg9is98w1f1w3hfh72rgi7kc93d0k4v0"; depends=[edgeR]; };
   PROPS = derive2 { name="PROPS"; version="1.3.0"; sha256="15md6zvsa9ismdwbhlzwxkyj38n4bqv4kpbvxbzg7kb50hc109w6"; depends=[Biobase bnlearn reshape2 sva]; };
   PROcess = derive2 { name="PROcess"; version="1.57.0"; sha256="1sb25yfpvq4z6famifk951gwx75dd51srf1khm96psz9k0klxbqg"; depends=[Icens]; };
   PSEA = derive2 { name="PSEA"; version="1.15.0"; sha256="1rcz03n4asjajlncppvfhmlnar6f9qzb6m9bg99nmp0gdkjcwa2j"; depends=[Biobase MASS]; };
-  PSICQUIC = derive2 { name="PSICQUIC"; version="1.19.0"; sha256="06x6r2js8mxl10yrgmmvzb0na5ydya3ldzxaagh8z21smi154215"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; };
+  PSICQUIC = derive2 { name="PSICQUIC"; version="1.19.1"; sha256="0554irz5sxq3vglxq1jlr0fip3hfd41zw5wfd05gn5k0h8s3ff7j"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; };
   PWMEnrich = derive2 { name="PWMEnrich"; version="4.17.0"; sha256="1mknim17d0wl7vhn6cffjasisd9nmgs4b3fjz42yjj9y5xqjxwv9"; depends=[BiocGenerics Biostrings evd gdata seqLogo]; };
   PanVizGenerator = derive2 { name="PanVizGenerator"; version="1.9.0"; sha256="0x1rzblyy45xdr3hnjbacip7v1pbr54wfc2abldgij9mgc0hmhl9"; depends=[FindMyFriends igraph jsonlite pcaMethods shiny]; };
   Path2PPI = derive2 { name="Path2PPI"; version="1.11.0"; sha256="1f6qc6cvsrnhh26lkprjan9fxc1kw4hbb1wbr83rswg0lj8nyg6r"; depends=[igraph]; };
-  PathNet = derive2 { name="PathNet"; version="1.21.0"; sha256="1gnzghvj0gf4mcbh099v6c13gqjkalgb3g9fpn2i86fq8h61zplh"; depends=[]; };
-  PathoStat = derive2 { name="PathoStat"; version="1.7.2"; sha256="0j5by6yqgiyj17wn036dkb9q3d47ynb4m4w9zkf01d38lqzfp2hr"; depends=[ape BiocStyle ComplexHeatmap corpcor DESeq2 devtools dplyr DT edgeR ggplot2 glmnet gmodels knitr limma matrixStats phyloseq plotly plyr RColorBrewer rentrez reshape2 ROCR scales shiny shinyjs tidyr vegan webshot XML]; };
-  PathwaySplice = derive2 { name="PathwaySplice"; version="1.5.0"; sha256="15yc7d84cghmqai4m86bzi3cwidngmn6b680a1ngm6lmfj03bykj"; depends=[annotate AnnotationDbi AnnotationHub BiasedUrn Biobase BiocGenerics DOSE dplyr EnrichmentBrowser ensembldb gdata geneLenDataBase GO_db goseq gplots gridExtra htmlwidgets igraph JunctionSeq KEGGREST mgcv org_Hs_eg_db org_Mm_eg_db plotly RColorBrewer reshape2 S4Vectors tibble VennDiagram webshot]; };
-  PharmacoGx = derive2 { name="PharmacoGx"; version="1.11.0"; sha256="0s2gwvp9pdc1qf35apcgscz2xrx5sy1x9kcixy9wjwm4qnhr8cag"; depends=[Biobase caTools downloader lsa magicaxis piano RColorBrewer reshape2]; };
+  PathNet = derive2 { name="PathNet"; version="1.21.2"; sha256="1ihd81wwx0w1alzylc2wydg9kx9x3m2hw3zyp8qjhxxjf9pps507"; depends=[]; };
+  PathoStat = derive2 { name="PathoStat"; version="1.7.8"; sha256="1lnv8x2im6nw4kckv62cmxi06hjxw3ivj9jyzxi9wc0yylyrbp6j"; depends=[ape BiocStyle ComplexHeatmap corpcor DESeq2 devtools dplyr DT edgeR ggplot2 glmnet gmodels knitr limma matrixStats phyloseq plotly plyr RColorBrewer rentrez reshape2 ROCR scales shiny shinyjs tidyr vegan webshot XML]; };
+  PathwaySplice = derive2 { name="PathwaySplice"; version="1.5.2"; sha256="1dj56ssc31yxn3g29485phmjjd9a4nndx455yvvig8p74630149w"; depends=[annotate AnnotationDbi AnnotationHub BiasedUrn Biobase BiocGenerics DOSE dplyr EnrichmentBrowser ensembldb gdata geneLenDataBase GO_db goseq gplots gridExtra htmlwidgets igraph JunctionSeq KEGGREST mgcv org_Hs_eg_db org_Mm_eg_db plotly RColorBrewer reshape2 S4Vectors tibble VennDiagram webshot]; };
+  Pbase = derive2 { name="Pbase"; version="0.21.3"; sha256="0945vdb18879j269fd16rac4pmlnqbddp6nn1vkfyprfqv3aqdq8"; depends=[AnnotationFilter Biobase BiocGenerics BiocParallel biomaRt Biostrings cleaver ensembldb GenomicRanges Gviz IRanges MSnbase mzID mzR Pviz Rcpp rtracklayer S4Vectors]; };
+  PharmacoGx = derive2 { name="PharmacoGx"; version="1.11.3"; sha256="14dib394xhrdapli5lwrzvf4fmbbgpcrgnbrv80749y9ivmg2jb1"; depends=[Biobase caTools downloader lsa magicaxis piano RColorBrewer reshape2]; };
   PhenStat = derive2 { name="PhenStat"; version="2.17.0"; sha256="1fvkaqg1ignyknjgrnj359a5276rrscrkdk9029851rjpyzwypd5"; depends=[car corrplot ggplot2 graph knitr lme4 logistf MASS msgps nlme nortest pingr reshape SmoothWin]; };
-  Pi = derive2 { name="Pi"; version="1.9.0"; sha256="1bdr53dxz2sfmm7n4214m5mqp47l8ipsm562mhs1pybqfawfwfff"; depends=[caret dnet GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel glmnet Gviz igraph lattice MASS Matrix plot3D randomForest ROCR scales supraHex XGR]; };
-  Pigengene = derive2 { name="Pigengene"; version="1.7.4"; sha256="072bzpimq9135r4s7sfxgw8sb6h0fgygay9fvlbldfcql8amx7kp"; depends=[bnlearn C50 GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; };
+  Pi = derive2 { name="Pi"; version="1.9.3"; sha256="0h3a40bhj2410w8ibfbfp2nl76c5anh62pva8phf6y2g4bxvhi9p"; depends=[caret dnet GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel glmnet Gviz igraph lattice MASS Matrix plot3D randomForest ROCR scales supraHex XGR]; };
+  Pigengene = derive2 { name="Pigengene"; version="1.7.8"; sha256="0spdvc7wl8y7nsvyfrzni666wpbi8021ff2nlc4f6chhx6zqvg2i"; depends=[bnlearn C50 GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; };
   Polyfit = derive2 { name="Polyfit"; version="1.15.0"; sha256="0k3apzd7szmglba2s51grmp4lbvv2wmv6kvv43mvbvrvc59cyxq5"; depends=[DESeq]; };
   PowerExplorer = derive2 { name="PowerExplorer"; version="1.1.1"; sha256="06igcls1khn3dvajp7289v4ax6yr5cgg0da0d81dkr38cb6lwnpx"; depends=[Biobase BiocParallel data_table DESeq2 ggplot2 gridExtra MASS ROTS S4Vectors SummarizedExperiment vsn]; };
   Prize = derive2 { name="Prize"; version="1.11.0"; sha256="0fk26mk97l3jdj9n20ha7m8gcfxc20w4c9c5xshnphfij56brrr5"; depends=[diagram ggplot2 gplots matrixcalc reshape2 stringr]; };
   ProCoNA = derive2 { name="ProCoNA"; version="1.19.0"; sha256="1648ly7mpqfhj1phnvwrkzsj31wdk5ddg7cc073kbwwgmz859r0d"; depends=[BiocGenerics flashClust GOstats MSnbase WGCNA]; };
-  Prostar = derive2 { name="Prostar"; version="1.13.0"; sha256="01k76vh9z15ya8cjymwmpcl0z79q3fqpz2m5yvvsy21ijw2vd004"; depends=[DAPAR DAPARdata data_table DT highcharter htmlwidgets R_utils rhandsontable shiny shinyAce shinyBS shinyjs webshot]; };
+  Prostar = derive2 { name="Prostar"; version="1.13.16"; sha256="0kfqzibwkwbggjs5isgf9s1nk3zssahcicf9vpr3s2rkkmn18y8j"; depends=[BiocManager colourpicker DAPAR DAPARdata data_table DT future highcharter htmlwidgets later promises R_utils rclipboard rhandsontable shiny shinyAce shinyBS shinycssloaders shinyjqui shinyjs shinythemes shinyTree shinyWidgets webshot XML]; };
   ProtGenerics = derive2 { name="ProtGenerics"; version="1.13.0"; sha256="0mcdiy93c01ki2zfv90a5q00hss8i4mds4gw6n6gp32f40ap7h2j"; depends=[]; };
-  ProteomicsAnnotationHubData = derive2 { name="ProteomicsAnnotationHubData"; version="1.11.0"; sha256="01279ybid6k8l8w564rpx7jd1487dafxkmgfzvg0964z930i7qsm"; depends=[AnnotationHub AnnotationHubData Biobase BiocInstaller Biostrings GenomeInfoDb MSnbase mzR RCurl]; };
-  PureCN = derive2 { name="PureCN"; version="1.11.11"; sha256="1n2ikzcyxw8rfbid2bgg6fnn3nlfwgmjw73f9y06hyci0m2qpc8n"; depends=[BiocGenerics Biostrings data_table DNAcopy futile_logger GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra IRanges Matrix RColorBrewer rhdf5 Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VGAM]; };
+  ProteoMM = derive2 { name="ProteoMM"; version="0.99.8"; sha256="0j9sjj7r6jbgwv2vfsgd61xk5sd6rlw6ns5j0qvpcry6a5a26z3s"; depends=[biomaRt gdata ggplot2 ggrepel gtools matrixStats]; };
+  ProteomicsAnnotationHubData = derive2 { name="ProteomicsAnnotationHubData"; version="1.11.1"; sha256="1zlwsfk1f0pc6diqmd5r6cfxz48zz1m1hxagly7rw3v52qmjqynh"; depends=[AnnotationHub AnnotationHubData Biobase BiocManager Biostrings GenomeInfoDb MSnbase mzR RCurl]; };
+  PureCN = derive2 { name="PureCN"; version="1.11.20"; sha256="0nznlpqpj1lrxn0lymq5xksn8zs6hda4jmq57mks9nj8ilq1sw0r"; depends=[BiocGenerics Biostrings data_table DNAcopy futile_logger GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra IRanges Matrix RColorBrewer rhdf5 Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VGAM]; };
   Pviz = derive2 { name="Pviz"; version="1.15.0"; sha256="08kkrhxmy60lkvmjwpkv3nv7w8mybv5465923a9hghzs291qjvn4"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; };
   QDNAseq = derive2 { name="QDNAseq"; version="1.17.0"; sha256="113s3ir4dxhxxpfy700hp2lgvx6qgzy1nbqin0g3fz7z0y50m2ns"; depends=[Biobase BiocParallel CGHbase CGHcall DNAcopy GenomicRanges IRanges matrixStats R_utils Rsamtools]; };
+  QSutils = derive2 { name="QSutils"; version="0.99.8"; sha256="03840r3xw83gd1k56p66qang26g26gilrddfdnjjilpkcshmbksd"; depends=[ape BiocGenerics Biostrings psych]; };
   QUALIFIER = derive2 { name="QUALIFIER"; version="1.25.1"; sha256="1acaga0zc3vnjmr15xmyd05xp2cdwh96armg47qbpb4kygfh433g"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; };
-  QUBIC = derive2 { name="QUBIC"; version="1.9.0"; sha256="1kayxj3msc171x6glgvqpqygrigf8x0knknk7ci7fmbg6haf44jf"; depends=[biclust Matrix Rcpp RcppArmadillo]; };
-  QuartPAC = derive2 { name="QuartPAC"; version="1.13.0"; sha256="0mxq3nn5lqfqk8lpg1pys724pvviqz1fkhbnp5zlszvyhikmic9q"; depends=[data_table GraphPAC iPAC SpacePAC]; };
-  QuasR = derive2 { name="QuasR"; version="1.21.0"; sha256="1q3h4dg95wqmfkbrp5rvyp7qazafcgwc4chhw7rlwdbvic080g63"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges IRanges Rbowtie Rsamtools rtracklayer S4Vectors ShortRead zlibbioc]; };
-  QuaternaryProd = derive2 { name="QuaternaryProd"; version="1.15.0"; sha256="0b0qxsqf3g42k68d22w22n8y5yjvhx4jfkwpaxg38z5i8404n03k"; depends=[dplyr Rcpp yaml]; };
-  R3CPET = derive2 { name="R3CPET"; version="1.13.0"; sha256="0viqypiwmrhi08islj8lg2byhvhfblwjj340ms2a7wf8zbyl439l"; depends=[BiocGenerics clues clValid data_table GenomeInfoDb GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp RCurl reshape2 S4Vectors]; };
+  QUBIC = derive2 { name="QUBIC"; version="1.9.1"; sha256="0akvph9v1rqiq5a4ygi3wcpi82n4py59fdwvzbphnkd1wpva61wn"; depends=[biclust Matrix Rcpp RcppArmadillo]; };
+  QuartPAC = derive2 { name="QuartPAC"; version="1.13.1"; sha256="105jl05hai0jiy240618zbb861d7ya0x51hds6h9af189jgc98jz"; depends=[data_table GraphPAC iPAC SpacePAC]; };
+  QuasR = derive2 { name="QuasR"; version="1.21.2"; sha256="1wz8mq86ffws24akwf0idvq3s2ys8dgwcm47ajv59589x75a9qwv"; depends=[Biobase BiocGenerics BiocManager BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges IRanges Rbowtie Rsamtools rtracklayer S4Vectors ShortRead zlibbioc]; };
+  QuaternaryProd = derive2 { name="QuaternaryProd"; version="1.15.3"; sha256="0k3a64j3zkvqqg04hlx94iiw5g2hndnl99m2bbn6asjx3vyjj237"; depends=[dplyr Rcpp yaml]; };
+  R3CPET = derive2 { name="R3CPET"; version="1.13.1"; sha256="182h5zgq496lg284ncjk5qrqfnzab2cs8lkjrrxf4yzvf8h38bgl"; depends=[BiocGenerics clues clValid data_table GenomeInfoDb GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp RCurl reshape2 S4Vectors]; };
   R453Plus1Toolbox = derive2 { name="R453Plus1Toolbox"; version="1.31.0"; sha256="16cri94hg585804xaq5gfbs9nn62nhmcayapvwpb2y7vs855g4qx"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; };
   R4RNA = derive2 { name="R4RNA"; version="1.9.0"; sha256="08jrmdcdwk9dzk38sjc6rxn4nf3s5lg6x9w540drhiynd3jw9nxw"; depends=[Biostrings]; };
   RBGL = derive2 { name="RBGL"; version="1.57.0"; sha256="0bm2wfsi3himissj2x1v16rgrz3j2wz9s1kisaxxpgv27a4bvp0i"; depends=[graph]; };
-  RBM = derive2 { name="RBM"; version="1.13.0"; sha256="0ssl53wbzakkggx2jlzy378jnw13w116dxs3wnzmdaywa5nqbamr"; depends=[limma marray]; };
+  RBM = derive2 { name="RBM"; version="1.13.1"; sha256="1yc0cqw84b5bzwnp85x50q3ibq7zr3awnc0ndrf05q38jbqrgskc"; depends=[limma marray]; };
   RBioinf = derive2 { name="RBioinf"; version="1.41.0"; sha256="1bi7dx51nhq7y2s0395hncbfbwfhdixwwn5n238f6fq6sxg95v1h"; depends=[graph]; };
-  RCAS = derive2 { name="RCAS"; version="1.7.0"; sha256="14s4f6lfy31vv791h8yasc4b3883r0ksjab9wrsw8w8381ac2323"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DBI DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo knitr motifRG org_Hs_eg_db pbapply pheatmap plotly plotrix proxy rmarkdown RSQLite rtracklayer S4Vectors topGO]; };
+  RCAS = derive2 { name="RCAS"; version="1.7.3"; sha256="1k8frzidrg88j0mzbhn4njm2jfgxi5lv91yszarl43fhl19zrdl2"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DBI DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo knitr motifRG org_Hs_eg_db pbapply pheatmap plotly plotrix proxy rmarkdown RSQLite rtracklayer S4Vectors topGO]; };
   RCASPAR = derive2 { name="RCASPAR"; version="1.27.0"; sha256="00r0p6hzzjsgpwc0ja6ws2sn7fp5qzlcajvwq3l5zd99zcn3lds8"; depends=[]; };
-  RCy3 = derive2 { name="RCy3"; version="2.1.13"; sha256="1kp2hgh2kid9xy8w97wkwc3759sxz7lp6inamsflff5a12ffd41c"; depends=[BiocGenerics graph httr igraph RJSONIO XML]; };
-  RCyjs = derive2 { name="RCyjs"; version="2.3.6"; sha256="1gbqpf9ljvlhl8zmd39d7fifn67sv6gmfvryfk9yf0y53x9l95sc"; depends=[base64enc BiocGenerics BrowserViz graph httpuv]; };
+  RCy3 = derive2 { name="RCy3"; version="2.1.26"; sha256="0j8ynimcgr0jbnlfib17vr4zjf3k5j5159aq1v8y3dxcx21hqh0d"; depends=[BiocGenerics graph httr igraph RJSONIO XML]; };
+  RCyjs = derive2 { name="RCyjs"; version="2.3.11"; sha256="1q74r04h169mix224jcahh8mir17dc1ifasfcgjir9szw3gh97lv"; depends=[base64enc BiocGenerics BrowserViz graph httpuv]; };
   RDAVIDWebService = derive2 { name="RDAVIDWebService"; version="1.19.0"; sha256="0in7bnx1v9z9z55b88hmix8fgrjysbzjxp0c53psq3k7fm46yxg7"; depends=[Category ggplot2 GO_db GOstats graph RBGL rJava]; };
   RDRToolbox = derive2 { name="RDRToolbox"; version="1.31.0"; sha256="0zm1319g4b0jfqi7ix7insqadilccmlcc1bnwf4hwgw1d2bsby1p"; depends=[MASS rgl]; };
+  REBET = derive2 { name="REBET"; version="0.99.6"; sha256="1q8ksqv13rnk2rv0xs1cfkskp8j701pi231b5m14s41gxq85f689"; depends=[ASSET]; };
   REDseq = derive2 { name="REDseq"; version="1.27.0"; sha256="0s1v5qlbzz54pck44vy0bzhkm0ga7wa01nrr4x1fbswxbkz80djy"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome BSgenome_Celegans_UCSC_ce2 ChIPpeakAnno IRanges multtest]; };
-  REMP = derive2 { name="REMP"; version="1.5.0"; sha256="0gr7x6l9z871p41w32q8dqz2jaglvz51d7zrrwxy55iidbnqw5jv"; depends=[AnnotationHub BiocGenerics BiocParallel Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 caret doParallel foreach GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylationEPICanno_ilm10b2_hg19 impute IRanges iterators kernlab minfi org_Hs_eg_db ranger S4Vectors settings SummarizedExperiment]; };
+  REMP = derive2 { name="REMP"; version="1.5.2"; sha256="04jg8c2x1k3wbf1gr8ncdgy4z09r2zk1fhbxpgz8cv2hngdpwhfi"; depends=[AnnotationHub BiocGenerics BiocParallel Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 caret doParallel foreach GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylationEPICanno_ilm10b2_hg19 impute IRanges iterators kernlab minfi org_Hs_eg_db ranger S4Vectors settings SummarizedExperiment]; };
   RGMQL = derive2 { name="RGMQL"; version="1.1.0"; sha256="1z7dj3lmw40b08x33bl9fb4asr22syn0cinl12ya60nawh5rlxsi"; depends=[BiocGenerics data_table dplyr GenomicRanges glue httr plyr RGMQLlib rJava rtracklayer S4Vectors xml2]; };
   RGSEA = derive2 { name="RGSEA"; version="1.15.0"; sha256="1c0i33lz0cl983dk520g2caf0844jknd39h71fy6kynknqxmnqqs"; depends=[BiocGenerics]; };
   RGalaxy = derive2 { name="RGalaxy"; version="1.25.0"; sha256="04xs1w3yndlrdbac2ybzhdk8fdbg95a3qmjjqyykhfl5mck97d97"; depends=[Biobase BiocGenerics optparse roxygen2 XML]; };
   RGraph2js = derive2 { name="RGraph2js"; version="1.9.0"; sha256="0y7fnysz9rljyrk4gs1r29zgxzzcpwk3jayv6km20l6abxzbfccr"; depends=[digest graph rjson whisker]; };
-  RIPSeeker = derive2 { name="RIPSeeker"; version="1.21.0"; sha256="02m401h56lb88qcfbidfxvh5nxls465y68jgjcfv7sd4x83ykd7z"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
-  RITAN = derive2 { name="RITAN"; version="1.5.2"; sha256="0nfnrh4w3y33rygdl07ydvxzl05nnysl3zlsg9nf459w98y4s7xg"; depends=[BgeeDB dynamicTreeCut ggplot2 gplots gridExtra gsubfn hash igraph knitr linkcomm MCL plotrix png ProNet RColorBrewer reshape2 RITANdata sqldf STRINGdb]; };
-  RIVER = derive2 { name="RIVER"; version="1.5.0"; sha256="1fdav14pba08a1hyqh82yad1ynvbzbc9i5gn5gxiypa833s5v31h"; depends=[Biobase ggplot2 glmnet pROC]; };
+  RIPSeeker = derive2 { name="RIPSeeker"; version="1.21.1"; sha256="0vxllhd0pyq1a3z0gqpiv5llyb18qi8ph6h8jmqbjsknba243j30"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+  RITAN = derive2 { name="RITAN"; version="1.5.5"; sha256="0p2dpn6zas3wndzr9dbs1l97s5w7qzj0y7db7796jysd3mlzlvz1"; depends=[BgeeDB dynamicTreeCut ggplot2 gplots gridExtra gsubfn hash igraph knitr linkcomm MCL plotrix png RColorBrewer reshape2 RITANdata sqldf STRINGdb]; };
+  RIVER = derive2 { name="RIVER"; version="1.5.1"; sha256="1c7li0kihq3rxqv7ykz12accyqpiwwvjdlma137mfh5dhpjlx5cr"; depends=[Biobase ggplot2 glmnet pROC]; };
   RImmPort = derive2 { name="RImmPort"; version="1.9.0"; sha256="0amhihh6g8j817xr05bqcp9sx564gp0jlg34iinmjqzizksflv1g"; depends=[data_table DBI dplyr plyr reshape2 RSQLite sqldf]; };
   RJMCMCNucleosomes = derive2 { name="RJMCMCNucleosomes"; version="1.5.0"; sha256="008nmql2f1qw246bj50w38kabcfw2bvgqb086ch9h9cv4b976dwi"; depends=[BiocGenerics BiocParallel consensusSeekeR GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
   RLMM = derive2 { name="RLMM"; version="1.43.0"; sha256="1hfr0w56jai1v3x0b6w4z5y00yf8j2aa2yhcd994lj48klwgjacp"; depends=[MASS]; };
+  RMassBank = derive2 { name="RMassBank"; version="2.9.2"; sha256="0yvbd1425ygp3xmn1danhbx5865cyl2h340yscs4r6g9whciw1vn"; depends=[Biobase digest httr MSnbase mzR rcdk Rcpp RCurl rjson S4Vectors XML yaml]; };
   RNASeqPower = derive2 { name="RNASeqPower"; version="1.21.0"; sha256="0gd3mbish7k4zwfv4kadcnifwm485p7zizvdj8pk1ns1fl5cwpbz"; depends=[]; };
-  RNAdecay = derive2 { name="RNAdecay"; version="1.1.1"; sha256="1xnj3q52biy8rzpyvd7b77sszsvs01sxkkkkkz0waqi61q58rhvv"; depends=[ggplot2 gplots nloptr TMB]; };
-  RNAinteract = derive2 { name="RNAinteract"; version="1.29.0"; sha256="03xizq9h93ii1jwjbk6kcmh71fc882qk9fnv3hbl15a9d8yvzpnv"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; };
+  RNASeqR = derive2 { name="RNASeqR"; version="0.99.25"; sha256="03mka6s8s064agyrvl3xzdds1dr03jimgcqgnisr61ypdy9lyih0"; depends=[ballgown Biostrings clusterProfiler corrplot DESeq2 DOSE edgeR factoextra FactoMineR ggplot2 gridExtra org_Hs_eg_db org_Sc_sgd_db pathview PerformanceAnalytics pheatmap rafalib reshape2 reticulate Rsamtools stringr systemPipeR systemPipeRdata]; };
+  RNAdecay = derive2 { name="RNAdecay"; version="1.1.2"; sha256="09z07f5x0h19dbk47lwmp9h9ijvmdznr8hxxyihazqvr66qb5ghn"; depends=[ggplot2 gplots nloptr TMB]; };
+  RNAinteract = derive2 { name="RNAinteract"; version="1.29.1"; sha256="1wq1b3z8yqslw4l4103x28lv063m5f1wi1dr43q9h345gcb4kyvs"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; };
   RNAither = derive2 { name="RNAither"; version="2.29.0"; sha256="0w90awkmdi2h6q2hpvl6i5qbkdggbpvac1cbxx2995hmx8lc6pwa"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
   RNAprobR = derive2 { name="RNAprobR"; version="1.13.0"; sha256="0hjhk0ap6n17ccjkjfxq8c8cfg166gcwbapmwixac4dqwqg5k997"; depends=[BiocGenerics Biostrings GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr Rsamtools rtracklayer S4Vectors]; };
   ROC = derive2 { name="ROC"; version="1.57.0"; sha256="1glip25d37gz13b2c4zpk1vm34kvfxvgbsz302ww0g8wqq3cc0i5"; depends=[]; };
   ROTS = derive2 { name="ROTS"; version="1.9.1"; sha256="061z3cnwaz5fgbpikg6vqazp1bqsxp7ln8krn3i1fz20k4ny800z"; depends=[Biobase Rcpp]; };
   ROntoTools = derive2 { name="ROntoTools"; version="2.9.0"; sha256="1ivsr52qf9sz08zpp1vbvwyqpsfd55m4jj8g62mb5khkmrf8mnwl"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; };
-  RPA = derive2 { name="RPA"; version="1.37.0"; sha256="0cm2sfv6pkrxjq8xnby2hsnda687bdlc63b3i96fmhzjldfwnixf"; depends=[affy BiocGenerics phyloseq]; };
-  RProtoBufLib = derive2 { name="RProtoBufLib"; version="1.3.0"; sha256="1ji9m1x9l84iwdw1bd2bhbvdfwn3jnw80inc6xnc6vp4k64zll4m"; depends=[]; };
+  RPA = derive2 { name="RPA"; version="1.37.2"; sha256="16yr6qp6wcdrb4zpyrs30zv0q4zb74s04fzpddk6c7v1phmakk0a"; depends=[affy BiocGenerics phyloseq]; };
+  RProtoBufLib = derive2 { name="RProtoBufLib"; version="1.3.7"; sha256="0f68ziylg1pp3wakxr08i6hlhf3grnvfmsr7fc1v1phsz8amg676"; depends=[]; };
   RRHO = derive2 { name="RRHO"; version="1.21.0"; sha256="00wy53vmfdzfv56ib277cl7rnv2l6klyixyjq93whmzr39d8mbwi"; depends=[VennDiagram]; };
   RSVSim = derive2 { name="RSVSim"; version="1.21.0"; sha256="0l7wq0cvws0n78xp14rwagrjhm3pxzf2jg3k1w5pv6w778mhm9dw"; depends=[Biostrings GenomicRanges IRanges ShortRead]; };
   RSeqAn = derive2 { name="RSeqAn"; version="1.1.0"; sha256="186qcffr5f1g5x5didd8gkhfdl9wxdivqjwxbcn001i3k71h11mm"; depends=[]; };
   RTCA = derive2 { name="RTCA"; version="1.33.0"; sha256="0wyvn004xjxgr80ar5a0bcc6jpz9ksi03is8yc8ijsdlssk9cs71"; depends=[Biobase gtools RColorBrewer]; };
-  RTCGA = derive2 { name="RTCGA"; version="1.11.0"; sha256="1r5qxbbw420cq2a648ispxwlswv5xpi9r4r89r7d7cgaw1k1n0h5"; depends=[assertthat data_table dplyr ggplot2 ggthemes knitr purrr rvest scales stringi survival survminer viridis XML xml2]; };
-  RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.11.1"; sha256="0ajrz01aqqs30m5dq6x0l2gn49vhbi4k9ppyzgdy0ljpvx95c8hb"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges httr IRanges limma plyr RaggedExperiment RCircos RCurl RJSONIO S4Vectors stringr SummarizedExperiment survival TCGAutils XML]; };
-  RTN = derive2 { name="RTN"; version="2.5.1"; sha256="1gwvqqjky6cgq4sdj8myjqrywdx7a44wnvb20l47qlqamlr41905"; depends=[car data_table igraph IRanges limma minet RedeR S4Vectors snow]; };
-  RTNduals = derive2 { name="RTNduals"; version="1.5.1"; sha256="17vp27lxjh3v0y2s1d96xk2y3wxwj2lh40c5z7lqh6qx89lyhirz"; depends=[RTN]; };
-  RTNsurvival = derive2 { name="RTNsurvival"; version="1.5.0"; sha256="0fyks8lvxqdli3wm0z0py6vn5y3mfpvi95mqb7hycafc2812am68"; depends=[png RColorBrewer RTN RTNduals survival]; };
+  RTCGA = derive2 { name="RTCGA"; version="1.11.3"; sha256="1r0c2lj73brq174lfnxlwvjz34wckf2kd5hkzmymwv6vgy83j98q"; depends=[assertthat data_table dplyr ggplot2 ggthemes knitr purrr rvest scales stringi survival survminer viridis XML xml2]; };
+  RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.11.8"; sha256="0sb5n88vbx24dfn66i4xd71c8kswsgwd14zky172lrjhplb1lkwm"; depends=[BiocGenerics data_table DelayedArray GenomeInfoDb GenomicRanges IRanges limma RaggedExperiment RCircos RCurl RJSONIO S4Vectors stringr SummarizedExperiment survival TCGAutils XML]; };
+  RTN = derive2 { name="RTN"; version="2.5.6"; sha256="01r5hv1xc3znllqknc06x8zs9nxs2d9y2fxi8mv8ggxplaw05mwz"; depends=[data_table igraph IRanges limma minet mixtools RedeR S4Vectors snow viper]; };
+  RTNduals = derive2 { name="RTNduals"; version="1.5.4"; sha256="1kjx590l4q2g9khph4xfkj2nqnq9aycyy16havv2ll4i48k4j4i7"; depends=[RTN]; };
+  RTNsurvival = derive2 { name="RTNsurvival"; version="1.5.4"; sha256="0gn6s0lpxag113v1smh20k1w0yyhpr2wp4i0hvihxlqascmrp73j"; depends=[RColorBrewer RTN RTNduals scales survival viper]; };
   RTopper = derive2 { name="RTopper"; version="1.27.0"; sha256="1d2bnvjlwgrahxjd1x6gzdhz70wyd990iq9204kc072qyi40l2yz"; depends=[Biobase limma multtest]; };
-  RUVSeq = derive2 { name="RUVSeq"; version="1.15.0"; sha256="1dnjshlpalfnrgk9dmig5k1bnshpk4ifp3bvh1cp1z55yihmw111"; depends=[Biobase EDASeq edgeR MASS]; };
+  RUVSeq = derive2 { name="RUVSeq"; version="1.15.1"; sha256="0j60afjrnbi8x00nw5y0l8m2j7i4n1aq31k8swxinsniawhidbvn"; depends=[Biobase EDASeq edgeR MASS]; };
   RUVcorr = derive2 { name="RUVcorr"; version="1.13.0"; sha256="0cfq69vvajn2s8gyrr4g9vzf8l8wp7p6hg6jlfffv2kfn3yhd05g"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; };
   RUVnormalize = derive2 { name="RUVnormalize"; version="1.15.0"; sha256="02v5kj8hbzgcckqq671zypfkf460j3rxiqxh4w5izp9bxqdv9g3g"; depends=[Biobase RUVnormalizeData]; };
-  RVS = derive2 { name="RVS"; version="1.3.0"; sha256="0y98yaj5lvlc4104nqjhk7g00f1zqaqsig3mdf7hvwqhlwdsyh0l"; depends=[gRain kinship2 snpStats]; };
-  RaggedExperiment = derive2 { name="RaggedExperiment"; version="1.5.2"; sha256="157sfaz4s6wpvccn4s7w0j0iv69zqzf8vxpamp4kdzdhg9ky7byw"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
-  RandomWalkRestartMH = derive2 { name="RandomWalkRestartMH"; version="1.1.0"; sha256="1kzxl773z4619lvznxv67yb7k2lfjn3bfgfssgql0adrjfm8qi1a"; depends=[dnet igraph Matrix]; };
+  RVS = derive2 { name="RVS"; version="1.3.1"; sha256="02y68m30aqmcyf1bv0aicrijdx87gzaa9a5f2dlfjfd6jgk2ijn9"; depends=[gRain kinship2 snpStats]; };
+  RaggedExperiment = derive2 { name="RaggedExperiment"; version="1.5.7"; sha256="1wvczzqhsgdj0f6a2v7ls4c51vm9wik10wnlkxsw06h3xz6c3xmf"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
+  RandomWalkRestartMH = derive2 { name="RandomWalkRestartMH"; version="1.1.1"; sha256="0p9qvbsmxvca615h6pk51n8dm21265bmciix3ddnhljq1c6lgc7x"; depends=[dnet igraph Matrix]; };
   RankProd = derive2 { name="RankProd"; version="3.7.0"; sha256="1zqawks6i567dk4ylnyh0jddnp62nqygshv4ihy39xhjab4j04wx"; depends=[gmp Rmpfr]; };
   RareVariantVis = derive2 { name="RareVariantVis"; version="2.9.0"; sha256="1466zh50n0f1apkbd38lp84r8byras0pna5bm49bc7i7s9agkp14"; depends=[BiocGenerics BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores googleVis gtools IRanges phastCons100way_UCSC_hg19 S4Vectors SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; };
   Rariant = derive2 { name="Rariant"; version="1.17.0"; sha256="0nm0k2d1bhqsk9gir38gd0py6xn5wk0b985kpix8ghi64mypmqmr"; depends=[BiocGenerics dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; };
   RbcBook1 = derive2 { name="RbcBook1"; version="1.49.0"; sha256="1ar8jl97fillw0g7kf09mxkr9215dw3jmw2b6qaq9pch7qg8qnr7"; depends=[Biobase graph rpart]; };
-  Rbowtie = derive2 { name="Rbowtie"; version="1.21.0"; sha256="05ql92h3s7ppsf5fdrsqbhsn9snwhf168yr78n7qhafw9p6ry77j"; depends=[]; };
-  Rbowtie2 = derive2 { name="Rbowtie2"; version="1.3.0"; sha256="02cf3hn9nb10583fwxqzb8iygsm5xzmxhk4y0iadyvxi6nsz6lbk"; depends=[]; };
+  Rbowtie = derive2 { name="Rbowtie"; version="1.21.2"; sha256="1l5mllfa4kfdrf65xmssd3wpfvqnl9p0lajg2fz1hl98xwm7yl31"; depends=[]; };
+  Rbowtie2 = derive2 { name="Rbowtie2"; version="1.3.1"; sha256="1ss2i77lq3fazv6ipv543cfizchp9gh566d7xbjkggh1a0vcm1db"; depends=[]; };
   Rcade = derive2 { name="Rcade"; version="1.23.0"; sha256="0d6cyn6b06g0qkps2d7b65p7pa7bz6iv71lv4hbzmdc581azg4fq"; depends=[baySeq GenomeInfoDb GenomicAlignments GenomicRanges IRanges plotrix rgl Rsamtools S4Vectors]; };
   Rchemcpp = derive2 { name="Rchemcpp"; version="2.19.0"; sha256="17kz0ld7hnrvdv69hz3kj3mhv2f4qms9i65lrwam63g0aydfzyrx"; depends=[ChemmineR Rcpp]; };
   RchyOptimyx = derive2 { name="RchyOptimyx"; version="2.21.0"; sha256="0fzmw1kxnaqmk5h61r2dkwq0xp8ir7gg7kq2wkhyvpd68hr3ir3d"; depends=[flowType graph Rgraphviz sfsmisc]; };
-  RcisTarget = derive2 { name="RcisTarget"; version="1.1.2"; sha256="1a909bnc96bhn1jd8yk1d68f9x49lbd6wgbmwqxq1k1iqh8qj2hs"; depends=[AUCell BiocGenerics data_table feather GSEABase R_utils SummarizedExperiment]; };
-  Rcpi = derive2 { name="Rcpi"; version="1.17.0"; sha256="0a6cs6bvnzx9cp5y4m3h9in0bhq78iy50p48p59k6qqzkvldgcqy"; depends=[Biostrings ChemmineR doParallel fmcsR foreach GOSemSim rcdk RCurl rjson]; };
+  RcisTarget = derive2 { name="RcisTarget"; version="1.1.3"; sha256="09zkvl5hwcds9w5n5h51zgpilmygljmar3fqd5wihr8dd6bj1qnk"; depends=[AUCell BiocGenerics data_table feather GSEABase R_utils SummarizedExperiment]; };
+  Rcpi = derive2 { name="Rcpi"; version="1.17.2"; sha256="1d77jnlw2jsg8f2ij7ax8ngwb99bngiq0vvdpx2q5nmhkzn9w5vq"; depends=[Biostrings ChemmineR doParallel fmcsR foreach GOSemSim rcdk RCurl rjson]; };
   Rdisop = derive2 { name="Rdisop"; version="1.41.0"; sha256="038bgrf5bcdwy8bji5wprq55ypajwp68lqv1i24bk6hikfm2g7p9"; depends=[Rcpp RcppClassic]; };
   ReQON = derive2 { name="ReQON"; version="1.27.0"; sha256="1dvsnbsl5ljwfirn61rbcxvrdy74qv96xbs4d8x1wmkfs2bsm2gy"; depends=[rJava Rsamtools seqbias]; };
-  ReactomePA = derive2 { name="ReactomePA"; version="1.25.0"; sha256="0hrprjkzg6mdsyqyxgzpscfvgm0335j2avv96a9n70w7rj1zx3ym"; depends=[AnnotationDbi DOSE enrichplot ggplot2 ggraph graphite igraph reactome_db]; };
-  ReadqPCR = derive2 { name="ReadqPCR"; version="1.27.0"; sha256="0qbfx6kj6bk60wilbnp49inairhhsi1638i5hhfd1w8365mmzalq"; depends=[affy Biobase]; };
+  ReactomePA = derive2 { name="ReactomePA"; version="1.25.1"; sha256="1kqhm5n1g8r1rci0n1135pcka2x0p8h565m609bfljiqnmgaza9v"; depends=[AnnotationDbi DOSE enrichplot ggplot2 ggraph graphite igraph reactome_db]; };
+  ReadqPCR = derive2 { name="ReadqPCR"; version="1.27.2"; sha256="1mbaqp0xj0ncdja7rgb84j54bv1vricsabnfj6d8v55yrp1jp7p6"; depends=[Biobase]; };
   RedeR = derive2 { name="RedeR"; version="1.29.0"; sha256="00j3yr07qg363ghbgv76ydyar0jp48zdfw5pdpxnv13mzm48wa4r"; depends=[igraph]; };
   RefNet = derive2 { name="RefNet"; version="1.17.0"; sha256="0lcbg131gxkvsvmbwj4gpqdpfqjik91jmyd2g745yb7rayly252g"; depends=[AnnotationHub BiocGenerics IRanges PSICQUIC RCurl shiny]; };
   RefPlus = derive2 { name="RefPlus"; version="1.51.0"; sha256="0wq0l2883ns2sl8ia5qdx6wn9227lxaz7m0g3lqmr36xkflc1ka1"; depends=[affy affyPLM Biobase preprocessCore]; };
   Repitools = derive2 { name="Repitools"; version="1.27.0"; sha256="1anh3fn4wyn69838y7jr5h6bhi8m7d7r1n68rbqvsvbr4bik54vr"; depends=[aroma_affymetrix BiocGenerics Biostrings BSgenome cluster DNAcopy edgeR GenomeInfoDb GenomicAlignments GenomicRanges gplots gsmoothr IRanges MASS Ringo Rsamtools Rsolnp rtracklayer S4Vectors]; };
   ReportingTools = derive2 { name="ReportingTools"; version="2.21.1"; sha256="0rdndxizkbx8bdjcx82x59y326ypsxrlmzyrgkgkmm3hgq041n97"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category DESeq2 edgeR ggbio ggplot2 GOstats GSEABase hwriter IRanges knitr lattice limma PFAM_db R_utils XML]; };
   Rgin = derive2 { name="Rgin"; version="1.1.0"; sha256="1yqif2dpw0c3p4kg8pni80ggh3f6430nd7k3k0fxirz74ljv642h"; depends=[RcppEigen]; };
-  Rgraphviz = derive2 { name="Rgraphviz"; version="2.25.0"; sha256="06kvi85d2wgm2v9pvxn9swrvi4cavww5idcc7gx4d80w4kwzhx5f"; depends=[graph]; };
-  Rhdf5lib = derive2 { name="Rhdf5lib"; version="1.3.1"; sha256="1g25896i244fv2bpzd68sd542s2842fs39bssxdjd8fcshxkzy2v"; depends=[]; };
+  Rgraphviz = derive2 { name="Rgraphviz"; version="2.25.1"; sha256="1l98pa3zp18xp64phrp5k7sn9an3a8mqp124ik8a2gk8hs021glx"; depends=[graph]; };
+  Rhdf5lib = derive2 { name="Rhdf5lib"; version="1.3.3"; sha256="19r2afmvik4as8cwgk0adh3rm94bjp9vll3c63845swrsk13smzz"; depends=[]; };
   Rhtslib = derive2 { name="Rhtslib"; version="1.13.4"; sha256="0g60pz7ssy872ppws7qvsv7miph3yhx48p6sqmxi3qbz0qs6dq15"; depends=[zlibbioc]; };
   RiboProfiling = derive2 { name="RiboProfiling"; version="1.11.0"; sha256="0l76dfz2r2grx31v8ic80k3mry78m20znssrh5i7v6xfh33ghg6c"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape2 Rsamtools rtracklayer S4Vectors sqldf]; };
   Ringo = derive2 { name="Ringo"; version="1.45.0"; sha256="0pwyfjv8f91g7i1h9qpzwgbkgyh04dyvmrm9v4rdabmfbhr38c6g"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; };
-  Risa = derive2 { name="Risa"; version="1.23.0"; sha256="1kch6h68a6sxdrndqzxmqhyj5mv08iipdmv09z3hax7aw45lk08h"; depends=[affy Biobase biocViews Rcpp xcms]; };
+  Risa = derive2 { name="Risa"; version="1.23.2"; sha256="0ng31ms4ndfgwna99qqf73ad9klgi7d477x3my4wkd6896hk7xg3"; depends=[affy Biobase biocViews Rcpp xcms]; };
   Rmagpie = derive2 { name="Rmagpie"; version="1.37.0"; sha256="1qzxifxdkc86p4q8l7qz8bmxlh5an7zkmgbzb72chwm6bby774m8"; depends=[Biobase e1071 kernlab pamr]; };
   RmiR = derive2 { name="RmiR"; version="1.37.0"; sha256="0zz0jgqfqph0rhkbx0bgm8kcwm81hsk1cml8a917gfymfpzj93s8"; depends=[DBI RmiR_Hs_miRNA RSVGTipsDevice]; };
   Rmmquant = derive2 { name="Rmmquant"; version="0.99.11"; sha256="0lj7dnjf5msrn7fbr68krv2rgav8qrpahgj37qa64k5cn0xyiblw"; depends=[BiocStyle DESeq2 devtools GenomicRanges org_Mm_eg_db Rcpp S4Vectors SummarizedExperiment TBX20BamSubset TxDb_Mmusculus_UCSC_mm9_knownGene]; };
-  RnBeads = derive2 { name="RnBeads"; version="1.13.1"; sha256="146aziw6d7jalkjj81kgdkbnmzpvia8khgqkbpfngjykyykdgqy9"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr S4Vectors]; };
+  RnBeads = derive2 { name="RnBeads"; version="1.99.0"; sha256="1gmhq1rp5jlkm0dmbzzxzpylyxzpbf2529j3v7a37fq4pia0nylk"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr S4Vectors]; };
   RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="1.13.0"; sha256="0d27jiw016fkmzpd4lsjnrkd122amqi37cr5rpnwviyw47rw5dxj"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp RnaSeqSampleSizeData]; };
   Rnits = derive2 { name="Rnits"; version="1.15.0"; sha256="0vg3rx87fw9y792b9icf1qliwsbi7h74csk7n9ya8jwjsyb0fcv2"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; };
   Roleswitch = derive2 { name="Roleswitch"; version="1.19.0"; sha256="12pqrclq4vfsv0y9ykisri5l2zy3pz3sz22xqlqfkmlldqvngy4v"; depends=[Biobase biomaRt Biostrings DBI microRNA plotrix pracma reshape]; };
   RpsiXML = derive2 { name="RpsiXML"; version="2.23.0"; sha256="061r9c1lb3qrm4lwpk87ynsi6nqjwqv2cxk9z6l01b14cb2mn6r3"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; };
-  Rqc = derive2 { name="Rqc"; version="1.15.0"; sha256="07zq9p2jkkzfjkccwryfh02xrz6bq20lw3z9v1pikk0dap6g1447"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings biovizBase digest GenomicAlignments GenomicFiles ggplot2 IRanges knitr markdown plyr Rcpp reshape2 Rsamtools S4Vectors shiny ShortRead]; };
-  Rsamtools = derive2 { name="Rsamtools"; version="1.33.0"; sha256="0qp084lwadvwngn98lmlj758yra7il5sykdnxj82a4llr38fwg20"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
-  Rsubread = derive2 { name="Rsubread"; version="1.31.5"; sha256="14azrcgip829pm1aa6yq2s50zghf83l7mn7pizc98qjrlkwbia89"; depends=[]; };
+  Rqc = derive2 { name="Rqc"; version="1.15.1"; sha256="0hb3115hrq4vgl32w01fagkbyisxxkbhs96fbxrz3rlkw982b636"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings biovizBase digest GenomicAlignments GenomicFiles ggplot2 IRanges knitr markdown plyr Rcpp reshape2 Rsamtools S4Vectors shiny ShortRead]; };
+  Rsamtools = derive2 { name="Rsamtools"; version="1.33.7"; sha256="1jlhfjdby0cgsjfjcbf6kgcc8g1c6nfwlyp67yrn6x577cf9vl40"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
+  Rsubread = derive2 { name="Rsubread"; version="1.31.23"; sha256="1n59sxlfmwvk9yfp88lcffbqpbxdg5b1hgawkz0d3sy9f4wv6vg1"; depends=[]; };
   Rtreemix = derive2 { name="Rtreemix"; version="1.43.0"; sha256="0wkszdsbpkai8snqvgr46mc0kqlgha76hclr4kbgddlbg9cmbymh"; depends=[Biobase graph Hmisc]; };
-  S4Vectors = derive2 { name="S4Vectors"; version="0.19.17"; sha256="1cqv7lcgrqbvffmi8xw0pwwl2k3s6kyyfx4dhj05w42r5ax9wk0k"; depends=[BiocGenerics]; };
+  S4Vectors = derive2 { name="S4Vectors"; version="0.19.24"; sha256="0r8plfk310jkymlpkxvkqh9b5y9xd00iy2jn28w5ajf7zxrdbxl2"; depends=[BiocGenerics]; };
   SAGx = derive2 { name="SAGx"; version="1.55.0"; sha256="1xriaf6qhmisx7415jgrpk6p0jhhv0mn3ab1zj4g6dvm495s0579"; depends=[Biobase multtest]; };
   SANTA = derive2 { name="SANTA"; version="2.19.0"; sha256="0qfzmsqssb62bab9csak82s0dhrrpz93q0825sdjk7sy2qnp3c6l"; depends=[igraph Matrix snow]; };
   SBMLR = derive2 { name="SBMLR"; version="1.77.0"; sha256="0xhs5adrirlplm8m3ldsw0m085wqi7mgjn3c7ldkhmlr9w9vc7wg"; depends=[deSolve XML]; };
   SC3 = derive2 { name="SC3"; version="1.9.1"; sha256="1nj5sjxgv0ic0s74w9vy3dwnrwywwj2kaydnn5s1p1hnrc6xsm11"; depends=[BiocGenerics cluster doParallel doRNG e1071 foreach ggplot2 pheatmap Rcpp RcppArmadillo robustbase ROCR rrcov S4Vectors shiny SingleCellExperiment SummarizedExperiment WriteXLS]; };
   SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.23.0"; sha256="1l7h4r4msq8gdiklmnb8cnh29babknzsbncxg3qkrf28q6gihz29"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; };
-  SCnorm = derive2 { name="SCnorm"; version="1.3.0"; sha256="0zij0ny8xnmxcci08br3vb10dfmsxp11mgfr6f5ga8s868n09260"; depends=[BiocParallel cluster data_table forcats ggplot2 moments quantreg S4Vectors SummarizedExperiment]; };
-  SDAMS = derive2 { name="SDAMS"; version="1.1.0"; sha256="0z6ajklzq6srlx2r4ymgpsgfzzg5qzypcza7kh0zfahg2pb262w4"; depends=[qvalue SummarizedExperiment trust]; };
+  SCBN = derive2 { name="SCBN"; version="0.99.2"; sha256="10rcvn19k2034dgcc5lyv24ir5ql9qsikr5fplsp4qc4v9z8v658"; depends=[]; };
+  SCnorm = derive2 { name="SCnorm"; version="1.3.3"; sha256="0vbyvvx3pf5k9j9fy0jkfawic3l54kj5sjmsgb1bb6b5x1njdz0h"; depends=[BiocParallel cluster data_table forcats ggplot2 moments quantreg S4Vectors SingleCellExperiment SummarizedExperiment]; };
+  SDAMS = derive2 { name="SDAMS"; version="1.1.2"; sha256="0zd1y03g9dxflvj3adg2jqlzcipbaz87vm927l1cd3pdzgzvx294"; depends=[qvalue SummarizedExperiment trust]; };
   SELEX = derive2 { name="SELEX"; version="1.13.0"; sha256="0n2xpdyr6sy8mnbq9vqccaphfa5pjbldcnmpm4zb9w2zdg27g24k"; depends=[Biostrings rJava]; };
   SEPA = derive2 { name="SEPA"; version="1.11.0"; sha256="19904q9pxbxwaj8vfqk1nvwb5sn69g15zfk9xyb7wwnwxrrkph0r"; depends=[ggplot2 org_Hs_eg_db org_Mm_eg_db reshape2 segmented shiny topGO]; };
-  SEPIRA = derive2 { name="SEPIRA"; version="1.1.0"; sha256="0wxk45lp7gdnshr4w4205khkq6dn09p7vr77s9hdz8968wj0rzg3"; depends=[corpcor limma]; };
+  SEPIRA = derive2 { name="SEPIRA"; version="1.1.2"; sha256="1v6xqrvvnkf5r5cl6k4akq9450qhii0hwbysc76ndnwyc7lgmjws"; depends=[corpcor limma]; };
   SGSeq = derive2 { name="SGSeq"; version="1.15.0"; sha256="09ksqyszgh84lwv0vzy8kp4vdhczdqpk1mr7h18ja5rpilnk60r0"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer RUnit S4Vectors SummarizedExperiment]; };
   SIAMCAT = derive2 { name="SIAMCAT"; version="1.1.0"; sha256="0aaw372yl2b74ni3hr788bqglma679vqfzhfad2903ln0lx54rl3"; depends=[beanplot glmnet gridBase gridExtra LiblineaR matrixStats mlr ParamHelpers phyloseq pROC PRROC RColorBrewer]; };
   SICtools = derive2 { name="SICtools"; version="1.11.0"; sha256="1jgq6acqqfx6fcwkyqn49p94m399dblc86s3hf7xgdml61jjxa81"; depends=[Biostrings doParallel GenomicRanges IRanges matrixStats plyr Rsamtools stringr]; };
   SIM = derive2 { name="SIM"; version="1.51.0"; sha256="0z23b4pgiyah5qcixhww7csmkq01gw0bd9hmzrwrn046yy3mmnql"; depends=[globaltest quantreg quantsmooth]; };
-  SIMAT = derive2 { name="SIMAT"; version="1.13.0"; sha256="0kac998ddp94qls9jd68bd32cvnkxzdk63ysrcliiwmxcpplymrq"; depends=[ggplot2 mzR Rcpp reshape2]; };
-  SIMLR = derive2 { name="SIMLR"; version="1.7.0"; sha256="0f8ds6qjkj2z79pl18pwgwsn5fp0k05s50kakfiy9cbmbhnqy9ik"; depends=[Matrix pracma Rcpp RcppAnnoy RSpectra]; };
+  SIMAT = derive2 { name="SIMAT"; version="1.13.4"; sha256="142lafcpbmfnx1ywwas9dba4gz2vxnds4pia4dcxya6r254pbw9b"; depends=[ggplot2 mzR Rcpp reshape2]; };
+  SIMD = derive2 { name="SIMD"; version="0.99.10"; sha256="17m05cvc1yzdjlyx7j971cais8lyacil2vjfl09vvj93ygfks1sy"; depends=[edgeR methylMnM statmod]; };
+  SIMLR = derive2 { name="SIMLR"; version="1.7.4"; sha256="0pgz774i1ffix5s37qxxm78wa283zaghshwrj1chqzsk2hw1vy21"; depends=[Matrix pracma Rcpp RcppAnnoy RSpectra]; };
   SISPA = derive2 { name="SISPA"; version="1.11.0"; sha256="1cw4xzcqjp8pdaglar9dfgr25zqyb6h31k3hn66hyxg9cyagj4k4"; depends=[changepoint data_table genefilter ggplot2 GSVA plyr]; };
   SLGI = derive2 { name="SLGI"; version="1.41.0"; sha256="0ihb43dmab2188641l5zpn98djj68mm5xq2v79wqrh136n9cam9j"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice ScISI]; };
   SLqPCR = derive2 { name="SLqPCR"; version="1.47.0"; sha256="0m2qhkc6l158phg5hwfcs5wlq2n2nrhsjprrmzjv3q9rsdhwid8c"; depends=[]; };
   SMAP = derive2 { name="SMAP"; version="1.45.0"; sha256="1i94sywcxp3pg30b93v5p9n70va1mixk67jxxfyhc6dlbfpx7d3y"; depends=[]; };
   SMITE = derive2 { name="SMITE"; version="1.9.0"; sha256="1hvmbsz7p4ibjfh2a45aqpvv1kridkfg3zk3kzgbmws5l1vf154z"; depends=[AnnotationDbi Biobase BioNet geneLenDataBase GenomicRanges ggplot2 goseq Hmisc igraph IRanges KEGG_db org_Hs_eg_db plyr reactome_db S4Vectors scales]; };
   SNAGEE = derive2 { name="SNAGEE"; version="1.21.0"; sha256="0lsb2rqb1a3dgfgv5bijgb87y3zdl3mp1p38nzzi05n180yrgpzr"; depends=[SNAGEEdata]; };
-  SNPRelate = derive2 { name="SNPRelate"; version="1.15.0"; sha256="02xaxm3qrlgalndk4fmmvdy0rxpv565ysh2vc36gxcdvgz39pf1s"; depends=[gdsfmt]; };
+  SNPRelate = derive2 { name="SNPRelate"; version="1.15.5"; sha256="19lzy5jcp64kvg569x0688v03jalpbigmxpbaqsyc61j9h3gqkh7"; depends=[gdsfmt]; };
   SNPchip = derive2 { name="SNPchip"; version="2.27.0"; sha256="15cf2nrwixiqiyav5634qlv7md5dmv17h3z97j5771dv75fkl2gr"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses S4Vectors SummarizedExperiment]; };
-  SNPediaR = derive2 { name="SNPediaR"; version="1.7.0"; sha256="0van1q586n5dd5snvhc3j7hkdhdwrmbky9mj1nfdfzgcdl7bnmk3"; depends=[jsonlite RCurl]; };
+  SNPediaR = derive2 { name="SNPediaR"; version="1.7.1"; sha256="1lly6gajffcia6kjb3bshy401w2ydrwj674kas3dipamchp7k7p9"; depends=[jsonlite RCurl]; };
   SNPhood = derive2 { name="SNPhood"; version="1.11.0"; sha256="03dami2l6y21fh7sazh3bzjhj1n9vqc0fva4ig1kkdansd1bvp0f"; depends=[BiocGenerics BiocParallel Biostrings checkmate cluster data_table DESeq2 GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges lattice RColorBrewer reshape2 Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
   SPEM = derive2 { name="SPEM"; version="1.21.0"; sha256="19l21yaqcazymnapqalrkb6az10jkmzy8zvp5wh28rb8bl2p88f3"; depends=[Biobase Rsolnp]; };
   SPIA = derive2 { name="SPIA"; version="2.33.0"; sha256="06si8xr8hc4sr87gafaphv9rfiq9w82gwd4xzwn0js00fgalffvd"; depends=[KEGGgraph]; };
-  SPLINTER = derive2 { name="SPLINTER"; version="1.7.2"; sha256="070ciavxg9y5mahaaaq7sbsz1zkv8llz69x6qvh332v0hchn29yg"; depends=[biomaRt Biostrings BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz IRanges plyr S4Vectors seqLogo stringr]; };
+  SPLINTER = derive2 { name="SPLINTER"; version="1.7.4"; sha256="007h0y808cylwkr9bjgsdvf4d4bfvz0xpalh06drq666cr9cxdzr"; depends=[biomaRt Biostrings BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 googleVis Gviz IRanges plyr S4Vectors seqLogo stringr]; };
   SPONGE = derive2 { name="SPONGE"; version="1.3.0"; sha256="0xnrzzlm12rrr54ymfa10pcmzgq7njqhgynv9ki9msxrvn1rhcd4"; depends=[Biobase data_table doRNG expm foreach glmnet gRbase igraph iterators logging MASS ppcor]; };
   SQUADD = derive2 { name="SQUADD"; version="1.31.0"; sha256="0dh04i31lzdpkmqhawm1krn132hqj6qz5i6cj2sxxvk4chqq1xmf"; depends=[RColorBrewer]; };
   SRAdb = derive2 { name="SRAdb"; version="1.43.2"; sha256="01nr09lkm4lwc6p0mfl1nn8g4fkzsw8c157snkcclqzn829121bp"; depends=[GEOquery graph RCurl RSQLite]; };
@@ -701,81 +751,86 @@ in with self; {
   STAN = derive2 { name="STAN"; version="2.9.0"; sha256="0i8y0a2i60irdg3061l4fmwdmnfrf0fc5byhx1bwbr8w5g4ahpnh"; depends=[BiocGenerics GenomeInfoDb GenomicRanges Gviz IRanges poilog Rsolnp S4Vectors]; };
   STATegRa = derive2 { name="STATegRa"; version="1.17.1"; sha256="1k55kb5x108iq3f2hbbair96x9kn8cci0753jkmd485j3mizfqq4"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; };
   STRINGdb = derive2 { name="STRINGdb"; version="1.21.0"; sha256="079y5h2jfx40vr5yvvpafzzld1z7jc9z98gm31qy7gvm2lyzvgl5"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; };
-  STROMA4 = derive2 { name="STROMA4"; version="1.5.0"; sha256="0b20pdxc3wsndqhhrxjayi3ldsjnim3cgswa73kjdpdrm3amsvy4"; depends=[Biobase BiocParallel cluster matrixStats]; };
+  STROMA4 = derive2 { name="STROMA4"; version="1.5.2"; sha256="1c7cjzrvbb62j8lyq8fn6xl375yhzghw1a4zy6pp0s8sd1r6vpmn"; depends=[Biobase BiocParallel cluster matrixStats]; };
   SVAPLSseq = derive2 { name="SVAPLSseq"; version="1.7.0"; sha256="0g27ik0m7z6wya7z2xgaip0c8dingv1c2jq9qbwpwipvk2yl8f50"; depends=[edgeR ggplot2 limma lmtest pls SummarizedExperiment]; };
   SVM2CRM = derive2 { name="SVM2CRM"; version="1.13.0"; sha256="0bnd0bpxwd2c33xdp9bfn8lsvf9dm8an4n43py6akshf6q2l9x3y"; depends=[AnnotationDbi GenomicRanges IRanges LiblineaR mclust pls ROCR rtracklayer squash SVM2CRMdata verification zoo]; };
-  SWATH2stats = derive2 { name="SWATH2stats"; version="1.11.4"; sha256="144p070bcq5j45byw9z666qkzjk8c4brscl4pnsgkghzgiv7fg34"; depends=[biomaRt data_table ggplot2 reshape2]; };
+  SWATH2stats = derive2 { name="SWATH2stats"; version="1.11.7"; sha256="1j8c18kiijzz1sc28n4asspljdgxmd000ms6qq5pzac36gkjwn98"; depends=[biomaRt data_table ggplot2 reshape2]; };
   SamSPECTRAL = derive2 { name="SamSPECTRAL"; version="1.35.2"; sha256="0dzapl17bgykgsd9qapc1v0ihzn229n25zvagjp1kdx3r4jqmkbb"; depends=[]; };
   ScISI = derive2 { name="ScISI"; version="1.53.0"; sha256="02m4ma2izak4vg4240hnny0b84x440myayjwqcysg8r5gr6pzd83"; depends=[annotate AnnotationDbi apComplex GO_db org_Sc_sgd_db RpsiXML]; };
   Scale4C = derive2 { name="Scale4C"; version="1.3.0"; sha256="1a97dchcinhp24k0r5f7agca33zk3qyh1scz8250aiilhfa4w37y"; depends=[GenomicRanges IRanges smoothie SummarizedExperiment]; };
-  Sconify = derive2 { name="Sconify"; version="1.1.0"; sha256="0is0ix7591gjzpbnv388gnr2jnxbpbjvywv3ln61ign9p5h9gjva"; depends=[dplyr flowCore ggplot2 magrittr readr Rtsne tibble]; };
-  SemDist = derive2 { name="SemDist"; version="1.15.0"; sha256="1rfmlihgk2wa1z3a2yqp43nddxw4nmjaybv9jvp84b0yi3drvn8z"; depends=[annotate AnnotationDbi GO_db]; };
-  SeqArray = derive2 { name="SeqArray"; version="1.21.2"; sha256="0kkci67zrxlyhkbap9khn8655wl63h33004gkxzz1b3drvn0a95b"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
+  Sconify = derive2 { name="Sconify"; version="1.1.3"; sha256="1v5g6w51xfh8gs026k68lhrkzp4fkd5bwkjr7vxlbxggwp523sia"; depends=[dplyr flowCore FNN ggplot2 magrittr readr Rtsne tibble]; };
+  SemDist = derive2 { name="SemDist"; version="1.15.2"; sha256="1mqv1xj3wwadrvf7qv2fpqhjgmvlipsy8afljl67i2y5ik025svi"; depends=[annotate AnnotationDbi GO_db]; };
+  SeqArray = derive2 { name="SeqArray"; version="1.21.8"; sha256="03mv656dyvpxpqpxayr0d5zd47zjk0rn20jj58ma0cyln2a1rly8"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
   SeqGSEA = derive2 { name="SeqGSEA"; version="1.21.0"; sha256="10900fdl0g6izlpxwc3x2yix3cxpqfx6xxvbdq66mx2zqaksrq88"; depends=[Biobase biomaRt DESeq doParallel]; };
-  SeqSQC = derive2 { name="SeqSQC"; version="1.3.0"; sha256="19jv3yyga2fxpndi0rr36vrjz694l97aabr3llkcw7a6mgk78g12"; depends=[e1071 ExperimentHub gdsfmt GenomicRanges GGally ggplot2 IRanges rbokeh RColorBrewer reshape2 rmarkdown S4Vectors SNPRelate]; };
-  SeqVarTools = derive2 { name="SeqVarTools"; version="1.19.2"; sha256="18l60hwj04hr8yln8rm1g0s71axxhnpkzn1khfr0v872csi57m8p"; depends=[Biobase dplyr gdsfmt GenomicRanges GWASExactHW IRanges logistf Matrix S4Vectors SeqArray tidyr]; };
+  SeqSQC = derive2 { name="SeqSQC"; version="1.3.1"; sha256="0avzc9h0xabr2j54gbfpbj5dvf0yr690ckzj9phqz1g4xj16sa25"; depends=[e1071 ExperimentHub gdsfmt GenomicRanges GGally ggplot2 IRanges rbokeh RColorBrewer reshape2 rmarkdown S4Vectors SNPRelate]; };
+  SeqVarTools = derive2 { name="SeqVarTools"; version="1.19.4"; sha256="0cqf6lmqa0r9rzslcgrvfislkmf0cx5ylp6mqqxfzi09q7f74s6q"; depends=[Biobase dplyr gdsfmt GenomicRanges GWASExactHW IRanges logistf Matrix S4Vectors SeqArray tidyr]; };
   ShortRead = derive2 { name="ShortRead"; version="1.39.0"; sha256="1cwpd5xf40gwpcnwmvxysxsl21cgfx3rdgigrawlzlzfd7j9kdig"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
   SigCheck = derive2 { name="SigCheck"; version="2.13.0"; sha256="1cbdry06knmycqyc7p0z598rxlyyrw6yc8an8qm74b9p8vbnwp1a"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; };
   SigFuge = derive2 { name="SigFuge"; version="1.19.0"; sha256="07j9nzw5c4g99yf458n8jwkndr79mam2n4a6kcz9fpcsyjq4plp4"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; };
   SimBindProfiles = derive2 { name="SimBindProfiles"; version="1.19.0"; sha256="0916ml80crldixb8jn5sbzp156ba0r9lc7wc2ri8wmrslv3w97lv"; depends=[Biobase limma mclust Ringo]; };
-  SingleCellExperiment = derive2 { name="SingleCellExperiment"; version="1.3.6"; sha256="0rlww0zvrkfjpx68qafvakbaa5lcjlyrp0phrsji4zh5niv0sy4x"; depends=[BiocGenerics S4Vectors SummarizedExperiment]; };
+  SingleCellExperiment = derive2 { name="SingleCellExperiment"; version="1.3.12"; sha256="1f4c1ma86rzxxqfmyr6w29fmclm6yrmlinkvsdfs8g5ynvlr272m"; depends=[BiocGenerics S4Vectors SummarizedExperiment]; };
   SomaticSignatures = derive2 { name="SomaticSignatures"; version="2.17.0"; sha256="1xq3m2i0b9rklg741796i8n1x0d07mn3xbdmvlc3islh368661jw"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; };
-  SpacePAC = derive2 { name="SpacePAC"; version="1.19.0"; sha256="10g626vyxaidiypjwymk183hvn4nm2vayvka127aavpfaq4ka55r"; depends=[iPAC]; };
-  SparseSignatures = derive2 { name="SparseSignatures"; version="1.1.0"; sha256="1yhk7grm59ba7d7zwbqa9wlc00jzng9gdbaprpq9r5j6kj61id1z"; depends=[Biostrings BSgenome BSgenome_Hsapiens_1000genomes_hs37d5 data_table GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges NMF nnlasso nnls]; };
+  SpacePAC = derive2 { name="SpacePAC"; version="1.19.3"; sha256="0i74bxw99bbs83zvs625pxqbjgkcp0jw076g3j6k5mqlhq98bj7i"; depends=[iPAC]; };
+  SparseSignatures = derive2 { name="SparseSignatures"; version="1.1.5"; sha256="148x34p90x90lkl1ijj0s9gab3k295dbw2hyyy2hmx6hsmvp6hbl"; depends=[Biostrings BSgenome BSgenome_Hsapiens_1000genomes_hs37d5 data_table GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges NMF nnlasso nnls]; };
   SpeCond = derive2 { name="SpeCond"; version="1.35.0"; sha256="0sqb84sa7yf34lwwkchh5wb3dp6n4wk8kzqmsydx5lsaz6fxg32r"; depends=[Biobase fields hwriter mclust RColorBrewer]; };
-  SpidermiR = derive2 { name="SpidermiR"; version="1.11.0"; sha256="1gjjibc2lck5ihjm9k6vh032igvr5zw8dp1r0561cq00sd8w1y2v"; depends=[AnnotationDbi gdata ggplot2 gplots gridExtra httr igraph lattice latticeExtra miRNAtap miRNAtap_db networkD3 org_Hs_eg_db TCGAbiolinks visNetwork]; };
+  SpidermiR = derive2 { name="SpidermiR"; version="1.11.1"; sha256="0mxl07rzcs9agly7hx8f1xyjwfv8bi7yq93y2jzw0bfmxnn7b0rr"; depends=[AnnotationDbi gdata ggplot2 gplots gridExtra httr igraph lattice latticeExtra miRNAtap miRNAtap_db networkD3 org_Hs_eg_db TCGAbiolinks visNetwork]; };
   SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.21.0"; sha256="08n37qnhfk6j6gf0scm5m6i7q8ags821v4lp8aw670kij8xm4j5w"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; };
-  StarBioTrek = derive2 { name="StarBioTrek"; version="1.7.0"; sha256="1fv0xdgzjmmsla8265732vc31drpija8wfdigg5cjhh89mrlpgfm"; depends=[AnnotationDbi e1071 igraph KEGGREST org_Hs_eg_db ROCR SpidermiR]; };
+  StarBioTrek = derive2 { name="StarBioTrek"; version="1.7.1"; sha256="14a7rj8386iaqi3l47ahkpijh7bwwr8sir9ncmzj55fvk3m7c05g"; depends=[AnnotationDbi e1071 igraph KEGGREST org_Hs_eg_db ROCR SpidermiR]; };
   Starr = derive2 { name="Starr"; version="1.37.0"; sha256="0is2fy9zf2cgl3ywkn89v7n134sh812gibr3mpb8iccplvis7dks"; depends=[affxparser affy MASS pspline Ringo zlibbioc]; };
   Streamer = derive2 { name="Streamer"; version="1.27.0"; sha256="14wdvp51cgmzahqqr9dv5whgrl85yjj72sj1v3kqislqvfkn7lww"; depends=[BiocGenerics graph RBGL]; };
-  SummarizedBenchmark = derive2 { name="SummarizedBenchmark"; version="1.99.1"; sha256="1madkjzhjlv7hh5av4pwkjk35vdmc5pcdsy70fngck4kvrhbs28z"; depends=[BiocGenerics BiocParallel crayon digest dplyr ggplot2 mclust rlang S4Vectors sessioninfo stringr SummarizedExperiment tibble tidyr UpSetR]; };
-  SummarizedExperiment = derive2 { name="SummarizedExperiment"; version="1.11.5"; sha256="19qrcp3psnx3dpkcif3i0dy8fgn4nwliqii8v7mjllh2v6vz71x4"; depends=[Biobase BiocGenerics DelayedArray GenomeInfoDb GenomicRanges IRanges Matrix S4Vectors]; };
-  Sushi = derive2 { name="Sushi"; version="1.19.0"; sha256="1pqgrjprsifbf6whzw4y01sqwal35c160ibg49d5rn1r22lyqkc2"; depends=[biomaRt zoo]; };
-  SwathXtend = derive2 { name="SwathXtend"; version="2.3.0"; sha256="1fzkbl4rl3w04z449m3y4dwq4lmqjll0xsqg88kr1jy7k0bzhfnv"; depends=[e1071 lattice openxlsx VennDiagram]; };
-  SwimR = derive2 { name="SwimR"; version="1.19.0"; sha256="03qv3hcky138x449s5axc8j37j45hpalibmwwa3zd5a4fa15zmqr"; depends=[gplots heatmap_plus R2HTML signal]; };
-  TCC = derive2 { name="TCC"; version="1.21.1"; sha256="0p2cphkmzlpzqy2shszyzwxga35hyp0q8n0aj9hbjzvapnil61pg"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; };
-  TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.9.2"; sha256="1jbgv3p5dqhjkm5spn6x73z00ghjb1i4fbmn9xpns0v93axmd1k8"; depends=[biomaRt circlize ComplexHeatmap ConsensusClusterPlus data_table doParallel downloader dplyr EDASeq edgeR genefilter GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel ggthemes gridExtra httr IRanges jsonlite knitr limma matlab plyr R_utils RColorBrewer readr rvest S4Vectors scales selectr stringr SummarizedExperiment survival survminer sva tibble XML xml2]; };
-  TCGAutils = derive2 { name="TCGAutils"; version="1.1.11"; sha256="1dmsjw34shqjhj59g4r3320pgh2hlssp8yb12mhcf21xs95a6pql"; depends=[BiocGenerics GenomeInfoDb GenomicDataCommons GenomicRanges IRanges MultiAssayExperiment rvest S4Vectors stringr SummarizedExperiment xml2]; };
+  SummarizedBenchmark = derive2 { name="SummarizedBenchmark"; version="1.99.3"; sha256="00a6wnysxmxlanjh8zy3bycl9grvzlpsfc7p8qnslyz446dnqdp8"; depends=[BiocGenerics BiocParallel crayon digest dplyr ggplot2 mclust rlang S4Vectors sessioninfo stringr SummarizedExperiment tibble tidyr UpSetR]; };
+  SummarizedExperiment = derive2 { name="SummarizedExperiment"; version="1.11.6"; sha256="1wzp1yvn5vrfrr54v208i63rvb9awv7aplppv3lvwgk0j09hl4hh"; depends=[Biobase BiocGenerics DelayedArray GenomeInfoDb GenomicRanges IRanges Matrix S4Vectors]; };
+  Sushi = derive2 { name="Sushi"; version="1.19.2"; sha256="12dz0l0lkvayqcvr21i2jdlpbfpvvd3rnzchar2yq7k7cwwa3v9s"; depends=[biomaRt zoo]; };
+  SwathXtend = derive2 { name="SwathXtend"; version="2.3.1"; sha256="185rdcmdrahcmga3rkqniszg2i6scynspf7hh77q1ld7hi62ikcq"; depends=[e1071 lattice openxlsx VennDiagram]; };
+  SwimR = derive2 { name="SwimR"; version="1.19.1"; sha256="1nbcan63p8jplrc1w7ljkmfisczgi9jg5rasdfm2iws5azpa36w9"; depends=[gplots heatmap_plus R2HTML signal]; };
+  TCC = derive2 { name="TCC"; version="1.21.5"; sha256="140fhqn6yk8yayqhq47zpb6g3a1pwqhxdi6np5szz1h45scxzw01"; depends=[baySeq DESeq DESeq2 edgeR ROC]; };
+  TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.9.5"; sha256="1lw67yvmhh24yh6rhanvpxp1ma9qwy8klia4py29jskw86vva3ca"; depends=[biomaRt circlize ComplexHeatmap ConsensusClusterPlus data_table doParallel downloader dplyr EDASeq edgeR genefilter GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel ggthemes gridExtra httr IRanges jsonlite knitr limma matlab plyr R_utils RColorBrewer readr rvest S4Vectors scales selectr stringr SummarizedExperiment survival survminer sva tibble XML xml2]; };
+  TCGAbiolinksGUI = derive2 { name="TCGAbiolinksGUI"; version="1.7.3"; sha256="0h4cax1nl2f1ly5q7019jsadfmpva5ykg3qhz9zak8vph8jbwxyv"; depends=[caret clusterProfiler colourpicker data_table downloader DT ELMER ggplot2 ggrepel IlluminaHumanMethylation27kanno_ilmn12_hg19 IlluminaHumanMethylation27kmanifest IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest maftools minfi pathview plotly readr shiny shinyBS shinydashboard shinyFiles shinyjs stringr SummarizedExperiment TCGAbiolinks TCGAbiolinksGUI_data]; };
+  TCGAutils = derive2 { name="TCGAutils"; version="1.1.24"; sha256="1564ssv2f3xkc0lg4k8a4jlccbad9y8zbqx2iyy9ib31rjcysswj"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicDataCommons GenomicFeatures GenomicRanges IRanges MultiAssayExperiment RaggedExperiment rvest S4Vectors stringr SummarizedExperiment xml2]; };
   TCseq = derive2 { name="TCseq"; version="1.5.0"; sha256="1xir0481s72jwp0jnrb9134pv9vwy3g8mhk0rpzwr4qvxxxy7zxn"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; };
   TDARACNE = derive2 { name="TDARACNE"; version="1.31.0"; sha256="19qk0kc7yi4z8kqg7a9msxdiazad3y7xvshmf6pk0999ypacqws4"; depends=[Biobase GenKern Rgraphviz]; };
   TEQC = derive2 { name="TEQC"; version="4.3.0"; sha256="1ldjq8ap4si95zqywhp27rzd8kgij2p9hvcb0w8qvzw2ndk950z4"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; };
   TFARM = derive2 { name="TFARM"; version="1.3.0"; sha256="1c4gks6kvp8x68vnq7npxbq0q94gavbxvx3155prvx5qhsxw4jb8"; depends=[arules fields GenomicRanges stringr]; };
-  TFBSTools = derive2 { name="TFBSTools"; version="1.19.1"; sha256="1mi591pydgvkj5qzjlssg1lqrkgn2in8cj43af1nm9am7l92gwkw"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome caTools CNEr DBI DirichletMultinomial GenomeInfoDb GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XML XVector]; };
-  TFEA_ChIP = derive2 { name="TFEA.ChIP"; version="1.1.0"; sha256="07vwxy4sv8d8ij3cp7p17pvdf1nwbq883iqdjpcfb57ah67ffcx2"; depends=[biomaRt dplyr GenomicFeatures GenomicRanges IRanges org_Hs_eg_db R_utils TxDb_Hsapiens_UCSC_hg19_knownGene]; };
+  TFBSTools = derive2 { name="TFBSTools"; version="1.19.3"; sha256="1zv3wid1jbjd8gn789an6khhsjw6kj10xzs1l2k3vji2ma4by4xd"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome caTools CNEr DBI DirichletMultinomial GenomeInfoDb GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XML XVector]; };
+  TFEA_ChIP = derive2 { name="TFEA.ChIP"; version="1.1.1"; sha256="0n71va6mqdcgqagjr2ga5g7zrbp1a3xnl4hh3yjzsaa1g5fyx1yz"; depends=[biomaRt dplyr GenomicFeatures GenomicRanges IRanges org_Hs_eg_db R_utils TxDb_Hsapiens_UCSC_hg19_knownGene]; };
   TFHAZ = derive2 { name="TFHAZ"; version="1.3.0"; sha256="1j03dp2n459b373ig3yds88f1x5yawr9jqr91w2s8smx5vqqicm8"; depends=[GenomicRanges IRanges S4Vectors]; };
-  TFutils = derive2 { name="TFutils"; version="1.1.0"; sha256="04q54z0hrskz3grw1ayzvcj93r3ziba01sx359c9syh6hbwzl5cd"; depends=[AnnotationDbi AnnotationFilter Biobase data_table dplyr GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges GSEABase Gviz IRanges magrittr miniUI Rsamtools S4Vectors shiny]; };
+  TFutils = derive2 { name="TFutils"; version="1.1.9"; sha256="097fn90mzyafhw27hc3m0dwyls7fc5d5c4rsrp0ris90c5m9lwbb"; depends=[dplyr magrittr miniUI shiny]; };
   TIN = derive2 { name="TIN"; version="1.13.0"; sha256="0iphf37gff3m1hyvijbbpp46bmjvwdppqrrwgf1yj660r01cyvyl"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; };
   TMixClust = derive2 { name="TMixClust"; version="1.3.0"; sha256="1ga7mxlaxv4hglixlqa3kjrvqikzc46mrs1435aihhf649h8zz6j"; depends=[Biobase BiocParallel cluster flexclust gss mvtnorm SPEM zoo]; };
-  TPP = derive2 { name="TPP"; version="3.9.1"; sha256="183qdgly3a4xxiv1y8ckcm890dkg5rqyl99ab6pdgk3g53mx3pva"; depends=[Biobase biobroom broom data_table doParallel dplyr foreach futile_logger ggplot2 gridExtra knitr limma magrittr MASS mefa nls2 openxlsx plyr purrr RColorBrewer RCurl reshape2 rmarkdown sme stringr tidyr VennDiagram VGAM]; };
-  TRONCO = derive2 { name="TRONCO"; version="2.13.0"; sha256="117vq5ia5q68z5ymbvi5y010l4qpwxsbwm9xxx5jl49a86np8s6f"; depends=[bnlearn cgdsr circlize doParallel foreach gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; };
+  TPP = derive2 { name="TPP"; version="3.9.6"; sha256="152hnfxadkcr0dirwxjx428r94pxsmb2j8fpw89mnblr0l28y36g"; depends=[Biobase biobroom broom data_table doParallel dplyr foreach futile_logger ggplot2 gridExtra knitr limma magrittr MASS mefa nls2 openxlsx plyr purrr RColorBrewer RCurl reshape2 rmarkdown sme stringr tidyr VennDiagram VGAM]; };
+  TRONCO = derive2 { name="TRONCO"; version="2.13.3"; sha256="0s57yxz8kdjg2rs3njlay7fan4v241nq6aqv9g08wkhnd60220av"; depends=[bnlearn cgdsr circlize doParallel foreach gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; };
   TSCAN = derive2 { name="TSCAN"; version="1.19.0"; sha256="05zkydpl57j6b02bq0v3896612lbq33jbm896kimygbk4k2wa3g5"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; };
-  TSRchitect = derive2 { name="TSRchitect"; version="1.7.1"; sha256="06vzd7vs9ld714jhzdd46ippdmzmwfg705kky2wrcz6lq547llgp"; depends=[AnnotationHub BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+  TSRchitect = derive2 { name="TSRchitect"; version="1.7.2"; sha256="0fprnylwnwrbya0zpya578ljxwj2xbrnbwwc9qb31nanhwr7p68a"; depends=[AnnotationHub BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
   TSSi = derive2 { name="TSSi"; version="1.27.0"; sha256="1a4xvqmbx2wlhad1pb6013sas5gqm27kc7jhyqp49ccbwm7ayz4r"; depends=[Biobase BiocGenerics Hmisc IRanges minqa plyr S4Vectors]; };
   TTMap = derive2 { name="TTMap"; version="1.3.0"; sha256="0fg0d930icbm62rvfv0d177ld126f1shm5knird50da4vx3qr1a9"; depends=[Biobase colorRamps rgl SummarizedExperiment]; };
   TVTB = derive2 { name="TVTB"; version="1.7.0"; sha256="1514rfqdrp3s1z4zf53zprslqdbsdl1w3crfbqgsv6hisqrrwlm2"; depends=[AnnotationFilter BiocGenerics BiocParallel Biostrings ensembldb ensemblVEP GenomeInfoDb GenomicRanges GGally ggplot2 Gviz IRanges limma reshape2 Rsamtools S4Vectors SummarizedExperiment VariantAnnotation]; };
-  TarSeqQC = derive2 { name="TarSeqQC"; version="1.11.0"; sha256="1gbvfn5vpsbfbvpif8lvq55aav6ak619s1f743c7xj9md84rhx59"; depends=[BiocGenerics BiocParallel Biostrings cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 Hmisc IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; };
+  TarSeqQC = derive2 { name="TarSeqQC"; version="1.11.2"; sha256="0h8vpdy4ja0i8jpdk87qk2dkfrz4izg2m7lgqx18fl490plii1bk"; depends=[BiocGenerics BiocParallel Biostrings cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 Hmisc IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; };
   TargetScore = derive2 { name="TargetScore"; version="1.19.0"; sha256="1phdg2ncvsjgjsfggxv37n74fwj8asw73vccb8iaqj8x7vlkci85"; depends=[Matrix pracma]; };
-  TargetSearch = derive2 { name="TargetSearch"; version="1.37.2"; sha256="065nq07xwdb8s7n4gg0bwdpbasdank6ga9nza25x0lsf1m4kky8r"; depends=[ncdf4]; };
-  TissueEnrich = derive2 { name="TissueEnrich"; version="1.1.0"; sha256="12j0wkw964pbq62hiiavjk172hr3yp333v6c6g5kxmv2vycbxb3m"; depends=[dplyr ensurer ggplot2 GSEABase SummarizedExperiment tidyr]; };
-  TitanCNA = derive2 { name="TitanCNA"; version="1.19.0"; sha256="12c30v6f9i841jyfprn3bxm9dimczwvn5d846kjxmpghf3dgdlgi"; depends=[data_table dplyr foreach GenomeInfoDb GenomicRanges IRanges Rsamtools VariantAnnotation]; };
+  TargetSearch = derive2 { name="TargetSearch"; version="1.37.8"; sha256="1cgk9sg5d0m0njs75lj5c9kz5agyy89xn4vfznh2j06w6l60dvil"; depends=[ncdf4]; };
+  TissueEnrich = derive2 { name="TissueEnrich"; version="1.1.9"; sha256="11254f58mqhwa54kz83iac5sblcbpz6myw8gkwg06gx393yald22"; depends=[dplyr ensurer ggplot2 GSEABase SummarizedExperiment tidyr]; };
+  TitanCNA = derive2 { name="TitanCNA"; version="1.19.1"; sha256="0j84k2bysiizbzr5mfsnv7xmcmi74m7x8a14i375mahp6x9krp4v"; depends=[data_table dplyr foreach GenomeInfoDb GenomicRanges IRanges Rsamtools VariantAnnotation]; };
+  TnT = derive2 { name="TnT"; version="1.3.6"; sha256="0j64j32v1d83qqil3bfb6zxlp4k92qr6khzak5lkk7vdkhpbpckk"; depends=[Biobase data_table GenomeInfoDb GenomicRanges htmlwidgets IRanges jsonlite knitr S4Vectors]; };
   ToPASeq = derive2 { name="ToPASeq"; version="1.15.1"; sha256="13wzyspyipi122g976hp2haqyjhhgnwpaj844w2by8x65nh1hicl"; depends=[graph graphite Rcpp]; };
-  TransView = derive2 { name="TransView"; version="1.25.0"; sha256="1vlfncr2qv03r0b695ya47dd6h2m6qcvzndag1rqi5zzdn6p0w4q"; depends=[BiocGenerics GenomicRanges gplots IRanges Rsamtools S4Vectors zlibbioc]; };
-  Trendy = derive2 { name="Trendy"; version="1.3.2"; sha256="09r1slmx8cr8hc8nz5kkhd25mp19nk3mvlsg3c15lx39n5pimnhs"; depends=[BiocParallel DT gplots magrittr S4Vectors segmented shiny shinyFiles SummarizedExperiment]; };
+  TransView = derive2 { name="TransView"; version="1.25.2"; sha256="0b1bx8smkfp5a282rrmlmqgfgfkiqsvzn6jnkvgn4v3pq7w3752c"; depends=[BiocGenerics GenomicRanges gplots IRanges Rsamtools S4Vectors zlibbioc]; };
+  Trendy = derive2 { name="Trendy"; version="1.3.11"; sha256="01k4ryaymr3c6m3gfdqv1wq8g47x5sr4vcnp6x92gcnncmm8m1qh"; depends=[BiocParallel DT gplots magrittr S4Vectors segmented shiny shinyFiles SummarizedExperiment]; };
   TurboNorm = derive2 { name="TurboNorm"; version="1.29.0"; sha256="15k6cxxwjkb56r9b1r17va2ssq4da7z72dvvgj91bd3x6vqph13q"; depends=[affy convert lattice limma marray]; };
-  TxRegInfra = derive2 { name="TxRegInfra"; version="1.1.2"; sha256="18ymkwfarxfh56y4gg2fh72fccgi2xyjnb4091bgfsg8nvib6wbv"; depends=[BiocParallel GenomeInfoDb GenomicRanges IRanges mongolite RaggedExperiment rjson S4Vectors SummarizedExperiment]; };
+  TxRegInfra = derive2 { name="TxRegInfra"; version="1.1.4"; sha256="1fv107daivcila7j3wkgc413138jza7s8x5g9ksgyr8kxjfs9w7b"; depends=[BiocParallel GenomeInfoDb GenomicRanges IRanges mongolite RaggedExperiment rjson S4Vectors SummarizedExperiment]; };
   TypeInfo = derive2 { name="TypeInfo"; version="1.47.0"; sha256="1nh15bs814s09cck4829r48n18g0w4haglbn826razjrcj5k46y0"; depends=[]; };
   UNDO = derive2 { name="UNDO"; version="1.23.0"; sha256="0csl0kh2ksswmv53cmy10b35ns5l9yg917m99f9pjrnql1n3ciq6"; depends=[Biobase BiocGenerics boot MASS nnls]; };
-  Ularcirc = derive2 { name="Ularcirc"; version="0.99.20"; sha256="1i48shbv1cwl1z4czpzc53iyab0d04aqw4w27w9cnvzxqs9fc0aj"; depends=[AnnotationHub Biostrings BSgenome data_table DT GenomeInfoDb GenomeInfoDbData GenomicFeatures gsubfn httpuv mirbase_db moments shiny shinyFiles Sushi yaml]; };
-  UniProt_ws = derive2 { name="UniProt.ws"; version="2.21.3"; sha256="1ifzfghq7kk6s3wagjsvc1qz9gldfypgmniiw8pcsm1sji1y31ps"; depends=[AnnotationDbi BiocFileCache BiocGenerics rappdirs RCurl RSQLite]; };
-  Uniquorn = derive2 { name="Uniquorn"; version="2.1.0"; sha256="0livhr3kqjhh7s45fahvmshk7f6bbakpx58x16l7vclb1dlzkhii"; depends=[data_table doParallel foreach GenomicRanges IRanges R_utils stringr VariantAnnotation WriteXLS]; };
-  VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.27.1"; sha256="1m3bjqif7kwnwwry5zdm74jysq8pnxzkgkdf75bjgw08gg6ykd6j"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; };
-  VariantFiltering = derive2 { name="VariantFiltering"; version="1.17.1"; sha256="0gfvnbs9wh4g3z029b6h5pjky84iz4i9ijmg0kz83v2xybnv1n34"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores graph Gviz IRanges RBGL Rsamtools S4Vectors shiny shinyjs shinythemes shinyTree SummarizedExperiment VariantAnnotation XVector]; };
+  Ularcirc = derive2 { name="Ularcirc"; version="0.99.24"; sha256="0dq4lwx2q6lga1cd9smqrmngvsd26xj83amfhg8192jg6jys9i70"; depends=[AnnotationHub Biostrings BSgenome data_table DT GenomeInfoDb GenomeInfoDbData GenomicFeatures gsubfn httpuv mirbase_db moments shiny shinyFiles Sushi yaml]; };
+  UniProt_ws = derive2 { name="UniProt.ws"; version="2.21.4"; sha256="1dsz47zs47mqrijiybs4p1syrf975ff2g1waxpcixbi3jr20gq80"; depends=[AnnotationDbi BiocFileCache BiocGenerics rappdirs RCurl RSQLite]; };
+  Uniquorn = derive2 { name="Uniquorn"; version="2.1.4"; sha256="13xgw133kbrmm1idb21hdgm2mn619gvwq1k5bk6nw9m3qcwnp69l"; depends=[data_table doParallel foreach GenomicRanges IRanges R_utils stringr VariantAnnotation WriteXLS]; };
+  VanillaICE = derive2 { name="VanillaICE"; version="1.43.4"; sha256="0wdmcmynsrk6ir4sxmgdpvsfdqnb1cgjc3n7vvsa8rsa6b22a15d"; depends=[Biobase BiocGenerics BSgenome_Hsapiens_UCSC_hg18 crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; };
+  VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.27.9"; sha256="0vh50jil9ksjs6d9d9f457v31s8l4rn8cdm0wamj71gcdmp9x2f7"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; };
+  VariantFiltering = derive2 { name="VariantFiltering"; version="1.17.3"; sha256="16jgpja0mxlb2sny6ccnc4aqvgxkl1kna3j8dnn5gyxbd11vzxri"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicFeatures GenomicRanges GenomicScores graph Gviz IRanges RBGL Rsamtools S4Vectors shiny shinyjs shinythemes shinyTree SummarizedExperiment VariantAnnotation XVector]; };
   VariantTools = derive2 { name="VariantTools"; version="1.23.0"; sha256="1kr4w5c1rwsamb168ahj74f379rk87qldm2mivhn73zq75qrawaf"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
-  Vega = derive2 { name="Vega"; version="1.29.0"; sha256="1zjdhszz65wpjirakkl53a4jqh43z6ryvndf0hxal4gc586gifcd"; depends=[]; };
-  VegaMC = derive2 { name="VegaMC"; version="3.19.0"; sha256="1c4vfm2vv2xm6yw2ca57ml9bn6n9ddc2p8pcbxivxkxc8b5n2ysn"; depends=[Biobase biomaRt genoset]; };
-  XBSeq = derive2 { name="XBSeq"; version="1.13.0"; sha256="014c96hz2nqjz865xmbhcsqqxxgssd9rn1j1pgmxakkz87mcnvji"; depends=[Biobase DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma roar]; };
-  XDE = derive2 { name="XDE"; version="2.27.0"; sha256="1mls0fx2z2n7izmrmhpv6jg87x36d1j9x6gq51hhkzw5rbq25ng6"; depends=[Biobase BiocGenerics genefilter GeneMeta gtools MergeMaid mvtnorm RColorBrewer siggenes]; };
-  XVector = derive2 { name="XVector"; version="0.21.3"; sha256="12p9s5d10cpm86v202gdw6y9gnsmcsny43gv6qnhz48ilzwql4mc"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; };
+  Vega = derive2 { name="Vega"; version="1.29.1"; sha256="04yvxrv7m78dxg2k7pjcz6hz4clywb2lrldqs6pixyli2ifal8fq"; depends=[]; };
+  VegaMC = derive2 { name="VegaMC"; version="3.19.1"; sha256="1dah8j41qd9ym00nlv8k0kpz3vsl7y3f6h4nyzv8bwa3nf9ip9qy"; depends=[Biobase biomaRt genoset]; };
+  Wrench = derive2 { name="Wrench"; version="0.99.10"; sha256="1wm4zrh8wiyvjw246a4xwc3y278qyyvgx02n7kgnwznzg6wvh05s"; depends=[limma locfit matrixStats]; };
+  XBSeq = derive2 { name="XBSeq"; version="1.13.1"; sha256="1dkwk181glpqq3g6ks5mpx39p106a8vkhky40hh7zny1pdycbzzh"; depends=[Biobase DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma roar]; };
+  XDE = derive2 { name="XDE"; version="2.27.1"; sha256="1kj5wdn3w49zzi43hp8qs17v173nlgf215hm5pjy6l6pgvjjffjm"; depends=[Biobase BiocGenerics genefilter GeneMeta gtools MergeMaid mvtnorm RColorBrewer siggenes]; };
+  XINA = derive2 { name="XINA"; version="0.99.13"; sha256="1vyawdy8z1lisnpfdy6rxmkbjxzs9dzb5f8i6wqiyx726z68fcpc"; depends=[alluvial Biobase ggplot2 gridExtra igraph mclust plyr STRINGdb]; };
+  XVector = derive2 { name="XVector"; version="0.21.4"; sha256="1zb01pi6dm424ky95sli7h0a2qy2px6as0bz9ic48b3nwd7az2mn"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; };
   YAPSA = derive2 { name="YAPSA"; version="1.7.0"; sha256="1ny51v4papa067aylq7njyi2f17yp44y955szpark0lj0p759vjb"; depends=[circlize ComplexHeatmap corrplot dendextend GenomeInfoDb GenomicRanges GetoptLong ggplot2 gridExtra gtrellis KEGGREST lsei PMCMR reshape2 SomaticSignatures VariantAnnotation]; };
   a4 = derive2 { name="a4"; version="1.29.0"; sha256="0anj0gkbiccvb93xqzi7k1xxw2kqlwcf82pf4pqadc2fvmb1yfd7"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; };
   a4Base = derive2 { name="a4Base"; version="1.29.0"; sha256="03lnbfg94xwrib8g40y4bazp122zy9nnpv4v1m18wjc10hi7z7qp"; depends=[a4Core a4Preproc annaffy AnnotationDbi Biobase genefilter glmnet gplots limma mpm multtest]; };
@@ -784,106 +839,117 @@ in with self; {
   a4Preproc = derive2 { name="a4Preproc"; version="1.29.0"; sha256="1yhdsx23rd1mihj18jwvb7rl6kgyvbh4a75lsv0faqvsh9bk2k77"; depends=[AnnotationDbi]; };
   a4Reporting = derive2 { name="a4Reporting"; version="1.29.0"; sha256="1m79clrlf0f5f108vyamy2ia8sbxi3mm2kf8ckhbbsr6qgmnqcsb"; depends=[annaffy xtable]; };
   aCGH = derive2 { name="aCGH"; version="1.59.0"; sha256="17nqy2sgkvjzhm3l8ypg93i7yzsniy536b2wz7rd6km52spldp7r"; depends=[Biobase cluster multtest survival]; };
+  abseqR = derive2 { name="abseqR"; version="0.99.11"; sha256="1fzcchzxzpmiv2az8cg7nyx4pxkabfviyzm2nyx36kbyl4mfhwbb"; depends=[BiocParallel BiocStyle circlize flexdashboard ggcorrplot ggdendro ggplot2 gridExtra knitr plotly plyr png RColorBrewer reshape2 rmarkdown stringr vegan VennDiagram]; };
   acde = derive2 { name="acde"; version="1.11.0"; sha256="18551wkanalxk32g37j2yg766qgddsxid0lzv2rb61gqjb7qrmpa"; depends=[boot]; };
   adSplit = derive2 { name="adSplit"; version="1.51.0"; sha256="1azczbx6w17a1awwpfc1bbgx14562mr41mgii7skm9r8jb9pxn4n"; depends=[AnnotationDbi Biobase cluster GO_db KEGG_db multtest]; };
-  adaptest = derive2 { name="adaptest"; version="1.1.0"; sha256="0ddrkkh8mh3fq65dz6rrxm9wykyalwa90jf5vb0kllgjd3n6hvk8"; depends=[calibrate origami SummarizedExperiment tmle]; };
-  affxparser = derive2 { name="affxparser"; version="1.53.0"; sha256="1n81df9451r3pixakgjwi4zqna7gp0s9v6qrjpyw71294swi169f"; depends=[]; };
-  affy = derive2 { name="affy"; version="1.59.0"; sha256="1z57jn6l79jwks0j64m63s5h4kxdxg08qjmi646765xlf3xi746j"; depends=[affyio Biobase BiocGenerics BiocInstaller preprocessCore zlibbioc]; };
+  adaptest = derive2 { name="adaptest"; version="1.1.1"; sha256="02dlhbnfl11x8hpampzz2d76i958k6lm4d3yc4kicpdsl5vmv6mk"; depends=[calibrate origami SummarizedExperiment tmle]; };
+  affxparser = derive2 { name="affxparser"; version="1.53.2"; sha256="15i7rnwhc602y2c2i0h07z7fw29ynjq0jw1hqsjinw5df4afnxj7"; depends=[]; };
+  affy = derive2 { name="affy"; version="1.59.1"; sha256="08fppshnnj1rxjd0kkmlrsz9nhqllzbzha5r1jbcly1f3dgy0799"; depends=[affyio Biobase BiocGenerics BiocManager preprocessCore zlibbioc]; };
   affyContam = derive2 { name="affyContam"; version="1.39.0"; sha256="1mh1yqrdh47ggqibgghnlmjfq46n0w4q1hdji7cv1js6kry7wqcf"; depends=[affy affydata Biobase]; };
   affyILM = derive2 { name="affyILM"; version="1.33.0"; sha256="0q41aznln8kngmv0q6036zvzbbk5sw46lhmss3npk7r6q0ryyvwr"; depends=[affxparser affy Biobase gcrma]; };
   affyPLM = derive2 { name="affyPLM"; version="1.57.0"; sha256="17vy0knf0vb3l824q2ib4hp0izw4s8phbjalsrzbwvmm7gg25xv7"; depends=[affy Biobase BiocGenerics gcrma preprocessCore zlibbioc]; };
   affyPara = derive2 { name="affyPara"; version="1.41.0"; sha256="1j81wl9ivx24jag4jnnv6viblpqba72c72nmcxs60cdqq44vs87h"; depends=[affy affyio aplpack snow vsn]; };
   affyQCReport = derive2 { name="affyQCReport"; version="1.59.0"; sha256="16sz9rii38vph2qiplab0f7fakd2vl77df543mfiykk3w5f0why2"; depends=[affy affyPLM Biobase genefilter lattice RColorBrewer simpleaffy xtable]; };
   affycomp = derive2 { name="affycomp"; version="1.57.0"; sha256="167bgzq82zsl2mdgzai95msh188j10hwrmp4bqab5qh9h2s8phvb"; depends=[Biobase]; };
-  affycoretools = derive2 { name="affycoretools"; version="1.53.2"; sha256="10zr09sqg6yf5f22qy0157qp03c479lxcdlippxawsq3x5dag533"; depends=[affy AnnotationDbi Biobase BiocGenerics DBI edgeR gcrma ggplot2 GOstats gplots hwriter lattice limma oligoClasses ReportingTools RSQLite S4Vectors xtable]; };
+  affycoretools = derive2 { name="affycoretools"; version="1.53.4"; sha256="13vacl5a4rnizn6pgchyd8xxpf3sd4cdwxfyvmslwaci4dh0mlk5"; depends=[affy AnnotationDbi Biobase BiocGenerics DBI edgeR gcrma ggplot2 GOstats gplots hwriter lattice limma oligoClasses ReportingTools RSQLite S4Vectors xtable]; };
   affyio = derive2 { name="affyio"; version="1.51.0"; sha256="1p10bycid4dlhxhllalffywrc06xj1qjzs9f9fvj1y1yzj3xgmqz"; depends=[zlibbioc]; };
-  affylmGUI = derive2 { name="affylmGUI"; version="1.55.2"; sha256="0i0psf8rp2ars1ibb13vchmgapb8mf1smmabgb54c8gmd3lzx6js"; depends=[affy affyio affyPLM BiocGenerics BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
+  affylmGUI = derive2 { name="affylmGUI"; version="1.55.3"; sha256="0x6f92w8gqk2vs2p3walg2f0z0vx0gkiyz1jpnq01lz9zklwvhq9"; depends=[affy affyio affyPLM BiocGenerics BiocManager gcrma limma R2HTML tkrplot xtable]; };
   affypdnn = derive2 { name="affypdnn"; version="1.55.0"; sha256="11gwlr0ghw5c0977sgyhvghb953cgppp3vz3g1gfd3mdgkckvpqw"; depends=[affy]; };
   agilp = derive2 { name="agilp"; version="3.13.0"; sha256="1z7bxkdmqpz4kn1m2z91knnp36mp7z5awzj6qqwj7xwydc85m8np"; depends=[]; };
   alpine = derive2 { name="alpine"; version="1.7.0"; sha256="0d5r1izkx7lvl9f7sy0sy97mpvxaj05010vxmgw0c5yfpzzi3hz1"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph IRanges RBGL Rsamtools S4Vectors speedglm stringr SummarizedExperiment]; };
   alsace = derive2 { name="alsace"; version="1.17.0"; sha256="0p17f29n1z3n4x2rpv4hja10aq5349653ra4hwl5fbli3fa0ww43"; depends=[ALS ptw]; };
   altcdfenvs = derive2 { name="altcdfenvs"; version="2.43.0"; sha256="1md8rb732bpsxs1r1mgvd9f98ixg596rn28pw6pq8bl8hj5jh3l9"; depends=[affy Biobase BiocGenerics Biostrings hypergraph makecdfenv S4Vectors]; };
-  ampliQueso = derive2 { name="ampliQueso"; version="1.19.0"; sha256="0nvwvvrm41vi289zp86s4yb0b6z9i54gq43vmvk1jh556rg1wsh6"; depends=[DESeq doParallel edgeR foreach genefilter ggplot2 gplots knitr rgl rnaSeqMap samr statmod VariantAnnotation xtable]; };
-  amplican = derive2 { name="amplican"; version="1.3.1"; sha256="16h9py6yl6nb2203wk00g0lvgkic4f9xdwzrxdq9rk1mlnmjbyd2"; depends=[BiocGenerics BiocParallel Biostrings clusterCrit data_table dplyr GenomeInfoDb GenomicRanges ggforce ggplot2 ggthemes gridExtra gtable IRanges knitr Matrix matrixStats rmarkdown S4Vectors ShortRead stringr waffle]; };
-  anamiR = derive2 { name="anamiR"; version="1.9.0"; sha256="07xldx4dqc3s5vrankh1swg8a4hy50ihiw5wx5ndxvkpig8sspr8"; depends=[agricolae DBI DESeq2 gage gplots limma lumi RMySQL S4Vectors SummarizedExperiment]; };
+  ampliQueso = derive2 { name="ampliQueso"; version="1.19.4"; sha256="0nznv4cdjxr1lcr4cf2jpipcqn9s90kd97rqnv5kild2yv8srbhq"; depends=[DESeq doParallel edgeR foreach genefilter ggplot2 gplots knitr rgl rnaSeqMap samr statmod VariantAnnotation xtable]; };
+  amplican = derive2 { name="amplican"; version="1.3.5"; sha256="0yf9wjgg22ry89cs9in66gwfana8c9cqaq7anfkpa3ng27llakd7"; depends=[BiocGenerics BiocParallel Biostrings clusterCrit data_table dplyr GenomeInfoDb GenomicRanges ggforce ggplot2 ggthemes gridExtra gtable IRanges knitr Matrix matrixStats rmarkdown S4Vectors ShortRead stringr waffle]; };
+  anamiR = derive2 { name="anamiR"; version="1.9.2"; sha256="0l0lgan8zs04dyk972prvdng4xb8rig5g9rv55z1pplxvla4grqk"; depends=[agricolae DBI DESeq2 gage gplots limma lumi RMySQL S4Vectors SummarizedExperiment]; };
   annaffy = derive2 { name="annaffy"; version="1.53.0"; sha256="0z97liznk6by9a7klw0wirpchd9n57ycsf80xsprnlgy60slypvc"; depends=[AnnotationDbi Biobase DBI GO_db KEGG_db]; };
   annmap = derive2 { name="annmap"; version="1.23.0"; sha256="0m74p8zrqhyfgpbqf4s98174y7gz9p1nh9q272xbsqn8ckdk8c0a"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; };
-  annotate = derive2 { name="annotate"; version="1.59.0"; sha256="0m384l8asvl2kswaar408w08yps7n822pfsxqby8igblrfzjgxjq"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl XML xtable]; };
+  annotate = derive2 { name="annotate"; version="1.59.1"; sha256="016sgwqd0s3jhpqw4056y0xa7p1jc99i8b7biq754vzzbapjvyb0"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl XML xtable]; };
   annotationTools = derive2 { name="annotationTools"; version="1.55.0"; sha256="18rxyi7sx93l52agbxnla1b7gn2bk3fpby0qj224nqinydjxkmjj"; depends=[Biobase]; };
-  annotatr = derive2 { name="annotatr"; version="1.7.1"; sha256="0ccad82zrdy028dyycsvbcdijh2xl1ibjqz36wfnnnipxwc9fq89"; depends=[AnnotationDbi AnnotationHub dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges readr regioneR reshape2 rtracklayer S4Vectors]; };
+  annotatr = derive2 { name="annotatr"; version="1.7.2"; sha256="0q18fmb7wbbhqm3rwgf3d3cm9rpryrybv35jglsjsa3ca7y0550d"; depends=[AnnotationDbi AnnotationHub dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges readr regioneR reshape2 rtracklayer S4Vectors]; };
   anota = derive2 { name="anota"; version="1.29.0"; sha256="1najgyj4qn9954jxbq0c4psarsq8mrg6fz0w3p9vmcm68l8lz3ig"; depends=[multtest qvalue]; };
-  anota2seq = derive2 { name="anota2seq"; version="1.3.0"; sha256="0kr5wm6sirkycp0f017vqialqzzjadyfkm2fpv2zj6v8acnv3704"; depends=[DESeq2 edgeR limma multtest qvalue RColorBrewer SummarizedExperiment]; };
+  anota2seq = derive2 { name="anota2seq"; version="1.3.1"; sha256="1gp5f852kiz1ck19iasvkm1idgdcv636jdkmfp4j76r7k3vjzk36"; depends=[DESeq2 edgeR limma multtest qvalue RColorBrewer SummarizedExperiment]; };
   antiProfiles = derive2 { name="antiProfiles"; version="1.21.0"; sha256="166mx0y4b3j1vd3daxr9wd48d007qh1sj1vjssjfails6j4sy9lh"; depends=[locfit matrixStats]; };
   apComplex = derive2 { name="apComplex"; version="2.47.0"; sha256="0pqgrzfvljvinsalki5sc31c38k959g5gzag7sn33iilqw7s8grx"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; };
-  apeglm = derive2 { name="apeglm"; version="1.3.0"; sha256="1y9g9s68fqiinr2lwx10s5m533ccgbpzh4wqlf7nbjw696vshjnb"; depends=[emdbook GenomicRanges Rcpp RcppEigen RcppNumerical SummarizedExperiment]; };
+  apeglm = derive2 { name="apeglm"; version="1.3.2"; sha256="1w7g7vfzqs109b2bihw7vgsyxrc65j31zlxf4v9bn5y144hzrn2j"; depends=[emdbook GenomicRanges Rcpp RcppEigen RcppNumerical SummarizedExperiment]; };
+  appreci8R = derive2 { name="appreci8R"; version="0.99.5"; sha256="0jr8qfrxdigddw1nwlzgqs7whzvs5h1c8xzmlzrbwrzn3ymgka54"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 COSMIC_67 DT GenomicFeatures GenomicRanges GenomicScores Homo_sapiens IRanges MafDb_1Kgenomes_phase3_hs37d5 MafDb_ESP6500SI_V2_SSA137_hs37d5 MafDb_ExAC_r1_0_hs37d5 MafDb_gnomADex_r2_0_1_hs37d5 openxlsx PolyPhen_Hsapiens_dbSNP131 rentrez Rsamtools rsnps S4Vectors seqinr shiny shinyjs SIFT_Hsapiens_dbSNP137 SNPlocs_Hsapiens_dbSNP144_GRCh37 stringr SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation XtraSNPlocs_Hsapiens_dbSNP144_GRCh37]; };
+  aroma_light = derive2 { name="aroma.light"; version="3.11.2"; sha256="0m03zkil79axvrmvaaimlv5pas6h19ylc4l5pm7f2xnc5150n8vp"; depends=[matrixStats R_methodsS3 R_oo R_utils]; };
   arrayMvout = derive2 { name="arrayMvout"; version="1.39.0"; sha256="1yrqx8vkbhwsdh0x3ig5wmy3ynx56154wgc69hzssvw38jdlp9vy"; depends=[affy affyContam Biobase lumi mdqc parody simpleaffy]; };
   arrayQuality = derive2 { name="arrayQuality"; version="1.59.0"; sha256="1nhavhn4vnxvmj2hw8qlrnbyp3nsv3m90qcj20ijiv85jkr10mpa"; depends=[gridBase hexbin limma marray RColorBrewer]; };
-  arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.37.0"; sha256="0bd78q63gsnh0bfspif6zgkp77wf634xcq6h53ka96qs7d98nxcv"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; };
+  arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.37.1"; sha256="1pn3q37dmx2drqiq9k1y0s9n9hmh5njp70ljgkf4z83a3wwgz6fk"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; };
+  artMS = derive2 { name="artMS"; version="0.99.101"; sha256="0id199zy5cmbjap8zwp2if5hnr20cbsk9fsvfvkvg29pa01bi3x0"; depends=[AnnotationDbi biomaRt bit64 circlize cluster ComplexHeatmap corrplot data_table dplyr factoextra FactoMineR getopt ggdendro ggplot2 ggrepel gplots gProfileR limma MSstats openxlsx org_Hs_eg_db org_Mm_eg_db PerformanceAnalytics pheatmap plotly plyr RColorBrewer reshape2 seqinr stringr tidyr UpSetR VennDiagram yaml]; };
   attract = derive2 { name="attract"; version="1.33.2"; sha256="15mrqxcqflm3f77s336dyh8q57ipr27ca81aap6pwfxgpqykay49"; depends=[AnnotationDbi Biobase cluster GOstats KEGGREST limma org_Hs_eg_db reactome_db]; };
   bacon = derive2 { name="bacon"; version="1.9.0"; sha256="018082c3g5cdi3i1z1q26cq4v1f529d1c2q92p6qyzblcs8m2j2m"; depends=[BiocParallel ellipse ggplot2]; };
-  ballgown = derive2 { name="ballgown"; version="2.13.0"; sha256="16x4bh9wdqw5isia1vwi8kynlfaxvvc808lnbdkz8964rfxn317i"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; };
-  bamsignals = derive2 { name="bamsignals"; version="1.13.1"; sha256="1jyf9arivqk42zsj9k3fgjvz7d8ixlm2irsac4vkfjvr8nrfssyr"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; };
-  banocc = derive2 { name="banocc"; version="1.5.0"; sha256="1i86y34yhcaadl7ans6ypcr5yprqlnl4fl0bmr1k28pd8knwgq70"; depends=[coda mvtnorm rstan stringr]; };
+  ballgown = derive2 { name="ballgown"; version="2.13.1"; sha256="16464any97gpy6jmg61w58cryfd4z0c7qrq29vb28pbfxiwv4mmz"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; };
+  bamsignals = derive2 { name="bamsignals"; version="1.13.2"; sha256="1w8jqk8iz63cfhnbnf2r4k15052kp2cyq6da9zl4my9kc237nr14"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; };
+  banocc = derive2 { name="banocc"; version="1.5.2"; sha256="1sdj9gd43a7pz8sbzm0l9d7ifsmdpgksq6f52zs06blsy31aca99"; depends=[coda mvtnorm rstan stringr]; };
   basecallQC = derive2 { name="basecallQC"; version="1.5.0"; sha256="1g6hisqbg41kwz16iw7ai2rbw6hvndv560m7jxa85cm3kl9s5dxh"; depends=[data_table dplyr DT ggplot2 knitr lazyeval magrittr prettydoc raster rmarkdown ShortRead stringr tidyr XML yaml]; };
+  bayNorm = derive2 { name="bayNorm"; version="0.99.19"; sha256="1vk4rlc9vchlvidhykqb75ljxhy0v9pbm2jdd5md4dswwq74psad"; depends=[BB BiocParallel doSNOW fitdistrplus foreach iterators locfit MASS Rcpp RcppArmadillo RcppProgress SingleCellExperiment SummarizedExperiment]; };
   baySeq = derive2 { name="baySeq"; version="2.15.2"; sha256="01iv53gsrqm0ia44dzirdfpfqdrav46xxwml7xmb6cfgafx118qd"; depends=[abind edgeR GenomicRanges]; };
-  bcSeq = derive2 { name="bcSeq"; version="1.3.0"; sha256="1l1zpf1pyf7r3qqif6f4fjzxrvcj18yz8ggads1q98z74nrzwgwq"; depends=[Biostrings Matrix Rcpp]; };
-  beachmat = derive2 { name="beachmat"; version="1.3.2"; sha256="0mr1a8zcrrfs2klavq4jzw5lpcv64l3rvjpqx78jdhdvrfd0fi99"; depends=[DelayedArray HDF5Array Rcpp rhdf5 Rhdf5lib]; };
-  beadarray = derive2 { name="beadarray"; version="2.31.0"; sha256="1kf6fzq11mr49xav1ivz366vpsjaqhi1l0k4751k79s6rr30m6d6"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; };
+  bcSeq = derive2 { name="bcSeq"; version="1.3.3"; sha256="14lmv9zlrh1xqdm0d0xyfi2rbjk8h3hkiaq74mbrygcgy8i9n77b"; depends=[Biostrings Matrix Rcpp]; };
+  beachmat = derive2 { name="beachmat"; version="1.3.11"; sha256="06nb379rwpfb216qizxmmviljnm92vw52q9qlba8hsgrn189fbzl"; depends=[BiocGenerics DelayedArray HDF5Array Rcpp rhdf5 Rhdf5lib]; };
+  beadarray = derive2 { name="beadarray"; version="2.31.1"; sha256="1vnhdw4gcv35xbj6s2rhwf4w90ghpmyjqcp5r4hnh3f829921xvf"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; };
   beadarraySNP = derive2 { name="beadarraySNP"; version="1.47.0"; sha256="1x4byqw6d2xy4db6pgbadsdwakw39lvw58dckijk2fwgrimzipn0"; depends=[Biobase quantsmooth]; };
   bgafun = derive2 { name="bgafun"; version="1.43.0"; sha256="02pv0b72m7xy2hqjdhz881qkp83api8lwbjngq7v29xhp7mpmgq3"; depends=[ade4 made4 seqinr]; };
   bgx = derive2 { name="bgx"; version="1.47.0"; sha256="1vh2hhjsfyx8laq1xym7zaxsakgwcp0ybha6xxdc18mwlwr3q412"; depends=[affy Biobase gcrma]; };
-  bigmelon = derive2 { name="bigmelon"; version="1.7.0"; sha256="0r753dyi2ls6dy99zh519mvqqc9pr8vy16pyvmpmpvxg8bj1hx90"; depends=[Biobase BiocGenerics gdsfmt GEOquery methylumi minfi wateRmelon]; };
+  bigmelon = derive2 { name="bigmelon"; version="1.7.4"; sha256="10sypnsvj561v9fdii047xvy2hamljss3rdw89b5l478flh5h3bx"; depends=[Biobase BiocGenerics gdsfmt GEOquery methylumi minfi wateRmelon]; };
   bigmemoryExtras = derive2 { name="bigmemoryExtras"; version="1.29.0"; sha256="0cxbd4zdvrpqycnvgw7svvngknscc4s9ycqp3csa8v1gpc9bj9cd"; depends=[bigmemory]; };
-  bioCancer = derive2 { name="bioCancer"; version="1.9.0"; sha256="131a7la949ckklcbsr9rbm99nhaz7zlbk6ck7lhc8n55z5lig30d"; depends=[AlgDesign AnnotationFuncs Biobase cgdsr clusterProfiler DiagrammeR DOSE dplyr DT geNetClassifier htmlwidgets org_Hs_eg_db plyr r_import radiant_data reactome_db ReactomePA shiny shinythemes tibble visNetwork XML]; };
+  bioCancer = derive2 { name="bioCancer"; version="1.9.8"; sha256="0dzsa1v2w8x73vz41h1h7gfv6yk1csffmn453cpzvvy2sy6v7pls"; depends=[AlgDesign AnnotationFuncs Biobase cgdsr clusterProfiler DiagrammeR DOSE dplyr DT geNetClassifier htmlwidgets org_Hs_eg_db plyr r_import radiant_data reactome_db ReactomePA shiny shinythemes tibble visNetwork XML]; };
   bioDist = derive2 { name="bioDist"; version="1.53.0"; sha256="04pazvkmw36ghicyzbqvb7rq3kvpw7qrj01k7gddrg4c1dc2rdd2"; depends=[Biobase KernSmooth]; };
-  bioassayR = derive2 { name="bioassayR"; version="1.19.0"; sha256="1c2xjbh0lnik1dn2iwicpd0y1swbnnz1zac1vlaabhmxdw2g1h0n"; depends=[BiocGenerics ChemmineR DBI Matrix rjson RSQLite XML]; };
-  biobroom = derive2 { name="biobroom"; version="1.13.0"; sha256="1csxi4f7d0lg1j9sjnmp089pma65pq1k2yyimrh0vl8yw92zlns6"; depends=[Biobase broom dplyr tidyr]; };
+  bioassayR = derive2 { name="bioassayR"; version="1.19.3"; sha256="1p7akwrsa22qrngsyksin8xxldfmlfp63yypgsqackj1qni1p4gs"; depends=[BiocGenerics ChemmineR DBI Matrix rjson RSQLite XML]; };
+  biobroom = derive2 { name="biobroom"; version="1.13.2"; sha256="02mgb1rqdn616xgs1gjfmn84z6565v41m9zg16m6waba8p348chn"; depends=[Biobase broom dplyr tidyr]; };
   biocGraph = derive2 { name="biocGraph"; version="1.43.0"; sha256="1ps4r6rkffmqisfz5wip981r3dbx57n3r1j6whw9l6dbs043fjql"; depends=[BiocGenerics geneplotter graph Rgraphviz]; };
-  biocViews = derive2 { name="biocViews"; version="1.49.4"; sha256="1mgf21zbq8pm3iw8fsw700wzdjca1kf575xayaibblfsxcd1y59q"; depends=[Biobase graph RBGL RCurl RUnit XML]; };
-  biomaRt = derive2 { name="biomaRt"; version="2.37.3"; sha256="087vd0csab9ph21ijahjj66wpwnbsd48mvym12y7wrw71rvincw2"; depends=[AnnotationDbi httr progress RCurl stringr XML]; };
-  biomformat = derive2 { name="biomformat"; version="1.9.0"; sha256="1n8dwxkd6k0nvksg6dpcq84da9y9mjsmbn62362ja2kjgzqkh80x"; depends=[jsonlite Matrix plyr rhdf5]; };
+  biocViews = derive2 { name="biocViews"; version="1.49.10"; sha256="1dzd4ag0m2cprih66787aqgmm6fn68w6r7l5x6palsgix382m4m2"; depends=[Biobase graph RBGL RCurl RUnit XML]; };
+  biomaRt = derive2 { name="biomaRt"; version="2.37.9"; sha256="196glcsp4cp0wfw2hrlvpxrx9r7ncfd775gfpmy298xldsxqf319"; depends=[AnnotationDbi httr progress RCurl stringr XML]; };
+  biomformat = derive2 { name="biomformat"; version="1.9.1"; sha256="1kjk6agznq63a48jhj2yxkxr1nmwjlhb4zwmh1i1aawhzk1d04z1"; depends=[jsonlite Matrix plyr rhdf5]; };
   biomvRCNS = derive2 { name="biomvRCNS"; version="1.21.0"; sha256="193cfwknlm28pm5n7ydmrnaczw7xisiz07l29jyk0h05jrmrvna0"; depends=[GenomicRanges Gviz IRanges mvtnorm]; };
   biosigner = derive2 { name="biosigner"; version="1.9.0"; sha256="0v33vksq23byv5ybkb0mmvcb5fag3ghy9gcvb9aj16i7r0bs61ql"; depends=[Biobase e1071 randomForest ropls]; };
   biosvd = derive2 { name="biosvd"; version="2.17.0"; sha256="19l7mc1pbsbbzsb635iiqb778xq1lrlnmsnyd324471c3rnb1yn7"; depends=[Biobase BiocGenerics NMF]; };
   biotmle = derive2 { name="biotmle"; version="1.5.1"; sha256="0ihc1g60j1lkz3na23vvpd9c8xcz0p8wm5ksa6169zxjgqb90mmv"; depends=[BiocGenerics BiocParallel doFuture dplyr future ggplot2 ggsci limma S4Vectors SummarizedExperiment superheat tmle]; };
-  biovizBase = derive2 { name="biovizBase"; version="1.29.0"; sha256="0cmfigqy4ajrsdgwiwnwkhnznk14phq2di7yijjr0n3whk2xbvp4"; depends=[AnnotationDbi AnnotationFilter BiocGenerics Biostrings dichromat ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
+  biovizBase = derive2 { name="biovizBase"; version="1.29.2"; sha256="0xhwnjjwv41wsn3knl3pyswdwnrmsj49nwrxpmdlmivgqz6f0kz7"; depends=[AnnotationDbi AnnotationFilter BiocGenerics Biostrings dichromat ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer rlang Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
   birta = derive2 { name="birta"; version="1.25.0"; sha256="0c8rvf63cq6rzax2vhgk4y2xjgylnygihgv8yw7iznhpvqxxqm5g"; depends=[Biobase limma MASS]; };
   birte = derive2 { name="birte"; version="1.17.0"; sha256="14xgvv12457yai92vvbpnc2fn4bnc129nrpwxl4kck09mh7kzfii"; depends=[Biobase glmnet limma MASS nem Rcpp RcppArmadillo]; };
-  blima = derive2 { name="blima"; version="1.15.0"; sha256="160vdrinkq6pw851sxc9k0ybhh1ms0zd3jnxri6gdysbk2c2da2n"; depends=[beadarray Biobase BiocGenerics Rcpp]; };
+  blima = derive2 { name="blima"; version="1.15.1"; sha256="06j3ibg62kxv0qvn1rmals6y6g1h8a3y1icvypjanl2r96l3h8hv"; depends=[beadarray Biobase BiocGenerics Rcpp]; };
   bnbc = derive2 { name="bnbc"; version="1.3.0"; sha256="07jzc55x31zn5ak5rlpc0xpqgnkl03vhpdrd8ay12n450zggd77q"; depends=[BiocGenerics EBImage GenomeInfoDb GenomicRanges IRanges matrixStats preprocessCore Rcpp S4Vectors SummarizedExperiment sva]; };
+  brainImageR = derive2 { name="brainImageR"; version="0.99.13"; sha256="0yfp5z27iawr9m1avmlk6fwyxfzh030j6a6amz50zssmxx3girld"; depends=[BiocGenerics ExperimentHub ggplot2 gridExtra randomForest RColorBrewer testthat]; };
   branchpointer = derive2 { name="branchpointer"; version="1.7.0"; sha256="0ii7y3as43g7yp2qbzxv0bz66ayng8pxgk95303fp2l2akjb7gnx"; depends=[biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg38 caret cowplot data_table gbm GenomeInfoDb GenomicRanges ggplot2 IRanges kernlab plyr rtracklayer S4Vectors stringr]; };
+  breakpointR = derive2 { name="breakpointR"; version="0.99.11"; sha256="1d6s3zvr0sjif63czd8z0d67ysdvjyfcqfcvcjzwcv158h59h7vj"; depends=[BiocGenerics breakpointRdata cowplot doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gtools IRanges Rsamtools S4Vectors]; };
   bridge = derive2 { name="bridge"; version="1.45.0"; sha256="11rqvigax6j1bqj1nyf4x6ssmqi0892m1rhak1wz3xcj4adb8vwz"; depends=[rama]; };
-  bsseq = derive2 { name="bsseq"; version="1.17.0"; sha256="0mx9x996lhq63la9wkmygvdk8s215j3j833vx738prncc5wkkl4v"; depends=[Biobase BiocGenerics data_table DelayedArray DelayedMatrixStats GenomeInfoDb GenomicRanges gtools HDF5Array IRanges limma locfit permute R_utils S4Vectors scales SummarizedExperiment]; };
+  bsseq = derive2 { name="bsseq"; version="1.17.7"; sha256="1ch766hhahn70nsi2a0r6438q5b3b3z1a7l65ldbhr8c3w4x1wp3"; depends=[beachmat Biobase BiocGenerics BiocParallel Biostrings BSgenome data_table DelayedArray DelayedMatrixStats GenomeInfoDb GenomicRanges gtools HDF5Array IRanges limma locfit permute R_utils Rcpp Rhdf5lib S4Vectors scales SummarizedExperiment]; };
   bumphunter = derive2 { name="bumphunter"; version="1.23.0"; sha256="1dn6z7q8k54vd59dqirvdy6048ywa3c4njc2vrja8f5i2lsvfwc8"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; };
+  cTRAP = derive2 { name="cTRAP"; version="0.99.12"; sha256="0wg8phma29ijgfwp992l3dcqb64q7fzvamsiphrr3swn5dzs8kbv"; depends=[biomaRt cowplot data_table fgsea ggplot2 httr limma pbapply piano plyr R_utils readr rhdf5]; };
   caOmicsV = derive2 { name="caOmicsV"; version="1.11.0"; sha256="0lxlk5wlfna009k2jk8kgj61ks3hfcx1lvpymidb2yjx0kk2n7sg"; depends=[bc3net igraph]; };
-  canceR = derive2 { name="canceR"; version="1.15.0"; sha256="08iz3lih2rhnwd31pfq6ra6kwwgmmggrfrcqsivnp49ni19gy0sq"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; };
+  canceR = derive2 { name="canceR"; version="1.15.3"; sha256="03ib2ydmb26zc91hwy5w2sysvqay1087yjs03ki83spr4hh4hqmx"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; };
   cancerclass = derive2 { name="cancerclass"; version="1.25.0"; sha256="059nw8y6319m8k3i4l4crbydia2xz8v3dzc1dgj0hz6v3gfkxh8v"; depends=[binom Biobase]; };
   casper = derive2 { name="casper"; version="2.15.0"; sha256="129grx8bb2scjsvcqgyxigsw1n36miqbpf8val5yzm0lv9zwv24s"; depends=[Biobase BiocGenerics coda EBarrays gaga GenomeInfoDb GenomicFeatures GenomicRanges gtools IRanges limma mgcv Rsamtools rtracklayer S4Vectors sqldf survival VGAM]; };
-  categoryCompare = derive2 { name="categoryCompare"; version="1.25.0"; sha256="16zmqs8mf8lhsnlqfna40bq46v2zgqn823y98ycnx4c1m1l2jmk3"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCy3]; };
-  cbaf = derive2 { name="cbaf"; version="1.3.0"; sha256="19zy92jk8g5dzh5r2hpdc96yjgh0plqzn189giww65sq6hgiqvl2"; depends=[BiocFileCache cgdsr genefilter gplots RColorBrewer xlsx]; };
-  ccfindR = derive2 { name="ccfindR"; version="1.1.1"; sha256="1xp960q6jcskganvygxkpr9may680s30p57fjm5x625z4vwvd8r8"; depends=[ape BiocGenerics gtools Matrix RColorBrewer Rtsne S4Vectors SingleCellExperiment SummarizedExperiment]; };
+  categoryCompare = derive2 { name="categoryCompare"; version="1.25.1"; sha256="1qxfkqzyq6q4imhi517bbxn785i0qzwcy4ac68k1iw0c8frcn1hg"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCy3]; };
+  cbaf = derive2 { name="cbaf"; version="1.3.5"; sha256="08gr3axl77gyall3hd97gf5npqz588p24aafqf4p31djqxmv64wn"; depends=[BiocFileCache cgdsr genefilter gplots RColorBrewer xlsx]; };
+  ccfindR = derive2 { name="ccfindR"; version="1.1.23"; sha256="14gl5jmjp23q0kh9wrv5ds5l0qly9x07h4ny1ivm3sqqlbs8ya9h"; depends=[ape gtools irlba Matrix RColorBrewer Rcpp RcppEigen Rmpi Rtsne S4Vectors SingleCellExperiment SummarizedExperiment]; };
+  ccmap = derive2 { name="ccmap"; version="1.7.2"; sha256="1f0b24c0is8nxkfxxjnbdbmqv4p9ifcsdw49skkwnsc5n9k6w54c"; depends=[AnnotationDbi BiocManager ccdata data_table doParallel foreach lsa xgboost]; };
   ccrepe = derive2 { name="ccrepe"; version="1.17.0"; sha256="1k464wrgigq0yyr2w7pw8qwkql49jnl58ayr26785ajdn79lfcq4"; depends=[infotheo]; };
+  celaref = derive2 { name="celaref"; version="0.99.3"; sha256="1nmdqadrj5hgqijjywk8754ajj4i59bmrpah9xdginpiakdbskra"; depends=[BiocGenerics dplyr ggplot2 magrittr MAST Matrix readr rlang S4Vectors SummarizedExperiment tibble]; };
   cellGrowth = derive2 { name="cellGrowth"; version="1.25.0"; sha256="12flwz3pzjhwqxsljy5g2ylgxiygln24z5zydc62xrkjcg3wqgn0"; depends=[lattice locfit]; };
-  cellHTS2 = derive2 { name="cellHTS2"; version="2.45.0"; sha256="1dbjsxhfifjpmyn3w3zhmhaf3s2arrpl6lipg31sp9w9xfiij1xs"; depends=[Biobase BiocGenerics Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; };
-  cellTree = derive2 { name="cellTree"; version="1.11.0"; sha256="1rkrj316fm2xx1x7wjk9qv2kdr4vxhbixfw7y2r1p6kvxl1xwdi0"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; };
+  cellHTS2 = derive2 { name="cellHTS2"; version="2.45.1"; sha256="0ccl152v44380666xhqj5s1vwd9xqih3a7ysdjb5n8mwpq1kq0av"; depends=[Biobase BiocGenerics Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; };
+  cellTree = derive2 { name="cellTree"; version="1.11.1"; sha256="026f59jj07j5jbv0j3048c44sz2zr50lzwy07m0i6yvl0w1pc57h"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; };
   cellbaseR = derive2 { name="cellbaseR"; version="1.5.0"; sha256="0067s59gq395ha4kjmdvqx3bdjgkgczwvchwjswr23hm6ffbgss3"; depends=[BiocParallel data_table doParallel foreach httr jsonlite pbapply R_utils Rsamtools tidyr]; };
-  cellity = derive2 { name="cellity"; version="1.9.0"; sha256="0rdknpw38cwf4vvq30g573irv4l51gyx9yaff8rkrd0b38bpywa8"; depends=[AnnotationDbi e1071 ggplot2 mvoutlier org_Hs_eg_db org_Mm_eg_db robustbase topGO]; };
-  cellscape = derive2 { name="cellscape"; version="1.5.0"; sha256="0was4lsw2rpg98kzdzpd6wv84jzfh7ncgnvsyc2ijbjanf52ycxd"; depends=[dplyr gtools htmlwidgets jsonlite plyr reshape2 stringr]; };
+  cellity = derive2 { name="cellity"; version="1.9.2"; sha256="0hc8whsqq066drwbk3aiz8pdy7zd3qx7fmsa5knw0xk1dpbpglcg"; depends=[AnnotationDbi e1071 ggplot2 mvoutlier org_Hs_eg_db org_Mm_eg_db robustbase topGO]; };
+  cellscape = derive2 { name="cellscape"; version="1.5.1"; sha256="1fi9qxnhrh9n9br1gjpss8acpfd2fm22nd9ih2flng0hgy4aymyc"; depends=[dplyr gtools htmlwidgets jsonlite plyr reshape2 stringr]; };
   cghMCR = derive2 { name="cghMCR"; version="1.39.0"; sha256="119nk170b8a8lr1hi2nmj2bgaydkxf11732bqxhpm13hn9cyvnpr"; depends=[BiocGenerics CNTools DNAcopy limma]; };
   charm = derive2 { name="charm"; version="2.27.0"; sha256="0cgrh027qjy34nb0xd0fl7fxifpgb1i9qcy3g7w7vv0sgj5g2gxc"; depends=[Biobase Biostrings BSgenome ff fields genefilter gtools IRanges limma nor1mix oligo oligoClasses preprocessCore RColorBrewer siggenes SQN sva]; };
   chimera = derive2 { name="chimera"; version="1.23.0"; sha256="16l1y016wdmdqm4psnl3rxs4gw1d8b0hvfr29x9sv7153fpvqxhf"; depends=[AnnotationDbi Biobase BSgenome_Hsapiens_UCSC_hg19 GenomicAlignments GenomicRanges Homo_sapiens Rsamtools TxDb_Hsapiens_UCSC_hg19_knownGene]; };
-  chimeraviz = derive2 { name="chimeraviz"; version="1.7.0"; sha256="12xkgvmqfdwfzrxw6f3iqkbknqw3238ks5903jk314wc1sz1pxxc"; depends=[AnnotationDbi AnnotationFilter ArgumentCheck BiocStyle Biostrings dplyr DT ensembldb GenomeInfoDb GenomicAlignments GenomicRanges graph Gviz IRanges org_Hs_eg_db org_Mm_eg_db plyr RCircos RColorBrewer readr Rgraphviz rmarkdown Rsamtools S4Vectors]; };
+  chimeraviz = derive2 { name="chimeraviz"; version="1.7.5"; sha256="0k0yn24v3lgkzwbx1597n5k81igjmvmz232mwfsazd3znwdbwm7b"; depends=[AnnotationDbi AnnotationFilter ArgumentCheck BiocStyle Biostrings data_table dplyr DT ensembldb GenomeInfoDb GenomicAlignments GenomicRanges graph Gviz IRanges org_Hs_eg_db org_Mm_eg_db plyr RCircos RColorBrewer Rgraphviz rmarkdown Rsamtools S4Vectors]; };
   chipenrich = derive2 { name="chipenrich"; version="2.5.0"; sha256="1ssvmnnlf6s37hbj0cdpcjyfz3qj7mv1nfxbdsb3cbq541lxidlv"; depends=[AnnotationDbi BiocGenerics chipenrich_data GenomeInfoDb GenomicRanges IRanges lattice latticeExtra mgcv org_Dm_eg_db org_Dr_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db plyr rms rtracklayer S4Vectors stringr]; };
   chipseq = derive2 { name="chipseq"; version="1.31.0"; sha256="0pfi2jyi3cb73c6k0300k1yvk2nvzh6lc19qmgs9qxqm0zjh5vly"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; };
   chopsticks = derive2 { name="chopsticks"; version="1.47.0"; sha256="0lvd5fpvlkwzplm6wpxrmi6gl35vg9li8zs8kiyf65yggp8azkd7"; depends=[survival]; };
-  chroGPS = derive2 { name="chroGPS"; version="1.99.1"; sha256="18i133z22d7pmd4xkkm2ciqpawvp7lh7sx4qkcysixxi9cdj7iix"; depends=[Biobase changepoint cluster DPpackage ellipse GenomicRanges ICSNP IRanges MASS vegan]; };
+  chroGPS = derive2 { name="chroGPS"; version="1.99.4"; sha256="10grx4zwj2w2wcf4bf09m97fi4nn31q99jrlnmpm5zfwfyh9y1nk"; depends=[Biobase changepoint cluster DPpackage ellipse GenomicRanges ICSNP IRanges MASS vegan]; };
   chromDraw = derive2 { name="chromDraw"; version="2.11.0"; sha256="17lb88jp4997nmdb7g3rmi509vn552rda603diq5qxjd8hxszhj7"; depends=[GenomicRanges Rcpp]; };
   chromPlot = derive2 { name="chromPlot"; version="1.9.0"; sha256="0g7vnv12m9db563p99kcdv9mjb5h2saxmvq810ckw3vd9hxla4sm"; depends=[biomaRt GenomicRanges]; };
-  chromVAR = derive2 { name="chromVAR"; version="1.3.0"; sha256="1vx8ai2x3mmrlpqz4kww19q6drwhs51ndfhqvcm20hnjvw4q86fb"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; };
-  chromstaR = derive2 { name="chromstaR"; version="1.7.1"; sha256="0jhli9jzxi35j8ar94wjjqbg3d3ankbizx2ck5kfpsr4kz6cf91j"; depends=[bamsignals chromstaRData doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges mvtnorm reshape2 Rsamtools S4Vectors]; };
-  chromswitch = derive2 { name="chromswitch"; version="1.3.1"; sha256="1qylaxmyrh16gxh8l5isngs4ixk3v758f41r3nc15r1gbncdv7nx"; depends=[Biobase BiocParallel cluster dplyr GenomicRanges gplots IRanges lazyeval magrittr matrixStats NMF rtracklayer S4Vectors tidyr]; };
-  cisPath = derive2 { name="cisPath"; version="1.21.0"; sha256="0bgc9jm3lkpij938yd1jni7yd4jbahqgr6s9zlzrly24f3pks24a"; depends=[]; };
-  cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.19.0"; sha256="0d7xk559jg3bik9gwzi3lh51jspmq3ain706d2cm4dq96wms03a5"; depends=[BiocGenerics BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomicRanges seqinr]; };
+  chromVAR = derive2 { name="chromVAR"; version="1.3.2"; sha256="0wg1ajyff9ly82q0468cy33iysj59dfidp2qqgkp85vik0aci1sx"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; };
+  chromstaR = derive2 { name="chromstaR"; version="1.7.3"; sha256="0nbfzh7ks9816yllyd125nd4qm7fk5i4x36jd7wd81hp0cpb7ia5"; depends=[bamsignals chromstaRData doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges mvtnorm reshape2 Rsamtools S4Vectors]; };
+  chromswitch = derive2 { name="chromswitch"; version="1.3.2"; sha256="1ls6007vz2b0ij543vgdpxv5dqbjaklv9ps81c3z6n91qf9ld2an"; depends=[Biobase BiocParallel cluster dplyr GenomicRanges gplots IRanges lazyeval magrittr matrixStats NMF rtracklayer S4Vectors tidyr]; };
+  cicero = derive2 { name="cicero"; version="0.99.57"; sha256="1gj0ckn4b3ifkvvb8lbwl83fdnmcayk3wmd83piq95j8nkaba0c8"; depends=[assertthat Biobase BiocGenerics data_table dplyr FNN GenomicRanges ggplot2 glasso Gviz igraph IRanges Matrix monocle plyr reshape2 S4Vectors stringr tibble VGAM]; };
+  cisPath = derive2 { name="cisPath"; version="1.21.1"; sha256="06s9ch9av414vqi8l6rsz8y49bklygv9m7wrvv8nmx14h6fvpbmq"; depends=[]; };
+  cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.19.1"; sha256="12izlkfqx1cshb48qzn987hhanqxjfhaiiwl6lrn0xpqbw384k3y"; depends=[BiocGenerics BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomicRanges seqinr]; };
   cleaver = derive2 { name="cleaver"; version="1.19.0"; sha256="19jrmz8bjj9yg52j002zyf6v1as2k7m0g0msvmgvlsf0nvgk5h72"; depends=[Biostrings IRanges S4Vectors]; };
   clippda = derive2 { name="clippda"; version="1.31.0"; sha256="18jsfx4y09mzsah8w2pqwarl7h1kn76cm6sjh6r3dqikbzq24rak"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; };
   clipper = derive2 { name="clipper"; version="1.21.1"; sha256="19gkqz94sxamw8gx1rib17j7sxivzflrhypkp4bsyqshkydyzgcq"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; };
@@ -891,102 +957,109 @@ in with self; {
   clst = derive2 { name="clst"; version="1.29.0"; sha256="0bz0hd7zjr9a225hg1jl0r86zvdz4i9i63grg0nm0dvs32pbaf2g"; depends=[lattice ROC]; };
   clstutils = derive2 { name="clstutils"; version="1.29.0"; sha256="0fsqlx06qd7bqdnk746pcn1w29xbpcpjazsnvk1dibxyxqkbqvjh"; depends=[ape clst lattice rjson RSQLite]; };
   clustComp = derive2 { name="clustComp"; version="1.9.0"; sha256="1lmg17d3n97kp5z21wl2kyx140kmqlfwsm4q6qcq7j9zyfq2jrdc"; depends=[sm]; };
-  clusterExperiment = derive2 { name="clusterExperiment"; version="2.1.5"; sha256="0fwbvm25ymmazw4i1l1v5bd0yrihzgiqmkycfxk5ismf9nbyny13"; depends=[ape BiocGenerics cluster DelayedArray dendextend edgeR HDF5Array howmany kernlab limma locfdr matrixStats NMF phylobase RColorBrewer Rcpp RSpectra S4Vectors scales SingleCellExperiment stringr SummarizedExperiment zinbwave]; };
-  clusterProfiler = derive2 { name="clusterProfiler"; version="3.9.1"; sha256="0bz6n4y10f2kgkxmsr2rf8clqfsg2drgavx0xp36jv66bp511l4d"; depends=[AnnotationDbi DOSE enrichplot ggplot2 GO_db GOSemSim magrittr plyr qvalue rvcheck tidyr]; };
-  clusterSeq = derive2 { name="clusterSeq"; version="1.5.0"; sha256="1naw9hprdgb2wxqcvjvzgmjhnl0cncixar7gzs7d63dyf9d3khzs"; depends=[baySeq BiocGenerics BiocParallel]; };
+  clusterExperiment = derive2 { name="clusterExperiment"; version="2.1.6"; sha256="0wgi8qil7vyqlqsbqm0fbk9337wvcz53xid8qy4qc5l9pipf7s4r"; depends=[ape BiocGenerics cluster DelayedArray dendextend edgeR HDF5Array howmany kernlab limma locfdr matrixStats NMF phylobase RColorBrewer Rcpp RSpectra S4Vectors scales SingleCellExperiment stringr SummarizedExperiment zinbwave]; };
+  clusterProfiler = derive2 { name="clusterProfiler"; version="3.9.2"; sha256="1y9kss22c64yk3abbcz12ph2q38xp6x38cvffnr3wcm71pa26aj2"; depends=[AnnotationDbi DOSE enrichplot ggplot2 GO_db GOSemSim magrittr plyr qvalue rvcheck tidyr]; };
+  clusterSeq = derive2 { name="clusterSeq"; version="1.5.1"; sha256="0y8a5ik310pvhbrpaf77dpdlhgsggv8b4ziw9270lw552wq6m2s2"; depends=[baySeq BiocGenerics BiocParallel]; };
   clusterStab = derive2 { name="clusterStab"; version="1.53.0"; sha256="1fz5l64c7sfzxvqrfxbwvla6k72dq32r9v9nsc4cycpmyyfvgqfg"; depends=[Biobase]; };
-  cn_farms = derive2 { name="cn.farms"; version="1.29.0"; sha256="03nq4xyq4q4x9ajlz24pda4jy2vqnxrr2jyrfy54d54qqkn6hj18"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; };
+  cn_farms = derive2 { name="cn.farms"; version="1.29.1"; sha256="0dysp6kvdgxbzjhm9sd0h9l2ckl7kvlg910bxzz192p9nlwpgc25"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; };
   cn_mops = derive2 { name="cn.mops"; version="1.27.0"; sha256="1fzsp4amldbfg2msll3synvwlwdsda1fajwsl5qxg83pcy0v8rm2"; depends=[Biobase BiocGenerics exomeCopy GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; };
   cnvGSA = derive2 { name="cnvGSA"; version="1.25.0"; sha256="0ha9nh485r7x67q25cj6r7m8lckw9bm1kvd1rvkrwn6nnlld8bn1"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; };
   coGPS = derive2 { name="coGPS"; version="1.25.0"; sha256="081ljzlc0vq19h7w31ccqxbdhi2rivi8qrrvnxw6imj0pfckn1hn"; depends=[]; };
-  coMET = derive2 { name="coMET"; version="1.13.0"; sha256="1vyzwrdf10n9ribfcacfxmsfkr6pm9g4gi90n2c5lhhn4983m1wk"; depends=[biomaRt colortools corrplot GenomicRanges gridExtra Gviz hash IRanges psych rtracklayer S4Vectors]; };
-  cobindR = derive2 { name="cobindR"; version="1.19.0"; sha256="1hb6mwd6xqxgzdglz496cn39hmjnxs87qc0c633r6a2bhq8dpcca"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; };
+  coMET = derive2 { name="coMET"; version="1.13.4"; sha256="0fzgwy11jcscp207giwdwpkq5zad72sdhcd4d5qrprda8565kx33"; depends=[biomaRt colortools corrplot GenomicRanges gridExtra Gviz hash IRanges psych rtracklayer S4Vectors]; };
+  coRdon = derive2 { name="coRdon"; version="0.99.11"; sha256="1fa2zzqrnj5ggk3czvdqkn1ixha1a991xjv27plw9hvy8snvyjzc"; depends=[Biobase Biostrings data_table dplyr ggplot2 purrr]; };
+  cobindR = derive2 { name="cobindR"; version="1.19.1"; sha256="1n4yr8izd1fhn6qzcifamhvd1shah0hv06v1a097xjnghnr46r8q"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; };
   codelink = derive2 { name="codelink"; version="1.49.0"; sha256="0fqxdmzwx6vhclsamc4i0kshdnqpjpqgzrmjm2lwvjai2bnbiaz4"; depends=[annotate Biobase BiocGenerics limma]; };
   coexnet = derive2 { name="coexnet"; version="1.3.0"; sha256="0kqzvi5zs1nvcnbvgrq06fzzcfdsga5fz0r70drcsx449nkqrj5c"; depends=[acde affy Biobase GEOquery igraph limma minet rmarkdown siggenes STRINGdb SummarizedExperiment vsn]; };
-  cogena = derive2 { name="cogena"; version="1.15.0"; sha256="05hdmx7awxsrbblm0sfgszhi10wggpx2141ariy01gvha8kmm8l8"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; };
-  compcodeR = derive2 { name="compcodeR"; version="1.17.0"; sha256="0b591axva9x93pq7cbcg9z86n6rdnaw29q18q7cwvd44j5l8b6ah"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; };
-  condcomp = derive2 { name="condcomp"; version="0.99.1"; sha256="0493d56hqn1vrd85j7174y9i2f7whqy68nn5645fr57a0wl4bn4i"; depends=[cluster ggplot2 ggrepel outliers]; };
+  cogena = derive2 { name="cogena"; version="1.15.1"; sha256="0ch85p3abar0cahb3f8hrd28ylwbd1m7z7s28gh4wrrxx9cfqjmx"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; };
+  compEpiTools = derive2 { name="compEpiTools"; version="1.15.3"; sha256="06m6kd2c6cadnsl8lq3dna1kxyc7sgr14g9qbjr3qf40kc2njmka"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges GO_db gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; };
+  compcodeR = derive2 { name="compcodeR"; version="1.17.2"; sha256="0p8mv2pw8hrv23yswqavagii5ascppmgm89zq7589xnc20bl70yh"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; };
+  condcomp = derive2 { name="condcomp"; version="0.99.2"; sha256="1wckrk43h6ab30caqvffrxlssib2iigagqlpbifwf6l2856c642i"; depends=[cluster ggplot2 ggrepel outliers]; };
+  consensus = derive2 { name="consensus"; version="0.99.17"; sha256="0ipdx2qazvh2aliz1k48cq6k21vn40wql1h67qgcnb5s8s10k24a"; depends=[gplots matrixStats RColorBrewer]; };
+  consensusDE = derive2 { name="consensusDE"; version="0.99.10"; sha256="1zx233m9d65xvsjwgm1m54sqqvp3fjjcxi0yj1j7by3a96yhy7my"; depends=[airway AnnotationDbi Biobase BiocParallel Biostrings dendextend DESeq2 EDASeq edgeR GenomicAlignments GenomicFeatures limma pcaMethods RColorBrewer Rsamtools RUVSeq S4Vectors SummarizedExperiment TxDb_Dmelanogaster_UCSC_dm3_ensGene]; };
   consensusOV = derive2 { name="consensusOV"; version="1.3.0"; sha256="0jk776svh4krp1cj77sy9lrp3rx6ka8vbc4xz1armf9vd9sn0ln8"; depends=[Biobase gdata genefu GSVA limma matrixStats randomForest]; };
   consensusSeekeR = derive2 { name="consensusSeekeR"; version="1.9.0"; sha256="0hdfnvvd06s2pbrsbrcp6nky7clvj2xqdf3d6x728mxfv17yflrl"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges IRanges rtracklayer S4Vectors stringr]; };
-  contiBAIT = derive2 { name="contiBAIT"; version="1.9.0"; sha256="1fgff5pr9ggqpl85yh410lspq0mbq9r264rsw716hqjy2rm6g8bd"; depends=[BH BiocParallel clue cluster colorspace data_table diagram DNAcopy exomeCopy GenomicAlignments GenomicFiles GenomicRanges ggplot2 gplots gtools IRanges Rcpp reshape2 Rsamtools rtracklayer S4Vectors TSP]; };
+  contiBAIT = derive2 { name="contiBAIT"; version="1.9.1"; sha256="0nli8r7wn20f92wax39gk8nawbiy8xjdxfv7r8267n9cmfdywxhm"; depends=[BH BiocParallel clue cluster colorspace data_table diagram DNAcopy exomeCopy GenomicAlignments GenomicFiles GenomicRanges ggplot2 gplots gtools IRanges Rcpp reshape2 Rsamtools rtracklayer S4Vectors TSP]; };
   conumee = derive2 { name="conumee"; version="1.15.0"; sha256="1xpq77j6zwqj3s8qxjvnzvrwk27g6cipqp8k8g1x61ayalw5mwn9"; depends=[DNAcopy GenomeInfoDb GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest IRanges minfi rtracklayer]; };
   convert = derive2 { name="convert"; version="1.57.0"; sha256="1bfwmxcvg3dxygzbl290l645ri610fxymvba349hj785w9v09hgi"; depends=[Biobase limma marray]; };
   copa = derive2 { name="copa"; version="1.49.0"; sha256="08myzip07f28iyyf1v28y60pwmyabv7yhbd1y9avmmfa8swh4zav"; depends=[Biobase]; };
   copynumber = derive2 { name="copynumber"; version="1.21.0"; sha256="1qcrq5ls1rj5had0v2abcya5bbm1mpni97lxvlm75yxpalkrbmg1"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors]; };
-  coseq = derive2 { name="coseq"; version="1.5.1"; sha256="0b5680pzwalgl8dfdclc03cp9742ap65d16h86h150h72h55cvh1"; depends=[BiocParallel capushe compositions corrplot DESeq2 e1071 edgeR ggplot2 gridExtra HTSCluster HTSFilter mvtnorm Rmixmod S4Vectors scales SummarizedExperiment]; };
+  coseq = derive2 { name="coseq"; version="1.5.2"; sha256="1hx8brqi422k5q9isbdfrp1799c161yjkfad2hq9zw3rkjj3hbyf"; depends=[BiocParallel capushe compositions corrplot DESeq2 e1071 edgeR ggplot2 HTSCluster HTSFilter mvtnorm Rmixmod S4Vectors scales SummarizedExperiment]; };
   cosmiq = derive2 { name="cosmiq"; version="1.15.2"; sha256="1n91gp3v27924pavlm4kkidihzhdgj5p679x5krxkqf430f3kbk4"; depends=[faahKO MassSpecWavelet pracma Rcpp xcms]; };
+  countsimQC = derive2 { name="countsimQC"; version="0.99.4"; sha256="0fnjl8pan117fcaxvpbcplrlqcd3sx2pq7ddcwy4qvhphbksk148"; depends=[caTools DESeq2 dplyr DT edgeR genefilter GenomeInfoDbData ggplot2 randtests rmarkdown SummarizedExperiment tidyr]; };
   covEB = derive2 { name="covEB"; version="1.7.0"; sha256="01qy9713bixj1nbdhafyappbm0m6q6k769akzysvcb4cs74isq3x"; depends=[Biobase gsl igraph LaplacesDemon Matrix mvtnorm]; };
-  covRNA = derive2 { name="covRNA"; version="1.7.0"; sha256="06rx0g294hndxkb2rgjghn7jbw0vn63wy54705s57wmi0cacq8dd"; depends=[ade4 Biobase genefilter]; };
+  covRNA = derive2 { name="covRNA"; version="1.7.1"; sha256="09915p41xmb4gxl9nhpy8qrlpf4z1dlc9g3yi1j73a49kvgamlaa"; depends=[ade4 Biobase genefilter]; };
   cpvSNP = derive2 { name="cpvSNP"; version="1.13.0"; sha256="0wv304nisngcbc8as6anlb7i090wl078rs0pclix975akj9s4zpw"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; };
   cqn = derive2 { name="cqn"; version="1.27.0"; sha256="1680ww5rr4y1jqhb267hbgk77ha87awbjrl3id5cz7d7ps75a7fb"; depends=[mclust nor1mix preprocessCore quantreg]; };
-  crisprseekplus = derive2 { name="crisprseekplus"; version="1.7.0"; sha256="01s08znfbd4am3lxm42664jx5qkjm383w50k36f2linrsg8j2rdc"; depends=[AnnotationDbi BiocInstaller BSgenome CRISPRseek DT GenomicFeatures GenomicRanges GUIDEseq hash shiny shinyjs]; };
-  crlmm = derive2 { name="crlmm"; version="1.39.0"; sha256="1piwi4w7shmszq2kbcw400jp0iqjhjv6q7kd7zpa4yqnh35dxa8q"; depends=[affyio beanplot Biobase BiocGenerics ellipse ff foreach illuminaio lattice limma matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; };
-  csaw = derive2 { name="csaw"; version="1.15.7"; sha256="18wy6q7qb4zif2sjgr0fygq6y3yj706iijib6dw2ywb4xsb7gqy8"; depends=[AnnotationDbi BiocGenerics BiocParallel edgeR GenomeInfoDb GenomicFeatures GenomicRanges IRanges limma Rcpp Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; };
+  crisprseekplus = derive2 { name="crisprseekplus"; version="1.7.3"; sha256="07fcgm24mfxxa7nv68kdd5pawkq46n2p9i3k2pmpfa07irywizf6"; depends=[AnnotationDbi BiocManager BSgenome CRISPRseek DT GenomicFeatures GenomicRanges GUIDEseq hash shiny shinyjs]; };
+  crlmm = derive2 { name="crlmm"; version="1.39.1"; sha256="1mb7zpqb9qfpjg8samrdd5pxgj64ganm7mkh2y7aa3vlhj450rmx"; depends=[affyio beanplot Biobase BiocGenerics ellipse ff foreach illuminaio lattice limma matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; };
+  crossmeta = derive2 { name="crossmeta"; version="1.7.1"; sha256="0n5g234ghcan9jx1cavpzngypjjcrg7lz621czfg8d0rfj8wavs9"; depends=[affxparser affy AnnotationDbi Biobase BiocGenerics BiocManager ccmap data_table doParallel doRNG DT fdrtool foreach GEOquery ggplot2 limma matrixStats metaMA metap miniUI oligo pander plotly RColorBrewer rdrop2 reshape shiny stringr sva]; };
+  csaw = derive2 { name="csaw"; version="1.15.9"; sha256="0p5clsxqfy8ihsh8lxvhl8ally5gi1k6v7cclvp8kvvwj5mvcg6p"; depends=[AnnotationDbi BiocGenerics BiocParallel edgeR GenomeInfoDb GenomicFeatures GenomicRanges IRanges limma Rcpp Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; };
   ctc = derive2 { name="ctc"; version="1.55.0"; sha256="0zkzdv3yrrr671bvr0j7xi1c358r7k09f96x5sciljg95gwpq6fm"; depends=[amap]; };
-  ctsGE = derive2 { name="ctsGE"; version="1.7.1"; sha256="1m8fm0339d17hfprwgpck31dqmm9cf1ajk60rii32sphv8x1h0r8"; depends=[ccaPP ggplot2 limma reshape2 shiny stringr]; };
+  ctsGE = derive2 { name="ctsGE"; version="1.7.2"; sha256="1qykz2w7c0v7zs9ga0crvdydi57sqbfkg0i14rfr9mrh2cn874la"; depends=[ccaPP ggplot2 limma reshape2 shiny stringr]; };
   cummeRbund = derive2 { name="cummeRbund"; version="2.23.0"; sha256="12npw9nr02fs1lyj1fism4zbw1vbd47rxyyc21z8kx9ra5c76df9"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer S4Vectors]; };
+  customProDB = derive2 { name="customProDB"; version="1.21.5"; sha256="01fkp1bhk21flb3ik38i533zxdzv2g1qfp9bp0b91r29z5rp8nz9"; depends=[AhoCorasickTrie AnnotationDbi biomaRt Biostrings DBI GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer S4Vectors stringr VariantAnnotation]; };
   cycle = derive2 { name="cycle"; version="1.35.0"; sha256="0wij6y9alg55kric7bs8syrw8ypd5w0iayh057qcl9qqr5lp1vq7"; depends=[Biobase Mfuzz]; };
-  cydar = derive2 { name="cydar"; version="1.5.0"; sha256="1qch98a8p1wmyaccz7zg1vsamikr8rmrqki9w5ahkdn5f05z7fs4"; depends=[Biobase BiocParallel flowCore Rcpp S4Vectors shiny SummarizedExperiment viridis]; };
+  cydar = derive2 { name="cydar"; version="1.5.9"; sha256="0c7k6c02yqs5nr8pirvcgdmjgqhg7ynml1sf4fsjj6m0jbqrp29p"; depends=[Biobase BiocGenerics BiocNeighbors BiocParallel flowCore Rcpp S4Vectors shiny SingleCellExperiment SummarizedExperiment viridis]; };
   cytofkit = derive2 { name="cytofkit"; version="1.13.0"; sha256="0dl0y609w2y3wpncw4mxhflrnq1ymdmzp8qwnrlc13ykkrcwh40w"; depends=[Biobase colourpicker destiny doParallel e1071 flowCore FlowSOM ggplot2 ggrepel gplots igraph pdist plyr RANN Rcpp reshape2 Rtsne shiny shinyFiles vegan VGAM]; };
-  cytolib = derive2 { name="cytolib"; version="1.3.0"; sha256="0zyfs7j7jijrrg7v8zf77nlad63x8id2f9bpcid4pn61qlqxqhgf"; depends=[BH RProtoBufLib]; };
+  cytolib = derive2 { name="cytolib"; version="1.3.2"; sha256="10c9f7fqa5qbcxbs985ad3lljbmgfnwgcgfkp95yhahr97jb7w3s"; depends=[BH RProtoBufLib]; };
   dSimer = derive2 { name="dSimer"; version="1.7.0"; sha256="0ra9y6df21s97pa8810dzbcwjhbh9br86mlqkgvvrq5rxwj97a35"; depends=[AnnotationDbi ggplot2 GO_db igraph org_Hs_eg_db Rcpp reshape2]; };
   daMA = derive2 { name="daMA"; version="1.53.0"; sha256="1ahmx5c58az3s3jybz3gx7g853n0qy7b84rm7gq157yi4iil01wf"; depends=[MASS]; };
-  dada2 = derive2 { name="dada2"; version="1.9.0"; sha256="1w8lq1ikzfa2dzmx0bk1p3v88af9ddhv8fqqkvh2pr1n71r09nrc"; depends=[BiocGenerics Biostrings data_table ggplot2 IRanges Rcpp RcppParallel reshape2 ShortRead XVector]; };
-  dagLogo = derive2 { name="dagLogo"; version="1.19.0"; sha256="0bp4cclcwc6asnk5s9fzzcq17lv5fz93j0smsszq3csl99qpiwmi"; depends=[biomaRt Biostrings grImport motifStack pheatmap]; };
+  dada2 = derive2 { name="dada2"; version="1.9.3"; sha256="1qqw51pvgvwznx3v81xbn9qakxd6s9yl8f2pxbzr0ampgm22s9yn"; depends=[BiocGenerics Biostrings data_table ggplot2 IRanges Rcpp RcppParallel reshape2 ShortRead XVector]; };
+  dagLogo = derive2 { name="dagLogo"; version="1.19.1"; sha256="1y966jzzy7357gr2vdq0qgkwvbdq8pls51vfmmwka9c2zqnsdxdm"; depends=[biomaRt Biostrings grImport motifStack pheatmap]; };
   dcGSA = derive2 { name="dcGSA"; version="1.9.0"; sha256="0d85qpq1v9sky5x8nv5w0hfry9w833kkljq5laa2x3n10czp1hb3"; depends=[BiocParallel Matrix]; };
-  ddCt = derive2 { name="ddCt"; version="1.37.0"; sha256="11nh9xzx3iyvbb1k40581ym17a0l2brcqmscx9riyh8bzh7jh1h0"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; };
-  ddPCRclust = derive2 { name="ddPCRclust"; version="1.1.1"; sha256="0lykdnbhl19nx00yxp09a2nvi10yq13dpqy30ixvbcjl04562j2q"; depends=[clue flowCore flowDensity flowPeaks ggplot2 openxlsx plotrix R_utils SamSPECTRAL]; };
-  debrowser = derive2 { name="debrowser"; version="1.9.0"; sha256="099gdj0vxihwyb35pfk3hhfay7zyz3nirzlzccnjknrybfdyd7i3"; depends=[annotate AnnotationDbi baySeq clusterProfiler d3heatmap DESeq2 DOSE DT edgeR enrichplot GenomicRanges ggplot2 ggvis googleAuthR gplots igraph IRanges jsonlite limma org_Hs_eg_db org_Mm_eg_db pathview RColorBrewer RCurl reshape2 S4Vectors shiny shinyBS shinydashboard shinyjs stringi SummarizedExperiment sva V8]; };
-  decontam = derive2 { name="decontam"; version="1.1.0"; sha256="1chys2j507y4pqcca2vsf905qz7g7vw71f3rapxq39mhzp4bcjda"; depends=[ggplot2 reshape2]; };
-  deepSNV = derive2 { name="deepSNV"; version="1.27.2"; sha256="0rm1wvw8qq20d4dcqijbsizhnyyrdvl6wwb6gfvafq5rzfdi01xc"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; };
-  deltaGseg = derive2 { name="deltaGseg"; version="1.21.0"; sha256="1378dj1gghsphwwbhbfixbnf49lfjxy0dn297b5lsjh2h40znc2z"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; };
-  derfinder = derive2 { name="derfinder"; version="1.15.0"; sha256="199nk5kjza1cy9rclgff6qq2pkzw5lfg69y9s60hbyd0hacxsqxx"; depends=[AnnotationDbi BiocGenerics BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
-  derfinderHelper = derive2 { name="derfinderHelper"; version="1.15.0"; sha256="1v32nrznh4nm67fsjqcqbj3ifb8hiddqfcmg8nlwmgiwq78fxksi"; depends=[IRanges Matrix S4Vectors]; };
-  derfinderPlot = derive2 { name="derfinderPlot"; version="1.15.0"; sha256="1zabxardj0gw8b4bscpkdxbddcd5ygxpgv0da6c7i04jp5qb80sg"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer RefManageR reshape2 S4Vectors scales]; };
+  ddCt = derive2 { name="ddCt"; version="1.37.1"; sha256="1bysg67mqyrx6fqxsfbxbn4fw3brpyw0nyrvxkgbh6kwwwaccwaw"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; };
+  ddPCRclust = derive2 { name="ddPCRclust"; version="1.1.2"; sha256="0d09vdwrv9kifgld4g3342xrcfi85y46nnl1pq4yv1n8dx14k3ms"; depends=[clue flowCore flowDensity flowPeaks ggplot2 openxlsx plotrix R_utils SamSPECTRAL]; };
+  debrowser = derive2 { name="debrowser"; version="1.9.21"; sha256="0a4nzgw4066a9ryanvdjrbscbns6a74js3c0gadw7q19b824gv6i"; depends=[annotate AnnotationDbi baySeq clusterProfiler colourpicker d3heatmap DESeq2 DOSE DT edgeR enrichplot GenomicRanges ggplot2 googleAuthR gplots Harman heatmaply igraph IRanges jsonlite limma org_Hs_eg_db org_Mm_eg_db pathview plotly RColorBrewer RCurl reshape2 S4Vectors shiny shinyBS shinydashboard shinyjs stringi SummarizedExperiment sva V8]; };
+  decontam = derive2 { name="decontam"; version="1.1.2"; sha256="0p3kdcwl0gph9mdffd7jmycpcj1kbk8rgcwhp0idkm2xbfnra4n2"; depends=[ggplot2 reshape2]; };
+  deepSNV = derive2 { name="deepSNV"; version="1.27.3"; sha256="02wn7y8dbikllpmgbq5fksxvbw6dnz3hkl1lvjd9ff6avsrpyzjs"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; };
+  deltaGseg = derive2 { name="deltaGseg"; version="1.21.1"; sha256="1mrm1j816j8b9myzy8az16sg8v1g5ynxv1j2dpwbqg003pm9b2zn"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; };
+  derfinder = derive2 { name="derfinder"; version="1.15.4"; sha256="1qyblw4iy33r37k9zfsbf6rbgx8fnz89wv99dy3xibiw07hahgf1"; depends=[AnnotationDbi BiocGenerics BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
+  derfinderHelper = derive2 { name="derfinderHelper"; version="1.15.2"; sha256="1xgzx1q2fzglnrn3xyqmhbzf9rl56wbfdc4n0fy0lfrg13rb5kq1"; depends=[IRanges Matrix S4Vectors]; };
+  derfinderPlot = derive2 { name="derfinderPlot"; version="1.15.2"; sha256="0vp6x6dd8ykvgaic82crykhddykiz9y3ji7nmg2j66cklsvp018s"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer RefManageR reshape2 S4Vectors scales]; };
   destiny = derive2 { name="destiny"; version="2.11.3"; sha256="0z9z0frhif84rshnpffizjjv2ckr1mp7vqlk9r3fyyxzz1pkrl29"; depends=[Biobase BiocGenerics ggplot2 ggthemes igraph Matrix proxy Rcpp RcppEigen scales scatterplot3d smoother SummarizedExperiment VIM]; };
-  dexus = derive2 { name="dexus"; version="1.21.0"; sha256="0p7ihli3la0x42v042azwxnjhwn6h8vlnfs8rrbg5wbpz1i3nsy9"; depends=[BiocGenerics]; };
+  dexus = derive2 { name="dexus"; version="1.21.1"; sha256="00yld22dj4i9ci2jniqycxcli0xg0k06n02cg3i0lj03g4ml202h"; depends=[BiocGenerics]; };
   diffGeneAnalysis = derive2 { name="diffGeneAnalysis"; version="1.63.0"; sha256="19g9azy3s359k84rg677l0yndq13h48fs0rmddrs4z8z8w4k2n9h"; depends=[minpack_lm]; };
-  diffHic = derive2 { name="diffHic"; version="1.13.3"; sha256="0ka8kma6imv3i2j1y2p83aandrmpvj6w1wqj5dsanx4mh6f316vk"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges InteractionSet IRanges limma locfit Rcpp rhdf5 Rhtslib Rsamtools S4Vectors SummarizedExperiment zlibbioc]; };
-  diffcoexp = derive2 { name="diffcoexp"; version="1.1.0"; sha256="1dmf32f2mq4m71nbr8g5bhkv8wl8lhyljs5jgpnkzw7ibfaisr6j"; depends=[BiocGenerics DiffCorr igraph psych SummarizedExperiment WGCNA]; };
-  diffcyt = derive2 { name="diffcyt"; version="1.1.1"; sha256="17g08x65glkgjn5h24h45fi9qdq53s9bmn323zpnc6012p8cx8vb"; depends=[circlize ComplexHeatmap dplyr edgeR flowCore FlowSOM limma lme4 magrittr multcomp reshape2 S4Vectors SummarizedExperiment tidyr]; };
+  diffHic = derive2 { name="diffHic"; version="1.13.7"; sha256="07w2djzjsla6z7dy2g2dr0zfc7p1r88i6vgs4fmp0jr0ifsc3dal"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges InteractionSet IRanges limma locfit Rcpp rhdf5 Rhtslib Rsamtools rtracklayer S4Vectors SummarizedExperiment zlibbioc]; };
+  diffcoexp = derive2 { name="diffcoexp"; version="1.1.2"; sha256="1nrhdhzz5768ah9p3z5xszn48q6swawz3k9d72lxywm1yx0yqy5c"; depends=[BiocGenerics DiffCorr igraph psych SummarizedExperiment WGCNA]; };
+  diffcyt = derive2 { name="diffcyt"; version="1.1.11"; sha256="1chm02ixzh7627xmdpb91zhymamxnc2j3n7di97yc1fgv83bm0bx"; depends=[circlize ComplexHeatmap dplyr edgeR flowCore FlowSOM limma lme4 magrittr multcomp reshape2 S4Vectors SummarizedExperiment tidyr]; };
   diffloop = derive2 { name="diffloop"; version="1.9.0"; sha256="0wfnh79xkfkkzm3rkx90i0ij81l33ssm03b91mfq02yzijqv5dzv"; depends=[Biobase biomaRt data_table dplyr edgeR foreach GenomeInfoDb GenomicRanges ggplot2 IRanges limma locfit matrixStats pbapply plyr readr reshape2 rtracklayer S4Vectors statmod Sushi]; };
-  diffuStats = derive2 { name="diffuStats"; version="0.105.0"; sha256="1dhnqf2nljmc3pvn9hwmnihlgg5qwjnh5almfzw9vgnwm10yrkjl"; depends=[expm igraph MASS Matrix plyr precrec Rcpp RcppArmadillo RcppParallel]; };
-  diggit = derive2 { name="diggit"; version="1.13.0"; sha256="1zy4na2sa2g8vg7aw6n8k3965yyhal0sp6f8rrgwgh3wd8w1zf56"; depends=[Biobase ks viper]; };
-  discordant = derive2 { name="discordant"; version="1.5.0"; sha256="1lnljhz2xa7xfdbi8dwq1nzdm0w9j35251yh0dndhrq0sck1a3dg"; depends=[Biobase biwt gtools MASS]; };
+  diffuStats = derive2 { name="diffuStats"; version="1.1.0"; sha256="02269q356hvddnsi87p141cdyl1bmprarm9hqvpyjj244a8nirrv"; depends=[expm igraph MASS Matrix plyr precrec Rcpp RcppArmadillo RcppParallel]; };
+  diggit = derive2 { name="diggit"; version="1.13.1"; sha256="1sryn5n6vrc9cf7gsz9xgg6hp9gn18m7h9zz286l1p5cvmk4y1i9"; depends=[Biobase ks viper]; };
+  discordant = derive2 { name="discordant"; version="1.5.2"; sha256="011vh7xzxldfmid6w4g29b7s4w81lqifwxfj6r0d6725pa3bcxb4"; depends=[Biobase biwt gtools MASS]; };
   dks = derive2 { name="dks"; version="1.27.0"; sha256="04da9f6ckqzw8dppxrrcc7aqgkb980jq1g15dkmzx9ys54bnhh78"; depends=[cubature]; };
-  dmrseq = derive2 { name="dmrseq"; version="1.1.12"; sha256="0whd2fwvbf7xxxdw2dmfpn1xp3xp7w8jli9n0nj2yi0p0a98889n"; depends=[AnnotationHub annotatr BiocParallel bsseq bumphunter DelayedMatrixStats GenomeInfoDb GenomicRanges ggplot2 IRanges locfit matrixStats nlme outliers RColorBrewer rtracklayer S4Vectors]; };
-  doppelgangR = derive2 { name="doppelgangR"; version="1.9.5"; sha256="16d6j10b57llfwvg7kcimmhisg1rqmnvv3pb46fgn1mldahmiziq"; depends=[Biobase BiocParallel digest impute mnormt SummarizedExperiment sva]; };
-  drawProteins = derive2 { name="drawProteins"; version="1.1.0"; sha256="1bhdz04d8xv8hx821n6scni9gpc8r6qqs954i9dc1p366x995y8c"; depends=[dplyr ggplot2 httr]; };
+  dmrseq = derive2 { name="dmrseq"; version="1.1.21"; sha256="15jvpy5n27vdb387qmcv63c2fs5pnx5zdsg1h2b99cil650b1c0s"; depends=[AnnotationHub annotatr BiocParallel bsseq bumphunter DelayedMatrixStats GenomeInfoDb GenomicRanges ggplot2 IRanges locfit matrixStats nlme outliers RColorBrewer rtracklayer S4Vectors]; };
+  doppelgangR = derive2 { name="doppelgangR"; version="1.9.6"; sha256="07y79wbb82j4iqh04rcjg66qkngply7s4b2hcmc5i6g5ycar5cmv"; depends=[Biobase BiocParallel digest impute mnormt SummarizedExperiment sva]; };
+  drawProteins = derive2 { name="drawProteins"; version="1.1.1"; sha256="12n5pi0yj692k9wridiwnjazcajknlpvjbl7wav6408lg4ph5z6p"; depends=[dplyr ggplot2 httr readr stringr]; };
   dualKS = derive2 { name="dualKS"; version="1.41.0"; sha256="125gpaykiy2cplkvixghj2c1xh08zga7jvi2xmsh0j1illdssab5"; depends=[affy Biobase]; };
-  dupRadar = derive2 { name="dupRadar"; version="1.11.0"; sha256="17m3xmw8m4qaljlz3kw158mrnqcm3ss0c8dqla8j4p33mfyzc7qy"; depends=[Rsubread]; };
-  dyebias = derive2 { name="dyebias"; version="1.41.0"; sha256="0c4z54pw2pdfg4z2mm70w6h4my2kv1swndy50r4bjv0ll46yyvcs"; depends=[Biobase marray]; };
+  dupRadar = derive2 { name="dupRadar"; version="1.11.1"; sha256="0myl9j77gpjgkqz24vxnf8x889qa06xr54bgmr32jhb0n6i9km90"; depends=[Rsubread]; };
+  dyebias = derive2 { name="dyebias"; version="1.41.2"; sha256="0mjin0pvpi9z9vq8pj5smbz4968za5n31aclgwaiydy5lfmqd6zz"; depends=[Biobase marray]; };
   easyRNASeq = derive2 { name="easyRNASeq"; version="2.17.0"; sha256="0siki1k4qvkgkyhldrz7i05vhria9nd9yvf848a4gkx4l68v2189"; depends=[Biobase BiocGenerics BiocParallel biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; };
   ecolitk = derive2 { name="ecolitk"; version="1.53.0"; sha256="14df276m23zlmz6q2lhbv2j91wj2jaxhs6wnl5x5gnjj1p8jv6wj"; depends=[Biobase]; };
-  edge = derive2 { name="edge"; version="2.13.0"; sha256="1y1g10lkpkv0z6sk79ir91jarx0gdl9fy5lx4snykq1amk7b9ib1"; depends=[Biobase jackstraw MASS qvalue snm sva]; };
-  edgeR = derive2 { name="edgeR"; version="3.23.3"; sha256="0lz12phiqppzyvq1mf6gfdvzpqf2jpf0635n6vym7nqpxpksrgiy"; depends=[limma locfit Rcpp]; };
-  eegc = derive2 { name="eegc"; version="1.7.4"; sha256="1q3fslmrw66z7x3anl8w7hszgz5qlq2f7d9hp9r6x4acipxni5ff"; depends=[AnnotationDbi clusterProfiler DESeq2 DOSE edgeR ggplot2 gplots igraph limma org_Hs_eg_db org_Mm_eg_db pheatmap R_utils S4Vectors sna wordcloud]; };
-  eiR = derive2 { name="eiR"; version="1.21.0"; sha256="0s0xrnxzrwp4cc0jw3a0vpx7psyiwjz4a5y3ajxr68lq7k09hdma"; depends=[BiocGenerics ChemmineR DBI digest gespeR RcppAnnoy RCurl RUnit snow snowfall]; };
+  edge = derive2 { name="edge"; version="2.13.2"; sha256="1qjsxydfdzr2zrz5ns69w743rsfhxcmp7i13ax7pz5kry2sf0hl1"; depends=[Biobase jackstraw MASS qvalue snm sva]; };
+  edgeR = derive2 { name="edgeR"; version="3.23.7"; sha256="0mwx3qqf2c8g9p03qxy2qixri8jm2wxd642zskl2173r05iba2sm"; depends=[limma locfit Rcpp]; };
+  eegc = derive2 { name="eegc"; version="1.7.5"; sha256="1dhfzsi0avamj3bnp0p99ba3lc5dw83b0pl7idfhnh5yp4imv6nf"; depends=[AnnotationDbi clusterProfiler DESeq2 DOSE edgeR ggplot2 gplots igraph limma org_Hs_eg_db org_Mm_eg_db pheatmap R_utils S4Vectors sna wordcloud]; };
+  eiR = derive2 { name="eiR"; version="1.21.1"; sha256="0zk1jf0n2kpajqpnlwwi2814vrbmy8gixnnkapflcbdl0z25m25z"; depends=[BiocGenerics ChemmineR DBI digest gespeR RcppAnnoy RCurl RUnit snow snowfall]; };
   eisa = derive2 { name="eisa"; version="1.33.0"; sha256="18jk4iwav2r95wfjynl9dwnhsm5n97kq0i7xv5dhgw2gqh5yfv64"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; };
-  enrichplot = derive2 { name="enrichplot"; version="1.1.2"; sha256="0hnh32gkayps5zh7hddgwrsyskq19i2wqbs1ph627fbckk1xqzlr"; depends=[AnnotationDbi cowplot DOSE ggplot2 ggraph ggridges GOSemSim igraph reshape2 UpSetR]; };
-  ensemblVEP = derive2 { name="ensemblVEP"; version="1.23.0"; sha256="0sz0xsnw4ycq1rja9nzdzayralrnvnds6adxg1bzbgsgnhfi9qv0"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; };
-  ensembldb = derive2 { name="ensembldb"; version="2.5.2"; sha256="047c06v6d3qxw72bj0ynqvh3sk9jyv3pswf15i132qg12jq7yn8r"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; };
-  epiNEM = derive2 { name="epiNEM"; version="1.5.0"; sha256="1kiaz5w2c793n3038qr8jyjgbw0shn8ljrargl0pk3d0i66cqah4"; depends=[BoolNet e1071 graph gtools igraph lattice latticeExtra minet nem pcalg RColorBrewer]; };
+  enrichplot = derive2 { name="enrichplot"; version="1.1.7"; sha256="14i800cnlgc8bm8g5rlgl4rd9ajbpgljg3bhqh89zfgvvj6xy3v1"; depends=[AnnotationDbi cowplot DOSE europepmc ggplot2 ggplotify ggraph ggridges GOSemSim gridExtra igraph purrr RColorBrewer reshape2 UpSetR]; };
+  ensemblVEP = derive2 { name="ensemblVEP"; version="1.23.1"; sha256="0sh1c2pmyp3lxabm2if4266mczb1as562hbyzxd3dq79n7s0wijj"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; };
+  ensembldb = derive2 { name="ensembldb"; version="2.5.9"; sha256="0sbrcfg4d8yqpls11ba05qgddg1y8s23fpq68560wrzippz4j2p7"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; };
+  epiNEM = derive2 { name="epiNEM"; version="1.5.2"; sha256="1wqn5mqjxw6i21byig7b0cypiws6kjq6vjwcafg6dxry2fx675iw"; depends=[BoolNet e1071 graph gtools igraph lattice latticeExtra minet nem pcalg RColorBrewer]; };
   epigenomix = derive2 { name="epigenomix"; version="1.21.0"; sha256="11vcdklmg7ghwr3da1n5bnm272m0wgqinhc1gj3i6wpgcvijnwr3"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; };
-  epivizr = derive2 { name="epivizr"; version="2.11.0"; sha256="14mmgfl9hqyx760l1c56hgfswbqpr34afvlyzjc459kyr8i57b5q"; depends=[epivizrData epivizrServer GenomicRanges IRanges S4Vectors]; };
-  epivizrChart = derive2 { name="epivizrChart"; version="1.3.0"; sha256="0gbisd84w11fyl4zwwhakv2vv729ly9vh88zwixv46y4y1lln92v"; depends=[epivizrData epivizrServer htmltools rjson]; };
-  epivizrData = derive2 { name="epivizrData"; version="1.9.0"; sha256="1r6pqsl8fyzqgwmg5msad2bsh7drgbyk39sn84pfrrv66zpp6yxj"; depends=[Biobase ensembldb epivizrServer GenomeInfoDb GenomicFeatures GenomicRanges IRanges OrganismDbi S4Vectors SummarizedExperiment]; };
-  epivizrServer = derive2 { name="epivizrServer"; version="1.9.1"; sha256="01177j6yhiwbiarpj0v98dv4rcfhxyj9s7brxmzi9s3qrkfw9787"; depends=[httpuv mime R6 rjson]; };
-  epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.9.0"; sha256="1jkhwa3wc391x961hy9k5bhbp5zjijs7y9fjy836yc54kdxghdq4"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; };
+  epivizr = derive2 { name="epivizr"; version="2.11.1"; sha256="08x7zbqpi3mrgkilibm0nrkqv7v4zr4l6a0xzgln3y4ns226lvy1"; depends=[epivizrData epivizrServer GenomicRanges IRanges S4Vectors]; };
+  epivizrChart = derive2 { name="epivizrChart"; version="1.3.4"; sha256="18j25cyimifrblfipfjlazhpp10h606shgw9rq7b351gnr6a92ac"; depends=[BiocGenerics epivizrData epivizrServer htmltools rjson]; };
+  epivizrData = derive2 { name="epivizrData"; version="1.9.4"; sha256="0fscvaq46rvnvpcbzli8mrk4ig7ik6q7yprgf1dmj40a7pcx48j3"; depends=[Biobase ensembldb epivizrServer GenomeInfoDb GenomicFeatures GenomicRanges IRanges OrganismDbi S4Vectors SummarizedExperiment]; };
+  epivizrServer = derive2 { name="epivizrServer"; version="1.9.4"; sha256="0pxpmqbkwsh4g72zdr7c0dsxwxm538cs1fv6y1ns1mpiv9k4wmcl"; depends=[httpuv mime R6 rjson]; };
+  epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.9.1"; sha256="0snqd11np3zksrxmya5pb6fbwx5k3iipqika1ig3wmvry1czrsr9"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; };
   erccdashboard = derive2 { name="erccdashboard"; version="1.15.0"; sha256="0g8b2ngfc5a6cagpiqh1q2k66s3d275r03z1yb2lvaqv1bprx0s7"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr qvalue reshape2 ROCR scales stringr]; };
   erma = derive2 { name="erma"; version="0.13.1"; sha256="01s2rpcbhd9hi2md5nzccral4ffp3xjl3qkkhm42q114dfbk5ccp"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel GenomeInfoDb GenomicFiles GenomicRanges ggplot2 Homo_sapiens IRanges rtracklayer S4Vectors shiny SummarizedExperiment]; };
-  esATAC = derive2 { name="esATAC"; version="1.3.1"; sha256="0jdn6xhwvlsv6gh0lhmwkznlnv71dd3875qvna5livjvs2m8m84w"; depends=[AnnotationDbi BiocGenerics BiocInstaller Biostrings BSgenome ChIPseeker clusterProfiler corrplot DiagrammeR digest GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 igraph IRanges JASPAR2016 knitr magrittr motifmatchr R_utils Rbowtie2 Rcpp rJava rmarkdown Rsamtools rtracklayer S4Vectors ShortRead TFBSTools VennDiagram]; };
-  esetVis = derive2 { name="esetVis"; version="1.7.1"; sha256="0xhgq2w38wfyg1ixh455ppi0880yfp44ld8y44l8yz2646qp904d"; depends=[Biobase hexbin MASS MLP mpm Rtsne]; };
+  esATAC = derive2 { name="esATAC"; version="1.3.6"; sha256="1qwq2vchc1jyqy6h141ygkibz1i5nxfvciv7mqkz7sp6a3i2a149"; depends=[AnnotationDbi BiocGenerics BiocManager Biostrings BSgenome ChIPseeker clusterProfiler corrplot DiagrammeR digest GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 igraph IRanges JASPAR2016 knitr magrittr motifmatchr R_utils Rbowtie2 Rcpp rJava rmarkdown Rsamtools rtracklayer S4Vectors ShortRead TFBSTools VennDiagram]; };
+  esetVis = derive2 { name="esetVis"; version="1.7.3"; sha256="0yr2rbpj2rddr50v4ws21jl16ylnjan5ag7m629lcrp34lxn7b73"; depends=[Biobase hexbin MASS MLP mpm Rtsne]; };
   eudysbiome = derive2 { name="eudysbiome"; version="1.11.0"; sha256="0372hl9jsk225zjm3ca63q95x4rcnj4i13r7192gfxzisy7y9i36"; depends=[Biostrings plyr R_utils Rsamtools]; };
   exomeCopy = derive2 { name="exomeCopy"; version="1.27.0"; sha256="003r5750vnadkvc19aaw8rf4qlfs1015nmndmsaazbg70dwkkdyl"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; };
   exomePeak = derive2 { name="exomePeak"; version="2.15.0"; sha256="1xyx8c1sflf98fp2588cvwmpz7f4bji6mwaw0297cj7h4893nb2a"; depends=[GenomicAlignments GenomicFeatures Rsamtools rtracklayer]; };
   explorase = derive2 { name="explorase"; version="1.45.0"; sha256="18cch1m5k8sr9fjgfqv6ya2miwin89viq7sigpdv15r0xiz1js77"; depends=[limma rggobi RGtk2]; };
-  fCCAC = derive2 { name="fCCAC"; version="1.7.1"; sha256="1cpma76xn4ddqyjsyhlgwa812v4p2kkby77diyy7gxha843ylncl"; depends=[ComplexHeatmap fda genomation GenomicRanges ggplot2 IRanges RColorBrewer S4Vectors]; };
-  fCI = derive2 { name="fCI"; version="1.11.0"; sha256="0h94ivm66d3cnrf0cnrymq3b4a2v5jg38ylv8wylnidj5g98czap"; depends=[FNN gtools psych rgl VennDiagram zoo]; };
+  fCCAC = derive2 { name="fCCAC"; version="1.7.2"; sha256="18hbjv0c53mr9751h27b1spn1kc47wvbkh0p35y68akjk815gfrw"; depends=[ComplexHeatmap fda genomation GenomicRanges ggplot2 IRanges RColorBrewer S4Vectors]; };
+  fCI = derive2 { name="fCI"; version="1.11.1"; sha256="0b9n1vigqd7hvyqpgdaqdpz1iqmng2xl3zkgbasqyq71crcfchwv"; depends=[FNN gtools psych rgl VennDiagram zoo]; };
   fabia = derive2 { name="fabia"; version="2.27.0"; sha256="0lp2h8px9f4czvld93v1cpra31375qwvyfaq336jc7ib2myvdclz"; depends=[Biobase]; };
   factDesign = derive2 { name="factDesign"; version="1.57.0"; sha256="1kf98xygnq5pwjl7ak5jasrkgnrqhzpb81gljgsc0xp3a1mj37gn"; depends=[Biobase]; };
   farms = derive2 { name="farms"; version="1.33.0"; sha256="1xbndc128m1f5jv8firhgsbgyqvwrxma22182p5axxjf5qwymnl9"; depends=[affy Biobase MASS]; };
@@ -997,159 +1070,166 @@ in with self; {
   fgsea = derive2 { name="fgsea"; version="1.7.1"; sha256="1aiiqc3jbanlxa6q3inqzj1h81dpar2i05bmaja38k7inciaysa0"; depends=[BiocParallel data_table fastmatch ggplot2 gridExtra Matrix Rcpp]; };
   flagme = derive2 { name="flagme"; version="1.37.0"; sha256="0pjyi90l7k2i7bm93p9yyvrx18jmwcg0gaj2wixa0inyx9w5bymc"; depends=[CAMERA gcspikelite gplots MASS SparseM xcms]; };
   flipflop = derive2 { name="flipflop"; version="1.19.0"; sha256="0283bks3jbscnvyj51jm3z47rvdpfmaj40bc2h1ck8md82jrhiqj"; depends=[GenomicRanges IRanges Matrix]; };
-  flowAI = derive2 { name="flowAI"; version="1.9.1"; sha256="1j2a7aivy54vlf9vhk2d12wfzr3jdqq6582wd7pi2sg5j15mbl7v"; depends=[changepoint flowCore ggplot2 knitr plyr RColorBrewer reshape2 rmarkdown scales]; };
+  flowAI = derive2 { name="flowAI"; version="1.11.3"; sha256="1ha80s8w2mcy72r2h6kj5sq0qrwkan4vzxpy2lf9frbpxrdkw696"; depends=[changepoint flowCore ggplot2 knitr plyr RColorBrewer reshape2 rmarkdown scales]; };
   flowBeads = derive2 { name="flowBeads"; version="1.19.0"; sha256="16h0jd88nada5lsaxl7q1m3nqf7gzqc1hw9cv5q96qa8n13a50la"; depends=[Biobase flowCore knitr rrcov xtable]; };
   flowBin = derive2 { name="flowBin"; version="1.17.0"; sha256="0axib7fny5n1h0fcisy2ll67m1illv41swwi1xdc37d2v605c6jk"; depends=[BiocGenerics class flowCore flowFP limma snow]; };
   flowCHIC = derive2 { name="flowCHIC"; version="1.15.0"; sha256="1qsa6lkdang9x44wva0dwkgvv4kxqadk3jvjkg0q59bdf137irrs"; depends=[EBImage flowCore ggplot2 hexbin vegan]; };
-  flowCL = derive2 { name="flowCL"; version="1.19.1"; sha256="1fwa5r4hxnfya5ylzgx61nakfalsc0ahvy3da4xj78l52w17bjah"; depends=[graph Rgraphviz SPARQL]; };
+  flowCL = derive2 { name="flowCL"; version="1.19.3"; sha256="0rp3lrxk3sdwjv939kjkc246pwifidn6bvm6lk115yqa03ymii3w"; depends=[graph Rgraphviz SPARQL]; };
   flowClean = derive2 { name="flowClean"; version="1.19.0"; sha256="091d79vx5w76xhhjm1zvjfyfv9pn4ni91a85yq2ca4laplsd0nqn"; depends=[bit changepoint flowCore sfsmisc]; };
-  flowClust = derive2 { name="flowClust"; version="3.19.0"; sha256="1wkxfk1962cxwax2giyzva771rjxjcjy70vd9lsi7qkkxy5r3fdy"; depends=[Biobase BiocGenerics clue ellipse flowCore flowViz graph MCMCpack mnormt RBGL]; };
-  flowCore = derive2 { name="flowCore"; version="1.47.3"; sha256="0dp0aks75xzihg1nbyh441v76pgl3ikznzg1csswlzsnll4s6gdv"; depends=[BH Biobase BiocGenerics corpcor graph matrixStats Rcpp rrcov]; };
+  flowClust = derive2 { name="flowClust"; version="3.19.1"; sha256="0sdssv5bingj6zs0jp0ddfckkmbx3kljhh7snv74b0k0f3lndg4h"; depends=[Biobase BiocGenerics clue corpcor ellipse flowCore flowViz graph mnormt]; };
+  flowCore = derive2 { name="flowCore"; version="1.47.9"; sha256="03wzl92yv5zg4rgbffd07lzb69xk3flf1fg640b8kw6527wbgfkz"; depends=[BH Biobase BiocGenerics corpcor graph MASS matrixStats Rcpp rrcov]; };
   flowCyBar = derive2 { name="flowCyBar"; version="1.17.0"; sha256="1c3a12slk8z8y1vr8j09p2k5h2pw697ysk0a74p6n20sfl1zd3h9"; depends=[gplots vegan]; };
-  flowDensity = derive2 { name="flowDensity"; version="1.15.0"; sha256="0ppvvcd9brm1xqrlz7cdj35knylahqyafaabm4b7qdnwf0nz578x"; depends=[car flowCore flowWorkspace gplots RFOC rgeos sp]; };
+  flowDensity = derive2 { name="flowDensity"; version="1.15.2"; sha256="1qadx0lxvk74rapgmibp9fix19zdyg3illgl7qfnzkkadbjc1bbw"; depends=[car flowCore flowWorkspace gplots RFOC rgeos sp]; };
   flowFP = derive2 { name="flowFP"; version="1.39.0"; sha256="02n85dv2qvxzwdi44mc7awvxc26nbwpbzawb0ikjv8gwf4www9ch"; depends=[Biobase BiocGenerics flowCore flowViz]; };
-  flowFit = derive2 { name="flowFit"; version="1.19.0"; sha256="0ydpczklwaf0lr1vhz0fcp9qi29gc0hbn8l4qnfa4l7r2s3md418"; depends=[flowCore flowViz gplots kza minpack_lm]; };
-  flowMap = derive2 { name="flowMap"; version="1.19.0"; sha256="1viidnbhw054q1vl4d6xqsz1h1y764w1jsjs9nqgfnpxqmrlgls2"; depends=[abind ade4 doParallel Matrix reshape2 scales]; };
-  flowMatch = derive2 { name="flowMatch"; version="1.17.0"; sha256="0b1da6sfaykwj0dk4hbrj71q209jyarl0x40i5n324nj8r4ja7hz"; depends=[Biobase flowCore Rcpp]; };
+  flowFit = derive2 { name="flowFit"; version="1.19.1"; sha256="0v7qdrskm47d2j16gag2lv63051hz182l7j5j2m36jh1fbddwhz6"; depends=[flowCore flowViz gplots kza minpack_lm]; };
+  flowMap = derive2 { name="flowMap"; version="1.19.1"; sha256="1q3gvb4q2d3lh8828hlnxdrqzlsfm4chl5rvf99nbmapazz37r7g"; depends=[abind ade4 doParallel Matrix reshape2 scales]; };
+  flowMatch = derive2 { name="flowMatch"; version="1.17.1"; sha256="0ymvn6nyxp95yb23y6lr0ks297m1djqaisz34wssxqk524zjrgbr"; depends=[Biobase flowCore Rcpp]; };
   flowMeans = derive2 { name="flowMeans"; version="1.41.0"; sha256="1ixzwry1435w20w40z87yhscbgskbldqmrz0x7nqvlqp5yn1ax71"; depends=[Biobase feature flowCore rrcov]; };
   flowMerge = derive2 { name="flowMerge"; version="2.29.0"; sha256="0imabypbjyn83jyb3isichi7fy4p4nkmsphcqbkimpjrfgc391kw"; depends=[feature flowClust flowCore foreach graph Rgraphviz rrcov snow]; };
-  flowPeaks = derive2 { name="flowPeaks"; version="1.27.0"; sha256="12fw6vp5lar9y8k2hx8pjnr2km5bs1rjgdam3ifrfdj0rgicf6rk"; depends=[]; };
-  flowPloidy = derive2 { name="flowPloidy"; version="1.7.0"; sha256="06lwd20c97lq5b9z11agvi4d9h601pxgzsi3xzkqp3q8c7xnpa1a"; depends=[car caTools flowCore knitr minpack_lm rmarkdown shiny]; };
+  flowPeaks = derive2 { name="flowPeaks"; version="1.27.1"; sha256="07r0l4iyc9jrraswmd0j2lzrjw2ch7wkfniisr148k3a6gvhl0wq"; depends=[]; };
+  flowPloidy = derive2 { name="flowPloidy"; version="1.7.3"; sha256="1m7vr6z9ca04xk876s9mc36hjr1wd9bb3kgx1hi7zd1aazzis1rb"; depends=[car caTools flowCore knitr minpack_lm rmarkdown shiny]; };
   flowPlots = derive2 { name="flowPlots"; version="1.29.0"; sha256="0ylxkvhzghzybsi20lpprz430sl2d6mnrkbwp8bbsysr2ymsjml6"; depends=[]; };
-  flowQ = derive2 { name="flowQ"; version="1.41.0"; sha256="0290mk6zj2f2y4qiks9z9lnrl87fa0024idmdcf7slwlngf59mfd"; depends=[BiocGenerics bioDist flowCore flowViz geneplotter IRanges lattice latticeExtra mvoutlier outliers parody RColorBrewer]; };
+  flowQ = derive2 { name="flowQ"; version="1.41.1"; sha256="15n2w9958hp3w0rigx80p2gj5l4bg8zycv8h2l31ysdg34lij5r7"; depends=[BiocGenerics bioDist flowCore flowViz geneplotter IRanges lattice latticeExtra mvoutlier outliers parody RColorBrewer]; };
   flowQB = derive2 { name="flowQB"; version="2.9.0"; sha256="0d4n8qxja851z4d7ran9wr4rhfa64mnkhz7rqwa0vggrq1y0ksja"; depends=[extremevalues flowCore]; };
-  flowStats = derive2 { name="flowStats"; version="3.39.0"; sha256="1bz0saqkxznyq9ilabi1j4nwd18yk1p740asj7zlirqhiik2x20m"; depends=[Biobase BiocGenerics cluster fda flowCore flowViz flowWorkspace KernSmooth ks lattice MASS ncdfFlow]; };
+  flowStats = derive2 { name="flowStats"; version="3.39.4"; sha256="1cj7dwvqa9x3lxblfvxmsl88zc91fbjhh1viy3s2m88kxl6517vr"; depends=[Biobase BiocGenerics cluster fda flowCore flowViz flowWorkspace KernSmooth ks lattice MASS ncdfFlow RColorBrewer]; };
   flowTime = derive2 { name="flowTime"; version="1.5.0"; sha256="0qh2p696xh8xsi0j7d6s75kbf8ajm4virfs8c6c1rn48n4grhlpy"; depends=[flowCore plyr]; };
   flowTrans = derive2 { name="flowTrans"; version="1.33.0"; sha256="1fqw49s9dgz4khq3m73bf8f7vy9xzhdl91n0rkmcnwq7kd6wm5n9"; depends=[flowClust flowCore flowViz]; };
   flowType = derive2 { name="flowType"; version="2.19.0"; sha256="1313ak0n79pvhzpckrapbkzrzxhd8qnxawpvagm92lsdg5p79mfc"; depends=[BH Biobase flowClust flowCore flowMeans flowMerge Rcpp rrcov sfsmisc]; };
-  flowUtils = derive2 { name="flowUtils"; version="1.45.0"; sha256="1vrbyzhifqaf47a73hac75s4dnsg6fys3nhhl1rf81hsjhqh7q80"; depends=[Biobase corpcor flowCore graph RUnit XML]; };
+  flowUtils = derive2 { name="flowUtils"; version="1.45.2"; sha256="1x6ng8wvwqhq76r3wm62xyi29dq0086yvklv2ddv2gfc7ifzk8nl"; depends=[Biobase corpcor flowCore graph RUnit XML]; };
   flowVS = derive2 { name="flowVS"; version="1.13.0"; sha256="16r8ig33ym1d8hp2hvxnlszifc0qpmd4vnqzg1nn31a4j3xf575r"; depends=[flowCore flowStats flowViz]; };
   flowViz = derive2 { name="flowViz"; version="1.45.0"; sha256="076hjz0mvc7pygmlrapsgg6scsxkzd714yg4wq8r8fbbpblqhkxf"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; };
-  flowWorkspace = derive2 { name="flowWorkspace"; version="3.29.4"; sha256="1669sl43r31ikj5mjzgmlynls994607xg0x2rz1y1dxcy84rb9vc"; depends=[BH Biobase BiocGenerics cytolib data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra matrixStats ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz RProtoBufLib scales stringr XML]; };
-  flowcatchR = derive2 { name="flowcatchR"; version="1.15.0"; sha256="0m1wbddxi2sifhpil00gd9vr27i75h30cw3a2m59hccxw4di139j"; depends=[abind BiocParallel colorRamps EBImage plotly shiny]; };
-  fmcsR = derive2 { name="fmcsR"; version="1.23.0"; sha256="1m8v98qi3x2cwr74ynndb0ilw8m8n0dz7w7fpyv0fm3s0vy3x0rx"; depends=[BiocGenerics ChemmineR RUnit]; };
+  flowWorkspace = derive2 { name="flowWorkspace"; version="3.29.10"; sha256="0qch9hbpxqwma1kg9jrmnyf7d9zc714pjybpzphkgx9c9cdbaqzy"; depends=[BH Biobase BiocGenerics cytolib data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra matrixStats ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz RProtoBufLib scales stringr XML]; };
+  flowcatchR = derive2 { name="flowcatchR"; version="1.15.3"; sha256="04njcbq0bi53pwkfrf489l3fws63w9l981cf4iadkadbk5dl2hav"; depends=[abind BiocParallel colorRamps EBImage plotly shiny]; };
+  fmcsR = derive2 { name="fmcsR"; version="1.23.3"; sha256="1f2la9cx08yd3y96n2hkc6dzqvj5kya58rghr711axjmjfcigw2y"; depends=[BiocGenerics ChemmineR RUnit]; };
   focalCall = derive2 { name="focalCall"; version="1.15.0"; sha256="1vnihlpxaplnjp7h9n3k3py0103qz98dnkm1p7hns93pf185ih05"; depends=[CGHcall]; };
   frma = derive2 { name="frma"; version="1.33.0"; sha256="02n251fwg34f0mkvingrsv1n0v77cvmpmd44rs1a4qyl5nj3x9v6"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; };
   frmaTools = derive2 { name="frmaTools"; version="1.33.0"; sha256="1w62s3i6q92ka44dy8sqid21fgpjjghmnyavj3swx5czpn476vny"; depends=[affy Biobase DBI preprocessCore]; };
-  funtooNorm = derive2 { name="funtooNorm"; version="1.5.0"; sha256="175np47a1n3l9dkpfza9wdndxk3adk9np87c8hi4ybhjbx9w8bj5"; depends=[GenomeInfoDb IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest matrixStats minfi pls]; };
+  funtooNorm = derive2 { name="funtooNorm"; version="1.5.1"; sha256="0pqh1hiblr6989wvdx7fmxkkj451xijjj6z9jgqz2c08qpk2d4h8"; depends=[GenomeInfoDb IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest matrixStats minfi pls]; };
   gCMAP = derive2 { name="gCMAP"; version="1.25.0"; sha256="0mp0cg33slfpnqzk2fsggpb3dfgq95isj42lia0i3hkwkdfcisly"; depends=[annotate AnnotationDbi bigmemory bigmemoryExtras Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; };
   gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.21.0"; sha256="15fmiii9kkiy1p9d2h7hg9fi3kacifz6113hpkzkk0lic4phncg5"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; };
-  gCrisprTools = derive2 { name="gCrisprTools"; version="1.9.1"; sha256="1nscfxbyvy596sak9lj5g1wcbk7zprgy5654bbv69ain9p1i3kzc"; depends=[Biobase ggplot2 limma PANTHER_db rmarkdown RobustRankAggreg]; };
+  gCrisprTools = derive2 { name="gCrisprTools"; version="1.9.3"; sha256="1msp2xfd3h1bj04abad714r9rmgbr9w6g26lj7s8j451jjlw57na"; depends=[Biobase ggplot2 limma PANTHER_db rmarkdown RobustRankAggreg]; };
   gQTLBase = derive2 { name="gQTLBase"; version="1.13.0"; sha256="0rszhclakgc0xyg8jdb9mxgwaqcb28rcs9pyrg31d0wxi44c90w2"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
+  gQTLstats = derive2 { name="gQTLstats"; version="1.13.1"; sha256="0apicd22s2yx57ypqvnmxkh3ca06r5cq3mj7x3hz57z9sv99bq1w"; depends=[AnnotationDbi BatchJobs BBmisc beeswarm Biobase BiocGenerics doParallel dplyr erma ffbase foreach GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges ggbeeswarm ggplot2 gQTLBase HardyWeinberg Homo_sapiens IRanges limma mgcv plotly reshape2 S4Vectors shiny snpStats SummarizedExperiment VariantAnnotation]; };
   gaga = derive2 { name="gaga"; version="2.27.0"; sha256="09q5xfki8nnp5z4ia0l07pnvsmiwag7ahr1bxbic9aajql873ipk"; depends=[Biobase coda EBarrays mgcv]; };
-  gage = derive2 { name="gage"; version="2.31.0"; sha256="1lkq0xq7qz8vzd0y996c8yskh8wkm15hqs68krbs9z08scwjzpqg"; depends=[AnnotationDbi graph KEGGREST]; };
+  gage = derive2 { name="gage"; version="2.31.2"; sha256="0m4mp78g3sxa19rkw9p4d6sxw1ic9km6z5hir8d1lqg0hmv9y2ki"; depends=[AnnotationDbi graph KEGGREST]; };
   gaggle = derive2 { name="gaggle"; version="1.49.0"; sha256="0bi19b9ndccrky2i89scjzgna5b2gj0p74licynn8pm1jfwla584"; depends=[graph rJava RUnit]; };
-  gaia = derive2 { name="gaia"; version="2.25.0"; sha256="009lclb7dvy1mgxzxmp8nywcbq0jdq26qdla0vl7jb8p8vjp5k1c"; depends=[]; };
-  garfield = derive2 { name="garfield"; version="1.9.0"; sha256="1pndkw2an642ldgz0lw07l70gybj5npfs9w8qi2wm77fqfih8lj0"; depends=[]; };
-  gcapc = derive2 { name="gcapc"; version="1.5.0"; sha256="196fi5c1bhaq7qfxvw8jfbfahjygk1a6ykkjlrbqkhk60lzk9gbl"; depends=[BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS matrixStats Rsamtools S4Vectors]; };
+  gaia = derive2 { name="gaia"; version="2.25.3"; sha256="10qcjcfqiwa2xcgh2jpiq5hp8i8ihbl4nz503ndcz3j54rw3pjfn"; depends=[]; };
+  garfield = derive2 { name="garfield"; version="1.9.1"; sha256="1fj196imnr9vb8pg6rxf46n5yw7v3g1w0q8h49psrvw7zrmzknsg"; depends=[]; };
+  gcapc = derive2 { name="gcapc"; version="1.5.1"; sha256="1fk3vqxl6xpf4xhmacsn3ywwixs1brm24pfyshlbwp27rwj3jpzw"; depends=[BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS matrixStats Rsamtools S4Vectors]; };
   gcatest = derive2 { name="gcatest"; version="1.11.0"; sha256="0x0k557fydigj81610a39b8hg973wbjsfj0ailpjfa1grp77csa1"; depends=[lfa]; };
-  gcrma = derive2 { name="gcrma"; version="2.53.0"; sha256="14gcna1sagqizaryq5hv5907hw7agds8v0s2n1hd8k1yrpayhkwc"; depends=[affy affyio Biobase BiocInstaller Biostrings XVector]; };
-  gdsfmt = derive2 { name="gdsfmt"; version="1.17.2"; sha256="13rkbhjis5fjzalj03bpckq4w177c6v2m4p7743yvjhqhyyah9pq"; depends=[]; };
-  geNetClassifier = derive2 { name="geNetClassifier"; version="1.21.0"; sha256="0ikpsmjwbiq8kidyvllx51ih0b7jnw9s1nz6z6hfz21zf98kz9p6"; depends=[Biobase e1071 EBarrays minet]; };
+  gcrma = derive2 { name="gcrma"; version="2.53.1"; sha256="0qlvr4lgkddyrdvf81z60zzlbq0x7abdlgsgw1xr1xabmp7wbkrs"; depends=[affy affyio Biobase BiocManager Biostrings XVector]; };
+  gdsfmt = derive2 { name="gdsfmt"; version="1.17.6"; sha256="0x44n0qrcq82kxd8w1zlbfsgmf2yxxnf1i5h9z7ajlcz46cwgaxn"; depends=[]; };
+  geNetClassifier = derive2 { name="geNetClassifier"; version="1.21.1"; sha256="0fjkm6bg4g2qr5xyjjyhrpm9iijhmgy6rwd38iwimlq3qqgnm819"; depends=[Biobase e1071 EBarrays minet]; };
   geecc = derive2 { name="geecc"; version="1.15.0"; sha256="0wfa0a4hlwvjsjvxk7m6lgjxjvph3392a4kskg2y1vphh916qnxr"; depends=[gplots hypergea MASS Rcpp]; };
   genArise = derive2 { name="genArise"; version="1.57.0"; sha256="08hrc2y06prmacdzrd3qnlbyzrr9127jgglq7babrnhw0dffjl96"; depends=[locfit tkrplot xtable]; };
-  genbankr = derive2 { name="genbankr"; version="1.9.0"; sha256="0nzbf189w2rg9hy7h7qcw3jpz9lhl2yq57rhps29lgmizgdml8qp"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; };
+  genbankr = derive2 { name="genbankr"; version="1.9.2"; sha256="1ba891irw0carh6pg2r6v50g5g7am1k09zyw450rz878sfka50cj"; depends=[Biobase BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges rtracklayer S4Vectors VariantAnnotation]; };
   geneAttribution = derive2 { name="geneAttribution"; version="1.7.0"; sha256="1snpd1xy66kaj2mb8xjasgm3bipydxbrbcpvp5bny9shvk6di0cf"; depends=[BiocGenerics GenomeInfoDb GenomicFeatures GenomicRanges IRanges org_Hs_eg_db rtracklayer]; };
   geneClassifiers = derive2 { name="geneClassifiers"; version="1.5.0"; sha256="0qwqb1sq6bw688br5c5lxvc7dxwg1qwwb30dn9pklgfgpnjwp86n"; depends=[Biobase BiocGenerics]; };
   geneRecommender = derive2 { name="geneRecommender"; version="1.53.0"; sha256="1qrlk46y1hkgva2yrf8x2smy82p4kmzjpr7kyk9381rfl64nn18q"; depends=[Biobase]; };
   geneRxCluster = derive2 { name="geneRxCluster"; version="1.17.0"; sha256="0vlhskyymdnbigdq1qj9gimklcmzvybh74zn7f65if5ssqdgmj10"; depends=[GenomicRanges IRanges]; };
-  geneXtendeR = derive2 { name="geneXtendeR"; version="1.7.0"; sha256="0j3k3ijq7ml52avs6np7q5137fr348xi5012dkw1nmn4sqm9dwpy"; depends=[AnnotationDbi data_table dplyr GO_db networkD3 org_Ag_eg_db org_Bt_eg_db org_Ce_eg_db org_Cf_eg_db org_Dm_eg_db org_Dr_eg_db org_Gg_eg_db org_Hs_eg_db org_Mm_eg_db org_Mmu_eg_db org_Pt_eg_db org_Rn_eg_db org_Sc_sgd_db org_Ss_eg_db org_Xl_eg_db RColorBrewer rtracklayer SnowballC tm wordcloud]; };
-  genefilter = derive2 { name="genefilter"; version="1.63.0"; sha256="0wn6gwj8v3xl11mhx40529hlssay79n24vn071saq2y475bxhgkl"; depends=[annotate AnnotationDbi Biobase S4Vectors survival]; };
-  genefu = derive2 { name="genefu"; version="2.13.0"; sha256="1i0w1bhg93gpjwn2w2k9kz3z99vdifdf7a9nza8d79lirj4512p4"; depends=[AIMS amap biomaRt iC10 limma mclust survcomp]; };
-  geneplast = derive2 { name="geneplast"; version="1.7.0"; sha256="1ydcahw9imi281xdgpr7asihavsks3jjh52nhdrx0qn5plml254r"; depends=[ape igraph snow]; };
+  geneXtendeR = derive2 { name="geneXtendeR"; version="1.7.11"; sha256="1kws224q6rhzmdrgfv2695l5aah3hz6r5vacwl5akg2bja2v42yv"; depends=[AnnotationDbi BiocStyle data_table dplyr GO_db networkD3 org_Rn_eg_db RColorBrewer rtracklayer SnowballC tm wordcloud]; };
+  genefilter = derive2 { name="genefilter"; version="1.63.2"; sha256="0kx0fv9gjknffhvgz65y36hxcfi25rii6m35caxdrkcfm3cnrc6l"; depends=[annotate AnnotationDbi Biobase S4Vectors survival]; };
+  genefu = derive2 { name="genefu"; version="2.13.1"; sha256="0b1xrxfp1swfsvvrr1nkkkmjjb6bxbjhvvm2fl2463mmgy3qdsn6"; depends=[AIMS amap biomaRt iC10 limma mclust survcomp]; };
+  geneplast = derive2 { name="geneplast"; version="1.7.2"; sha256="18g39wzkcnkpp4v2fwbh3ff84b8fcwfn723hpfyla7857qjm6krp"; depends=[ape igraph snow]; };
   geneplotter = derive2 { name="geneplotter"; version="1.59.0"; sha256="1yqxqxchjn31sqw3csk5y3jmshb3v5580q245skam5r5v2nw5lhb"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; };
   genoCN = derive2 { name="genoCN"; version="1.33.0"; sha256="1rcly2dfm93lbsc1inm3z669l19k213zyq31kb4kkg1cnam2cflv"; depends=[]; };
-  genomation = derive2 { name="genomation"; version="1.13.0"; sha256="04101y44lnxlxkyhb2gb4d0wr9cy1s1c31dsfhqgl1rhy8rxi5b4"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr Rcpp readr reshape2 Rsamtools rtracklayer RUnit S4Vectors seqPattern]; };
+  genomation = derive2 { name="genomation"; version="1.13.1"; sha256="038fnkv0m2r47mm2cg2fmrzq776j0jfskppi7p0872rx59r0vl6y"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr Rcpp readr reshape2 Rsamtools rtracklayer RUnit S4Vectors seqPattern]; };
   genomeIntervals = derive2 { name="genomeIntervals"; version="1.37.0"; sha256="1xinqj7zzwjxx6qxi6mxrws2ajjm8cy7g9v1773x7mh47w9rz7mw"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; };
   genomes = derive2 { name="genomes"; version="3.11.0"; sha256="0vvc43ih4idj6jakm4jvwynvi4v90nndvbz18kb7nxb7fh1bl9m3"; depends=[curl readr]; };
   genoset = derive2 { name="genoset"; version="1.37.0"; sha256="0awbbvhz1qzra92ghal5wrqrkya4v0wd15q75dmqxb5xx36s8if6"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
-  genotypeeval = derive2 { name="genotypeeval"; version="1.13.1"; sha256="0qlzqfzpb74prq6b7zg77d610i8hj0d2f7jhi4l1difcgf8y7j2j"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; };
-  genphen = derive2 { name="genphen"; version="1.9.0"; sha256="1bps7mgznp5by1kfwmapnfj3vkdqiz3p3816kg9jmg7iggxn8gih"; depends=[Biostrings doParallel e1071 foreach ranger rstan]; };
+  genotypeeval = derive2 { name="genotypeeval"; version="1.13.2"; sha256="10zz9jd1xsk09gh3mkm23jmqi4j5kv7d5fbjwlr2bxq4z2yjl8h4"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; };
+  genphen = derive2 { name="genphen"; version="1.9.49"; sha256="0mdr79x7a036rrjdh1aqxnxskgsvvjbzyvlgcrf9jxh2yf45ciq1"; depends=[Biostrings doParallel e1071 foreach ranger rstan]; };
   gep2pep = derive2 { name="gep2pep"; version="1.1.1"; sha256="0h6qf7fl2hmg5chv6g9qfj5ih4mfc6xmihqny9pzg277i5gwmdsj"; depends=[Biobase digest foreach GSEABase iterators repo rhdf5 XML]; };
   gespeR = derive2 { name="gespeR"; version="1.13.0"; sha256="1qc9d8vp5s5rzw7bqbfm2n5l23yfk9d3kpmhyd4hnr9jb2h4jypp"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; };
-  ggbio = derive2 { name="ggbio"; version="1.29.0"; sha256="0skf5m8qglvv2y70jppjblvpl94cgimns02kprsqp85ghmbshy7s"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings biovizBase BSgenome ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; };
-  ggcyto = derive2 { name="ggcyto"; version="1.9.10"; sha256="17pvxml685gic39ycgq2crwnznw7ih0g5bhynxziffnfg0zqb6fc"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra ncdfFlow plyr RColorBrewer scales]; };
-  ggtree = derive2 { name="ggtree"; version="1.13.0"; sha256="1zkaasmb2y1k8hqjr7cbvhasmv1ykclhfqj3h0s6m6yvh2iql9nb"; depends=[ape dplyr ggplot2 magrittr purrr rlang rvcheck scales tibble tidyr tidytree treeio]; };
-  girafe = derive2 { name="girafe"; version="1.33.0"; sha256="0jdckfnsfvcqf7gnfbpxw12q0la9cxzfmhhy4n492fqavnzpbfgj"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; };
-  globalSeq = derive2 { name="globalSeq"; version="1.9.1"; sha256="105sxbs03xdfv6ikl517sj14wzn0cc92lxv5yfzabj2ys8911dl1"; depends=[]; };
-  globaltest = derive2 { name="globaltest"; version="5.35.0"; sha256="150mf64cr528jzcpc9ydfs1kf9dwrr8xnw47abpkxgmfmqi6jl01"; depends=[annotate AnnotationDbi Biobase survival]; };
-  gmapR = derive2 { name="gmapR"; version="1.23.0"; sha256="0c6chbf3kzx3z57gs36b0bi1bc58514sklxkplv80z7xnvxs8pl9"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
+  ggbio = derive2 { name="ggbio"; version="1.29.5"; sha256="1aqj3m7jkjdzwvnk8il74v05gybd3n6b056mlwq8slmmpyngjnc6"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings biovizBase BSgenome ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 rlang Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; };
+  ggcyto = derive2 { name="ggcyto"; version="1.9.13"; sha256="0dhwv19dny4490jg2p7bbmzqnpyf04zms33vwssaf7xwy7i8h0q9"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra ncdfFlow plyr RColorBrewer rlang scales]; };
+  ggtree = derive2 { name="ggtree"; version="1.13.6"; sha256="0hbw03ixzvmiqgacvi41mb8kjnh7s78z39900b532qd1ghmg8xrq"; depends=[ape dplyr ggplot2 magrittr purrr rlang rvcheck scales tibble tidyr tidytree treeio]; };
+  girafe = derive2 { name="girafe"; version="1.33.2"; sha256="1b7sqnbj3a6p8zdaf8w7s19fijiw5ciqchxsi8i7ali46fqvqhbs"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; };
+  glmSparseNet = derive2 { name="glmSparseNet"; version="0.99.36"; sha256="1qhjrpd70qfizkk64kl4spwwq8gjk7zg6ypj5gyk6pn98myvk2bm"; depends=[biomaRt dplyr forcats futile_logger ggplot2 glmnet loose_rock Matrix MultiAssayExperiment readr reshape2 rlang sparsebn sparsebnUtils STRINGdb stringr SummarizedExperiment survminer]; };
+  globalSeq = derive2 { name="globalSeq"; version="1.9.4"; sha256="146zfaz0w3gdic5q50vqzynr6gzv6b0c417yi1x350ir3qn2vczk"; depends=[]; };
+  globaltest = derive2 { name="globaltest"; version="5.35.1"; sha256="0q72cvh11qffkr6c17pz7a5d2wi2csk37pq9fjda11mmx1g01paq"; depends=[annotate AnnotationDbi Biobase survival]; };
+  gmapR = derive2 { name="gmapR"; version="1.23.1"; sha256="0qyn39vcp7a84xjn7n4cyhk47yw9yxn9mwq81kz3fjljafy2pv9z"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
   goProfiles = derive2 { name="goProfiles"; version="1.43.0"; sha256="19r3h8rnfs826aldlgkjgsllk4wj95rq7lq37qd927bjgvi4kbnj"; depends=[AnnotationDbi Biobase CompQuadForm GO_db stringr]; };
-  goSTAG = derive2 { name="goSTAG"; version="1.5.0"; sha256="13bnzz3adj9186sp992fbjp9442nvp7f0a80jnz1nygdr0d45i7m"; depends=[AnnotationDbi biomaRt GO_db memoise]; };
+  goSTAG = derive2 { name="goSTAG"; version="1.5.1"; sha256="1nazixjbh90460iqc7hgsgsilzaknjym639c5mmxcxdas96vmry1"; depends=[AnnotationDbi biomaRt GO_db memoise]; };
   goTools = derive2 { name="goTools"; version="1.55.0"; sha256="1lzgsdqvwrxckg5pdbmnxldifrsm7zyvl72pl3sz8x2997b4lc97"; depends=[AnnotationDbi GO_db]; };
   goseq = derive2 { name="goseq"; version="1.33.0"; sha256="102w1cxz2ab0gyzamy9rcdbf73bgkvqrm0lxasz6m2h79j9gfmc9"; depends=[AnnotationDbi BiasedUrn BiocGenerics geneLenDataBase GO_db mgcv]; };
+  gpart = derive2 { name="gpart"; version="0.99.19"; sha256="05nzlyn7n1a73qdrg8wrwjwcix4i7y43g6bycbfw07zxps8a3472"; depends=[AnnotationDbi biomaRt data_table GenomicRanges Homo_sapiens igraph IRanges OrganismDbi Rcpp TxDb_Hsapiens_UCSC_hg38_knownGene]; };
   gpls = derive2 { name="gpls"; version="1.53.0"; sha256="02yca8lllmq7lmbg55kn3yhsb0s9d2b828aj08lsp5hxmyill36k"; depends=[]; };
-  gprege = derive2 { name="gprege"; version="1.25.0"; sha256="123ggwjdkc2la9vbv6kmv7l7pg0wz3jzk4q0df5zm38a3nr8gy7p"; depends=[gptk]; };
-  graph = derive2 { name="graph"; version="1.59.0"; sha256="1pcn9rr9j679g6hgsh235nar5via1rmgj1dqpyp7sl9zfjrcim2p"; depends=[BiocGenerics]; };
-  graphite = derive2 { name="graphite"; version="1.27.2"; sha256="0c3ha2hjpzwbrv5jh2376ayd2c7j9z857m70rx8xiv5bn3kzvazz"; depends=[AnnotationDbi checkmate graph httr rappdirs]; };
-  groHMM = derive2 { name="groHMM"; version="1.15.0"; sha256="1q18f8ibjwik01n54c373fss82jwamik430irgaya8q5b5659c0d"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; };
+  gprege = derive2 { name="gprege"; version="1.25.2"; sha256="0qlbvss2hk3f3bfi4k4jcpyqwishkxsqq9cv846cbnkryn1xnrih"; depends=[gptk]; };
+  graph = derive2 { name="graph"; version="1.59.2"; sha256="1vncpr60yl63kwlxdp1b15r81ymf28whzkkd9mz5r8f6jz184h0g"; depends=[BiocGenerics]; };
+  graphite = derive2 { name="graphite"; version="1.27.6"; sha256="009gjkmnjr8y6j8dz9h19bn16qkzhvknqazrdm4pf86pn8w2gy2w"; depends=[AnnotationDbi checkmate graph httr rappdirs]; };
+  groHMM = derive2 { name="groHMM"; version="1.15.1"; sha256="1a6c40bfsskh0adaqjvimn6bysfgz24lga9byznp2cf2757i9bps"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; };
   gsean = derive2 { name="gsean"; version="1.1.0"; sha256="0aar598qdhppzkzrrmhzd1nkn7i3xci401yz3w5dsgz27fy12c18"; depends=[fgsea PPInfer]; };
-  gtrellis = derive2 { name="gtrellis"; version="1.13.1"; sha256="1nz1hq1nmn3759cnf7w2svkk7v6lzrp85l49vjwy7wfrpk612wch"; depends=[circlize GenomicRanges GetoptLong IRanges]; };
-  gwascat = derive2 { name="gwascat"; version="2.13.1"; sha256="1y595365q7hw84sgg6c307d3h1bryml4rxq1hg2vcr2ai0cbb065"; depends=[AnnotationDbi AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 graph Gviz Homo_sapiens IRanges Rsamtools rtracklayer S4Vectors snpStats SummarizedExperiment VariantAnnotation]; };
-  gwasurvivr = derive2 { name="gwasurvivr"; version="0.99.38"; sha256="0dcza6pscq9lndk3x1bc139fh3r61lwfrm88vizyaini7xyzd2p0"; depends=[GWASTools matrixStats SummarizedExperiment survival VariantAnnotation]; };
-  h5vc = derive2 { name="h5vc"; version="2.15.0"; sha256="001lz9pjr7ddlw8v69nvhmbdzzx643vd5akl7dzjx4z0kg3xyf55"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra h5vcData IRanges reshape rhdf5 Rsamtools S4Vectors]; };
+  gtrellis = derive2 { name="gtrellis"; version="1.13.3"; sha256="0pg30gnbmsn498isqw3g26a5pzxbq1k0hbz4sd986ak1whgac1q3"; depends=[circlize GenomicRanges GetoptLong IRanges]; };
+  gwascat = derive2 { name="gwascat"; version="2.13.5"; sha256="0p4l8skyyjblqzlcb13sj29sy6x62fakb5i56d757z6ic8pi84kx"; depends=[AnnotationDbi AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 gQTLstats graph Gviz Homo_sapiens IRanges Rsamtools rtracklayer S4Vectors snpStats SummarizedExperiment VariantAnnotation]; };
+  gwasurvivr = derive2 { name="gwasurvivr"; version="0.99.46"; sha256="137a4vclz7h462xf2aia47kaigz2gchlhxl6v7ycv4rq48i6qjrq"; depends=[GWASTools matrixStats SNPRelate SummarizedExperiment survival VariantAnnotation]; };
+  h5vc = derive2 { name="h5vc"; version="2.15.1"; sha256="1gfch3p8ylws4g22kd6xs79wsm6x65yfdaqxjhqp0cgsjlyrr29h"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra h5vcData IRanges reshape rhdf5 Rsamtools S4Vectors]; };
   hapFabia = derive2 { name="hapFabia"; version="1.23.0"; sha256="0dhq26aqqmnzmx3cnwmmrqa8zx5gxq48is1wmljvfn86qixr70xr"; depends=[Biobase fabia]; };
   heatmaps = derive2 { name="heatmaps"; version="1.5.0"; sha256="0lz2cxw3fxyvnmnzk95k791x8x3vjn5cif2bqp3zv2rlkwgdjd7m"; depends=[BiocGenerics Biostrings EBImage GenomeInfoDb GenomicRanges IRanges KernSmooth Matrix plotrix RColorBrewer]; };
   hiAnnotator = derive2 { name="hiAnnotator"; version="1.15.0"; sha256="12q17c31j1q1jbh1z1ddlcml1wxin5s32yz9xk7dd7bxa81frpmg"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; };
   hiReadsProcessor = derive2 { name="hiReadsProcessor"; version="1.17.0"; sha256="1qad1winpzjwjn9wnr7xvmspza2j0islsdqh7aig767svipw8870"; depends=[BiocGenerics BiocParallel Biostrings dplyr GenomicAlignments GenomicRanges hiAnnotator readxl rSFFreader sonicLength]; };
-  hicrep = derive2 { name="hicrep"; version="1.5.0"; sha256="17k4wynjjbailalm4h0gghw5fz7gavjpdzm3ibk1gih46l24fr0d"; depends=[]; };
+  hicrep = derive2 { name="hicrep"; version="1.5.1"; sha256="0vjif93dnjjqrd15gxflwlhncrr3sdrp3hw9944p4pmd1xq38i3i"; depends=[]; };
   hierGWAS = derive2 { name="hierGWAS"; version="1.11.0"; sha256="0wfv8pxnm8v1lwj1cbk4d7v0cyjzra8nm8gaawwr0aqcsg7ksp2f"; depends=[fastcluster fmsb glmnet]; };
-  hipathia = derive2 { name="hipathia"; version="1.1.1"; sha256="1x7aa8vbmzrfw5psyc4a7qcsnhfgcynfvp5k7qba4q5cp85gcgym"; depends=[AnnotationHub coin DelayedArray igraph limma matrixStats MultiAssayExperiment preprocessCore S4Vectors servr SummarizedExperiment]; };
-  hmdbQuery = derive2 { name="hmdbQuery"; version="1.1.1"; sha256="1rkyh115mn65rq90i7g3idw1n856v3r6139rbvaai7939rbi4gg9"; depends=[S4Vectors XML]; };
+  hierinf = derive2 { name="hierinf"; version="0.99.3"; sha256="0rwwdwgx1p96vgfszp01i85wa56d9djkrjnzphgcv5962smd0wka"; depends=[fmsb glmnet]; };
+  hipathia = derive2 { name="hipathia"; version="1.1.3"; sha256="08yx1jpfz08zsldxvjsz9957rp1wk2744kb8248k5rwf4fmcdp4w"; depends=[AnnotationHub coin DelayedArray igraph limma matrixStats MultiAssayExperiment preprocessCore S4Vectors servr SummarizedExperiment]; };
+  hmdbQuery = derive2 { name="hmdbQuery"; version="1.1.3"; sha256="0gvbfiibnb3w588ri385wwyg1x3my7a3ay6sacbjhh0j6amx9g7p"; depends=[S4Vectors XML]; };
   hopach = derive2 { name="hopach"; version="2.41.0"; sha256="1i329clrw9bjxkchinadprix36xjak5x6i1zqpdj27kyr8w26gn2"; depends=[Biobase BiocGenerics cluster]; };
-  hpar = derive2 { name="hpar"; version="1.23.2"; sha256="04h4xfmappx0vipw1fa9kd8n9hs4cpcfsllxcrq77akndkf1dc92"; depends=[]; };
+  hpar = derive2 { name="hpar"; version="1.23.4"; sha256="0nf8w8qn63zrq2y5i5imrwv242cc884lzi92jldd24ainybp362h"; depends=[]; };
   htSeqTools = derive2 { name="htSeqTools"; version="1.29.5"; sha256="0rigcwd8mc3kjsj0kxzxnspzqz0d1i58vav71p7a4cx76yrzi5z1"; depends=[Biobase BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges MASS S4Vectors]; };
   hyperdraw = derive2 { name="hyperdraw"; version="1.33.0"; sha256="0qcp9p3n7gxskvw8afz7yr2msm0gikl7v3dvzvrhfypad9czplx0"; depends=[graph hypergraph Rgraphviz]; };
   hypergraph = derive2 { name="hypergraph"; version="1.53.0"; sha256="1mj14bgkbs3p0smf6phfig2rcf7kd88d85djr6rq1c3vpiyhpyx3"; depends=[graph]; };
   iASeq = derive2 { name="iASeq"; version="1.25.0"; sha256="0p4m13k5n974469xh8vhz8xd5b37ill3i9jmglq0fa47n7rbdjz1"; depends=[]; };
   iBBiG = derive2 { name="iBBiG"; version="1.25.0"; sha256="1dbcazr88ac38g58jgr9byqaql36jvfn5bmr8gibn3hr187c5ypf"; depends=[ade4 biclust xtable]; };
-  iBMQ = derive2 { name="iBMQ"; version="1.21.0"; sha256="19f1iqfcdsq0lg9hbl65qwb7lwp9n36vrdnyah63dn7k3c23p5x1"; depends=[Biobase ggplot2]; };
-  iCARE = derive2 { name="iCARE"; version="1.9.0"; sha256="0z884xysrf00h56l4djq1yrm8478s4f3jqq0bz6sf5wqzibr492k"; depends=[]; };
-  iCNV = derive2 { name="iCNV"; version="1.1.0"; sha256="1kqsrw6pq4lcnfnf5ak4pdmcv3cr7p1jhmk304g5ywxpbd2fdfp9"; depends=[CODEX data_table dplyr fields ggplot2 rlang tidyr truncnorm]; };
+  iBMQ = derive2 { name="iBMQ"; version="1.21.1"; sha256="11bkzp25bv5j4x2xanj5cq173pwhl1av5l7kb94vhw80yhbk9l4r"; depends=[Biobase ggplot2]; };
+  iCARE = derive2 { name="iCARE"; version="1.9.7"; sha256="0bbzn5yx2i7ijfvsglzsi3f7rv6c0043qvv46n859bpq83pgng5p"; depends=[gtools Hmisc plotrix]; };
+  iCNV = derive2 { name="iCNV"; version="1.1.1"; sha256="0rwr2di8215fxjv0wz75ipwdipyxr043yv72m0c03iwq5rccglxd"; depends=[CODEX data_table dplyr fields ggplot2 rlang tidyr truncnorm]; };
   iCOBRA = derive2 { name="iCOBRA"; version="1.9.1"; sha256="08nzcsph0w5zp6l2lwrg2624gsgs939rkv1662ic72jf8759i4s1"; depends=[dplyr DT ggplot2 limma reshape2 ROCR scales shiny shinyBS shinydashboard UpSetR]; };
   iCheck = derive2 { name="iCheck"; version="1.11.0"; sha256="0bs9zzcc1pbdvvzq912yqr2waic72jj4pv6ksqjg6s9wz390a4gc"; depends=[affy Biobase GeneSelectMMD gplots limma lmtest lumi MASS preprocessCore randomForest rgl scatterplot3d]; };
-  iChip = derive2 { name="iChip"; version="1.35.0"; sha256="0c610x3g5nkpwsrkix66s3z8dc24dv11dfidms757hc0fwchnsq3"; depends=[limma]; };
-  iClusterPlus = derive2 { name="iClusterPlus"; version="1.17.0"; sha256="1ax42hac2wqkyawm9dwwzm0lf81cihric78j38v1vjic918l1b14"; depends=[]; };
-  iGC = derive2 { name="iGC"; version="1.11.0"; sha256="1bcbf1azdb4svdjz8yaxs55l76g5c8i1h53s66qjhss8i3pjydr3"; depends=[data_table plyr]; };
-  iPAC = derive2 { name="iPAC"; version="1.25.0"; sha256="1mdcr7fa2y78cnndsd8y08hrmlzbgbsgmhq0kzpszr79xj49kdzx"; depends=[Biostrings gdata multtest scatterplot3d]; };
-  iSEE = derive2 { name="iSEE"; version="1.1.2"; sha256="0x8pmyzpbb1x33ixh1jnpfs58l7b1d12r51gk7gjqxa291phg7zk"; depends=[AnnotationDbi BiocGenerics colourpicker cowplot dplyr DT ggplot2 igraph mgcv rentrez reshape2 rintrojs S4Vectors scales shiny shinyAce shinydashboard shinyjs SingleCellExperiment SummarizedExperiment vipor viridisLite]; };
-  iSeq = derive2 { name="iSeq"; version="1.33.0"; sha256="1sxy4hxpds6k1flmspwf9y4j8wkr96142z64scigg9mf3p88h5zz"; depends=[]; };
+  iChip = derive2 { name="iChip"; version="1.35.1"; sha256="0yaf4q92fjdw80v3ln596f7088wlp7nmwhdxgnbkj0x4kwa9mr2b"; depends=[limma]; };
+  iClusterPlus = derive2 { name="iClusterPlus"; version="1.17.2"; sha256="1da6hn0hysmbsd3mma9aq3qh2bj15hdc83p3lj0725c52xi6f2kx"; depends=[]; };
+  iGC = derive2 { name="iGC"; version="1.11.1"; sha256="02j3bfv5r8cjjp2k7d3w9y80gvygslcgawmhvzp70chjr12a5nds"; depends=[data_table plyr]; };
+  iPAC = derive2 { name="iPAC"; version="1.25.2"; sha256="15jvpz8qmmlcvarnxidmw2x3hn98ngwf2pxa6a8a0rl8qhgis3wb"; depends=[Biostrings gdata multtest scatterplot3d]; };
+  iSEE = derive2 { name="iSEE"; version="1.1.14"; sha256="057shg5ayy1c2xss12jknnfj9riavnd50nv6l39bfbxymmn5gwp1"; depends=[AnnotationDbi BiocGenerics colourpicker cowplot dplyr DT ggplot2 igraph mgcv rentrez reshape2 rintrojs S4Vectors scales shiny shinyAce shinydashboard shinyjs SingleCellExperiment SummarizedExperiment vipor viridisLite]; };
+  iSeq = derive2 { name="iSeq"; version="1.33.1"; sha256="1cw7fmzd0v6rdrqqkaxx0g5fz763sfwf4kyafmvw00chs4rzi21n"; depends=[]; };
   iasva = derive2 { name="iasva"; version="0.99.3"; sha256="1ax0594b3d2glam0lb4dzqzx8bbfdln0wglr96szjdxa6qi31ghk"; depends=[BiocParallel cluster irlba SummarizedExperiment]; };
   ibh = derive2 { name="ibh"; version="1.29.0"; sha256="07954bdkijs41r0h39fhlzpd8d75vhlk8gl4zlbaky93prsmi1hf"; depends=[simpIntLists]; };
   icetea = derive2 { name="icetea"; version="0.99.10"; sha256="14yzjsydnv2k8x183l7a94jmxsd27p2ndwzdvkd93d5nkh5iq36l"; depends=[BiocGenerics BiocParallel Biostrings csaw edgeR GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges limma Rsamtools rtracklayer S4Vectors ShortRead SummarizedExperiment TxDb_Dmelanogaster_UCSC_dm6_ensGene VariantAnnotation]; };
-  ideal = derive2 { name="ideal"; version="1.5.0"; sha256="1pdj0r0qfjwrwvsb4lrwl3mxd6wb4bwmabd9z413868453qk101p"; depends=[AnnotationDbi BiocParallel d3heatmap DESeq2 dplyr DT GenomicRanges ggplot2 GO_db goseq GOstats gplots IHW IRanges knitr limma pcaExplorer pheatmap plyr rentrez rintrojs rmarkdown S4Vectors shiny shinyAce shinyBS shinydashboard stringr SummarizedExperiment topGO UpSetR]; };
+  ideal = derive2 { name="ideal"; version="1.5.6"; sha256="1k2h2nn0s6pmy5m2l3c6nri11am49c4s2js1q6iywbhmlcxk5dh5"; depends=[AnnotationDbi BiocParallel d3heatmap DESeq2 dplyr DT GenomicRanges ggplot2 GO_db goseq GOstats gplots IHW IRanges knitr limma pcaExplorer pheatmap rentrez rintrojs rmarkdown S4Vectors shiny shinyAce shinyBS shinydashboard stringr SummarizedExperiment topGO UpSetR]; };
   idiogram = derive2 { name="idiogram"; version="1.57.0"; sha256="0nsldgh780amhdafafrkp1lzriwskm3l89fkn2licxvpw63rlajn"; depends=[annotate Biobase plotrix]; };
-  igvR = derive2 { name="igvR"; version="1.1.6"; sha256="12jl0yj6pgjfvrx3rv63nj88zdvakzrh499gx4kz1m5s8wqxswdi"; depends=[BiocGenerics BrowserViz GenomicRanges httpuv rtracklayer VariantAnnotation]; };
-  illuminaio = derive2 { name="illuminaio"; version="0.23.0"; sha256="00qf9qjinyqd16r3zv99cgkwxdy44f2i6q2hlhmic7942j6h6r55"; depends=[base64]; };
+  igvR = derive2 { name="igvR"; version="1.1.17"; sha256="1hqd65n1qkdf54jqghj9jxcbi6sl918ymarwbrgrfrm6dk1mxzsn"; depends=[BiocGenerics BrowserViz GenomicRanges httpuv rtracklayer VariantAnnotation]; };
+  illuminaio = derive2 { name="illuminaio"; version="0.23.2"; sha256="05m18f0ipc89lak30rdlg1b1aafsgjsjzbr6scn18168m12qkd5i"; depends=[base64]; };
   imageHTS = derive2 { name="imageHTS"; version="1.31.0"; sha256="0d7l8w5i0nlfks1iak0qdkxrarfx280wyqbpig38bhbmzkv31xrg"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; };
-  immunoClust = derive2 { name="immunoClust"; version="1.13.0"; sha256="0z17f415rqad4hmwhxgl1gh8a1r42v5yz38rpq9yhssq7w1mw8q0"; depends=[flowCore lattice]; };
+  immunoClust = derive2 { name="immunoClust"; version="1.13.4"; sha256="04wjiyqp4fcbgyllpqrandvl20cjayymyi35gs3cdg9g2dwci3aq"; depends=[flowCore lattice]; };
   impute = derive2 { name="impute"; version="1.55.0"; sha256="1nb2zpnx9ia2br0044jky4kcqj2vw1vw35s34869i35n90n3vqqc"; depends=[]; };
-  intansv = derive2 { name="intansv"; version="1.21.0"; sha256="0a2qrnw1jd5d7mqvmin54110xvn1089p16bfi14660qzip6cwb0i"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; };
-  interactiveDisplay = derive2 { name="interactiveDisplay"; version="1.19.0"; sha256="1iwv231mc6g2jp6l6b3rs0gm5n1pb7mbah522q3d4s563avs9g0d"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; };
-  interactiveDisplayBase = derive2 { name="interactiveDisplayBase"; version="1.19.0"; sha256="0jwsm5i5s6gkxb05n8fmsybyvi5829g6i6y39nxcpd189ihbmv16"; depends=[BiocGenerics shiny]; };
-  inveRsion = derive2 { name="inveRsion"; version="1.29.0"; sha256="12pzk7ppd48ccmfr3q2950pfckcc2kfvgnailwai7jxgss1h1148"; depends=[haplo_stats]; };
-  isobar = derive2 { name="isobar"; version="1.27.0"; sha256="02aa78jia246w729bg4pl54shjwp51yymskhy842xnznw01nd8p7"; depends=[Biobase biomaRt distr ggplot2 plyr]; };
-  isomiRs = derive2 { name="isomiRs"; version="1.9.1"; sha256="1k60zgb2b2yqwzb02nwvri10p1a2qdlgm4g0wg6593fmkr1q9p8h"; depends=[AnnotationDbi assertive_sets Biobase BiocGenerics cluster DESeq2 DiscriMiner dplyr GenomicRanges GGally ggplot2 gplots gridExtra gtools IRanges limma RColorBrewer readr reshape rlang S4Vectors SummarizedExperiment tibble tidyr]; };
-  iterClust = derive2 { name="iterClust"; version="1.3.0"; sha256="1bm2ld3w6sm1jn7s0yk9v7d53xmf2ix411p7pp2fyjqfj6vl3iz4"; depends=[Biobase cluster]; };
+  intansv = derive2 { name="intansv"; version="1.21.3"; sha256="0aqq5mc63s5gyz82wp37m0y3b7rkv2rxxkfld0jw6dn3fp6dapqp"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; };
+  interactiveDisplay = derive2 { name="interactiveDisplay"; version="1.19.3"; sha256="1lmc0x0gfi8jhzl3z8pmkbqmx56xn6fim0ydsrqcaygz25gif6fp"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; };
+  interactiveDisplayBase = derive2 { name="interactiveDisplayBase"; version="1.19.2"; sha256="02b3sps2irfb83zii5c0zxzjp2138xfr2jfdhwvh4h6wzqn2a21q"; depends=[BiocGenerics shiny]; };
+  inveRsion = derive2 { name="inveRsion"; version="1.29.1"; sha256="0bwr76l30sxzdfjjsf7py4i78diwazfjkf237yx8n4kzb0jlkilp"; depends=[haplo_stats]; };
+  ipdDb = derive2 { name="ipdDb"; version="0.99.10"; sha256="1k1giv6jvgy54pa5yqcy0yrmn53x1ggbryg9c7mmpb4dljw7vnrj"; depends=[AnnotationDbi AnnotationHub assertthat Biostrings DBI GenomicRanges IRanges RSQLite]; };
+  isobar = derive2 { name="isobar"; version="1.27.1"; sha256="0kznz8h6b8wq1z8xqkhn0k6gmc7wbxdfv3vy19s93njdk7w3gn5d"; depends=[Biobase biomaRt distr ggplot2 plyr]; };
+  isomiRs = derive2 { name="isomiRs"; version="1.9.5"; sha256="08xvxpl1x46rs4zh34irypq0bsici3xhh52dzirhr0671p9ihqa6"; depends=[AnnotationDbi assertive_sets Biobase BiocGenerics cluster cowplot DEGreport DESeq2 DiscriMiner dplyr GenomicRanges GGally ggplot2 gplots gridExtra gtools IRanges limma RColorBrewer readr reshape rlang S4Vectors SummarizedExperiment tibble tidyr]; };
+  iterClust = derive2 { name="iterClust"; version="1.3.2"; sha256="1gkqnpyhispjbzc30dfs1hdv1vq6r33sqkmjnzcil4mbr529gvc3"; depends=[Biobase cluster]; };
   iterativeBMA = derive2 { name="iterativeBMA"; version="1.39.0"; sha256="07xy5vjmgzglab6hp82xkd6gc67lb58n8g26zvssldpzm1kir70j"; depends=[Biobase BMA leaps]; };
   iterativeBMAsurv = derive2 { name="iterativeBMAsurv"; version="1.39.0"; sha256="1cj63g97xm05clix5cv3dmjdwb806rb5va262hfhvmd2aa6bgq2k"; depends=[BMA leaps survival]; };
-  iteremoval = derive2 { name="iteremoval"; version="1.1.0"; sha256="0ggmvmif5ak35mjzd000dflcbnp0zx14zspn2nabkak74zvdjsgm"; depends=[GenomicRanges ggplot2 magrittr SummarizedExperiment]; };
+  iteremoval = derive2 { name="iteremoval"; version="1.1.1"; sha256="09qdb60ndjljn4wgpgnxcy2yvivlpvzgr6vs04ssjwq9dk8vwc9l"; depends=[GenomicRanges ggplot2 magrittr SummarizedExperiment]; };
   ivygapSE = derive2 { name="ivygapSE"; version="1.3.0"; sha256="1730rd55ws484q4iwgd06cps8jfg7f1wzryjr0gzaykxq7n2yi94"; depends=[ggplot2 hwriter plotly S4Vectors shiny SummarizedExperiment survival survminer UpSetR]; };
   joda = derive2 { name="joda"; version="1.29.0"; sha256="0n76l7mrkqrsvjq67hp9am3b6ixi2v9vz7hppj36y37r02myhdlb"; depends=[bgmm RBGL]; };
-  karyoploteR = derive2 { name="karyoploteR"; version="1.7.1"; sha256="1fvvc8181vasbdky42yijhknm57pypb6abkswl9si91fv2zm4z28"; depends=[bezier biovizBase digest GenomeInfoDb GenomicFeatures GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors]; };
-  kebabs = derive2 { name="kebabs"; version="1.15.0"; sha256="061cpbsqd444p3jw08kv72b3q2cbrzd1939vgbbsg98l550684bs"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; };
+  karyoploteR = derive2 { name="karyoploteR"; version="1.7.17"; sha256="1ks87kkw12gr4598rpq262axaszk4kppm5dhs4hjhy0gkwlm4lhh"; depends=[bamsignals bezier biovizBase digest GenomeInfoDb GenomicFeatures GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors]; };
+  kebabs = derive2 { name="kebabs"; version="1.15.2"; sha256="1d08ad2cbrd77qlgmf3y6frya8g5kn8x9k7paabch1fxpzx4sj2g"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; };
   keggorthology = derive2 { name="keggorthology"; version="2.33.0"; sha256="11a1d08pycj99xzhwblgrjwl6idm6l90i0ya1c0q0bwmaiyqqbwp"; depends=[AnnotationDbi DBI graph hgu95av2_db]; };
   kimod = derive2 { name="kimod"; version="1.9.0"; sha256="1q2ndbpw13c9a6g5vs29w5zzrw3ac5y5rjnndw660xljfphid6x4"; depends=[Biobase cluster]; };
-  kissDE = derive2 { name="kissDE"; version="1.1.0"; sha256="0k5jw601sygbvvqysha243mbhwqv80c6k8dmbj9mdqpkd0bxw6aw"; depends=[aod Biobase DESeq2 DSS ggplot2 glmnet gplots matrixStats R_utils]; };
-  kmknn = derive2 { name="kmknn"; version="0.99.13"; sha256="1qdsm0y1saz594s2bijqwfg74yjds1s55mzsw26sw11rvk63x1z6"; depends=[BiocParallel DelayedArray Rcpp]; };
+  kissDE = derive2 { name="kissDE"; version="1.1.3"; sha256="0gm63ixcr3gfg64bg253n9vp1gasmdg3xpb4i27gq7njsx7hs6bw"; depends=[aod Biobase DESeq2 doParallel DSS foreach ggplot2 gplots matrixStats]; };
+  kmknn = derive2 { name="kmknn"; version="0.99.16"; sha256="14gvgdz4gvpv5bvr3l7rbn356cqvg3nqq7vcavgyd7bqsvk6mmg3"; depends=[BiocParallel DelayedArray Rcpp]; };
   lapmix = derive2 { name="lapmix"; version="1.47.0"; sha256="08qj6i6y42ax82j29maf89zs0k03iv6p30v1zlvgixfh1p86ffk4"; depends=[Biobase]; };
   ldblock = derive2 { name="ldblock"; version="1.11.1"; sha256="0z53xkh2khlfsnvr0nqsw8k6s375ba2y5a3njbr9qnif3r0846km"; depends=[BiocGenerics erma GenomeInfoDb GenomicFiles GO_db Homo_sapiens Matrix Rsamtools snpStats VariantAnnotation]; };
   les = derive2 { name="les"; version="1.31.0"; sha256="11ad0v5j31s8kcg4572ga4znnpx9ry83m994bqbk3h51cb48pzm8"; depends=[boot fdrtool gplots RColorBrewer]; };
+  levi = derive2 { name="levi"; version="0.99.13"; sha256="0n1sl3l7xdp346jz5s6xgfmdy0i71k05khkjygkp0yqnlnapd48z"; depends=[colorspace dplyr DT ggplot2 httr igraph knitr RColorBrewer Rcpp reshape2 shiny shinydashboard shinyjs testthat xml2]; };
   lfa = derive2 { name="lfa"; version="1.11.0"; sha256="1vww3lfzb3kx2hp1cm48vg1rmnazgklz1qz1y36yydg53lbl8igi"; depends=[corpcor]; };
-  limma = derive2 { name="limma"; version="3.37.2"; sha256="1wf9xpp8l43ld7mkinqznd2dxlpw4w9vgd8y8zg9nz7gp5h0b148"; depends=[]; };
+  limma = derive2 { name="limma"; version="3.37.10"; sha256="16jdx417iahrvai0p32qaf6cgknb2pc7bjas5ba4brd2p255sn8i"; depends=[]; };
+  limmaGUI = derive2 { name="limmaGUI"; version="1.57.1"; sha256="09dykl3gd231j0xi45j23mv0p9vk0xdhyjls1z5026vclnv6037s"; depends=[limma R2HTML tkrplot xtable]; };
   lmdme = derive2 { name="lmdme"; version="1.23.0"; sha256="0192ffh3qmqx31d67zxr8sg7qvwd4wmcgzxq44w9sflb947sn8ds"; depends=[limma pls stemHypoxia]; };
-  loci2path = derive2 { name="loci2path"; version="1.1.0"; sha256="0lqixyyv6wrmqbfl67yy131421pmyi6hp7hn11lbf3xm8q56smah"; depends=[BiocParallel data_table GenomicRanges pheatmap RColorBrewer S4Vectors wordcloud]; };
-  logicFS = derive2 { name="logicFS"; version="1.51.0"; sha256="1bijly35nfy6ix6b0h2salriy143xyc3l591hcngvif504zjd57b"; depends=[LogicReg mcbiopi]; };
+  loci2path = derive2 { name="loci2path"; version="1.1.1"; sha256="1mgnx1dji2dc3jd9biv4bs5f8sgpkxzk6mwsfivfbjll9m7hprb7"; depends=[BiocParallel data_table GenomicRanges pheatmap RColorBrewer S4Vectors wordcloud]; };
+  logicFS = derive2 { name="logicFS"; version="2.1.18"; sha256="14jdnjlgsgbciahljmp8wb5zn3dbqy2r3pywbn2iqqx628hl0li6"; depends=[LogicReg mcbiopi survival]; };
   logitT = derive2 { name="logitT"; version="1.39.0"; sha256="0ynd7h26ask2i15cxikx9igcm9cdmmihg561l1dv3m9zw84s6mvb"; depends=[affy]; };
   lol = derive2 { name="lol"; version="1.29.0"; sha256="050i433xkj365q7k5i7gw07z8li29myd3zgavjg14p9lkdcwia0w"; depends=[Matrix penalized]; };
   lpNet = derive2 { name="lpNet"; version="2.13.0"; sha256="1k94rsji8p9ri8mvs6xc23dm4fq4pxcd9323c6jllq9bdljxffkp"; depends=[lpSolve nem]; };
@@ -1163,208 +1243,217 @@ in with self; {
   maPredictDSC = derive2 { name="maPredictDSC"; version="1.19.0"; sha256="1hn35cgd9571b5vz3wv76lhg2hr77kl1s6r6nmpnjph4asqhj7yg"; depends=[affy AnnotationDbi caret class e1071 gcrma hgu133plus2_db limma LungCancerACvsSCCGEO MASS ROC ROCR]; };
   maSigPro = derive2 { name="maSigPro"; version="1.53.0"; sha256="0gf80ff0jhag6mj6r888ivla5fccrdg63d7wh1g322ygp5b27h4s"; depends=[Biobase MASS mclust venn]; };
   maanova = derive2 { name="maanova"; version="1.51.0"; sha256="0az1jxfmjjpz3aqb5hvxpw912rh188b6gf02jj3q4v294131rqw4"; depends=[Biobase]; };
-  macat = derive2 { name="macat"; version="1.55.0"; sha256="1bmalm7v6hxab5vcqqq6s3s2313xq0pifk7yxq20kh7n8m7n64iw"; depends=[annotate Biobase]; };
-  made4 = derive2 { name="made4"; version="1.55.0"; sha256="0pywxxcxbi3wihx7v67rcgk7clzwkc0611687rq764xlkwljaxfw"; depends=[ade4 gplots RColorBrewer scatterplot3d]; };
-  maftools = derive2 { name="maftools"; version="1.7.05"; sha256="070w04yq3khxl3pnd96cw8kxfv1j7iwwqwpc618pnarr7ii734mz"; depends=[Biostrings changepoint cometExactTest ComplexHeatmap cowplot data_table ggplot2 ggrepel gridExtra mclust NMF RColorBrewer rjson Rsamtools survival VariantAnnotation wordcloud]; };
+  macat = derive2 { name="macat"; version="1.55.3"; sha256="0ywngyddagavml8fyr3m2g9aic1bvy49r3mw8kbx1gy4mcqp0q9a"; depends=[annotate Biobase]; };
+  made4 = derive2 { name="made4"; version="1.55.2"; sha256="16r6dsg0ayj26xmblzlwmp93jhw8j1b7cv2z372id2cy1girfdxs"; depends=[ade4 gplots RColorBrewer scatterplot3d]; };
+  maftools = derive2 { name="maftools"; version="1.7.51"; sha256="1gvnbcyipjl13yj6yix693d6wibkamwqnmh2zds31hlbj0m2f09a"; depends=[Biostrings BSgenome cometExactTest ComplexHeatmap cowplot data_table ggplot2 ggrepel gridExtra mclust NMF RColorBrewer rjson survival wordcloud]; };
   maigesPack = derive2 { name="maigesPack"; version="1.45.0"; sha256="04ihpaqpkimf5k2j8hf2zwjqm6s75nkr1bn8gsvg21m88gajsh3x"; depends=[convert graph limma marray]; };
   makecdfenv = derive2 { name="makecdfenv"; version="1.57.0"; sha256="1v9a3r9gxijglxyhjb52jqm6p9vqkn549cim9zbw6mhngn2cqnzs"; depends=[affy affyio Biobase zlibbioc]; };
-  manta = derive2 { name="manta"; version="1.27.0"; sha256="0p3r0l0sgnf9rrih35a3n7c6l9a3q9xpd2hilmf3pbrrc5hrxnhm"; depends=[caroline edgeR Hmisc]; };
-  mapscape = derive2 { name="mapscape"; version="1.5.0"; sha256="0fs1cn7aw2awgjqmjjb70p5pz6fdnwfvix57wijvalc5qy777h1a"; depends=[base64enc htmlwidgets jsonlite stringr]; };
+  manta = derive2 { name="manta"; version="1.27.2"; sha256="15hqw96xpprmq38f0gq50ik6ynqk6k51fp3gxcsy1qbpk9kp89jx"; depends=[caroline edgeR Hmisc]; };
+  mapscape = derive2 { name="mapscape"; version="1.5.1"; sha256="1aqxpwz9a87y5kfxnz98axzc7q7d59qkw61jnj5sq9qv2s565q5v"; depends=[base64enc htmlwidgets jsonlite stringr]; };
   marray = derive2 { name="marray"; version="1.59.0"; sha256="01kgc79bhg5yg1zkglkpm85zrhm3dl5j63hvxbll3xsrrmy4bhs9"; depends=[limma]; };
   martini = derive2 { name="martini"; version="1.1.0"; sha256="1aj39flz18cnl9042hqlnqzyq6ff9j4dl5b2fm29y150s0j2wz5p"; depends=[igraph Matrix Rcpp RcppEigen Rgin S4Vectors snpStats]; };
-  maser = derive2 { name="maser"; version="0.99.15"; sha256="12i7yzv4id25186ny5j4bzjlg6jwrk0mwisnpaakvk9fwja4ygl5"; depends=[BiocGenerics data_table dplyr DT GenomeInfoDb GenomicRanges ggplot2 Gviz IRanges reshape2 rtracklayer]; };
+  maser = derive2 { name="maser"; version="0.99.16"; sha256="12dchpcxjj3bc4qz0viqxg20c1yv42830l8jc38k3nx90iafs93g"; depends=[BiocGenerics data_table dplyr DT GenomeInfoDb GenomicRanges ggplot2 Gviz IRanges reshape2 rtracklayer]; };
   maskBAD = derive2 { name="maskBAD"; version="1.25.0"; sha256="09g28yd1jwxrvqh59lbcnni8ba1kk0gkgcxb2x7s9m35nx8sdr04"; depends=[affy gcrma]; };
   massiR = derive2 { name="massiR"; version="1.17.0"; sha256="0gf0j965ssrawvyx4i3mq5xrwbjy73vplig3d5518425l38g3ajp"; depends=[Biobase cluster diptest gplots]; };
-  matchBox = derive2 { name="matchBox"; version="1.23.0"; sha256="0gkn4jx9fhpgdrbcqvq6yjy3yyh1fsxw7gq9izcy2mkyp9z2343i"; depends=[]; };
-  matter = derive2 { name="matter"; version="1.7.1"; sha256="0vjabjvh3gcxlvjbyncvj6jngwg701h9kr9w334rz1f4l9szkvrl"; depends=[biglm BiocGenerics digest irlba]; };
+  matchBox = derive2 { name="matchBox"; version="1.23.1"; sha256="134bv5pplxb2vg75wwb6x7b0mi5qscidrz9xpnf3wfk446mvpzyd"; depends=[]; };
+  matter = derive2 { name="matter"; version="1.7.6"; sha256="029qb75k8ps0d979wrvv99666dn6513mhk26x7s0ahj5b75iyymk"; depends=[biglm BiocGenerics digest irlba]; };
   mcaGUI = derive2 { name="mcaGUI"; version="1.29.1"; sha256="0klxp5g2s7c6k93imdkc9dxvzzvb89d5jf7x7p7v0mmsm6rbhg95"; depends=[bpca foreign gWidgets gWidgetsRGtk2 lattice MASS OTUbase proto vegan]; };
   mdgsa = derive2 { name="mdgsa"; version="1.13.1"; sha256="06p6dfffc7h80wzsypq1xk80q1ilzqpjxrwmvi70sdqv9fc9ac17"; depends=[AnnotationDbi cluster DBI GO_db KEGG_db Matrix]; };
   mdp = derive2 { name="mdp"; version="1.1.0"; sha256="0a5r860nywkd35h16vsgqqj0iin0ldbra0b8cs1ql2bwmdjccl7i"; depends=[ggplot2]; };
   mdqc = derive2 { name="mdqc"; version="1.43.0"; sha256="1h0pk6amx5vj9zxxwa3aydhnph0cn2qcibz7xk5whpr3fqrzk1b4"; depends=[cluster MASS]; };
-  meshes = derive2 { name="meshes"; version="1.7.1"; sha256="1ccbl1gnsapb5r60d2bdfgrj2fmn1glk5yxjxjlv68r9xkv0nfk8"; depends=[AnnotationDbi DOSE enrichplot GOSemSim MeSH_db rvcheck]; };
-  meshr = derive2 { name="meshr"; version="1.17.0"; sha256="03q7ihrg2a61kw3nkb13jn2fj3mv0p9g6pas5dm62z5i0yfgqypz"; depends=[BiocGenerics Category cummeRbund fdrtool MeSH_Aca_eg_db MeSH_AOR_db MeSH_Bsu_168_eg_db MeSH_db MeSH_Hsa_eg_db MeSH_PCR_db MeSH_Syn_eg_db MeSHDbi org_Hs_eg_db S4Vectors]; };
+  meshes = derive2 { name="meshes"; version="1.7.2"; sha256="03zhlaz7z6z6z9k4c0apqa871g1z5597szk7zq9vsdp210bbws7y"; depends=[AnnotationDbi DOSE enrichplot GOSemSim MeSH_db rvcheck]; };
+  meshr = derive2 { name="meshr"; version="1.17.2"; sha256="07y38icgvdncfqw4n4dmigwgl4dwwxmxypwi2rzd586m1wb3diy6"; depends=[BiocGenerics Category cummeRbund fdrtool MeSH_Aca_eg_db MeSH_AOR_db MeSH_Bsu_168_eg_db MeSH_db MeSH_Hsa_eg_db MeSH_PCR_db MeSH_Syn_eg_db MeSHDbi org_Hs_eg_db RSQLite S4Vectors]; };
   messina = derive2 { name="messina"; version="1.17.0"; sha256="0zllyp3azgv0yyx0hdcad1bv41shqvkyw143nb7nc79x34zgm11m"; depends=[foreach ggplot2 plyr Rcpp survival]; };
   metaArray = derive2 { name="metaArray"; version="1.59.0"; sha256="0xp7qnvgj9qa83lwv6dcbs3fw41jyp1lsw17n87jr9x2gnz9v2ly"; depends=[Biobase MergeMaid]; };
   metaCCA = derive2 { name="metaCCA"; version="1.9.0"; sha256="1i8qgq7qxngkrgibwqh8c6yigpi5w7bf1jivpmkk1swzlsa620y8"; depends=[]; };
   metaMS = derive2 { name="metaMS"; version="1.17.0"; sha256="194pw7fbf9nr0wxq7fbg4j45lh36va6ypr62aj8zc6l2hh42d2b5"; depends=[BiocGenerics CAMERA Matrix robustbase xcms]; };
   metaSeq = derive2 { name="metaSeq"; version="1.21.0"; sha256="0fcwfk0vz0pa5pykxlf4g8zg5iyd40qncq40kh8zydymkkz7njqg"; depends=[NOISeq Rcpp snow]; };
   metabomxtr = derive2 { name="metabomxtr"; version="1.15.0"; sha256="09mx5a26maf4zm670r17xs9bfyn7xz6hhyjh9bbbkm4lf0fyph22"; depends=[Biobase BiocParallel Formula ggplot2 multtest optimx plyr]; };
-  metagene = derive2 { name="metagene"; version="2.13.1"; sha256="0lyv5mm5bvvj2v3519swvwwsgmma952ccy8rxnpzr628lrvllcw9"; depends=[BiocParallel data_table DBChIP EnsDb_Hsapiens_v86 ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges magrittr matrixStats muStat purrr R6 Rsamtools rtracklayer stringr]; };
+  metagene = derive2 { name="metagene"; version="2.13.3"; sha256="19g9nh13b8wr4kbpr57vhnm2237zzx2iv4pvsvabsswr9ls09pfl"; depends=[BiocParallel data_table DBChIP EnsDb_Hsapiens_v86 ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges magrittr matrixStats muStat purrr R6 Rsamtools rtracklayer stringr]; };
   metagenomeFeatures = derive2 { name="metagenomeFeatures"; version="2.1.0"; sha256="1dbw7cvyrh4w8cjqdvslph3lbrxxyxnpc71l69myasf4w1hwwsjb"; depends=[ape Biobase Biostrings dbplyr DECIPHER dplyr lattice lazyeval magrittr purrr RSQLite S4Vectors stringr]; };
-  metagenomeSeq = derive2 { name="metagenomeSeq"; version="1.23.0"; sha256="09bfw6g9k4mimnlcrqf5690gpwn5f02pcairnnrmkx5kx7smj4zw"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer]; };
+  metagenomeSeq = derive2 { name="metagenomeSeq"; version="1.23.1"; sha256="141hm3dbbcpjy743gwcn0ajvkb6af4g4cxqq7lads1zxhfpl6fq4"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer]; };
   metahdep = derive2 { name="metahdep"; version="1.39.0"; sha256="1zm6j0i9myn4q4lwc2almy6d6khg1kqb8ij11cr5dhxmwx444ma8"; depends=[]; };
-  metaseqR = derive2 { name="metaseqR"; version="1.21.0"; sha256="1ny7srzlw1gv0bf4zflji0k48s6mw6cl2141y5l6wxwyiljgxvdp"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; };
+  metaseqR = derive2 { name="metaseqR"; version="1.21.2"; sha256="1vyjn9v0z3wx69ncqp2gzswwz6b47aarqf3dk1hpzwhrr30sqli8"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; };
   metavizr = derive2 { name="metavizr"; version="1.5.1"; sha256="1wvdzqvjlr2ygxkq2pvkfw5xdr09yafmalf4k5ya7mc70cg6w7nb"; depends=[Biobase data_table digest epivizr epivizrData epivizrServer epivizrStandalone GenomeInfoDb httr metagenomeSeq phyloseq vegan]; };
-  methInheritSim = derive2 { name="methInheritSim"; version="1.3.0"; sha256="180lha5avnrlnkc709hy5akmajwpkzb2slk7gf7641349lx3890v"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges methylKit msm S4Vectors]; };
+  methInheritSim = derive2 { name="methInheritSim"; version="1.3.1"; sha256="0grqjwv75yd0v3ji99cwnbbgp6s488kyh5d3kan1x88wqy6p00cw"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges methylKit msm S4Vectors]; };
   methVisual = derive2 { name="methVisual"; version="1.33.0"; sha256="0pyj09zkan51w6w0wnkg3ww49hlwqarl5sfw7wrbarfdvxvlyqpa"; depends=[Biostrings ca gridBase gsubfn IRanges plotrix sqldf]; };
-  methimpute = derive2 { name="methimpute"; version="1.3.1"; sha256="09v7dw2sdkzrypw9brqyym9ipmplww2r3jh5fybw66zj2fiqxhx6"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges ggplot2 IRanges minpack_lm Rcpp reshape2]; };
+  methimpute = derive2 { name="methimpute"; version="1.3.2"; sha256="1nd5ay6ymf0hchv1q62qpj3by4h7c83x59b8d72w1hrv5xcgqhi6"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges ggplot2 IRanges minpack_lm Rcpp reshape2]; };
   methyAnalysis = derive2 { name="methyAnalysis"; version="1.23.0"; sha256="1fhhk2yqcq2rh30369izn32w7jzcyzhlwaa5wcds4mb2caiyr4kj"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi org_Hs_eg_db rtracklayer SummarizedExperiment VariantAnnotation]; };
-  methylInheritance = derive2 { name="methylInheritance"; version="1.5.0"; sha256="1bf765bvv63xp3fxxf9rx0x5z8x4sk1xfwm67nm10shsd4wbh0za"; depends=[BiocParallel GenomicRanges ggplot2 gridExtra IRanges methylKit rebus S4Vectors]; };
-  methylKit = derive2 { name="methylKit"; version="1.7.4"; sha256="1mi3w3b60k1nnrp7g2dv4b561y9ws493n5v0s8gwz4w7m12xb2qx"; depends=[data_table emdbook fastseg GenomeInfoDb GenomicRanges gtools IRanges KernSmooth limma mclust qvalue R_utils Rcpp Rhtslib Rsamtools rtracklayer S4Vectors zlibbioc]; };
-  methylMnM = derive2 { name="methylMnM"; version="1.19.0"; sha256="1rzx8sd1kg4krzjqbnv0fi89lgc12xjdzlkbc8dpj8mx8d6gp8xg"; depends=[edgeR statmod]; };
+  methylGSA = derive2 { name="methylGSA"; version="0.99.16"; sha256="1jxwys6dlhqs8fq9f8vw63d5llzcbvyyczw2qgi94qwispb5s5bi"; depends=[AnnotationDbi clusterProfiler ggplot2 GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylationEPICanno_ilm10b2_hg19 missMethyl org_Hs_eg_db reactome_db RobustRankAggreg stringr]; };
+  methylInheritance = derive2 { name="methylInheritance"; version="1.5.2"; sha256="0vvwzxabm5xz94zfvi1yjw43d8asmv7wmcngjx571qphcl1hlyab"; depends=[BiocParallel GenomicRanges ggplot2 gridExtra IRanges methylKit rebus S4Vectors]; };
+  methylKit = derive2 { name="methylKit"; version="1.7.10"; sha256="1m8cb5w8rhcnsdh01ahcr16hnjpvzb77albxlbqcprhndvd7cxgh"; depends=[data_table emdbook fastseg GenomeInfoDb GenomicRanges gtools IRanges KernSmooth limma mclust qvalue R_utils Rcpp Rhtslib Rsamtools rtracklayer S4Vectors zlibbioc]; };
+  methylMnM = derive2 { name="methylMnM"; version="1.19.1"; sha256="1h0ydwljbrdyb5vn688303zp61np5a0zaah974g6v8mgs4izdqvk"; depends=[edgeR statmod]; };
   methylPipe = derive2 { name="methylPipe"; version="1.15.0"; sha256="0v00cc5jiw0n6nxq5nvbmaknbanp0gbzk8d3p5igfj3pva6zvpjy"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; };
   methylumi = derive2 { name="methylumi"; version="2.27.0"; sha256="1carjnp9fbldzyms0cnc5lv92y4cxgzri9wxd5m4svrdfagnj75z"; depends=[annotate AnnotationDbi Biobase BiocGenerics FDb_InfiniumMethylation_hg19 genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; };
-  methyvim = derive2 { name="methyvim"; version="1.3.0"; sha256="1w8jm4qba2cqi1ghrk0lmwhmdh6hn9fdbzh8f3gf7hlbbg5wf678"; depends=[BiocGenerics BiocParallel bumphunter cluster doFuture dplyr future GenomeInfoDb ggplot2 ggsci gridExtra gtools IRanges limma minfi SummarizedExperiment superheat tmle]; };
-  mfa = derive2 { name="mfa"; version="1.3.0"; sha256="14qb1l4czylj2jid2fqk24pqkg2rgv4fs2d719xmd8yd9snhda7r"; depends=[Biobase coda dplyr ggmcmc ggplot2 magrittr MCMCglmm MCMCpack Rcpp tibble]; };
+  methyvim = derive2 { name="methyvim"; version="1.3.1"; sha256="1jycwzqf7147pcdfais5n876x9w61xsr41jq2kgqhnmxz05rhwkb"; depends=[BiocGenerics BiocParallel bumphunter cluster doFuture dplyr future GenomeInfoDb ggplot2 ggsci gridExtra gtools IRanges limma minfi S4Vectors SummarizedExperiment superheat tmle]; };
+  mfa = derive2 { name="mfa"; version="1.3.1"; sha256="1nn35lxbq6dqsgc21pkbl7x803v385n360wnjv1qxjs9b8w8xqjk"; depends=[Biobase coda dplyr ggmcmc ggplot2 magrittr MCMCglmm MCMCpack Rcpp tibble]; };
   mgsa = derive2 { name="mgsa"; version="1.29.0"; sha256="1vhp23qx5vzaqmn06vngfd9c3y5ygizc6hhx1ccv7m5x4lz2a4jg"; depends=[gplots]; };
-  miRBaseConverter = derive2 { name="miRBaseConverter"; version="1.5.0"; sha256="0gj23y3sk269j0zci53f9b3mdqvdnk84awg80zxv5s25wjzsvwwf"; depends=[]; };
-  miRLAB = derive2 { name="miRLAB"; version="1.11.0"; sha256="12xyplcm923lhwpjxwy8a9xfn6mrhpcf264kyckzswmxzvnqy3n8"; depends=[energy entropy glmnet gplots Hmisc httr impute limma pcalg RCurl Roleswitch stringr]; };
+  miRBaseConverter = derive2 { name="miRBaseConverter"; version="1.5.6"; sha256="0r6cgvslm1lsg1mhrxzdghglk55zh7f3n1lhk136hk5nqh58nhk9"; depends=[]; };
+  miRLAB = derive2 { name="miRLAB"; version="1.11.1"; sha256="18bqx7gxx3hs9mfvgidnngf57grlxnapq8axp2cyhvbvspwaabb6"; depends=[Category ctc dplyr energy entropy glmnet GOstats gplots heatmap_plus Hmisc httr impute InvariantCausalPrediction limma org_Hs_eg_db pcalg RCurl Roleswitch stringr SummarizedExperiment TCGAbiolinks]; };
   miRNAmeConverter = derive2 { name="miRNAmeConverter"; version="1.9.0"; sha256="116zkdwspzb0rp6yhz9bjfarbi2mvvlngsb53zs1js59kzsrw06a"; depends=[AnnotationDbi DBI miRBaseVersions_db reshape2]; };
   miRNApath = derive2 { name="miRNApath"; version="1.41.0"; sha256="1hndq9aq3r3mci5j9ysfkb8kdw2zp7bbi3j7qfcdchm9q3g78rya"; depends=[]; };
-  miRNAtap = derive2 { name="miRNAtap"; version="1.15.0"; sha256="03i5bbjygkas379kp6frf68d4f7md3safbkayqiccdaq1vszah08"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; };
-  miRcomp = derive2 { name="miRcomp"; version="1.11.0"; sha256="08b4na83sdp3q6hcadbyc59jmd151vwg26prjvxvsmacqajlf2xc"; depends=[Biobase KernSmooth miRcompData]; };
+  miRNAtap = derive2 { name="miRNAtap"; version="1.15.1"; sha256="030kl4i7m1apxb4r3r3p2fbq2429zcm2aja96vdr6x2vmrna3nr5"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; };
+  miRSM = derive2 { name="miRSM"; version="0.99.28"; sha256="04liw858ihv2ljg4w14gj0mrkfrsycnfg0k0pp041pz158d4wn78"; depends=[BiBitR BicARE biclust Biobase dynamicTreeCut fabia flashClust GFA GSEABase iBBiG igraph isa2 linkcomm MCL miRsponge NMF PMA Rcpp rqubic runibic s4vd SummarizedExperiment WGCNA]; };
+  miRcomp = derive2 { name="miRcomp"; version="1.11.1"; sha256="1am0pxrdp297z12wbg1nlf7lbc37d9v01nb6hp4zw5gdkf3rfagd"; depends=[Biobase KernSmooth miRcompData]; };
   miRmine = derive2 { name="miRmine"; version="1.3.0"; sha256="10j2f6ldxxf78aps1ygvdzpvga5smb4xv9m4mhgbhl9qfbkqvkd1"; depends=[SummarizedExperiment]; };
-  miRsponge = derive2 { name="miRsponge"; version="1.7.0"; sha256="1w61pnjzp6g7p6sz6y88h6zdifmqdijr89y25rqrgk6ybz50206j"; depends=[clusterProfiler corpcor DOSE igraph linkcomm ProNet ReactomePA survival varhandle]; };
+  miRsponge = derive2 { name="miRsponge"; version="1.7.6"; sha256="1isl9mi8bqwxxsm1miv7bh0xahsg3lb22q0lyj35ij0bhkdr1sw7"; depends=[clusterProfiler corpcor DOSE igraph linkcomm MCL Rcpp ReactomePA survival varhandle]; };
   microRNA = derive2 { name="microRNA"; version="1.39.0"; sha256="0c1dvhp81kxv1kxr77rl7wgq5wr92gj37m8qsgn0b40zs5b1b49i"; depends=[Biostrings]; };
-  microbiome = derive2 { name="microbiome"; version="1.3.1"; sha256="0vwx4m4w26lrs5n30ikc5h38bcbpi5ynfiqm8kbnqmldzsfcq56q"; depends=[dplyr ggplot2 phyloseq reshape2 tidyr vegan]; };
-  mimager = derive2 { name="mimager"; version="1.5.0"; sha256="1jl3j7l75g04a7w2cf7kgci78b2q68wadpbq8hcg91qrr1jahw89"; depends=[affy affyPLM Biobase BiocGenerics DBI gtable oligo oligoClasses preprocessCore S4Vectors scales]; };
+  microbiome = derive2 { name="microbiome"; version="1.3.3"; sha256="17gnyy8qwxjg86i8nx4mpyhrsy8mkmzyhgmxfngkvlyb3cqqvbdl"; depends=[dplyr ggplot2 phyloseq reshape2 tidyr vegan]; };
+  mimager = derive2 { name="mimager"; version="1.5.3"; sha256="1zpp71qjws6qm1cdl7s057mgijbsqhahklaq0flc4izvjn7awkrs"; depends=[affy affyPLM Biobase BiocGenerics DBI gtable oligo oligoClasses preprocessCore S4Vectors scales]; };
   minet = derive2 { name="minet"; version="3.39.0"; sha256="0lbga3id91swx8vnfcw4vgwq5bypr3a110il3a84kwr9naq9vnvi"; depends=[infotheo]; };
-  minfi = derive2 { name="minfi"; version="1.27.5"; sha256="107y7npvk5cdr7nz6ll8whyhc83ni1wl3vsx28wyblh7qwk3fh64"; depends=[beanplot Biobase BiocGenerics BiocParallel Biostrings bumphunter data_table DelayedArray DelayedMatrixStats genefilter GenomeInfoDb GenomicRanges GEOquery HDF5Array illuminaio IRanges lattice limma MASS mclust nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; };
+  minfi = derive2 { name="minfi"; version="1.27.8"; sha256="0vizm0alsczrjqryzhl7za6n3gc6dmr3z6h2dihn31fc74z0lqyn"; depends=[beanplot Biobase BiocGenerics BiocParallel Biostrings bumphunter data_table DelayedArray DelayedMatrixStats genefilter GenomeInfoDb GenomicRanges GEOquery HDF5Array illuminaio IRanges lattice limma MASS mclust nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; };
   mirIntegrator = derive2 { name="mirIntegrator"; version="1.11.0"; sha256="1f6xi68rgc5xgmcpv25lfz9khdwh94k59a2r2lj81y7h1fg3asck"; depends=[AnnotationDbi ggplot2 graph org_Hs_eg_db Rgraphviz ROntoTools]; };
-  missMethyl = derive2 { name="missMethyl"; version="1.15.0"; sha256="027avacdx9h4b2gj7sv0a1a38iaby0x882zbn25zh4fabgjclffv"; depends=[AnnotationDbi BiasedUrn GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest limma methylumi minfi org_Hs_eg_db ruv statmod stringr]; };
-  missRows = derive2 { name="missRows"; version="1.1.0"; sha256="10wj9g5xy3y7zk3n0nnkvppj66zl226bd5cjbkgwicz8kb29n4ld"; depends=[ggplot2 gtools MultiAssayExperiment plyr S4Vectors]; };
+  missMethyl = derive2 { name="missMethyl"; version="1.15.5"; sha256="0p2mgq5njh830vhi2najh3slzhqz56fzi947xvrbyz5crqn8aq02"; depends=[AnnotationDbi BiasedUrn GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b4_hg19 IlluminaHumanMethylationEPICmanifest limma methylumi minfi org_Hs_eg_db ruv statmod stringr]; };
+  missRows = derive2 { name="missRows"; version="1.1.1"; sha256="09s34cd47hylqwi4qmcnba4qmwiz0n1n3z0m7pabqmw7ysn20mi8"; depends=[ggplot2 gtools MultiAssayExperiment plyr S4Vectors]; };
   mitoODE = derive2 { name="mitoODE"; version="1.19.0"; sha256="1qkhf4y5cnwxv39lacdph3r030d9d4jc76lzgg9gl7gyk9801rhh"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; };
-  mlm4omics = derive2 { name="mlm4omics"; version="0.99.20"; sha256="1h6s1ddj73wy1v79vpvjsf5hkjyxf3fha5w2n2cqr89ix4k76l3l"; depends=[BH ggplot2 MASS Matrix Rcpp RcppEigen rstan rstantools StanHeaders]; };
+  mixOmics = derive2 { name="mixOmics"; version="6.4.6"; sha256="1id5zcqqdzh72k41sc267fi7cbqyzlfwb8758xnxibgp9a3mjqci"; depends=[corpcor dplyr ellipse ggplot2 gridExtra igraph lattice MASS matrixStats rARPACK RColorBrewer reshape2 tidyr]; };
+  mlm4omics = derive2 { name="mlm4omics"; version="0.99.22"; sha256="0yrz6cg6w8nsv5lkpzs43jla0wgmvb4bv66q5wb5f3p38fvym4c1"; depends=[BH ggplot2 MASS Matrix Rcpp RcppEigen rstan rstantools StanHeaders]; };
   mogsa = derive2 { name="mogsa"; version="1.15.0"; sha256="02a9p3awa8lix75ghw8x0nm9dzccg57ydyg1hr5kxx3bq51lvj3v"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
   monocle = derive2 { name="monocle"; version="2.9.0"; sha256="15m4221g6m5r8w3af9qk8jxqnqjjj31xvfcxi2n7dhfvqw4f35a1"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree densityClust dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; };
   mosaics = derive2 { name="mosaics"; version="2.19.0"; sha256="1d5b7rhxzzzlyapfq4fmml8k41fpha2bw398jzq6xsk52wfjjbiv"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; };
   motifRG = derive2 { name="motifRG"; version="1.25.0"; sha256="0ramq5yk9ri04waj16vgcvr8jgd93afn2q8yr4avzaq9a1klsh7a"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 IRanges seqLogo XVector]; };
-  motifStack = derive2 { name="motifStack"; version="1.25.0"; sha256="0ry64xf3gsiapickxzhbh9sn4yhwnvg9vqxv6wrj565wl284zd1h"; depends=[ade4 Biostrings grImport htmlwidgets MotIV scales XML]; };
-  motifbreakR = derive2 { name="motifbreakR"; version="1.11.0"; sha256="1kaadjkcvdm1i8cpnz4qfyiwiffd0h61wx8mwa4x1xqyiwj5s04y"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges grImport Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr TFMPvalue VariantAnnotation]; };
-  motifcounter = derive2 { name="motifcounter"; version="1.5.2"; sha256="0cs9cp09r6k63ap131ir13hcswipwshdzy2gg562v8yrnysvv96p"; depends=[Biostrings]; };
+  motifStack = derive2 { name="motifStack"; version="1.25.3"; sha256="1qvillm4aflyws82gi6sk6wd8f0zpnm0srgv420l0plmiv9v8gaj"; depends=[ade4 Biostrings grImport htmlwidgets MotIV scales XML]; };
+  motifbreakR = derive2 { name="motifbreakR"; version="1.11.1"; sha256="1mpwxh7yigxplm3pczmqczqbs9nbfz1f5jpl4j5wkgcxh634s42l"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges grImport Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr TFMPvalue VariantAnnotation]; };
+  motifcounter = derive2 { name="motifcounter"; version="1.5.5"; sha256="1zf3sgl3d8wazbd673bmns3fx5r3ppbzlgrms3z2svzh9997z4gc"; depends=[Biostrings]; };
   motifmatchr = derive2 { name="motifmatchr"; version="1.3.0"; sha256="0p1v2nbxw889ck8jsvw0qkxqxnpzqvha2k64r9f8xg2d06pfr7ya"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp RcppArmadillo Rsamtools S4Vectors SummarizedExperiment TFBSTools]; };
   mpra = derive2 { name="mpra"; version="1.3.0"; sha256="1bh73npgphq2xanx9sc9yz0dpcilcvwnwz030fpy2mvaipnrqpjc"; depends=[BiocGenerics limma S4Vectors scales statmod SummarizedExperiment]; };
-  msPurity = derive2 { name="msPurity"; version="1.7.1"; sha256="0jf1r0p2v20g87lirzi956vkrzm25px9q47pbjfw3k2hf4k97pwp"; depends=[DBI doSNOW fastcluster foreach ggplot2 mzR plyr Rcpp reshape2 RSQLite stringr]; };
-  msa = derive2 { name="msa"; version="1.13.0"; sha256="0z2haqbz22q1zxmks570vky1a1i101pscq2ryi50aj78g4k87ad1"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; };
+  msPurity = derive2 { name="msPurity"; version="1.7.2"; sha256="018gawlqn1syhhqmg9dbdzxg2knrp4vwqpbbazdayxk8adsr4ak2"; depends=[DBI doSNOW fastcluster foreach ggplot2 mzR plyr Rcpp reshape2 RSQLite stringr]; };
+  msa = derive2 { name="msa"; version="1.13.1"; sha256="0fcs489fmx6vhdmqmksqwlakg1a9cn44s9mbdcjqkx15lhcqaa9r"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; };
   msgbsR = derive2 { name="msgbsR"; version="1.5.0"; sha256="1hlpg3zd4w514f1p0c36jsgg0dlirmnw1fq5l734yabgbf6zkv3l"; depends=[BSgenome easyRNASeq edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr R_utils Rsamtools S4Vectors SummarizedExperiment]; };
   msmsEDA = derive2 { name="msmsEDA"; version="1.19.0"; sha256="0xni6k9ij49zzxlhnbhn6v0nij49m26cxyv6xdlwfp0jh37390gk"; depends=[gplots MASS MSnbase RColorBrewer]; };
   msmsTests = derive2 { name="msmsTests"; version="1.19.0"; sha256="1kz9s9dc4rxz77k743ql6j84h2hv8fkbwl7707gqfs5789gj7w41"; depends=[edgeR msmsEDA MSnbase qvalue]; };
-  multiClust = derive2 { name="multiClust"; version="1.11.3"; sha256="0gjn9pl685pkl2yv6dbkdqr9hc3pcl39fk2h3nrd1irl7gf7isrw"; depends=[amap cluster ctc dendextend mclust survival]; };
-  multiMiR = derive2 { name="multiMiR"; version="1.3.0"; sha256="1zhpsipbcm1hqcc75nf0xjfm6v4nqc8bgp9pgj1v5q4ni8vffzsf"; depends=[AnnotationDbi BiocGenerics dplyr purrr RCurl tibble XML]; };
-  multiOmicsViz = derive2 { name="multiOmicsViz"; version="1.5.0"; sha256="1z750jwpvcl679ikzlcyy0yrifx13abxy8wigsxwrbc4wcljqyqw"; depends=[doParallel foreach SummarizedExperiment]; };
+  multiClust = derive2 { name="multiClust"; version="1.11.6"; sha256="1g5zxy0x3fipmdiw3dkwzjnrni9r7rcqc71jilq0jfr8z52h5kik"; depends=[amap cluster ctc dendextend mclust survival]; };
+  multiHiCcompare = derive2 { name="multiHiCcompare"; version="0.99.46"; sha256="0f2h2xdprarri4x19jvac9irm7gba2x1dhaab1r6pl6hkkmasi01"; depends=[BiocParallel BLMA data_table dplyr edgeR GenomeInfoDb GenomeInfoDbData GenomicRanges HiCcompare metap pbapply pheatmap qqman]; };
+  multiMiR = derive2 { name="multiMiR"; version="1.3.2"; sha256="19my81w8q1zva7p1k7wbjr69x3bmqwwkz2phmfmb6gaa2361gn6l"; depends=[AnnotationDbi BiocGenerics dplyr purrr RCurl tibble XML]; };
+  multiOmicsViz = derive2 { name="multiOmicsViz"; version="1.5.1"; sha256="0zjp90z00dmd6k96ffmb1iljzf22asij7m90lj764z2xskii9nz0"; depends=[doParallel foreach SummarizedExperiment]; };
   multiscan = derive2 { name="multiscan"; version="1.41.0"; sha256="08s4rpikrjzhip9zpb5dc0fi98hj304qlcvxm1agi881awlvpkig"; depends=[Biobase]; };
   multtest = derive2 { name="multtest"; version="2.37.0"; sha256="1xlizjdzvxn0i9gs1jpkb07fkkx1prrr1v5n6kfvff9izh40cx6j"; depends=[Biobase BiocGenerics MASS survival]; };
   muscle = derive2 { name="muscle"; version="3.23.0"; sha256="110wvrf2isiw2by15vkxsds5sxy68l1vav8fq55f5f8lx77450yp"; depends=[Biostrings]; };
-  myvariant = derive2 { name="myvariant"; version="1.11.0"; sha256="14mskpia58g17ydcv2d535kslj0fwm8rm0n4mv1qm0rff81v5hn3"; depends=[GenomeInfoDb Hmisc httr jsonlite magrittr plyr S4Vectors VariantAnnotation]; };
+  mygene = derive2 { name="mygene"; version="1.17.2"; sha256="1fi43b84q73kfyq6dincnkx7glhzxw8c42vy63k2j19dqygzc0k7"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; };
+  myvariant = derive2 { name="myvariant"; version="1.11.1"; sha256="0p4wan3cwmag2nnxza6zqc3rvidgcg6xdk3aqp1d40v1vyxd4j8c"; depends=[GenomeInfoDb Hmisc httr jsonlite magrittr plyr S4Vectors VariantAnnotation]; };
   mzID = derive2 { name="mzID"; version="1.19.0"; sha256="0czwvilzp756qfyjzf6x4wskg7w35zwl3df3md4p03v95c1ynbdk"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; };
-  mzR = derive2 { name="mzR"; version="2.15.1"; sha256="0m9q5ja326wz7cjmd6b1lvkhjggg5mlw8mxaqa90fs4qz6cr8hw6"; depends=[Biobase BiocGenerics ProtGenerics Rcpp Rhdf5lib zlibbioc]; };
+  mzR = derive2 { name="mzR"; version="2.15.5"; sha256="1kbnxini43zw1mvmbv15ms1na4d2piirzqq79w3d45a4dsdyjkkq"; depends=[Biobase BiocGenerics ncdf4 ProtGenerics Rcpp Rhdf5lib zlibbioc]; };
   ncdfFlow = derive2 { name="ncdfFlow"; version="2.27.0"; sha256="0m29ncb8i4xndialy9x8iagyvamiacq6jvdbl8v9m0f18ygv9y81"; depends=[BH Biobase BiocGenerics flowCore flowViz Rcpp RcppArmadillo Rhdf5lib zlibbioc]; };
-  ndexr = derive2 { name="ndexr"; version="1.3.0"; sha256="0558086vrjiliwpjyvwszy5dimq4p39x3gwiywx7jdjlzgwcv44q"; depends=[httr igraph jsonlite plyr tidyr]; };
+  ndexr = derive2 { name="ndexr"; version="1.3.1"; sha256="1nann1ndc6zy04inb4ag7axi5hl407xr7v283lad1gvqmhrjnzii"; depends=[httr igraph jsonlite plyr tidyr]; };
   nem = derive2 { name="nem"; version="2.55.0"; sha256="0y0yp1bq3ixkxdqjx4lbx5h1yfx2vsia2zpqnjjvp9hzqjddvvbl"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; };
-  netReg = derive2 { name="netReg"; version="1.5.0"; sha256="15dzz0068s38rxp0vjz9ssa09575xw5nggxl86r2zxcmb93x3yng"; depends=[Rcpp RcppArmadillo]; };
-  netSmooth = derive2 { name="netSmooth"; version="1.1.0"; sha256="1d2mpc9n32aah9dnmwk2bc44c9nq006i4xj79hg7z6cvsxkh67cb"; depends=[cluster clusterExperiment data_table entropy Matrix scater SingleCellExperiment SummarizedExperiment]; };
+  netReg = derive2 { name="netReg"; version="1.5.1"; sha256="0zw8q4dy893jdsjmb3zhy66g8y0w6m9iqvf360bhrnr5kzdfi8ac"; depends=[Rcpp RcppArmadillo]; };
+  netSmooth = derive2 { name="netSmooth"; version="1.1.1"; sha256="0pfqn3wmkmh4wvyy72pvy4f0z3h9vnpnnqp9l1cwgkpwwzlqsk9z"; depends=[cluster clusterExperiment data_table entropy Matrix scater SingleCellExperiment SummarizedExperiment]; };
   netbenchmark = derive2 { name="netbenchmark"; version="1.13.0"; sha256="0ssagk6gwdbrqwc037y05xjbnaiv7k5mq8rmwmx6y3d74jwwpb3d"; depends=[c3net corpcor fdrtool GeneNet GENIE3 grndata Matrix minet PCIT pracma Rcpp]; };
   netbiov = derive2 { name="netbiov"; version="1.15.0"; sha256="1njiy14g8pf4yps4npwsm4x883qgixwvv0f3p2pb69p9r4kg0phy"; depends=[igraph]; };
-  nethet = derive2 { name="nethet"; version="1.13.0"; sha256="0kvwwcwm4hx1r3f24s84pw19vms0aj0bacd79c3r7z26mlmzw7zh"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; };
+  nethet = derive2 { name="nethet"; version="1.13.1"; sha256="1rsgm1war7y5hjxcihjjfnha52jphlh3sayh1wmxwxn56cqfnsdr"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; };
   netprioR = derive2 { name="netprioR"; version="1.7.0"; sha256="076b72g6b9k2zz277i6whjw49jcl6b3bmr9n652nc11d1ydwq3ic"; depends=[doParallel dplyr foreach ggplot2 gridExtra Matrix pROC sparseMVN]; };
   netresponse = derive2 { name="netresponse"; version="1.41.0"; sha256="1spzd74z279rvpw0vpw3bw19gimhcdrcxk6hgxv1w7b0nllih606"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz]; };
   networkBMA = derive2 { name="networkBMA"; version="2.21.0"; sha256="1gax5312r6cz4s1qxxlg8k63dlk4ja8b57c2br1q0kpcdgbwhrqr"; depends=[BH BMA leaps Rcpp RcppArmadillo RcppEigen]; };
   nnNorm = derive2 { name="nnNorm"; version="2.45.0"; sha256="0m8zcv7kyv7ll6bw599nlihmssfizivkrfm1sqr1ndjwmc8b6blp"; depends=[marray nnet]; };
   nondetects = derive2 { name="nondetects"; version="2.11.0"; sha256="0iiwvad8cb3g2a7701vci7g2qkvhc43arw4cw7zpmg46qk6yhvv0"; depends=[arm Biobase HTqPCR limma mvtnorm]; };
   normalize450K = derive2 { name="normalize450K"; version="1.9.0"; sha256="01j9gp2d7b8n30ckf61ywncw0il81lf6d0sfczr39bqdq2x2xyj3"; depends=[Biobase illuminaio quadprog]; };
-  normr = derive2 { name="normr"; version="1.7.1"; sha256="15ajyr38km4fph8np8r171j4f97fwyvy0jcqdbs79gdh792h12sm"; depends=[bamsignals GenomeInfoDb GenomicRanges IRanges qvalue Rcpp rtracklayer]; };
+  normr = derive2 { name="normr"; version="1.7.2"; sha256="16f73sigq43f5fy74zhcz9pzcvd9hra5yzq4fp5sdkhnsnjd0b02"; depends=[bamsignals GenomeInfoDb GenomicRanges IRanges qvalue Rcpp rtracklayer]; };
   npGSEA = derive2 { name="npGSEA"; version="1.17.0"; sha256="0fw33zgrp9wkchddagsd93ijkspi20d8p7yvsqspqrjy3yv6yq3i"; depends=[Biobase BiocGenerics GSEABase]; };
-  nucleR = derive2 { name="nucleR"; version="2.13.0"; sha256="17fndr7wp7i31k3g18chm6nvqmh1di8s0l0v3kp61sn7v4qbfcc8"; depends=[Biobase BiocGenerics Biostrings dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges magrittr Rsamtools S4Vectors ShortRead]; };
+  nuCpos = derive2 { name="nuCpos"; version="0.99.1"; sha256="0p1nijap5a66q9ldh3mqdjg7b29wz1pfixy3zrwhmr05gar5c78y"; depends=[]; };
+  nucleR = derive2 { name="nucleR"; version="2.13.1"; sha256="19y523lg3a2jb9ajqyz0qky292makxmirj9f9244n9xmcm84sm2w"; depends=[Biobase BiocGenerics Biostrings dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges magrittr Rsamtools S4Vectors ShortRead]; };
   nucleoSim = derive2 { name="nucleoSim"; version="1.9.0"; sha256="0bn8gihg4b70gmdyvn91i5adzfbkfaqcb59kv3y56dss04ss736j"; depends=[IRanges S4Vectors]; };
   occugene = derive2 { name="occugene"; version="1.41.0"; sha256="13dqbp1kaan56xqlgfdqrld0l3qwky6487mf9j0g7788yxwl1fnm"; depends=[]; };
   odseq = derive2 { name="odseq"; version="1.9.0"; sha256="0yyg4y77ch7x0f6xa10wnz8kydc2pjrrpbvdc448388acmmbpdbl"; depends=[kebabs mclust msa]; };
-  oligo = derive2 { name="oligo"; version="1.45.0"; sha256="1w36wqry07ml048q55xnckb2mldv4llivsc72b9j5vhn54776n9d"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; };
-  oligoClasses = derive2 { name="oligoClasses"; version="1.43.1"; sha256="14h79m2pq7a5472xh9rvbn5dfr07nczx0iz8g7jc7sji10jp83nd"; depends=[affyio Biobase BiocGenerics BiocInstaller Biostrings DBI ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; };
-  omicRexposome = derive2 { name="omicRexposome"; version="1.3.0"; sha256="1x18vkfn1m8cwzwdg9lvpbmiprgpy3hs4x9h6jwqavgdnpq8lv60"; depends=[Biobase ggplot2 ggrepel gridExtra isva limma omicade4 PMA SmartSVA stringr SummarizedExperiment sva]; };
+  oligo = derive2 { name="oligo"; version="1.45.2"; sha256="01z9jhnnnnaprpp7zcl4727wkwrhn25djb94fiw7ycb830nqnkxv"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; };
+  oligoClasses = derive2 { name="oligoClasses"; version="1.43.3"; sha256="13c7hkbifylm315h4qgqbn9fv5i0742k4rmcjf72ll9wj1yqjzf9"; depends=[affyio Biobase BiocGenerics BiocManager Biostrings DBI ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; };
+  omicRexposome = derive2 { name="omicRexposome"; version="1.3.1"; sha256="14dqybpgj57avgsmjhf63lcy5n8r4g77idlpnblkqj0c232mpq6v"; depends=[Biobase ggplot2 ggrepel gridExtra isva limma MultiDataSet omicade4 PMA rexposome SmartSVA stringr SummarizedExperiment sva]; };
   omicade4 = derive2 { name="omicade4"; version="1.21.0"; sha256="055jnv8m9fhj2hixbc997mqv56p07azg40k8qb91mdc8fidypka6"; depends=[ade4 made4]; };
-  omicplotR = derive2 { name="omicplotR"; version="1.1.2"; sha256="0myr943y0dvpyh75sjc41cj9i77psmy7j60vl3y4daqd9vbgpkws"; depends=[ALDEx2 compositions knitr matrixStats rmarkdown shiny vegan zCompositions]; };
+  omicplotR = derive2 { name="omicplotR"; version="1.1.4"; sha256="0d2jhnjhxl2kl8s33fl45v2yyb85gjx9api8qwhpiny4bh12rq3q"; depends=[ALDEx2 compositions knitr matrixStats rmarkdown shiny vegan zCompositions]; };
   omicsPrint = derive2 { name="omicsPrint"; version="1.1.0"; sha256="0zsx8zabz07jyfl1xj28ak6k69jfrrig38psl7qny82ydz8bnbas"; depends=[MASS matrixStats MultiAssayExperiment RaggedExperiment SummarizedExperiment]; };
   oncomix = derive2 { name="oncomix"; version="1.3.0"; sha256="0rpwkksxakhwhqvir646gj0x8b1nqsnc2cvjzvh0mlxvv4zmmc0n"; depends=[ggplot2 ggrepel mclust RColorBrewer SummarizedExperiment]; };
-  oneSENSE = derive2 { name="oneSENSE"; version="1.3.0"; sha256="1krimcp6p2m6ls7vkkyfpacjxmg8fa1shwjw5cl2nvcgbn391k15"; depends=[flowCore gplots plotly Rtsne scatterplot3d shiny shinyFiles webshot]; };
+  oneSENSE = derive2 { name="oneSENSE"; version="1.3.1"; sha256="15790wlbw8ff752lqipmib5mq1chq1wvrrq6yj5zargdv4lffrik"; depends=[flowCore gplots plotly Rtsne scatterplot3d shiny shinyFiles webshot]; };
   onlineFDR = derive2 { name="onlineFDR"; version="0.99.7"; sha256="18naq5jfds1njalqqsi6b1hs2sld55flnv63s8yk2cnhpjcfyq47"; depends=[]; };
-  ontoProc = derive2 { name="ontoProc"; version="1.3.1"; sha256="0hh9rha7b5y3hnahmk1mkmwi22bdrjnm6r7fym2lpgdaihs3b43z"; depends=[AnnotationDbi Biobase ontologyIndex S4Vectors shiny]; };
-  openCyto = derive2 { name="openCyto"; version="1.19.1"; sha256="1i8n1yzrnmbl0h6ykqj9hl30nml8nvlvz4b975w1jh5sp21x0gcv"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
-  openPrimeR = derive2 { name="openPrimeR"; version="1.3.0"; sha256="0sq1f9ir2n9rrxa10cjwfsk1rwmi0aryd31z9zb9i5hciinv99gy"; depends=[ape BiocGenerics Biostrings DECIPHER digest distr distrEx dplyr fitdistrplus foreach GenomicRanges ggplot2 Hmisc IRanges lpSolveAPI magrittr openxlsx plyr RColorBrewer reshape2 S4Vectors scales seqinr stringdist stringr uniqtag XML]; };
-  openPrimeRui = derive2 { name="openPrimeRui"; version="1.3.0"; sha256="08ysqxf6dl5rsbxgfv6z9llxclmqn2gwf775r3py0x49sx4ra2hn"; depends=[DT openPrimeR rmarkdown shiny shinyBS shinyjs]; };
-  oposSOM = derive2 { name="oposSOM"; version="1.19.1"; sha256="16rnwlay7m6y4cf9333bq7zwnp5lcy1i1p23zl0mcvzlb9mam4j1"; depends=[ape arules Biobase biomaRt fastICA fdrtool igraph pixmap scatterplot3d som tsne]; };
-  oppar = derive2 { name="oppar"; version="1.9.0"; sha256="0j26hqskvfv8qb13kmi4dcg3ylzxgwxl4xn4chvi5k8svli4r2qw"; depends=[Biobase GSEABase GSVA]; };
-  pRolocGUI = derive2 { name="pRolocGUI"; version="1.15.0"; sha256="0vrpylrnl02abj6akcp0fb06fk18k42xv78g5f4cyy2jqdgqgijq"; depends=[Biobase dplyr DT ggplot2 MSnbase scales shiny]; };
+  ontoProc = derive2 { name="ontoProc"; version="1.3.5"; sha256="0xv0hin8khcpyj6dxnadncy62isdixjgaq8m1n8i49b0f368bgji"; depends=[AnnotationDbi Biobase ontologyIndex S4Vectors shiny]; };
+  openCyto = derive2 { name="openCyto"; version="1.19.2"; sha256="0m2lalpd9hn1vn62n6lfz4kflfdq188m5vcxdjmlj7wzkxijdcmw"; depends=[Biobase BiocGenerics clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
+  openPrimeR = derive2 { name="openPrimeR"; version="1.3.2"; sha256="0fc12pzp2b7ns1k039v43ns1d10k9lmww6pjrgvyxhrwdd16b9vn"; depends=[ape BiocGenerics Biostrings DECIPHER digest distr distrEx dplyr fitdistrplus foreach GenomicRanges ggplot2 Hmisc IRanges lpSolveAPI magrittr openxlsx plyr RColorBrewer reshape2 S4Vectors scales seqinr stringdist stringr tinytex uniqtag XML]; };
+  openPrimeRui = derive2 { name="openPrimeRui"; version="1.3.1"; sha256="10hky16l94bx0n3r12kq8951wjcm30kgp8qciqgji563kjq9lbww"; depends=[DT openPrimeR rmarkdown shiny shinyBS shinyjs]; };
+  oposSOM = derive2 { name="oposSOM"; version="1.99.0"; sha256="1k85a2ixnxzclfaw5is9myppmb3slpyd6n1jyg67y0ii6zac2aig"; depends=[ape Biobase biomaRt fastICA fdrtool igraph pixmap Rcpp RcppParallel scatterplot3d tsne]; };
+  oppar = derive2 { name="oppar"; version="1.9.1"; sha256="0irzz17xd1vf5syqzr8sp2rv7076xi64mr2anwp63xfx2xh02wrp"; depends=[Biobase GSEABase GSVA]; };
+  pRoloc = derive2 { name="pRoloc"; version="1.21.9"; sha256="11l2jssdrg3lz0svnjskk280xlkyzfymfhkq13517zv6jshn23gl"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class coda dendextend e1071 FNN ggplot2 gtools hexbin kernlab knitr LaplacesDemon lattice MASS mclust mixtools MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; };
+  pRolocGUI = derive2 { name="pRolocGUI"; version="1.15.2"; sha256="0yljbianwqb214g47s9s5s80sfiay6vxrgkzciibyr0bmn7bmrmb"; depends=[Biobase dplyr DT ggplot2 MSnbase pRoloc scales shiny]; };
   paircompviz = derive2 { name="paircompviz"; version="1.19.0"; sha256="1glli54k00gpm04p177hwgsdq352ypc7r8swbksk18j8xghk8cq4"; depends=[Rgraphviz]; };
   pandaR = derive2 { name="pandaR"; version="1.13.0"; sha256="13mv40jsclngfzcapscw0wxv67dd2ym4kkpcvy2v03z37ak3n1fk"; depends=[Biobase BiocGenerics ggplot2 hexbin igraph matrixStats plyr reshape RUnit]; };
-  panelcn_mops = derive2 { name="panelcn.mops"; version="1.3.0"; sha256="17d8ms86xvhqprwazi3cnv3sxyaxmammkf3dczka78i0dwl0p0df"; depends=[cn_mops GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; };
+  panelcn_mops = derive2 { name="panelcn.mops"; version="1.3.1"; sha256="13p3rrmkjv58f3hac26bxgwrknx6bhdhxkg2c4z1yxh9jny96h9a"; depends=[cn_mops GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors]; };
   panp = derive2 { name="panp"; version="1.51.0"; sha256="1yrxsjc0r9z0nfgbc9n9p5mhqhyx7x76v7vcjah6hdv4svi78csc"; depends=[affy Biobase]; };
   parglms = derive2 { name="parglms"; version="1.13.3"; sha256="0x8j7ffz8h7303n90v27wcb71x75m7j1rq4yz59iv9fpis16yj27"; depends=[BatchJobs BiocGenerics doParallel foreach]; };
-  parody = derive2 { name="parody"; version="1.39.0"; sha256="0lkv6csikcm2jw70gz3bkzjzj48w8dlx1gfc0sh5l49q2szn3fha"; depends=[]; };
+  parody = derive2 { name="parody"; version="1.39.1"; sha256="0213vnj1mbnc9zhrxidqjz5ls8nrgz7ljmz0f9hrbixn2k369ccl"; depends=[]; };
   pathRender = derive2 { name="pathRender"; version="1.49.0"; sha256="1ln36h3jy35398r92i5hm4qvcjfsmc0frpy4dpgi75ab1wgjzb1s"; depends=[AnnotationDbi cMAP graph RColorBrewer Rgraphviz]; };
   pathVar = derive2 { name="pathVar"; version="1.11.2"; sha256="1v0pia06qx995b9y4vllp844f5846877zyl587xz5026mnbr5p5l"; depends=[data_table EMT ggplot2 gridExtra Matching mclust]; };
   pathifier = derive2 { name="pathifier"; version="1.19.0"; sha256="0sazl4wi6pivvr2r098parc8j68hq8apfjb0nk6vicfisx0dqk1h"; depends=[princurve R_oo]; };
   pathprint = derive2 { name="pathprint"; version="1.11.3"; sha256="14x9i2gkra49aqnpi0xd94430nl05sw3yr85ramaxrzavm7lxvsf"; depends=[]; };
-  pathview = derive2 { name="pathview"; version="1.21.0"; sha256="0s8mq51gknca91qgy4q7fmgm4ga251w214f3zapc7zlxykb2qrys"; depends=[AnnotationDbi graph KEGGgraph KEGGREST org_Hs_eg_db png Rgraphviz XML]; };
-  paxtoolsr = derive2 { name="paxtoolsr"; version="1.15.0"; sha256="1fr6w5jbhj5rdsb53cafzsdn23b2rfcyyi6ivcfvn408x59cg3fg"; depends=[data_table httr igraph jsonlite plyr R_utils rJava rjson XML]; };
+  pathview = derive2 { name="pathview"; version="1.21.2"; sha256="14021aqb36s56w9j439ydgbv2b4yk7sbsndrmyzbdxrisi6q3xyw"; depends=[AnnotationDbi graph KEGGgraph KEGGREST org_Hs_eg_db png Rgraphviz XML]; };
+  paxtoolsr = derive2 { name="paxtoolsr"; version="1.15.1"; sha256="13rc66d9fyd85haylmc55irvshrfrxgny3l539ga1zq4h6bhlxz6"; depends=[httr igraph jsonlite plyr R_utils readr rJava rjson XML]; };
   pbcmc = derive2 { name="pbcmc"; version="1.9.0"; sha256="1hxhpxixl5jfpiqpwqvkfcnp2k7sw43asc5ikj6qpl4p5xrrfn0d"; depends=[Biobase BiocGenerics BiocParallel cowplot genefu ggplot2 gridExtra limma reshape2]; };
-  pcaExplorer = derive2 { name="pcaExplorer"; version="2.7.0"; sha256="138a6qrg0cqq5n5565i5y4fzlbk79hjk11ziz8hh2dxbymv1h9mq"; depends=[AnnotationDbi biomaRt d3heatmap DESeq2 DT genefilter GenomicRanges ggplot2 ggrepel GO_db GOstats IRanges knitr limma NMF pheatmap plyr rmarkdown S4Vectors scales shiny shinyAce shinyBS shinydashboard SummarizedExperiment threejs tidyr topGO]; };
-  pcaGoPromoter = derive2 { name="pcaGoPromoter"; version="1.25.0"; sha256="10c08lawhg1p7jydk2bb5z6rjn7pjrfr069s06syababq75j1pnw"; depends=[AnnotationDbi Biostrings ellipse]; };
-  pcaMethods = derive2 { name="pcaMethods"; version="1.73.0"; sha256="0k079s8fwqhwk5hmbl0rqi52nav2dzbbsilnn2a2x92c2rzfiqc0"; depends=[Biobase BiocGenerics MASS Rcpp]; };
+  pcaExplorer = derive2 { name="pcaExplorer"; version="2.7.6"; sha256="0dwhd5ybli05wlv8j0l639phbksm0h9g418bdq2x9f7h1vskr3z5"; depends=[AnnotationDbi biomaRt d3heatmap DESeq2 DT genefilter GenomicRanges ggplot2 ggrepel GO_db GOstats IRanges knitr limma NMF pheatmap plyr rmarkdown S4Vectors scales shiny shinyAce shinyBS shinydashboard SummarizedExperiment threejs tidyr topGO]; };
+  pcaGoPromoter = derive2 { name="pcaGoPromoter"; version="1.25.1"; sha256="1dfvd3bb7v5dz58icb7j802fj358waa6xs8sasz0kvlvapma9kx1"; depends=[AnnotationDbi Biostrings ellipse]; };
+  pcaMethods = derive2 { name="pcaMethods"; version="1.73.1"; sha256="0vslvglp2j6zkkbjcwj66bbv683qzjnqlpa8adb8wmgc2l4a1rkv"; depends=[Biobase BiocGenerics MASS Rcpp]; };
   pcot2 = derive2 { name="pcot2"; version="1.49.0"; sha256="0ffg35602h7k904dq47sgnfyky041alnypaf3gvx7m6f8yszq46c"; depends=[amap Biobase]; };
-  pcxn = derive2 { name="pcxn"; version="2.3.0"; sha256="1d7maq8vbxcs1bvz4qlc29583nbfq6jpan0gsqday51xj7ngqbcs"; depends=[pcxnData pheatmap]; };
+  pcxn = derive2 { name="pcxn"; version="2.3.1"; sha256="0yp9hfbval7ind2nqa2n4nfafgbrfr4gq7hm7dkrfampp7if66j3"; depends=[pcxnData pheatmap]; };
   pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.45.0"; sha256="15whr6rjdf75z6wg9k8zsyvfn08vidimzx2rw6ki1zmbh0fz8in6"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
   pepStat = derive2 { name="pepStat"; version="1.15.0"; sha256="08dpwiphw9s8dafy4m946jxi1jfyc3lzzdg4h0ax7d6knzq0za73"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; };
   pepXMLTab = derive2 { name="pepXMLTab"; version="1.15.0"; sha256="1bwp82zvg65yrhlx1xk2jci9fqsgc83h1x7124ci2afzlvx56ms5"; depends=[XML]; };
   perturbatr = derive2 { name="perturbatr"; version="1.1.0"; sha256="0cwk2f0bm9vlgdngb9blcpcwg2gl8ik0rdx0a6i36qzdd256qk91"; depends=[assertthat diffusr doParallel dplyr foreach formula_tools ggplot2 igraph lazyeval lme4 magrittr rlang scales tibble tidyr]; };
-  pgca = derive2 { name="pgca"; version="1.5.0"; sha256="1scxcrfs8b0rw38c0v569dnq2b5viqvm3ckjwm1gzqgxcjy6r324"; depends=[]; };
-  phantasus = derive2 { name="phantasus"; version="1.1.2"; sha256="1g4q9ff11i7xfw29g9mqwqvr1py4mwwddd0yr1dhw92abbc5w2z4"; depends=[assertthat Biobase fgsea GEOquery ggplot2 htmltools httpuv httr jsonlite limma opencpu protolite rhdf5 Rook stringr svglite]; };
+  pgca = derive2 { name="pgca"; version="1.5.1"; sha256="11la42gqiqxwlms84lc1dsvpys3bmrzwz5d8vcx4xwnl9pc3lqhh"; depends=[]; };
+  phantasus = derive2 { name="phantasus"; version="1.1.5"; sha256="148mxhmc0qymjdkx64ji4karaazx89vmwmyrrk8d1g7m3lj1qpvl"; depends=[assertthat Biobase ccaPP fgsea GEOquery ggplot2 gtable htmltools httpuv httr jsonlite limma Matrix Matrix_utils opencpu pheatmap protolite rhdf5 Rook scales stringr svglite]; };
   phenoTest = derive2 { name="phenoTest"; version="1.29.0"; sha256="10mw83ivb99ipndjjc5r69wpsanfvzx01bfpzhq5pygjzhl6m8jb"; depends=[annotate AnnotationDbi Biobase biomaRt BMA Category ellipse genefilter ggplot2 gplots GSEABase Heatplus hgu133a_db Hmisc hopach HTSanalyzeR limma mgcv SNPchip survival xtable]; };
   phenopath = derive2 { name="phenopath"; version="1.5.0"; sha256="05a1d7apyhg4d4nahl97i0794fji6dnnd454wfww89adjx68nfnc"; depends=[dplyr ggplot2 Rcpp SummarizedExperiment tibble tidyr]; };
-  philr = derive2 { name="philr"; version="1.7.0"; sha256="165k6cnj08lpkw66zljiqqwfy1knd2n46mg734d0fiy72j2va4z2"; depends=[ape ggplot2 ggtree phangorn tidyr]; };
-  phosphonormalizer = derive2 { name="phosphonormalizer"; version="1.5.0"; sha256="0m9lgg1wcyy3ppxvmkgdv5ccz48j5mw1fsxg21vw08hpm6fm9y60"; depends=[matrixStats plyr]; };
-  phyloseq = derive2 { name="phyloseq"; version="1.25.0"; sha256="1344gil3dsnvy92fsp91wvh6j1rd7xzjjapmjkvdz5rjs5rh0kd2"; depends=[ade4 ape Biobase BiocGenerics biomformat Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; };
-  piano = derive2 { name="piano"; version="1.21.0"; sha256="1d7gld59bryzcvnvl6x8wx3v1wji58rs4zszsqpyz73qmw8ikw0d"; depends=[Biobase BiocGenerics fgsea gplots igraph marray relations]; };
+  philr = derive2 { name="philr"; version="1.7.3"; sha256="1nzn6xv5kkm1babdimhvcjd5ql58hhj772asjd1i6r4qbidzyjfd"; depends=[ape ggplot2 ggtree phangorn tidyr]; };
+  phosphonormalizer = derive2 { name="phosphonormalizer"; version="1.5.1"; sha256="1bvbjm42nr1mjxixbcd39g4qz4171qrb7x7ssz5jkrf8y3j26yxa"; depends=[matrixStats plyr]; };
+  phyloseq = derive2 { name="phyloseq"; version="1.25.3"; sha256="081f1fwkda6am9i64y2zq8z6xiz9z7hfz3agrlxkfrrfc455ch65"; depends=[ade4 ape Biobase BiocGenerics biomformat Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; };
+  piano = derive2 { name="piano"; version="1.21.1"; sha256="1adwsk3vkdg3695yjfw6sip1ww8zfd90dmmbzsf1kryidlkl60nz"; depends=[Biobase BiocGenerics fgsea gplots igraph marray relations]; };
   pickgene = derive2 { name="pickgene"; version="1.53.0"; sha256="1nklcgm3wryljq22hc3fcja6x2kwa9bilp76gzhy8zpj8swwjszl"; depends=[MASS]; };
   pint = derive2 { name="pint"; version="1.31.0"; sha256="10kwlp947h03w8xqcs9qcyp21wvx60sl47k2cnbrdhva3wf35vp3"; depends=[dmt Matrix mvtnorm]; };
-  pkgDepTools = derive2 { name="pkgDepTools"; version="1.47.1"; sha256="08wc5qklyddz5p237q75dipvykiksdr17xcd2qkfzj3138wfkgvy"; depends=[graph RBGL]; };
+  pkgDepTools = derive2 { name="pkgDepTools"; version="1.47.2"; sha256="12bc56a5l3p9mdi15ryinicvyyzv58qwprksixjwm54mx42r5kw2"; depends=[graph RBGL]; };
   plateCore = derive2 { name="plateCore"; version="1.39.0"; sha256="0vf42ms3vky8n2n7x16kc284252zifjmch32lsww0lmsxv0h857n"; depends=[Biobase flowCore flowStats flowViz lattice latticeExtra MASS robustbase]; };
-  plethy = derive2 { name="plethy"; version="1.19.0"; sha256="05v123qrpasl11kivp1p2ib0v638yi4y19gk4df8mfald95nxcmn"; depends=[Biobase BiocGenerics DBI ggplot2 IRanges plyr RColorBrewer reshape2 RSQLite S4Vectors Streamer]; };
+  plethy = derive2 { name="plethy"; version="1.19.1"; sha256="0pmrryxkxpgrb8c4pr25ajfn3v6m53810xz9da1j3hnyk9l42ha7"; depends=[Biobase BiocGenerics DBI ggplot2 IRanges plyr RColorBrewer reshape2 RSQLite S4Vectors Streamer]; };
   plgem = derive2 { name="plgem"; version="1.53.0"; sha256="04hwkr3v126mildi76jfr5b8s8lly9z60iydh5i3dc5zsyd6h84f"; depends=[Biobase MASS]; };
   plier = derive2 { name="plier"; version="1.51.0"; sha256="1m7bwaypnaw7kk756k0wl6xi3s0j9awi986lpa8ncjv587q0442h"; depends=[affy Biobase]; };
+  plotGrouper = derive2 { name="plotGrouper"; version="0.99.43"; sha256="1b36ay09h0fx3kcyiw1pd48750b6slqzidw8g2bvjpgw2i03f4ww"; depends=[colourpicker dplyr egg ggplot2 ggpubr gridExtra gtable Hmisc magrittr readr readxl rlang scales shiny shinythemes stringr tibble tidyr]; };
   plrs = derive2 { name="plrs"; version="1.21.0"; sha256="18k3xad3gmkw74klyvqzbvnlr1pq93is6dqxm2bxb4cmzar12f6k"; depends=[Biobase BiocGenerics CGHbase ic_infer marray quadprog Rcsdp]; };
   plw = derive2 { name="plw"; version="1.41.0"; sha256="0q9dwj7rznhdj1h34ygnw0snfswnr8ycx0927jzsiiycz31n8z0f"; depends=[affy MASS]; };
-  plyranges = derive2 { name="plyranges"; version="1.1.8"; sha256="10p0i8q229gy0z3fg90m3xaib32v9w1zxcmn3gb87ipz9mic8ykk"; depends=[BiocGenerics dplyr GenomeInfoDb GenomicAlignments GenomicRanges IRanges magrittr rlang Rsamtools rtracklayer S4Vectors tidyr tidyselect]; };
+  plyranges = derive2 { name="plyranges"; version="1.1.10"; sha256="0q9dsgnflr9gly3x4kbvr8ambfz5k5mvgn6hj9qyyb2vy6viqvni"; depends=[BiocGenerics dplyr GenomeInfoDb GenomicAlignments GenomicRanges IRanges magrittr rlang Rsamtools rtracklayer S4Vectors tidyr tidyselect]; };
   pmm = derive2 { name="pmm"; version="1.13.0"; sha256="0p0xnkz6hgnpvai7947861kw5hmjwwf3zj2y423whdr7x2lpdayw"; depends=[lme4]; };
-  podkat = derive2 { name="podkat"; version="1.13.0"; sha256="1h297id3gxix06xmhqkl1lc5gfp4vi8jkfh2gpld4bw233fvi6h5"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; };
+  podkat = derive2 { name="podkat"; version="1.13.1"; sha256="0brp4d5y0708yv1b2jylywp4j7fknxy5vayss5jr9xp82sbahagz"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; };
   pogos = derive2 { name="pogos"; version="1.1.0"; sha256="1135bxxhamcxs5hn6hq43hc7s7cr9v0jy2884dz7f9qvgnrqhymi"; depends=[ggplot2 httr ontoProc rjson S4Vectors shiny]; };
-  polyester = derive2 { name="polyester"; version="1.17.0"; sha256="0dz73jsyx3yivpmxz7p1q14i2rvj388bq53d7w1mz3ixrqilzgz2"; depends=[Biostrings IRanges limma logspline S4Vectors zlibbioc]; };
-  powerTCR = derive2 { name="powerTCR"; version="1.1.1"; sha256="0427r8qwy8j3z2mpvka2b6y2k39nwiy86gb06njs6m19f597936v"; depends=[cubature evmix magrittr purrr tcR truncdist VGAM]; };
+  polyester = derive2 { name="polyester"; version="1.17.2"; sha256="1f2vd15qfkbka9pi88n61mrsmxx7pnl88aiarm5ahy4nmdv3fyrq"; depends=[Biostrings IRanges limma logspline S4Vectors zlibbioc]; };
+  powerTCR = derive2 { name="powerTCR"; version="1.1.4"; sha256="0zf2ip194y5ad7xzzkplv1lbilpns2l78flf8snrvi14n8588gjj"; depends=[cubature doParallel evmix foreach magrittr purrr tcR truncdist vegan VGAM]; };
   ppiStats = derive2 { name="ppiStats"; version="1.47.0"; sha256="0prrs1g99g55i993689c6s497crijnl96z2qzgga1y9w4zbf6g88"; depends=[Biobase Category graph lattice ppiData RColorBrewer ScISI]; };
-  pqsfinder = derive2 { name="pqsfinder"; version="1.9.0"; sha256="1igg500dvwq1lvxyl0c8fcdkgpmxzsxcd6c24pz0dhjqsaxml2as"; depends=[BH Biostrings GenomicRanges IRanges Rcpp S4Vectors]; };
+  pqsfinder = derive2 { name="pqsfinder"; version="1.9.2"; sha256="1hj0mx9ii7rxjcwn8mg2ywhlzpf4ckwxf8w9ms7fkj7kk37r9wy1"; depends=[BH Biostrings GenomicRanges IRanges Rcpp S4Vectors]; };
   prada = derive2 { name="prada"; version="1.57.0"; sha256="0isj6w4lzfsqwwzs3njddabn2xznjqhp0bbihwfvc31kiya9k8di"; depends=[Biobase BiocGenerics MASS RColorBrewer rrcov]; };
-  prebs = derive2 { name="prebs"; version="1.21.0"; sha256="0q5ibq492jw8axp50qijn0fsa5qxarxnlxz4s8hv3ql6rjlsiw8v"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; };
+  prebs = derive2 { name="prebs"; version="1.21.3"; sha256="0gqgl5sqsn92b5rck85nn4ri5b6mzvgyk13n9dp5qa0hxvdifhx4"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; };
   predictionet = derive2 { name="predictionet"; version="1.27.0"; sha256="0ls88pw7k1vy3qjzl91dj6kfbkgvz67448zhj1b3g308b33qasqk"; depends=[catnet igraph MASS penalized RBGL]; };
   preprocessCore = derive2 { name="preprocessCore"; version="1.43.0"; sha256="13859ip42jk6j6ngs8bwkzfarrqzd0jzhq9kdgsnicl9kf9k9vj6"; depends=[]; };
+  primirTSS = derive2 { name="primirTSS"; version="0.99.29"; sha256="17d2x3y5iiz0r840d8adkb7lypdyhp76izxbkj42b89rqsfm5v2j"; depends=[BiocGenerics Biostrings BSgenome_Hsapiens_UCSC_hg38 dplyr GenomicRanges GenomicScores Gviz IRanges JASPAR2018 phastCons100way_UCSC_hg38 purrr R_utils rtracklayer S4Vectors shiny stringr TFBSTools tibble tidyr]; };
   proBAMr = derive2 { name="proBAMr"; version="1.15.0"; sha256="1cl1ns7m1d1n3ayhga7f45xrjx9cy2a8l9xs2z7x3074kx8h8xxg"; depends=[AnnotationDbi Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer]; };
   proFIA = derive2 { name="proFIA"; version="1.7.0"; sha256="1qx79xamr77rjdfr50ms0dzrmwqwc2fzd24k2njbknxvz8kay5is"; depends=[Biobase BiocParallel minpack_lm missForest pracma ropls xcms]; };
-  procoil = derive2 { name="procoil"; version="2.9.0"; sha256="048wkmsidcw31mqjli2vspkf332ddx74dd709xbw5bkggw5l5a0b"; depends=[Biostrings kebabs S4Vectors]; };
+  procoil = derive2 { name="procoil"; version="2.9.1"; sha256="1dhb7aphl93rxqk2k3fx8nrwgbd07wckrfx44c72fq0biam5qi5j"; depends=[Biostrings kebabs S4Vectors]; };
   profileScoreDist = derive2 { name="profileScoreDist"; version="1.9.0"; sha256="1jv9szg451ljggx458sgcgiaf1p6i7sin62lhbh6b8jn1s4h7qrw"; depends=[BiocGenerics Rcpp]; };
   progeny = derive2 { name="progeny"; version="1.3.0"; sha256="0rini10n59yzyq7bzckbyxvvl2lgj35k4dzm72lx47cws8nlqyl0"; depends=[Biobase]; };
-  prot2D = derive2 { name="prot2D"; version="1.19.0"; sha256="1aawirq8plgdrz88yzzqh3p1m8y17ygf2l3a433lzrm3ffz6y3qx"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; };
-  proteinProfiles = derive2 { name="proteinProfiles"; version="1.21.0"; sha256="0zvgf4zmx42idyy8c6zfmf4gv22gxpyw1bs8285d9bfjk7qpvgwc"; depends=[]; };
+  prot2D = derive2 { name="prot2D"; version="1.19.1"; sha256="141f38lcvrm0nirghx31gr3qzfq3q5zmqvvzcf5071s60hhm3syb"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; };
+  proteinProfiles = derive2 { name="proteinProfiles"; version="1.21.1"; sha256="1s35xglin78hv8f83jzi1racvklmnpf3gyjqxl60fj2i8b2r27dz"; depends=[]; };
   proteoQC = derive2 { name="proteoQC"; version="1.17.0"; sha256="17a6wmkxr8jfb7nbwykfc562fgj4p8addq5idajag2ijaiycvzz5"; depends=[dplyr ggplot2 MSnbase Nozzle_R1 plotly plyr reshape2 rmarkdown rpx rTANDEM seqinr tidyr VennDiagram XML]; };
   psichomics = derive2 { name="psichomics"; version="1.7.0"; sha256="0vj20pw305p4i08s7kxj0np1xxi8mhdlasagypc76ysnlhq0w6bn"; depends=[AnnotationHub cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma miscTools pairsD3 plyr R_utils Rcpp shiny shinyBS shinyjs stringr survival XML xtable]; };
-  psygenet2r = derive2 { name="psygenet2r"; version="1.13.0"; sha256="0hpipknbcg3ic6sr19ksy1zs71h2kk3p1bvvhqy4xirajzqf3z41"; depends=[BgeeDB Biobase BiocInstaller biomaRt ggplot2 GO_db igraph labeling RCurl reshape2 stringr topGO]; };
-  puma = derive2 { name="puma"; version="3.23.0"; sha256="1h299ach0bff17az4vfa7dbb9x8z3b32mfmg322afpmfvj3xdqa7"; depends=[affy affyio Biobase mclust oligo oligoClasses]; };
-  pvac = derive2 { name="pvac"; version="1.29.0"; sha256="0ax1pndxw4knhas0cp54b9gyr3xjl6rriyif1sccmqrszswkdv06"; depends=[affy Biobase]; };
-  pvca = derive2 { name="pvca"; version="1.21.0"; sha256="0ayi9f2zd5f3c96w8kfb68nmd6idbg1l19h0ys1zdjgzz1dkqqc2"; depends=[Biobase lme4 Matrix vsn]; };
+  psygenet2r = derive2 { name="psygenet2r"; version="1.13.3"; sha256="0ldyrzhxw7m146yfm5fjr917g089f0mnhddinsqmd7h5pykhidb2"; depends=[BgeeDB Biobase BiocManager biomaRt ggplot2 GO_db igraph labeling RCurl reshape2 stringr topGO]; };
+  puma = derive2 { name="puma"; version="3.23.3"; sha256="0jk8696hna14c261ni1xpi5klfpgzjci9yd62nkqfvf3pynl12a9"; depends=[affy affyio Biobase mclust oligo oligoClasses]; };
+  pvac = derive2 { name="pvac"; version="1.29.2"; sha256="087bmn6snyvw7z3j3xzga31rq4w81fxx46c54drapz6pfjmc0gzy"; depends=[affy Biobase]; };
+  pvca = derive2 { name="pvca"; version="1.21.1"; sha256="0j2hqix5ih462rr5mpxav8whvkvng3v497qiznb7nlv20p6swgbi"; depends=[Biobase lme4 Matrix vsn]; };
   pwOmics = derive2 { name="pwOmics"; version="1.13.0"; sha256="0y4jsybxd6bcv9hqa25zij5lsbh55790njdy0p383pywbsn2dwvs"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots graph igraph rBiopaxParser STRINGdb]; };
-  qPLEXanalyzer = derive2 { name="qPLEXanalyzer"; version="0.99.9"; sha256="0kaa1y5m150b3c6chpkadcj5l446kjq2hhvwf17n1gn58gzmbalv"; depends=[assertthat Biobase BiocGenerics Biostrings dplyr GenomicRanges ggdendro ggplot2 IRanges limma magrittr MSnbase preprocessCore purrr RColorBrewer statmod stringr tibble tidyr]; };
-  qcmetrics = derive2 { name="qcmetrics"; version="1.19.0"; sha256="1m2q9lhvk9yicsn5anw88hvs3jg7wqfm9vhm1g43hbgjbqy4jzqj"; depends=[Biobase knitr Nozzle_R1 pander S4Vectors xtable]; };
+  qPLEXanalyzer = derive2 { name="qPLEXanalyzer"; version="0.99.12"; sha256="11q97nx0yss8w69jvq58mw34lma700rzkkkxs0qlga4hijjkm3v7"; depends=[assertthat Biobase BiocGenerics Biostrings dplyr GenomicRanges ggdendro ggplot2 IRanges limma magrittr MSnbase preprocessCore purrr RColorBrewer statmod stringr tibble tidyr]; };
+  qcmetrics = derive2 { name="qcmetrics"; version="1.19.2"; sha256="043ybq0ykry2r5xh2gv76lbg16723zsflic930q12hc1pxncxa8m"; depends=[Biobase knitr Nozzle_R1 pander S4Vectors xtable]; };
   qpcrNorm = derive2 { name="qpcrNorm"; version="1.39.0"; sha256="18h58d58c0hs804n0xzsn0ydp4xw5cvab447zxq50g4adajjf7r8"; depends=[affy Biobase limma]; };
-  qpgraph = derive2 { name="qpgraph"; version="2.15.0"; sha256="1q6lrhxq4zra6x3wx3ikc70np8yqz8b6hzgdiy4fxx6b4kjcpnd3"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; };
+  qpgraph = derive2 { name="qpgraph"; version="2.15.2"; sha256="0lw5wfcw9br8k4wr70vp9xqgfjhbnzhjxfw4hzyp9z9h54vb9fay"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; };
   qrqc = derive2 { name="qrqc"; version="1.35.0"; sha256="1mcb7gpncr91lq95vmbf6skjm5hxqlzx25inac3zwj3j4q07ipnk"; depends=[Biostrings biovizBase brew ggplot2 plyr reshape Rsamtools testthat xtable]; };
-  qsea = derive2 { name="qsea"; version="1.7.3"; sha256="11icpr1x374r77kn7fdlys37m8q6xi7g84gnn6m0wdx7srla3aal"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges gtools HMMcopy IRanges limma Rsamtools rtracklayer zoo]; };
-  quantro = derive2 { name="quantro"; version="1.15.0"; sha256="1r9q1kmql8fgdnljgb17simjkfdm14nn0fxmrh09ijg8640bdis4"; depends=[Biobase doParallel foreach ggplot2 iterators minfi RColorBrewer]; };
+  qsea = derive2 { name="qsea"; version="1.7.4"; sha256="1rnm4f9skig9p8i0qz9nrfm6vxnjgi67s8r2665c3c87j52r4gga"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges gtools HMMcopy IRanges limma Rsamtools rtracklayer zoo]; };
+  quantro = derive2 { name="quantro"; version="1.15.2"; sha256="0lf3d17b9d5gszpjknzhc5s2k8m31f8qf4k8y2lsrs7kaqr0skq0"; depends=[Biobase doParallel foreach ggplot2 iterators minfi RColorBrewer]; };
   quantsmooth = derive2 { name="quantsmooth"; version="1.47.0"; sha256="1w2gwaxy90s6laghgdhxqb0c0s93ci8g61zbrn7xjpd6af1vz1md"; depends=[quantreg]; };
-  qusage = derive2 { name="qusage"; version="2.15.0"; sha256="025xjbaw1mkvh0wa656l851f1c2m4sjxqb6xvjks3fz4bwlrk2xr"; depends=[Biobase limma lsmeans nlme]; };
+  qusage = derive2 { name="qusage"; version="2.15.1"; sha256="03fxcg63mlxkc3m3pj5y828spk42h3f5h8l9zcfjmf93qacal6s7"; depends=[Biobase limma lsmeans nlme]; };
   qvalue = derive2 { name="qvalue"; version="2.13.0"; sha256="1g6lfgn73z68imy6qmh9s1zyniaq1wyx8jyllrk4lxpgk17i5dgh"; depends=[ggplot2 reshape2]; };
   r3Cseq = derive2 { name="r3Cseq"; version="1.27.0"; sha256="13cswnxp8ikv95xb3szn7br7xm5ml3mpj365vxhaky2s1x9kxr9p"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; };
-  rBiopaxParser = derive2 { name="rBiopaxParser"; version="2.21.0"; sha256="0bgxw31ivqmzykxhrnzrswf39kxp7sj9kpi4fz8pxggjwnb59pfl"; depends=[data_table XML]; };
+  rBiopaxParser = derive2 { name="rBiopaxParser"; version="2.21.1"; sha256="15lzqw4frw59scwarzcncp1a75xaf274bfy17ypwq0y7fnvqvlh5"; depends=[data_table XML]; };
   rCGH = derive2 { name="rCGH"; version="1.11.2"; sha256="10284xrdqh0pbn8a3ibwr2znf3lajnimli93lrhs4d60cna8wp9n"; depends=[aCGH affy AnnotationDbi DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges lattice limma mclust org_Hs_eg_db plyr shiny TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; };
-  rDGIdb = derive2 { name="rDGIdb"; version="1.7.0"; sha256="12c3ly2x1wc9ry514vzks20drv8q1r19sflhpnwhbc00lmh13s1k"; depends=[httr jsonlite]; };
+  rDGIdb = derive2 { name="rDGIdb"; version="1.7.1"; sha256="195z5zifd48sq96rx9ayijfpqbrs5rygjsgjm42h4zylm2niasxi"; depends=[httr jsonlite]; };
   rGADEM = derive2 { name="rGADEM"; version="2.29.0"; sha256="1bqzmawhz1m00zcbnvznxzvak5f1b65xalr7sgas2sbrd77lvrhr"; depends=[Biostrings BSgenome IRanges seqLogo]; };
-  rGREAT = derive2 { name="rGREAT"; version="1.13.2"; sha256="18cfmvcmk60shrg2pd2qwi1s5679sbrv846vac2py29f6c7gq5zl"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; };
+  rGREAT = derive2 { name="rGREAT"; version="1.13.3"; sha256="0fkcv2nz674i66yd3x34ba3897sdq96c1cns2kj7hjnv92l88qv3"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; };
   rHVDM = derive2 { name="rHVDM"; version="1.47.0"; sha256="1y8dkws06j7jh6rnlq3y91bn5wy8fn2ha224mmvx4qchp6y9xcxd"; depends=[affy Biobase minpack_lm R2HTML]; };
   rMAT = derive2 { name="rMAT"; version="3.31.0"; sha256="0d2hn2jjs6c5xjwf6w0m9v53bb9mfpqvmms5vnzhwh6z3jankavm"; depends=[affxparser Biobase BiocGenerics IRanges]; };
   rRDP = derive2 { name="rRDP"; version="1.15.1"; sha256="0m00070c87za48a4in8bqzb3l77177jqys2ya6wv6xylmfig899j"; depends=[Biostrings]; };
@@ -1372,102 +1461,106 @@ in with self; {
   rTANDEM = derive2 { name="rTANDEM"; version="1.21.0"; sha256="1n7yaycgh5822j119si8i66yn0asg1mz9a9g7idiyvj8gpq54fv5"; depends=[data_table Rcpp XML]; };
   rTRM = derive2 { name="rTRM"; version="1.19.0"; sha256="1x8gbrn4b80v52isxg8a5rhkwijnlx649xyipnj206ky6ihzd3hc"; depends=[AnnotationDbi DBI igraph RSQLite]; };
   rTRMui = derive2 { name="rTRMui"; version="1.19.0"; sha256="0gw5yx609nzk8r8qc7q9zgkfs32s79d8v1zpw2njcb5d6figs7b1"; depends=[MotifDb org_Hs_eg_db org_Mm_eg_db rTRM shiny]; };
-  rWikiPathways = derive2 { name="rWikiPathways"; version="1.1.0"; sha256="0vcqrcg90npn3rmwkywnf0qnjwxw491mn0xrski70yyij2lylckg"; depends=[caTools httr RJSONIO]; };
+  rWikiPathways = derive2 { name="rWikiPathways"; version="1.1.7"; sha256="180pfczj66sm1a7g7r4ykl0qv8bncq7gqp0vf6hr39jmi985shin"; depends=[caTools httr RJSONIO]; };
   rain = derive2 { name="rain"; version="1.15.0"; sha256="0zrxh7bmc9x9rh6zbb0zmv3nvz6l7hqq21h4gh3rzzyjy79vw3aj"; depends=[gmp multtest]; };
   rama = derive2 { name="rama"; version="1.55.0"; sha256="0kmp25yw86vqxf43br2j75svvaprz97s5nvnxxjxbjwiigbjla7h"; depends=[]; };
-  ramwas = derive2 { name="ramwas"; version="1.5.0"; sha256="0g794y9xawkrfcylasjjv123rlsz1yfrdl89nrr4i99jfw7innw2"; depends=[BiocGenerics biomaRt Biostrings digest filematrix GenomicAlignments glmnet KernSmooth Rsamtools]; };
+  ramwas = derive2 { name="ramwas"; version="1.5.1"; sha256="1ixis62wpg0mzrzirgyfmp3k4kglsnw0vhgd1n4mvwa3v49vlbgi"; depends=[BiocGenerics biomaRt Biostrings digest filematrix GenomicAlignments glmnet KernSmooth Rsamtools]; };
   randPack = derive2 { name="randPack"; version="1.27.0"; sha256="0s7460iz01vmkf4a8g3vn6hrfx94bp5mihfyjkcv46nd9p3k6af5"; depends=[Biobase]; };
   rbsurv = derive2 { name="rbsurv"; version="2.39.0"; sha256="08lh9hn97sc0rx9vmkd977kpijs6gqa6r89my7afsvmkm8v7n7ls"; depends=[Biobase survival]; };
-  rcellminer = derive2 { name="rcellminer"; version="2.3.0"; sha256="0rm5azbpyfsdaqxmip7wyw8f5apwac8s6n6cm0sqdwwsslm5dsl4"; depends=[Biobase fingerprint ggplot2 gplots rcdk rcellminerData shiny stringr]; };
-  readat = derive2 { name="readat"; version="1.7.0"; sha256="186hx7r5gvybvp1f6yzpi515b7hsv3a6il02hwpr8y1xdx3408nv"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_sets assertive_types Biobase data_table dplyr magrittr openxlsx pathological reshape2 stringi SummarizedExperiment testthat tidyr]; };
+  rcellminer = derive2 { name="rcellminer"; version="2.3.2"; sha256="0fmg98pcv20gx5c4cbcdcs2cd1a84sg29xld5c7sa76i60ajy6ij"; depends=[Biobase fingerprint ggplot2 gplots rcdk rcellminerData shiny stringr]; };
+  readat = derive2 { name="readat"; version="1.7.2"; sha256="0wskar887f6hyrp7p69z50kilwz0kb2d1f6rllbkgrchlh3zn53g"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_sets assertive_types Biobase data_table dplyr magrittr openxlsx pathological reshape2 stringi SummarizedExperiment testthat tidyr]; };
   reb = derive2 { name="reb"; version="1.59.0"; sha256="0sdlhx64sh55waxj47hz9kfb6bvxrw4ycyzj5cycr1w3sk2idszc"; depends=[Biobase idiogram]; };
-  recount = derive2 { name="recount"; version="1.7.2"; sha256="17cymdrkr9aiszv98qfsy7das1ain2g0g8q4f8ik7bk868ahsaj2"; depends=[BiocParallel derfinder downloader GenomeInfoDb GenomicRanges GEOquery IRanges RCurl rentrez rtracklayer S4Vectors SummarizedExperiment]; };
-  recoup = derive2 { name="recoup"; version="1.9.0"; sha256="0z13mj7b5hywp5mbk0faq01k7d1mpnz2b9633h75hkh04w5260n9"; depends=[BiocGenerics biomaRt circlize ComplexHeatmap GenomicAlignments GenomicRanges ggplot2 plyr rtracklayer]; };
-  regionReport = derive2 { name="regionReport"; version="1.15.1"; sha256="12mbpblgg0lf3kixi1isx92jkxxcnifhwq03ipgigrkd0iv9s7q6"; depends=[BiocStyle DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitcitations knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; };
-  regioneR = derive2 { name="regioneR"; version="1.13.0"; sha256="0iy118hy66d7wina49sh7xwi0akx9hp7k98gwfjc0bpwdj7gs1h9"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer S4Vectors]; };
-  regsplice = derive2 { name="regsplice"; version="1.7.0"; sha256="1gl5isfrqi0xyb4mdv7j6sb8ah4mzmwkaal1kcphjsrj8g46ba80"; depends=[edgeR glmnet limma pbapply S4Vectors SummarizedExperiment]; };
-  restfulSE = derive2 { name="restfulSE"; version="1.3.1"; sha256="02jq9gjf7z70ny1bmywx39igxm29nkmc6qv1acy81gxxpsr8naih"; depends=[AnnotationDbi AnnotationHub bigrquery Biobase DBI DelayedArray dplyr ExperimentHub GO_db magrittr reshape2 rhdf5client rlang S4Vectors SummarizedExperiment]; };
+  recount = derive2 { name="recount"; version="1.7.6"; sha256="03gk0h8aqzky7q1jgmn4f27cm18602m5nqbql9nyfxpbdpy9gdwb"; depends=[BiocParallel derfinder downloader GenomeInfoDb GenomicRanges GEOquery IRanges RCurl rentrez rtracklayer S4Vectors SummarizedExperiment]; };
+  recoup = derive2 { name="recoup"; version="1.9.2"; sha256="0c6zd42xr7068yfnsag8xfjix83m3wa3s8fsc2dv5fz2gnmhbfm2"; depends=[BiocGenerics biomaRt circlize ComplexHeatmap GenomicAlignments GenomicRanges ggplot2 plyr rtracklayer]; };
+  regionReport = derive2 { name="regionReport"; version="1.15.5"; sha256="02fhvjx5pj5hb3bdmm417rdjd8bzx81icdd8yqc4q7layhjrqb5q"; depends=[BiocStyle DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitcitations knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; };
+  regioneR = derive2 { name="regioneR"; version="1.13.3"; sha256="1rmh4xq596yb8kd411j5h02b6g2rflkwy9a1g38djj7lhzihy2im"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer S4Vectors]; };
+  regsplice = derive2 { name="regsplice"; version="1.7.1"; sha256="07g7jhwsb6yqhjvapr7kyqd8cwvn5jq9nrrf1ywifbf54x0kgzm1"; depends=[edgeR glmnet limma pbapply S4Vectors SummarizedExperiment]; };
+  restfulSE = derive2 { name="restfulSE"; version="1.3.23"; sha256="1cpxkqnffmhj6js1a4y3k85jmrcciw1sih35akj8v6rpv4fsy7xa"; depends=[AnnotationDbi AnnotationHub bigrquery Biobase DBI DelayedArray dplyr ExperimentHub GO_db magrittr reshape2 rhdf5client rlang S4Vectors SummarizedExperiment]; };
+  rexposome = derive2 { name="rexposome"; version="1.3.4"; sha256="0w5w4agdphrv935y3415hcrbgsxw27yk7h1xrjl5vk1ymkrj767z"; depends=[Biobase circlize corrplot FactoMineR ggplot2 ggrepel glmnet gplots gridExtra gtools Hmisc imputeLCMD lme4 lsr mice pryr reshape2 S4Vectors scales scatterplot3d stringr]; };
   rfPred = derive2 { name="rfPred"; version="1.19.0"; sha256="0xnb68s8iw01cnxma5iqyfki4f30i4if7kxc9p0i8w1nv3jf28xj"; depends=[data_table GenomicRanges IRanges Rsamtools]; };
   rgsepd = derive2 { name="rgsepd"; version="1.13.0"; sha256="128dqx7qzs9pf7ffxn94g8krkyryhcvj4wq9m1mdfj024yl4s04i"; depends=[AnnotationDbi biomaRt DESeq2 GO_db goseq gplots hash org_Hs_eg_db SummarizedExperiment]; };
-  rhdf5 = derive2 { name="rhdf5"; version="2.25.4"; sha256="129jzsqfswv6vhvfypqm9wcsnm94blq2zmjcp78c1vcjxc2i4li6"; depends=[Rhdf5lib]; };
-  rhdf5client = derive2 { name="rhdf5client"; version="1.3.3"; sha256="0iyhqsnfr7c9z7zk80i6i15f7sqkb28nakjxccldhn0g8xkaavq9"; depends=[DelayedArray httr rjson S4Vectors]; };
+  rhdf5 = derive2 { name="rhdf5"; version="2.25.11"; sha256="02xa4pc743k7q523p8x9njzqk8j0zv5kmprx5srnmrr1r1m4am8g"; depends=[Rhdf5lib]; };
+  rhdf5client = derive2 { name="rhdf5client"; version="1.3.13"; sha256="0pcppacx3n1pr67amd5y7r25sm2w9k8vhxn8k8v66ndp08i0pd9b"; depends=[DelayedArray httr R6 rjson S4Vectors]; };
   riboSeqR = derive2 { name="riboSeqR"; version="1.15.0"; sha256="0cwf51cish38slfv3cqfn4rqjs8k9wwwph0n4w7wd4dh7c9p2rmn"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools seqLogo]; };
   rnaSeqMap = derive2 { name="rnaSeqMap"; version="2.39.0"; sha256="07q9dblld6ns943ppjdl1xlbzhg3yvxci8v1x2kbifqwlvv2lzs6"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; };
   rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.11.0"; sha256="0r1n74x5xbp264ap9xsndiich89cv2140whi6ax179dpjs57ikaa"; depends=[RColorBrewer]; };
   roar = derive2 { name="roar"; version="1.17.0"; sha256="09wmsfn4lqzj8ffqlf5z9npx4v0y3bpvxrm6b5rggc3prlq9m4qb"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges rtracklayer S4Vectors SummarizedExperiment]; };
-  rols = derive2 { name="rols"; version="2.9.1"; sha256="0lzwl32zd61cj57ndxs9y74bclfpwl7s590a81cj99kidz6sx0c3"; depends=[Biobase BiocGenerics httr jsonlite progress]; };
-  ropls = derive2 { name="ropls"; version="1.13.6"; sha256="1gbjnpm5phimfgg2qfav04wc4aabvinj8gxirw9f6gp1wra0kbyr"; depends=[Biobase]; };
-  rpx = derive2 { name="rpx"; version="1.17.0"; sha256="0h5s2dwnpn7qqk5wk7128agdh9av9jzxhix4xrl0nhdd3jzi202y"; depends=[RCurl xml2]; };
-  rqt = derive2 { name="rqt"; version="1.7.0"; sha256="1iai2g1k7ybdlmw4r9k2zqdqq58ayggzs0gzdrn1bxmgp83v87fv"; depends=[car CompQuadForm glmnet Matrix metap pls ropls RUnit SummarizedExperiment]; };
+  rols = derive2 { name="rols"; version="2.9.4"; sha256="15qvqv3gi33ihdh0nlqqrv7raqs8g5hskaz2gk4pw0v24bzh1579"; depends=[Biobase BiocGenerics httr jsonlite progress]; };
+  ropls = derive2 { name="ropls"; version="1.13.8"; sha256="1ryxjnpd7q0pwi8sd2ha3jlfwkk6v4cqz2751bv952k8c9mldna7"; depends=[Biobase]; };
+  rpx = derive2 { name="rpx"; version="1.17.2"; sha256="0h0y31bi5f9z64ilcsgx1bj52qwfh1rv9ar00v3xkgx0zax5aw2m"; depends=[RCurl xml2]; };
+  rqt = derive2 { name="rqt"; version="1.7.2"; sha256="1nnacv0vgf9y3abrph04hmibjm08bmhi32ik7vrbr5pv5bbmdhrn"; depends=[car CompQuadForm glmnet Matrix metap pls ropls RUnit SummarizedExperiment]; };
   rqubic = derive2 { name="rqubic"; version="1.27.0"; sha256="06pp8ha9va9hkr5s7dmw6xsxs55sv0cn9vwysja0n4hdbbh5fx9v"; depends=[biclust Biobase BiocGenerics]; };
   rsbml = derive2 { name="rsbml"; version="2.39.0"; sha256="0ch87r9v7yxxqab81n99silsi6am7vwf1fzg43jg8x5726yz4pip"; depends=[BiocGenerics graph]; };
-  rtracklayer = derive2 { name="rtracklayer"; version="1.41.3"; sha256="1z8g303smfg3c3rax3c9fx4017fy9ch5sbvqsiincykigjsrn21b"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
-  runibic = derive2 { name="runibic"; version="1.3.1"; sha256="1l1rywk4lhgssmysd8998gd1wr5ms08s2s8skq2ss6qcxp1qrnvi"; depends=[biclust Rcpp SummarizedExperiment testthat]; };
+  rtracklayer = derive2 { name="rtracklayer"; version="1.41.8"; sha256="029qzy68il0mn7bkjhqdainl93a6v6k044ihgg5mndyhhhadjv03"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
+  runibic = derive2 { name="runibic"; version="1.3.3"; sha256="038afzgh06f908m1rlr0v58vfgm97q3shd174772k9rllzqr0q0j"; depends=[biclust Rcpp SummarizedExperiment testthat]; };
   sRAP = derive2 { name="sRAP"; version="1.21.0"; sha256="1mfailybmpa5ikc372qcfp57rnsksv6kn4x48bf6c0g5vln2kpjh"; depends=[gplots pls qvalue ROCR WriteXLS]; };
   sSeq = derive2 { name="sSeq"; version="1.19.0"; sha256="19d7xj3bqvvlxl23i08ab8ja53342nzi658a1f7xzf7khgp58fg9"; depends=[caTools RColorBrewer]; };
   safe = derive2 { name="safe"; version="3.21.0"; sha256="12h9d3dradnnkmhxz94d1b191q6xvx74nvp9y9y46yla7rxqpzma"; depends=[AnnotationDbi Biobase SparseM]; };
   sagenhaft = derive2 { name="sagenhaft"; version="1.51.0"; sha256="0mvj275rrqvz53fsv48c5gd3lzxmwh036353bmw7jswb1mrrv5qz"; depends=[SparseM]; };
-  samExploreR = derive2 { name="samExploreR"; version="1.5.0"; sha256="1gnlrkvyzw36m3da67vz7g8cfrrk4lg0yg2b9svhf3rjhfq6sjvv"; depends=[edgeR ggplot2 RNAseqData_HNRNPC_bam_chr14 Rsubread]; };
-  sampleClassifier = derive2 { name="sampleClassifier"; version="1.5.0"; sha256="08lr8b0dg489mfiljnpqdryflim8m902b66fl8qkkn5hm842dm22"; depends=[annotate e1071 ggplot2 MGFM MGFR]; };
+  samExploreR = derive2 { name="samExploreR"; version="1.5.1"; sha256="1qzi9vn2hj9ph23mf8v0m6m587qisqvp0fmvkavxm8v3y07mcnpk"; depends=[edgeR ggplot2 RNAseqData_HNRNPC_bam_chr14 Rsubread]; };
+  sampleClassifier = derive2 { name="sampleClassifier"; version="1.5.1"; sha256="1a4y3nnibjkv51i0m1qpj8mb675r9gz9zdpyra18c19ga245bwih"; depends=[annotate e1071 ggplot2 MGFM MGFR]; };
   sangerseqR = derive2 { name="sangerseqR"; version="1.17.0"; sha256="02v0khp8dksvj8h0p3py5cdxwgbla9hv60mrj6ay2d6yyv2w0vz6"; depends=[Biostrings shiny]; };
   sapFinder = derive2 { name="sapFinder"; version="1.19.0"; sha256="0f0k3afijnj0h6bh46cnkm3gajdsvngamcw2q5xbdrafidrk6npm"; depends=[pheatmap Rcpp rTANDEM]; };
   savR = derive2 { name="savR"; version="1.19.0"; sha256="1lzlrpv244pnwmf3347r7l5vwz0cd4hlm9nvlpdlvv8glvf7v4ay"; depends=[ggplot2 gridExtra reshape2 scales XML]; };
   scDD = derive2 { name="scDD"; version="1.5.0"; sha256="1s2a4nz3ys4vllk9dphwskqrw2bb9shkqx4bismprn0b7qcmnv9j"; depends=[arm BiocParallel EBSeq fields ggplot2 mclust outliers S4Vectors scran SingleCellExperiment SummarizedExperiment]; };
-  scFeatureFilter = derive2 { name="scFeatureFilter"; version="1.1.0"; sha256="0d4rrrk4fdrnrf7rdqwz915sg7m81w0fzfrrnjzpsncpwzkqa1pg"; depends=[dplyr ggplot2 magrittr rlang tibble]; };
-  scPipe = derive2 { name="scPipe"; version="1.3.7"; sha256="1gvpkcxjal81r5vh4f16ll9p0nj70iyp8gp5c9rkg2pr0p28ryx3"; depends=[AnnotationDbi BiocGenerics biomaRt GGally ggplot2 MASS mclust org_Hs_eg_db org_Mm_eg_db Rcpp reshape Rhtslib robustbase S4Vectors scales SingleCellExperiment SummarizedExperiment testthat zlibbioc]; };
-  scater = derive2 { name="scater"; version="1.9.6"; sha256="0yxw73fvxyvq99lnpwp4j4mf2jy6zkyw934ql2y2avbnyclj4id5"; depends=[beachmat Biobase BiocGenerics data_table DelayedArray DelayedMatrixStats dplyr ggbeeswarm ggplot2 limma Matrix plyr Rcpp reshape2 rhdf5 Rhdf5lib rjson S4Vectors SingleCellExperiment SummarizedExperiment tximport viridis]; };
+  scFeatureFilter = derive2 { name="scFeatureFilter"; version="1.1.1"; sha256="0xsbyqlflmphrdc0rqbgjyc93fmm2b747wn2lswq24r6g87084cs"; depends=[dplyr ggplot2 magrittr rlang tibble]; };
+  scPipe = derive2 { name="scPipe"; version="1.3.8"; sha256="0c250q77rwcmns0m5px7485axbrflb7xmkrw58fxyzn58i13y3bc"; depends=[AnnotationDbi BiocGenerics biomaRt GGally ggplot2 MASS mclust org_Hs_eg_db org_Mm_eg_db Rcpp reshape Rhtslib robustbase S4Vectors scales SingleCellExperiment SummarizedExperiment testthat zlibbioc]; };
+  scater = derive2 { name="scater"; version="1.9.24"; sha256="062afh547brk3jxjxkyapz66agkdyvsn62ppx1n2qcpbhxlpppnd"; depends=[beachmat BiocGenerics BiocParallel DelayedArray DelayedMatrixStats dplyr ggbeeswarm ggplot2 Matrix plyr Rcpp reshape2 Rhdf5lib S4Vectors SingleCellExperiment SummarizedExperiment viridis]; };
   scde = derive2 { name="scde"; version="2.9.0"; sha256="1zmhbjdy9v2v11q261l7gwjm77qpiyqdskgbkcaxf7a65wbzs90r"; depends=[BiocParallel Cairo edgeR extRemes flexmix MASS mgcv nnet pcaMethods quantreg RColorBrewer Rcpp RcppArmadillo rjson RMTstat Rook]; };
   scfind = derive2 { name="scfind"; version="1.3.0"; sha256="08xkvmjd6p6vsnfk7a5y4586b9r3ap7l9ig0g6cd6cj8pjhvf51b"; depends=[bit dplyr hash Rcpp reshape2 SingleCellExperiment SummarizedExperiment]; };
   scmap = derive2 { name="scmap"; version="1.3.0"; sha256="0pnflc49ysq7sxcg0ddcapi65vfjq3zl9pnz119hjr6avp8sjmhy"; depends=[Biobase BiocGenerics dplyr e1071 ggplot2 googleVis matrixStats proxy randomForest Rcpp RcppArmadillo reshape2 S4Vectors SingleCellExperiment SummarizedExperiment]; };
-  scone = derive2 { name="scone"; version="1.5.0"; sha256="0n49j4z48zfrrj7a9nv538vyi5611w5r68rw9w99c28k2n6lvril"; depends=[BiocParallel boot class cluster compositions diptest edgeR fpc gplots hexbin limma matrixStats mixtools rARPACK RColorBrewer rhdf5 RUVSeq SummarizedExperiment]; };
+  scmeth = derive2 { name="scmeth"; version="1.1.8"; sha256="1fkf2pxbnhl992cql5nd73qq0kqzhvhl8g7rjfyx2zlfnb0a2m22"; depends=[AnnotationHub annotatr Biostrings BSgenome bsseq DelayedArray DT GenomeInfoDb GenomicRanges HDF5Array knitr reshape2 rmarkdown SummarizedExperiment]; };
+  scone = derive2 { name="scone"; version="1.5.1"; sha256="0sqnwq34ixlpaq8zrpqjwvpfx985yzyc7wdymfkwfy2ysclrcbn6"; depends=[aroma_light BiocParallel boot class cluster compositions diptest edgeR fpc gplots hexbin limma matrixStats mixtools rARPACK RColorBrewer rhdf5 RUVSeq SummarizedExperiment]; };
   scoreInvHap = derive2 { name="scoreInvHap"; version="1.3.1"; sha256="1nysi4blc9rxfsq4kwyyq9nbzdww7xfwgrcw8czvnfca59dbfgdq"; depends=[BiocParallel Biostrings GenomicRanges snpStats SummarizedExperiment VariantAnnotation]; };
-  scran = derive2 { name="scran"; version="1.9.10"; sha256="1c55i0iq6dfhxdmnps440d0i1lsidj2wx0v2a476lks4hi32bwsf"; depends=[beachmat BiocGenerics BiocParallel DelayedArray DelayedMatrixStats dynamicTreeCut edgeR igraph kmknn limma Matrix Rcpp Rhdf5lib S4Vectors scater SingleCellExperiment statmod SummarizedExperiment]; };
+  scran = derive2 { name="scran"; version="1.9.39"; sha256="174s3jymh8w1gbaq60m4lwhk038bfzrwva2a8xry3ampns818a6b"; depends=[beachmat BiocGenerics BiocNeighbors BiocParallel DelayedArray DelayedMatrixStats dynamicTreeCut edgeR igraph limma Matrix Rcpp Rhdf5lib S4Vectors scater SingleCellExperiment statmod SummarizedExperiment]; };
+  scruff = derive2 { name="scruff"; version="0.99.39"; sha256="1za3d79p6cm19m3xqwbfgvrnfhjrr3j54s5vqhaaxxxvj9xbpv06"; depends=[AnnotationDbi BiocGenerics BiocParallel Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 ggthemes plyr refGenome Rsamtools S4Vectors scales ShortRead SingleCellExperiment stringdist SummarizedExperiment]; };
   scsR = derive2 { name="scsR"; version="1.17.0"; sha256="1ppw53nl05rfs7jkgr464pa24yrczlvh7yfgmn5apd3yxbmf9i9w"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; };
-  segmentSeq = derive2 { name="segmentSeq"; version="2.15.0"; sha256="07cm7314vjhsara5ngs3j0gi7fjbdvn51r6s7ifxm6vij43ivpqs"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; };
-  semisup = derive2 { name="semisup"; version="1.5.1"; sha256="170x6s5q1lja64p4ldpravlaal8vs7rzqk8lyvrydsg02ss7vj7h"; depends=[SummarizedExperiment VGAM]; };
-  seq2pathway = derive2 { name="seq2pathway"; version="1.13.0"; sha256="03gbim70cnym2ga6zynj67r9ad1j4hrgydzzsi8r1nykkmjlk5lj"; depends=[biomaRt GenomicRanges GSA nnet seq2pathway_data WGCNA]; };
-  seqCAT = derive2 { name="seqCAT"; version="1.3.3"; sha256="0s3r550w41x5kdzqjnk2ypp2fn3sd8qn8b85s4h8rdzyc8brp0d8"; depends=[dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges lazyeval S4Vectors scales SummarizedExperiment tidyr VariantAnnotation]; };
+  segmentSeq = derive2 { name="segmentSeq"; version="2.15.1"; sha256="10qjyzzi4vr43p66rgpxkm5hlgfpg6s76g19vdyzs8lh0mn4shfw"; depends=[abind baySeq GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; };
+  semisup = derive2 { name="semisup"; version="1.5.3"; sha256="13xmxl1915hk000l2kg120h4cqyw1372j2b92vfz5mn45ngmg99k"; depends=[SummarizedExperiment VGAM]; };
+  seq2pathway = derive2 { name="seq2pathway"; version="1.13.2"; sha256="15fvc4dqn7adl3jsphin60krbm29mbm3w8000plcmk8n5bxdxqvj"; depends=[biomaRt GenomicRanges GSA nnet seq2pathway_data WGCNA]; };
+  seqCAT = derive2 { name="seqCAT"; version="1.3.7"; sha256="10c5y3d63zk6zsyjx38srw73xj03nk7apa2p81z91jwwmva2ab2m"; depends=[dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges lazyeval S4Vectors scales SummarizedExperiment tidyr VariantAnnotation]; };
   seqCNA = derive2 { name="seqCNA"; version="1.27.0"; sha256="03zxkdcvxgjjhciv1w9l9gdj21ljqrw3c9cgkf2pqp3jk0swpaa7"; depends=[adehabitatLT doSNOW GLAD seqCNA_annot]; };
   seqLogo = derive2 { name="seqLogo"; version="1.47.0"; sha256="1hqfgxd7yvh7lm5q3qfhlkiy0pq5ffxls317miivsgid28shwmwk"; depends=[]; };
   seqPattern = derive2 { name="seqPattern"; version="1.13.0"; sha256="1xm7f3z29ahyiiy8586yfy5m4cqalws8hsyp8yc9xybw0mwdpyhg"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; };
   seqTools = derive2 { name="seqTools"; version="1.15.0"; sha256="0qnj79xhgflhjcrd2n61fmx099q83iil8hy6pq7jzhnzhg4572pj"; depends=[zlibbioc]; };
   seqbias = derive2 { name="seqbias"; version="1.29.0"; sha256="1lv6wcqzlr40jmwac9s07ixx9vyikkc5a8f5wjmip9gglyy7m5f4"; depends=[Biostrings GenomicRanges Rsamtools zlibbioc]; };
   seqcombo = derive2 { name="seqcombo"; version="1.3.0"; sha256="1l4n2472kr4kimf4aq8v5whqwjpzwbkisfrf74wjljdj43903dr2"; depends=[Biostrings cowplot dplyr ggplot2 igraph magrittr rvcheck]; };
-  seqplots = derive2 { name="seqplots"; version="1.19.0"; sha256="1qx7b2jzhprncgff4n88w7kq10hp98a6bcky0lq4z8rjf3ksaph7"; depends=[Biostrings BSgenome class DBI digest DT fields GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix RColorBrewer reshape2 Rsamtools RSQLite rtracklayer S4Vectors shiny]; };
-  seqsetvis = derive2 { name="seqsetvis"; version="1.1.2"; sha256="0az4s9v69b57fnisc5ln827da7cyhx16wwzh5cx8qqhkffzn323s"; depends=[data_table eulerr GenomicRanges ggplot2 IRanges limma png RColorBrewer Rsamtools rtracklayer S4Vectors]; };
-  sesame = derive2 { name="sesame"; version="0.99.3"; sha256="1dz1jx4cmpbis0h3mmk5p7h6ybprsrnvdbzcv6kj0h0q31al2rg9"; depends=[DNAcopy GenomicRanges ggplot2 illuminaio IRanges MASS preprocessCore R6 randomForest sesameData wheatmap]; };
-  sevenC = derive2 { name="sevenC"; version="1.1.0"; sha256="05h05y7nkq73igsv54znawrzav7ijvrzwqsbpw8di43fah1klpg7"; depends=[BiocGenerics boot data_table GenomeInfoDb GenomicRanges InteractionSet IRanges purrr readr rtracklayer S4Vectors]; };
-  sevenbridges = derive2 { name="sevenbridges"; version="1.11.0"; sha256="1c3mj8k5fscj4hcg7rm12zjfp9hbwlp9k83hi8ijq55iw66jp399"; depends=[curl docopt dplyr httr jsonlite miniUI objectProperties rstudioapi S4Vectors shiny stringr uuid yaml]; };
-  shinyMethyl = derive2 { name="shinyMethyl"; version="1.17.0"; sha256="0cs3s08mijpcz598d07as3yl0fcw3x5q6q1lxmq29x36kmfz6yrg"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; };
+  seqplots = derive2 { name="seqplots"; version="1.19.3"; sha256="0drjn6l80xqy3lij4qzg48chrwi0sjhv0xnqgg9m6qyq9xb7hy5l"; depends=[BiocManager Biostrings BSgenome class DBI digest DT fields GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix RColorBrewer reshape2 Rsamtools RSQLite rtracklayer S4Vectors shiny]; };
+  seqsetvis = derive2 { name="seqsetvis"; version="1.1.7"; sha256="01yd5lbkad79s274yc0byfvi4pp51b8ikrdnrza9r6jffaalzi60"; depends=[data_table eulerr GenomicRanges ggplot2 IRanges limma png RColorBrewer Rsamtools rtracklayer S4Vectors]; };
+  sesame = derive2 { name="sesame"; version="0.99.7"; sha256="19l3cl5202aysf8bahhb4sm53q3x2jlz424ykw9zdf0ab9m3zbnc"; depends=[DNAcopy GenomicRanges ggplot2 illuminaio IRanges MASS preprocessCore R6 randomForest S4Vectors sesameData wheatmap]; };
+  sevenC = derive2 { name="sevenC"; version="1.1.4"; sha256="16x95kb8264r5z55r635lyy13i37jsnyghmn27mw4wj8acdgv6gb"; depends=[BiocGenerics boot data_table GenomeInfoDb GenomicRanges InteractionSet IRanges purrr readr rtracklayer S4Vectors]; };
+  sevenbridges = derive2 { name="sevenbridges"; version="1.11.5"; sha256="07pndfkcx4ixh5sk2hq64r5xzz2b6h26km50dk4pizj03lpcgalr"; depends=[curl docopt dplyr httr jsonlite miniUI objectProperties rstudioapi S4Vectors shiny stringr uuid yaml]; };
+  shinyMethyl = derive2 { name="shinyMethyl"; version="1.17.1"; sha256="18s9m1yxqvpzqaq87c09k5wvjxpxijz6b9gi7nr1b4jxfglkxrdl"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; };
   shinyTANDEM = derive2 { name="shinyTANDEM"; version="1.19.0"; sha256="0yvf4rxpki7xb7f7yckxrm7ycsx2clqn13smc2m7ihdyvg5kw941"; depends=[mixtools rTANDEM shiny xtable]; };
-  sigFeature = derive2 { name="sigFeature"; version="0.99.4"; sha256="011drdrq1pj37jbp8289rws1nmhbyivghbfpkirj6g4wc6pnpghn"; depends=[BiocParallel biocViews e1071 Matrix nlme openxlsx pheatmap RColorBrewer SparseM SummarizedExperiment]; };
+  sigFeature = derive2 { name="sigFeature"; version="0.99.5"; sha256="08fs7pa4r4gbsg8j1f630lz9b0p4z4cq9r54akv0ix5q1mi71n2p"; depends=[BiocParallel biocViews e1071 Matrix nlme openxlsx pheatmap RColorBrewer SparseM SummarizedExperiment]; };
   sigPathway = derive2 { name="sigPathway"; version="1.49.0"; sha256="0fzqf17xqb0f2af9lz392l656naddann4wsxn233d28dajdvw5rx"; depends=[]; };
   sigaR = derive2 { name="sigaR"; version="1.29.0"; sha256="0lmv6m0rb7pnrqp6gd8klni3vd0rb98xscfx7qb5xpkihqcnya9s"; depends=[Biobase CGHbase corpcor igraph limma marray MASS mvtnorm penalized quadprog snowfall]; };
   siggenes = derive2 { name="siggenes"; version="1.55.0"; sha256="1lfw6ny0s76jcypqin49raz1zrbl1rwds3646c8h52rd37c4hdx0"; depends=[Biobase multtest]; };
-  sights = derive2 { name="sights"; version="1.7.0"; sha256="0ygld23zpqqa7xalbq1kyf6x03kpqbmicr4hrysjk54h3r5pv56y"; depends=[ggplot2 lattice MASS qvalue reshape2]; };
-  signeR = derive2 { name="signeR"; version="1.7.1"; sha256="1xmz6b33n0idby69739mm8frv4l95g8rsdcp98dg6fhpf2s49ky3"; depends=[BiocGenerics Biostrings class GenomicRanges nloptr NMF PMCMR Rcpp RcppArmadillo VariantAnnotation]; };
-  signet = derive2 { name="signet"; version="1.1.0"; sha256="1rdmq4x0xf13hl54f2nbnckz8nci9391g6l00zznv1vzykp6awdm"; depends=[graph igraph RBGL]; };
+  sights = derive2 { name="sights"; version="1.7.1"; sha256="05zny8xlsxzyp9bbv4jlgrpkmy0ppzqf97809ic6myfch547x7gp"; depends=[ggplot2 lattice MASS qvalue reshape2]; };
+  signeR = derive2 { name="signeR"; version="1.7.2"; sha256="1ranfb4kik0k6cpi8zhsnqhvccrlizrkrijcp1yzhhaq5w33xj5b"; depends=[BiocGenerics Biostrings class GenomicRanges nloptr NMF PMCMR Rcpp RcppArmadillo VariantAnnotation]; };
+  signet = derive2 { name="signet"; version="1.1.1"; sha256="0fcrwsimxx9j7m5x7civv9qrlcgnn6dyb7kcblsfxw6lidqhv59n"; depends=[graph igraph RBGL]; };
   sigsquared = derive2 { name="sigsquared"; version="1.13.0"; sha256="11bjd0bq2kf4inkybx7hkf970ma8rhwvagrlwxnxafh8nzw5amn8"; depends=[Biobase survival]; };
   similaRpeak = derive2 { name="similaRpeak"; version="1.13.0"; sha256="1lgs161banaxsi22ydgmw1jpf04h7js92sqzir5v7ms0h12nym15"; depends=[R6]; };
   simpleaffy = derive2 { name="simpleaffy"; version="2.57.0"; sha256="0yc44svjmh2vr1z3a77nvmas7kfcl0p6rjygq6ax477rvzldw7rq"; depends=[affy Biobase BiocGenerics gcrma genefilter]; };
-  simulatorZ = derive2 { name="simulatorZ"; version="1.15.0"; sha256="1x90bakarcp01h72536yr0ks2w3a64l0lwvdvka8whwm72sh8255"; depends=[Biobase BiocGenerics CoxBoost gbm GenomicRanges Hmisc IRanges S4Vectors SummarizedExperiment survival]; };
-  sincell = derive2 { name="sincell"; version="1.13.0"; sha256="0mqm5qrb5nrcpigpvkjvhs0fh386x9lm6p5ns1vl38gvdq9yqvi3"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; };
-  singleCellTK = derive2 { name="singleCellTK"; version="1.1.5"; sha256="180klrpaq8dz484xpd76aif2n5jyqxi4l0lr969v0yby9hn9jvyq"; depends=[AnnotationDbi ape Biobase circlize cluster colourpicker ComplexHeatmap data_table DelayedArray DESeq2 DT ggplot2 ggtree gridExtra GSVA GSVAdata limma MAST matrixStats multtest plotly RColorBrewer reshape2 Rtsne S4Vectors shiny shinyalert shinyjs SingleCellExperiment SummarizedExperiment sva]; };
-  singscore = derive2 { name="singscore"; version="1.1.0"; sha256="1n21cikl874xhbx2c0nd678p53s6gvavih3dz2cbm1l1mprn5gx1"; depends=[Biobase BiocParallel edgeR ggplot2 ggrepel ggsci GSEABase magrittr matrixStats plotly plyr RColorBrewer reshape SummarizedExperiment tidyr]; };
+  simulatorZ = derive2 { name="simulatorZ"; version="1.15.1"; sha256="16vzgni41r2jj8g8lbf3hh7r7202j0zq77shdaivrfzas19gaxwc"; depends=[Biobase BiocGenerics CoxBoost gbm GenomicRanges Hmisc SummarizedExperiment survival]; };
+  sincell = derive2 { name="sincell"; version="1.13.2"; sha256="1h43wmx7l2sl9ka9lklqxfd35zkjbxvwsza979vxp6c8j8plp03g"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; };
+  singleCellTK = derive2 { name="singleCellTK"; version="1.1.26"; sha256="1caw8cyw9f0ky3mj1fsk5lfgb4v0g3ghqb0l32j70q1r1yipdl87"; depends=[AnnotationDbi ape Biobase circlize cluster colourpicker ComplexHeatmap data_table DelayedArray DESeq2 DT enrichR ggplot2 ggtree gridExtra GSVA GSVAdata limma MAST matrixStats multtest plotly RColorBrewer reshape2 Rtsne S4Vectors shiny shinyalert shinycssloaders shinyjs SingleCellExperiment SummarizedExperiment sva]; };
+  singscore = derive2 { name="singscore"; version="1.1.1"; sha256="12qqx0xnjza2rlyy1isq8mp28baphmb5yld3av5wvackyn0mwmf7"; depends=[Biobase BiocParallel edgeR ggplot2 ggrepel ggsci GSEABase magrittr matrixStats plotly plyr RColorBrewer reshape SummarizedExperiment tidyr]; };
   sizepower = derive2 { name="sizepower"; version="1.51.0"; sha256="0g0f5z0ccypk7m81b2nhrrj86fv1fin96qm8wba2j6ib2wf0p4np"; depends=[]; };
-  skewr = derive2 { name="skewr"; version="1.13.1"; sha256="0kgs9xf1609y0na5d9lrl6gj3rrpraagbhnhh9iq3p5b0r1ad92m"; depends=[IlluminaHumanMethylation450kmanifest methylumi minfi mixsmsn RColorBrewer S4Vectors wateRmelon]; };
-  slalom = derive2 { name="slalom"; version="1.3.0"; sha256="0b68dq85h3rq0q4lbiv7zv4wg1prf79kh96m06hg9dp6336wy60w"; depends=[BH ggplot2 GSEABase Rcpp RcppArmadillo rsvd SingleCellExperiment SummarizedExperiment]; };
-  slingshot = derive2 { name="slingshot"; version="0.99.8"; sha256="0yafvan6py8m4xnhx89hipzv4kbyviivxgn07mp74falci5f9mxw"; depends=[ape clusterExperiment igraph matrixStats princurve rgl SingleCellExperiment SummarizedExperiment]; };
-  slinky = derive2 { name="slinky"; version="0.99.18"; sha256="09074wzn1534x76fczfcj6jl94vgv33yq3vhzsv1m342kwqn3mi5"; depends=[curl dplyr foreach httr jsonlite readr rhdf5 SummarizedExperiment tidyr]; };
+  skewr = derive2 { name="skewr"; version="1.13.2"; sha256="01ks1ir4sclf2gpwjn0mahxg9iz9iz66axxni190x7gnn076byc4"; depends=[IlluminaHumanMethylation450kmanifest methylumi minfi mixsmsn RColorBrewer S4Vectors wateRmelon]; };
+  slalom = derive2 { name="slalom"; version="1.3.1"; sha256="0qjw9zqyxnm6s6glw5j9iaqalnb5rbnrzkmwha2gswq9g6jd803n"; depends=[BH ggplot2 GSEABase Rcpp RcppArmadillo rsvd SingleCellExperiment SummarizedExperiment]; };
+  slingshot = derive2 { name="slingshot"; version="0.99.13"; sha256="0w7ii3npq0qgjlszmsmn82sks9rdavhzqvxnn3d7p6c5y5bhz51j"; depends=[ape clusterExperiment igraph matrixStats princurve rgl SingleCellExperiment SummarizedExperiment]; };
+  slinky = derive2 { name="slinky"; version="0.99.20"; sha256="1k41hw11wv9lnwkfbfbwdcajfac0sm0c7cspk8iwnkpzkj2qns8c"; depends=[curl dplyr foreach httr jsonlite readr rhdf5 SummarizedExperiment tidyr]; };
   snapCGH = derive2 { name="snapCGH"; version="1.51.0"; sha256="0qfkc3sa8inlnviw5wx36nyy71b59xas9rqsmfb4j32nxdhqj64p"; depends=[aCGH cluster DNAcopy GLAD limma tilingArray]; };
   snm = derive2 { name="snm"; version="1.29.0"; sha256="052mayih2hdgsgklqhvzmvnvx82ch8q4jvpx8ch5rp4k4g0qlqyj"; depends=[corpcor lme4]; };
   snpStats = derive2 { name="snpStats"; version="1.31.0"; sha256="1pxdf5qnibp6szwsllcayqxm9164yl30awfizlv6jmphfkah2i35"; depends=[BiocGenerics Matrix survival zlibbioc]; };
   soGGi = derive2 { name="soGGi"; version="1.13.0"; sha256="1xg6yaprmafl861g66j5pymlg1hpjanyibyi3zkrd15avvxw23g9"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
   sparseDOSSA = derive2 { name="sparseDOSSA"; version="1.5.0"; sha256="15vpj6v1x84zfy7vblhkm1vsv8hp5qa0fhfgfxbnzc5v28g1g41h"; depends=[MASS MCMCpack optparse tmvtnorm]; };
+  sparsenetgls = derive2 { name="sparsenetgls"; version="0.99.7"; sha256="05n4c3gic10hy68kkc8mvh7d51sfbzvr8wr04y160pmlgrjslps4"; depends=[glmnet huge MASS Matrix parcor]; };
   specL = derive2 { name="specL"; version="1.15.0"; sha256="1xdfsvq7i9g2pbr0fh0awdwvl3j5ggk1r0n5bxhq7s2p4kjppxc6"; depends=[DBI protViz RSQLite seqinr]; };
   spikeLI = derive2 { name="spikeLI"; version="2.41.0"; sha256="1wx57idxn0wbg9mcfxdydcs5fbxmarsvv4hjcp62r5dpp4ymhcsb"; depends=[]; };
   spkTools = derive2 { name="spkTools"; version="1.37.0"; sha256="12nwaifk726dr0lh6yf8xaxdmhlybiy88fwc1qypm3kvw6jff6ma"; depends=[Biobase gtools RColorBrewer]; };
-  splatter = derive2 { name="splatter"; version="1.5.1"; sha256="0anp2ipvagv2vfhnk0yzldmn9s1z3liqmmqrs23s1yfi9dasdgbs"; depends=[akima BiocGenerics BiocParallel checkmate crayon edgeR fitdistrplus ggplot2 locfit matrixStats scales scater SingleCellExperiment SummarizedExperiment]; };
+  splatter = derive2 { name="splatter"; version="1.5.8"; sha256="1bcjrywp49inr59xc01c7iz925wm2jpghx0anj97w08w0z5pn59s"; depends=[akima BiocGenerics BiocParallel checkmate crayon edgeR fitdistrplus ggplot2 locfit matrixStats scales scater SingleCellExperiment SummarizedExperiment]; };
   spliceSites = derive2 { name="spliceSites"; version="1.29.0"; sha256="1ivw3zsy5jggacvcby2nx9g9h0r1vvj331qpxxnvzajp9j0187yq"; depends=[Biobase BiocGenerics Biostrings doBy IRanges rbamtools refGenome seqLogo]; };
   splicegear = derive2 { name="splicegear"; version="1.53.0"; sha256="15bc3wmz3rz2jipgfj51bj2shr5cy941vnzxnk277yzh5wvz9hvc"; depends=[annotate Biobase XML]; };
   splineTimeR = derive2 { name="splineTimeR"; version="1.9.0"; sha256="114c641vyi585yl11czkq5n8gl01q6h8q34g427sj7aspqpf8lkc"; depends=[Biobase FIs GeneNet GSEABase gtools igraph limma longitudinal]; };
@@ -1477,40 +1570,45 @@ in with self; {
   sscore = derive2 { name="sscore"; version="1.53.0"; sha256="0p6klmcl2zd4i8qmmqj043p310grjmi6b2d610wanas03f0jdv71"; depends=[affy affyio]; };
   sscu = derive2 { name="sscu"; version="2.11.0"; sha256="0hnzxyyp82psjddh97kw3g533aiczkji858jl1xqi1kbr02avwc0"; depends=[BiocGenerics Biostrings seqinr]; };
   ssize = derive2 { name="ssize"; version="1.55.0"; sha256="061gpsj4dlzxii5ar3rdbc0kpvwby9639l3pk8vfslvcbl290w9f"; depends=[gdata xtable]; };
-  ssviz = derive2 { name="ssviz"; version="1.15.0"; sha256="18yz1jy0rl4r7ws21kyl1rjix81jkrqbqhqxgn9qf7zsssynxjf9"; depends=[Biostrings ggplot2 RColorBrewer reshape Rsamtools]; };
+  ssviz = derive2 { name="ssviz"; version="1.15.1"; sha256="0q7xzn5xy8xx660711klssbi996218yvi9map04qinb9n60h0bbw"; depends=[Biostrings ggplot2 RColorBrewer reshape Rsamtools]; };
   staRank = derive2 { name="staRank"; version="1.23.0"; sha256="1gqvfbs15hdg7fkz6yxjxwn227am7lj372yhiiadgm629bwgcyxi"; depends=[cellHTS2]; };
-  stageR = derive2 { name="stageR"; version="1.3.25"; sha256="0gq5j7an4m0npc7vx4p8csiwhsdhx9p48gfjp3gds2jjrlnrpsc0"; depends=[SummarizedExperiment]; };
-  statTarget = derive2 { name="statTarget"; version="1.11.0"; sha256="06cwz5mwlc580bj2pqli08a6ia4q68d792jx0ssjhk6ggh58czqp"; depends=[gWidgets2 gWidgets2RGtk2 impute pdist pls plyr randomForest ROC rrcov]; };
+  stageR = derive2 { name="stageR"; version="1.3.28"; sha256="1k7by1vds39xyxn3yas181si96v8q8rqxwv34b12ihsb4z7nsxpi"; depends=[SummarizedExperiment]; };
+  statTarget = derive2 { name="statTarget"; version="1.11.7"; sha256="06vvha2dp1wf3lbpxxf2p4w1jvicd7fcicc525km7qkw9wp7bl5j"; depends=[impute pdist pls plyr randomForest ROC rrcov]; };
   stepNorm = derive2 { name="stepNorm"; version="1.53.0"; sha256="1iq4kv3dj8nr9nqd4nnrndss4ypc87a9pl389ha9q671ifqahaii"; depends=[marray MASS]; };
-  subSeq = derive2 { name="subSeq"; version="1.11.0"; sha256="0grwj60ax5i9z3bg04wi73pq9qx5mizldc059ja23f4rkk4nq7vg"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; };
-  supraHex = derive2 { name="supraHex"; version="1.19.0"; sha256="0m4plhy7v0rfxr8ysndyqmd1x9nbf2y3hbka5gvs3zmi45wd4rds"; depends=[ape hexbin MASS]; };
-  survcomp = derive2 { name="survcomp"; version="1.31.0"; sha256="0r95jgddlvgx61jwsjgdqb2npm4mi19jyrqw2349h3bds6w1r840"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; };
-  sva = derive2 { name="sva"; version="3.29.0"; sha256="0xrqhnayir6c3hz7yw35rlscgbv6hp0s798v5qmlgdfk4s2x1sq4"; depends=[BiocParallel genefilter limma matrixStats mgcv]; };
+  strandCheckR = derive2 { name="strandCheckR"; version="0.99.15"; sha256="02g18vb3adnk5vd5khpi61whall2vrpj9ghwf7dh43d37q7x3kz9"; depends=[BiocGenerics dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges magrittr reshape2 Rsamtools S4Vectors stringr TxDb_Hsapiens_UCSC_hg38_knownGene]; };
+  subSeq = derive2 { name="subSeq"; version="1.11.1"; sha256="1xhfxccbdgzy8k3y41vjr7pi42z7lyffvyrfa6w24dvyqxbg5cb0"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; };
+  supraHex = derive2 { name="supraHex"; version="1.19.1"; sha256="0gkp192jg1xnpy8g320hr89qd1w55dlbc3lir3mmx1yyfcdmiclv"; depends=[ape hexbin MASS]; };
+  survcomp = derive2 { name="survcomp"; version="1.31.2"; sha256="029fzp9gpmcrswyd9347kghg1swqkwvi886q4hqffrddwm7dx4a6"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; };
+  sva = derive2 { name="sva"; version="3.29.1"; sha256="0864qxajs9r26x7051hfnf9ns813j8v1l7wgkwjndk8i4h0bbchg"; depends=[BiocParallel genefilter limma matrixStats mgcv]; };
   swfdr = derive2 { name="swfdr"; version="1.7.0"; sha256="1bnqmz6vcj79j6cp15gla9lmsa3d96m790f5yl9vffbcj48n0rlc"; depends=[dplyr ggplot2 reshape2]; };
-  switchBox = derive2 { name="switchBox"; version="1.17.0"; sha256="01bx0ij8ylk0r1hn73mq2dhf07mw8z44bw3mhrydhr8byp0rqz0c"; depends=[gplots pROC]; };
-  switchde = derive2 { name="switchde"; version="1.7.0"; sha256="0kicwjsm5k7glcqp3q19aq2cqdyh3s6jblzp836xgygwxm1yab2m"; depends=[dplyr ggplot2 SingleCellExperiment SummarizedExperiment]; };
-  synapter = derive2 { name="synapter"; version="2.5.1"; sha256="0nmkyza5a7lzmdpv50s7zn1gd30w4xvjlxaycg8id1n2cjzazq75"; depends=[Biobase Biostrings cleaver knitr lattice MSnbase multtest qvalue RColorBrewer readr rmarkdown]; };
+  switchBox = derive2 { name="switchBox"; version="1.17.1"; sha256="06k771nrdzmr8w5k9d5a7b83bwvnahwahdmx5q4cg7n6la1yll91"; depends=[gplots pROC]; };
+  switchde = derive2 { name="switchde"; version="1.7.1"; sha256="14n3h4afr3sfv08vxip3i8hnn77npcwvhrfg759da8qaqmyb9dky"; depends=[dplyr ggplot2 SingleCellExperiment SummarizedExperiment]; };
+  synapter = derive2 { name="synapter"; version="2.5.2"; sha256="04gxig9cya85xha19zrgqh8hkl43nhpdgvhxh7kl2pnfgx0q82nf"; depends=[Biobase Biostrings cleaver knitr lattice MSnbase multtest qvalue RColorBrewer readr rmarkdown]; };
   synergyfinder = derive2 { name="synergyfinder"; version="1.7.0"; sha256="0v76jdh7dh9hhjgxfbls529lrv1wkjvaym39s7ahm3p1njycx05d"; depends=[drc ggplot2 gplots gridBase lattice nleqslv reshape2 SpatialExtremes]; };
   synlet = derive2 { name="synlet"; version="1.11.0"; sha256="0ijhssagav4hw7nm8x5157crdv4i8yhikrk6qf9w134lkkl0mviq"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; };
-  systemPipeR = derive2 { name="systemPipeR"; version="1.15.1"; sha256="1ljvvsbwnn03czl8rckbx4rlnggh29y133k95ldj3p8vjn61f23r"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicFeatures GenomicRanges ggplot2 GO_db GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
-  tRNAscanImport = derive2 { name="tRNAscanImport"; version="1.1.1"; sha256="0b9qr0wkbdy31j1jnxi6k883avr60shx8v111ra3pjvrfnczl933"; depends=[assertive BiocGenerics Biostrings GenomeInfoDb GenomicRanges reshape2 rtracklayer S4Vectors stringr]; };
-  tRanslatome = derive2 { name="tRanslatome"; version="1.19.0"; sha256="08wlv7a39m1zrk8pssmck2zmyghn19ksr9fpf03z8ypwsqghaac5"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma org_Hs_eg_db plotrix RankProd samr sigPathway topGO]; };
-  tenXplore = derive2 { name="tenXplore"; version="1.3.0"; sha256="1x0b4gjs1igir8k8zlwc66w63gsf2ffk3vk7yas1cl3ivvvvw400"; depends=[AnnotationDbi matrixStats ontoProc org_Mm_eg_db restfulSE shiny SummarizedExperiment]; };
+  systemPipeR = derive2 { name="systemPipeR"; version="1.15.4"; sha256="174nh3p7rhfdhpl0rpyg14z3nr9gkv5j57csazdsqn6qd6fgblxy"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicFeatures GenomicRanges ggplot2 GO_db GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
+  tRNA = derive2 { name="tRNA"; version="0.99.11"; sha256="1ahqh4jrlgjdb25v47ilwx84dibgg0birqxz4jxmbkya0sah36i9"; depends=[assertive BiocGenerics Biostrings GenomicRanges ggplot2 IRanges S4Vectors scales stringr XVector]; };
+  tRNAdbImport = derive2 { name="tRNAdbImport"; version="0.99.7"; sha256="0rys26q9vrblpkjq1hhsv924k9k3vf40dnqsbmwc7xbwxi3cb434"; depends=[assertive Biostrings GenomicRanges httr IRanges S4Vectors stringr tRNA xml2]; };
+  tRNAscanImport = derive2 { name="tRNAscanImport"; version="1.1.9"; sha256="0r971lja5fb352yzvhnvbynci78rpni3rli4kx5pyshh7bymiml2"; depends=[assertive BiocGenerics Biostrings GenomeInfoDb GenomicRanges rtracklayer S4Vectors stringr tRNA]; };
+  tRanslatome = derive2 { name="tRanslatome"; version="1.19.5"; sha256="1li5qwwmsq5pgawkb2ffd6yqh8qr88dan624fm938rj0iqdwaxz8"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma org_Hs_eg_db plotrix RankProd sigPathway topGO]; };
+  tenXplore = derive2 { name="tenXplore"; version="1.3.1"; sha256="1jam1x14hr8rcgxq21yrpvfxcap3rcpcyz4pxh0d5z9n8ry7m2mr"; depends=[AnnotationDbi matrixStats ontoProc org_Mm_eg_db restfulSE shiny SummarizedExperiment]; };
   ternarynet = derive2 { name="ternarynet"; version="1.25.1"; sha256="01yzfiyrbkdgzzkdnn2ifa879j8pal38k8zm83d4ad9y06v8ndbm"; depends=[igraph]; };
-  tigre = derive2 { name="tigre"; version="1.35.0"; sha256="0bby62hc2858pppk071fn2qrnqyjwc7fnpvg17y5ff2042mg0g02"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; };
+  tigre = derive2 { name="tigre"; version="1.35.3"; sha256="0ya16fnif6ww3xviadhrnkh7hdgpi7bb2rbj27lxahd7kpigja2v"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; };
   tilingArray = derive2 { name="tilingArray"; version="1.59.0"; sha256="1kbw2hj4x3wizqia245kfb1x7rkd6prij7ywif8w3wcv9c8p919m"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; };
   timecourse = derive2 { name="timecourse"; version="1.53.0"; sha256="1424s2ai9mkmxxswy6i928gzkk6kk5yz59nxkz91icg39xlf0rl5"; depends=[Biobase limma marray MASS]; };
-  timescape = derive2 { name="timescape"; version="1.5.0"; sha256="0p0i3ypd4gg44l8s7yvphjwzadnnf5l6grg28wbm7miim54vvc2y"; depends=[dplyr gtools htmlwidgets jsonlite stringr]; };
+  timescape = derive2 { name="timescape"; version="1.5.1"; sha256="0525j832iffyjcb1ii82jy0ix8mdfyf7w9frmc5zrwkflq0x2ds2"; depends=[dplyr gtools htmlwidgets jsonlite stringr]; };
   tkWidgets = derive2 { name="tkWidgets"; version="1.59.0"; sha256="0nxvgfl8kmasb1i6s3sq46qz0f7sjbqlwm5hpww1856bqd8dyyld"; depends=[DynDoc widgetTools]; };
-  tofsims = derive2 { name="tofsims"; version="1.9.0"; sha256="0hadp7726y0vfaz953hwpl27j8bhrdwrm66c81ic4jrpcicixvvr"; depends=[ALS ChemometricsWithR KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; };
-  topGO = derive2 { name="topGO"; version="2.33.0"; sha256="1avq073grahvf92sg4jr6fg3ld5z18l1pnfsgp337m308zvss0mv"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; };
-  trackViewer = derive2 { name="trackViewer"; version="1.17.2"; sha256="0hnhcns4kblnlvdsvvs3z1cmgmjvligyw90ykgskq47navwghjmm"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph grImport Gviz htmlwidgets InteractionSet IRanges plotrix Rgraphviz Rsamtools rtracklayer S4Vectors scales]; };
+  tofsims = derive2 { name="tofsims"; version="1.9.1"; sha256="12agad74lcnmg6v5g0rjzvk0qa7abav5giaz45rha61f7lz2lv12"; depends=[ALS ChemometricsWithR KernSmooth ProtGenerics Rcpp RcppArmadillo signal]; };
+  topGO = derive2 { name="topGO"; version="2.33.1"; sha256="0g6kpxn0x4v55x2p28ikc556hcy3xy1d4wgag01k19ch9bmfaqhs"; depends=[AnnotationDbi Biobase BiocGenerics DBI GO_db graph lattice matrixStats SparseM]; };
+  topdownr = derive2 { name="topdownr"; version="1.3.6"; sha256="0wsicb1m9r3a2gzx0masrfbmdd2ind415rp9iba22blj5ykqx4x0"; depends=[Biobase BiocGenerics Biostrings ggplot2 Matrix MSnbase mzR ProtGenerics S4Vectors]; };
+  trackViewer = derive2 { name="trackViewer"; version="1.17.8"; sha256="196c6inqnvxb0hdlnmi8dyp9sx9jyx6f3ks4gvlv3687yfb0b3fv"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph grImport Gviz htmlwidgets InteractionSet IRanges plotrix Rgraphviz Rsamtools rtracklayer S4Vectors scales]; };
   tracktables = derive2 { name="tracktables"; version="1.15.0"; sha256="05glrr3f9clix43nvbsknicm9lyckswc5vj654444zhx08dmgnj5"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; };
-  transcriptR = derive2 { name="transcriptR"; version="1.9.0"; sha256="0i5lclprp0ajm56czknqci6wiml9y30gy4y2gzm9150da2d6m3jc"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; };
-  transcriptogramer = derive2 { name="transcriptogramer"; version="1.3.5"; sha256="0yfkblrbjgm1nf0c7bvb3xks5mmyf4d6g5m0anzhscq2l6a3r01a"; depends=[biomaRt data_table doSNOW foreach ggplot2 igraph limma progress RedeR snow tidyr topGO]; };
+  transcriptR = derive2 { name="transcriptR"; version="1.9.1"; sha256="09ikxr69d54kskrpx18z8gsmbv3fa120x9qncmkmxczddkmswh6j"; depends=[BiocGenerics caret chipseq e1071 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges pROC reshape2 Rsamtools rtracklayer S4Vectors]; };
+  transcriptogramer = derive2 { name="transcriptogramer"; version="1.3.6"; sha256="0yzb4yzd5qbcq8gnmni0bprjz2bni2ak08v75ln51k4hcnjdqsxa"; depends=[biomaRt data_table doSNOW foreach ggplot2 igraph limma progress RedeR snow tidyr topGO]; };
+  transite = derive2 { name="transite"; version="0.99.4"; sha256="0iikbbpa9ih6jwz3dmcyqr7698axsr4zim9zfmvw5s516q939h2w"; depends=[BiocGenerics Biostrings dplyr GenomicRanges ggplot2 ggseqlogo gridExtra Rcpp scales TFMPvalue]; };
   traseR = derive2 { name="traseR"; version="1.11.0"; sha256="18s4sy6v9wzcyd0i33zh1kf4nbxmsmzpvqsz6nz7d26xprmir450"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; };
-  treeio = derive2 { name="treeio"; version="1.5.1"; sha256="1qn2zxv3adkwddar9d76xghamjl9y7589l2b2b17kd1pldx0q9m3"; depends=[ape dplyr jsonlite magrittr rlang rvcheck tibble tidytree]; };
-  trena = derive2 { name="trena"; version="1.3.0"; sha256="1jchm38bwa4bf4a6mjwy4h96qjm65m05qq5yvwdd9257pm1lfs6p"; depends=[AnnotationDbi BiocParallel biomaRt Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 DBI flare GenomicRanges glmnet lassopv MotifDb org_Hs_eg_db randomForest RPostgreSQL RSQLite SNPlocs_Hsapiens_dbSNP150_GRCh38 vbsr]; };
+  treeio = derive2 { name="treeio"; version="1.5.5"; sha256="1nvk2hr75zram3kiw5j65hlzf4gng2j0kbpscn3iwnhv8ja1a08h"; depends=[ape dplyr jsonlite magrittr rlang rvcheck tibble tidytree]; };
+  trena = derive2 { name="trena"; version="1.3.1"; sha256="0yzspka8j9iyr4lb8vqsyzap3ps74bjnan3crq2b8qjfpmr0qrcy"; depends=[AnnotationDbi BiocParallel biomaRt Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 DBI flare GenomicRanges glmnet lassopv MotifDb org_Hs_eg_db randomForest RPostgreSQL RSQLite SNPlocs_Hsapiens_dbSNP150_GRCh38 vbsr]; };
   triform = derive2 { name="triform"; version="1.23.0"; sha256="0rmxaa6hfslpqg5zngcy8s659v9n5mry6kjm1svniz347z7smdrj"; depends=[BiocGenerics IRanges yaml]; };
   trigger = derive2 { name="trigger"; version="1.27.0"; sha256="0yi3r23yw1vsz5y5wxzql0gmvwks0i6kn7f4r53swzmb12fkgs7h"; depends=[corpcor qtl qvalue sva]; };
   trio = derive2 { name="trio"; version="3.19.0"; sha256="1zix49bxx0qiz535cl8pmzjdbh4n4g5qa6bzd87p6ylrzzyxcq0j"; depends=[]; };
@@ -1518,31 +1616,32 @@ in with self; {
   tspair = derive2 { name="tspair"; version="1.39.0"; sha256="0anbb202pazdryadm7ww68nlrmyzand8kiwjfxnf59n6ansls8nd"; depends=[Biobase]; };
   tweeDEseq = derive2 { name="tweeDEseq"; version="1.27.0"; sha256="0aycx0ixg6bj05wz9am84jxbwa9qbbh3hmjp0w4pppzbmv6xrydw"; depends=[cqn edgeR limma MASS]; };
   twilight = derive2 { name="twilight"; version="1.57.0"; sha256="0mhx126yqlq76smabagwjxdff6n3vn9vzsr38nn0v8cs4vzq7v20"; depends=[Biobase]; };
-  twoddpcr = derive2 { name="twoddpcr"; version="1.5.1"; sha256="0kw54x0wsf6mdbdzhvlyh8p8s6vw7yr8a2iyac7j50sqz3zwip5y"; depends=[class ggplot2 hexbin RColorBrewer S4Vectors scales shiny]; };
-  tximport = derive2 { name="tximport"; version="1.9.7"; sha256="0xyb1zigqcpdfcwb3gyn7zwqmdxca4cpwl83qhxrfhb30jccxs6g"; depends=[]; };
+  twoddpcr = derive2 { name="twoddpcr"; version="1.5.2"; sha256="0vs1hhlpsn08g5vf5yza0lb055x3lj0xwhgnd4lnq1qc8d1ksz1r"; depends=[class ggplot2 hexbin RColorBrewer S4Vectors scales shiny]; };
+  tximeta = derive2 { name="tximeta"; version="0.99.18"; sha256="1x5vv6w34w3fqrp04i3zbq11zb8mblkvdqgmd790ll0f5y1qhq58"; depends=[AnnotationDbi BiocFileCache ensembldb GenomeInfoDb GenomicFeatures jsonlite rappdirs S4Vectors SummarizedExperiment tibble tximport]; };
+  tximport = derive2 { name="tximport"; version="1.9.12"; sha256="1s5h5kxzb8nq9qc68rq5ik894yx7jl0315cn1b4k97i12rpajyjf"; depends=[]; };
   uSORT = derive2 { name="uSORT"; version="1.7.0"; sha256="1f5dabc7ksz6fhx7x87dm8whlxrhzh5zzfysgs18fv6yn815x747"; depends=[Biobase BiocGenerics cluster fpc gplots igraph Matrix monocle plyr RANN RSpectra VGAM]; };
   unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.17.0"; sha256="0rf9hrilb6d9jr2lbw20d3almds9lmhbdkmm130kx26kybp6vi1i"; depends=[BiocGenerics HTqPCR]; };
-  variancePartition = derive2 { name="variancePartition"; version="1.11.6"; sha256="1759wz6xfvsbc0kf09dqq3n59nqqw0z81khh5gvzbgvq5q17ak3h"; depends=[Biobase colorRamps doParallel foreach ggplot2 gplots iterators limma lme4 lmerTest MASS pbkrtest reshape2]; };
+  variancePartition = derive2 { name="variancePartition"; version="1.11.14"; sha256="091j76x1jcc6g8vnzsjfnpf8q6d35rmvmv7sxcjx1jdyshl7gfjd"; depends=[Biobase colorRamps doParallel foreach ggplot2 gplots iterators limma lme4 lmerTest MASS pbkrtest reshape2 scales]; };
   vbmp = derive2 { name="vbmp"; version="1.49.0"; sha256="0h2lwkqx765s6iyyr3mivj83zdg761bci0jz1g8q9wl8xk72ajif"; depends=[]; };
-  vidger = derive2 { name="vidger"; version="1.1.3"; sha256="1hvxp7lzy95i37vyhk0xa0dpn64f9kflx6k95cndl0bbivq6lrbb"; depends=[Biobase DESeq2 edgeR GGally ggplot2 ggrepel knitr RColorBrewer rmarkdown scales SummarizedExperiment tidyr]; };
-  viper = derive2 { name="viper"; version="1.15.0"; sha256="0cl6qn0jw5xgrg2wz9rkx8j5w3hx9vbjw1yh1ayvsdghb4vb8k5b"; depends=[Biobase e1071 KernSmooth mixtools]; };
+  vidger = derive2 { name="vidger"; version="1.1.4"; sha256="1a48x1jjyccxbz792j7g538w82ascmm4aja10q0r60994h6hx6f2"; depends=[Biobase DESeq2 edgeR GGally ggplot2 ggrepel knitr RColorBrewer rmarkdown scales SummarizedExperiment tidyr]; };
+  viper = derive2 { name="viper"; version="1.15.1"; sha256="1mi1qcznr8xcz5n5wr8mcbq5wxvb00rz4zahyv90aa5py62sxagw"; depends=[Biobase e1071 KernSmooth mixtools]; };
   vsn = derive2 { name="vsn"; version="3.49.1"; sha256="1lklwnxvwv1x68nyywxkdgla5pz8d94a86whf5x9vcbvcmk92x2i"; depends=[affy Biobase ggplot2 lattice limma]; };
   vtpnet = derive2 { name="vtpnet"; version="0.21.0"; sha256="0f89b3s1412sxwp64dlnc8rlawy2w86d1y5g1c7n2hd290m51dvp"; depends=[doParallel foreach GenomicRanges graph gwascat]; };
-  vulcan = derive2 { name="vulcan"; version="1.3.0"; sha256="182aq3ly17chrlisdjsf3zzwxfv004cwbbpl2rfk40ws1376xf1i"; depends=[Biobase caTools ChIPpeakAnno csaw DESeq DiffBind GenomicRanges gplots locfit S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene viper wordcloud zoo]; };
-  wateRmelon = derive2 { name="wateRmelon"; version="1.25.0"; sha256="0arrpkdrxy1rz3ryiswq767rz5rqmvs2rxj85lagk6rj17ia64c2"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; };
+  vulcan = derive2 { name="vulcan"; version="1.3.1"; sha256="0lviq4mgnpfqb0rrh64r73xlqb50q2k4qagbn8gn9ifj35wvv2lr"; depends=[Biobase caTools ChIPpeakAnno csaw DESeq DiffBind GenomicRanges gplots locfit S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene viper wordcloud zoo]; };
+  wateRmelon = derive2 { name="wateRmelon"; version="1.25.2"; sha256="0cqy6kp2d4bms235sdzr9vy8j0956wyqr80q2kk4jqywxcb6l1yn"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; };
   wavClusteR = derive2 { name="wavClusteR"; version="2.15.0"; sha256="0pngqm1b5z8zm5sdnqprq5mibrfm5rwzi0sa0mgwg9gsrn8wcg09"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr wmtsa]; };
   waveTiling = derive2 { name="waveTiling"; version="1.23.0"; sha256="018vhrv092qfyd5vmdbq216h3rsr6xk9nnknb4x0vnk1l7yckrk8"; depends=[affy Biobase Biostrings GenomeGraphs GenomicRanges IRanges oligo oligoClasses preprocessCore waveslim]; };
   weaver = derive2 { name="weaver"; version="1.47.0"; sha256="096sgg9xrnlf819bh6gz6a9phbhn7a54phd4nl8gz7xfjxscfrhi"; depends=[codetools digest]; };
-  webbioc = derive2 { name="webbioc"; version="1.53.0"; sha256="0vm80p0sbp9lj9d29g3agmkrav4whbndgj4rhw9gz9cd7i1lv0jj"; depends=[affy annaffy Biobase BiocInstaller gcrma multtest qvalue vsn]; };
+  webbioc = derive2 { name="webbioc"; version="1.53.1"; sha256="0wjkfa6s1a0vhbfpplsvy0qzkrs94x2zd3s1kpcg5p6j4v9x9ph4"; depends=[affy annaffy Biobase BiocManager gcrma multtest qvalue vsn]; };
   widgetTools = derive2 { name="widgetTools"; version="1.59.0"; sha256="1ypz4rpi6yw6dg1w1dgnjx389xldmjzh484bs9dqzz27ly8b860v"; depends=[]; };
-  wiggleplotr = derive2 { name="wiggleplotr"; version="1.5.0"; sha256="1n338nhd8rpdv218qwnlrj8vqvnq131x51nfylzv9a8fn4d3lv7g"; depends=[assertthat cowplot dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges purrr rtracklayer S4Vectors]; };
-  xcms = derive2 { name="xcms"; version="3.3.2"; sha256="1pnbp8a9gx1ys69yr7vv7mdzl5mcj9azxy0agq16xhxix7mwp13w"; depends=[Biobase BiocGenerics BiocParallel lattice MassSpecWavelet MSnbase multtest mzR plyr ProtGenerics RANN RColorBrewer robustbase S4Vectors]; };
+  wiggleplotr = derive2 { name="wiggleplotr"; version="1.5.1"; sha256="01d237s89qkj5i2d377g20h2ibqz1f4m087xchq1lnfmkb3mq0fm"; depends=[assertthat cowplot dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges purrr rtracklayer S4Vectors]; };
+  xcms = derive2 { name="xcms"; version="3.3.6"; sha256="17mj4jlw0r48l311nhh44qpmgjcw4bq535xj7ljvg5mkxx74zlxj"; depends=[Biobase BiocGenerics BiocParallel lattice MassSpecWavelet MSnbase multtest mzR plyr ProtGenerics RANN RColorBrewer robustbase S4Vectors]; };
   xmapbridge = derive2 { name="xmapbridge"; version="1.39.0"; sha256="075yj9vqy4gf5ijirpfnm08rxqzg3bflirlr5j6qmr146jsj5cky"; depends=[]; };
   xps = derive2 { name="xps"; version="1.41.2"; sha256="01da8wc01fry7z8ma880h5g6vvqi3rdwqg5wmx9x56yfg0c293im"; depends=[]; };
   yamss = derive2 { name="yamss"; version="1.7.0"; sha256="1h8wz9cm042n9scgpm0m3c7v3wik8nr7lrm4nb47bikzcij7ymd3"; depends=[BiocGenerics data_table EBImage IRanges limma Matrix mzR S4Vectors SummarizedExperiment]; };
   yaqcaffy = derive2 { name="yaqcaffy"; version="1.41.0"; sha256="044gyqh9pk2ml6f99mfjfw7zp2ygnis74jh4x8z7i99q6jip8pbn"; depends=[simpleaffy]; };
-  yarn = derive2 { name="yarn"; version="1.7.0"; sha256="19x4r9mmii1r4ypj2p6f4vk396f0xqzbbpys3wqkwklf9gsqia32"; depends=[Biobase biomaRt downloader edgeR gplots limma matrixStats preprocessCore quantro RColorBrewer readr]; };
+  yarn = derive2 { name="yarn"; version="1.7.1"; sha256="02km8cd5l2l7whzb585c741qkzv6zlmxrl0fjfp13nsww69vg914"; depends=[Biobase biomaRt downloader edgeR gplots limma matrixStats preprocessCore quantro RColorBrewer readr]; };
   zFPKM = derive2 { name="zFPKM"; version="1.3.0"; sha256="12yj97g1y37aq4qfyqchgvp93kkb0bzxmk196s1vygh4dk0b36lp"; depends=[checkmate dplyr ggplot2 SummarizedExperiment tidyr]; };
-  zinbwave = derive2 { name="zinbwave"; version="1.3.2"; sha256="1arl59nlzksmc95hqp5pj86yj8xq122mdw3ng4pxwdbm5fs63dw7"; depends=[BiocParallel copula edgeR genefilter glmnet Matrix SingleCellExperiment softImpute SummarizedExperiment]; };
+  zinbwave = derive2 { name="zinbwave"; version="1.3.4"; sha256="0px2v20plqnshb41wy7fk9vh00l45m8mm7paqd4m197wjpxbyf3s"; depends=[BiocParallel copula edgeR genefilter glmnet Matrix SingleCellExperiment softImpute SummarizedExperiment]; };
   zlibbioc = derive2 { name="zlibbioc"; version="1.27.0"; sha256="17jr4jgl30qlnmjfzzc1qd1rah5c9bwbp08dsnkhy7fxpwimqm2i"; depends=[]; };
 }
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index db78421cf5e..e942aa83877 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-07-06"; };
+let derive2 = derive { snapshot = "2018-10-29"; };
 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=[]; };
@@ -12,7 +12,7 @@ in with self; {
   ABCoptim = derive2 { name="ABCoptim"; version="0.15.0"; sha256="1ih0xk88qhsmpvnxf56041wx5sk8as2f4f2gdnpnwdym9mbr9n4b"; depends=[Rcpp]; };
   ABCp2 = derive2 { name="ABCp2"; version="1.2"; sha256="1s2skkxpzss7c29i8600psgrp0hl46jcrxqrmy2b4db8hc0kcnbx"; depends=[MASS]; };
   ABHgenotypeR = derive2 { name="ABHgenotypeR"; version="1.0.1"; sha256="08cpmnaaxsm5c5bjifnfxdlvg5inrf13biqpcl2yq5zpqjmiki0l"; depends=[ggplot2 reshape2]; };
-  ABPS = derive2 { name="ABPS"; version="0.2"; sha256="1k3f5i34f4w2khkszb4qhwwcpiy7gsfh82vjr6rypwg6rx5rjclq"; depends=[kernlab]; };
+  ABPS = derive2 { name="ABPS"; version="0.3"; sha256="0n3f66nmfi5v94il1mxy026mi84w01ph2aljk60vn3mrz8kwf2ll"; depends=[kernlab]; };
   ACA = derive2 { name="ACA"; version="1.1"; sha256="1i3hm27nvnkvc39xlh0d1blq8q0q02czmvgi3cazmjx3jvxay0vq"; depends=[]; };
   ACCLMA = derive2 { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; };
   ACD = derive2 { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; };
@@ -26,9 +26,9 @@ in with self; {
   ADCT = derive2 { name="ADCT"; version="0.1.0"; sha256="1glf83ydx4v3ld8c4gb9h3jk6srd054bis5l8k57p1ba4fnqnnpp"; depends=[mvtnorm]; };
   ADDT = derive2 { name="ADDT"; version="2.0"; sha256="044bb1jw2m8vwk5q8l7rlz4kqphjvy8i9d59rjg0k5q5l9vczfrp"; depends=[coneproj Matrix nlme]; };
   ADGofTest = derive2 { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; };
-  ADMM = derive2 { name="ADMM"; version="0.3.0"; sha256="0j3sh497pf495qf1ivvp8h4hplq6km6m923kiv5j02sianl1j9zh"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo Rdpack]; };
+  ADMM = derive2 { name="ADMM"; version="0.3.1"; sha256="121hqglivik65gv657bdv7a8kzgvrwgwckz2h746fcibv2s7dfsi"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo Rdpack]; };
   ADMMnet = derive2 { name="ADMMnet"; version="0.1"; sha256="15f1zhgv7xai954qz2ahj4kpxyvr2svxpmybz7j43bhjpkq72dmq"; depends=[Matrix Rcpp RcppEigen]; };
-  ADMMsigma = derive2 { name="ADMMsigma"; version="2.0"; sha256="1lyixqbfmrk850y4v89chwws0arjc6j420r55p733p0zvj0mryha"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; };
+  ADMMsigma = derive2 { name="ADMMsigma"; version="2.1"; sha256="1943dza086s22pr0yz41wzn9cdg11x7fl9zr3w012865yj219m7l"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; };
   ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; };
   ADPclust = derive2 { name="ADPclust"; version="0.7"; sha256="0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1"; depends=[cluster dplyr fields knitr]; };
   AEDForecasting = derive2 { name="AEDForecasting"; version="0.20.0"; sha256="16q2sn5zzvysyy3r32jnr21pbdkkn0k0sbarni6fdkx7pj27yijn"; depends=[changepoint forecast signal]; };
@@ -61,7 +61,7 @@ in with self; {
   AMModels = derive2 { name="AMModels"; version="0.1.3"; sha256="1lhd15sh550z664qqxw6jpknnh628hm585d70ipx8s4mswi6g4hj"; 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.2.0"; sha256="0n3qzkqxq06vxx0nk4983k7khcy14hc4cxd3cii8lscf3y6bmvjc"; depends=[backports data_table dplyr knitr reshape2 rvest tibble xml2]; };
+  AMR = derive2 { name="AMR"; version="0.4.0"; sha256="056r5z553r6amq7kdbc4rl4mqlcrzsm7aprlf733as8rrabjfh9c"; depends=[backports curl data_table dplyr hms knitr rlang rvest 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]; };
@@ -72,24 +72,26 @@ in with self; {
   APSIM = derive2 { name="APSIM"; version="0.9.2"; sha256="0yyjz1kyvqpw9dh71ls2lf44gbb6r7bp9a22mr3z68k89azps5rc"; depends=[data_table lubridate plyr RSQLite sirad stringr]; };
   APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; };
   APfun = derive2 { name="APfun"; version="0.1.3"; sha256="02p40n4l66r63wq8x7ygchfhxmnpaa7vgy4bjhkqx5gfi2v4psxd"; depends=[maptools raster rgdal sp yesno]; };
-  APtools = derive2 { name="APtools"; version="3.0"; sha256="0v5xgznc8hvw3gid8x5chksc62zpwbx34qsh64sv7d1kqmh5w26j"; depends=[survival]; };
+  APtools = derive2 { name="APtools"; version="6.8.8"; sha256="171aydyd7s8qll7djl4ysy596wxdf5wfwpqwfi14jjglc9r9qrrr"; depends=[cmprsk survival]; };
   AR = derive2 { name="AR"; version="1.1"; sha256="1wn4g2997c4vc3mzq2pv8ld0ryp0i78v4zlqqryvhshxgnz4f2pr"; depends=[DISTRIB]; };
   AR1seg = derive2 { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; };
   ARCensReg = derive2 { name="ARCensReg"; version="2.1"; sha256="05zjk1wxqfigzg80lvx1940a059jfdr9zbzgzmz2n01glj1lvj63"; depends=[msm mvtnorm numDeriv tmvtnorm]; };
   ARHT = derive2 { name="ARHT"; version="0.1.0"; sha256="1fz81a202r8vk655dg6a03zfq3gfkimqjvmc95k3j02xz0iv58kn"; depends=[]; };
+  ARIbrain = derive2 { name="ARIbrain"; version="0.2"; sha256="18c7yxkrnqh18gcfzvdc5wqig6ywdmjcy8rlz0fdj3b8fb84dfpr"; depends=[hommel plyr RNifti]; };
   AROC = derive2 { name="AROC"; version="1.0"; sha256="1mmcd8nqwzaqghzbcrv0g767j57svzvlzgk71ir61vvjhsk91dkg"; depends=[Hmisc MASS Matrix moments np]; };
   ARPobservation = derive2 { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; };
   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.32"; sha256="12mrxssjcj08svdsrxv2nm53mzsgy1k0whd5zzy6fz327bjyqsrz"; depends=[data_table Formula]; };
-  ARTool = derive2 { name="ARTool"; version="0.10.4"; sha256="1malrjv4myk9nj3dndgpzscfhky4y6lj8xbfg8h2b29g7s2k846q"; depends=[car dplyr lme4 magrittr plyr]; };
+  ARTP2 = derive2 { name="ARTP2"; version="0.9.44"; sha256="0qwjfpinvlsxswq7m2biyd78cvm14xbb09g873vhmkjds3qxdk4c"; 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]; };
-  ASMap = derive2 { name="ASMap"; version="1.0-2"; sha256="0fhivq5i2py79jkwfms0my77p9x8lrkn5vn1lwbsawfkyar4dvkq"; depends=[fields gtools lattice qtl RColorBrewer]; };
+  ASMap = derive2 { name="ASMap"; version="1.0-4"; sha256="0xnrl8jhbvbc789w5gc9dz7j7gzc7wsc94a3d2wdplrmxn186nrb"; depends=[fields gtools lattice qtl RColorBrewer]; };
   ASPBay = derive2 { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; };
   ASSA = derive2 { name="ASSA"; version="1.0"; sha256="0xdmkl3qy1i6rb5wpiw6rqhz5c88zg9nav7qll235jvxwh3388xk"; depends=[]; };
   ASSISTant = derive2 { name="ASSISTant"; version="1.2-3"; sha256="072lmvmdi5yfyfda42vs556ciwj2rnka02isnknk6czir3947nck"; depends=[mvtnorm R6]; };
+  AST = derive2 { name="AST"; version="0.1.0"; sha256="0z5dw5qw0i61v4796ms7pp66f9y4ylxrcls31ixzcmkklh3rcnp3"; depends=[]; };
   ATE = derive2 { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; };
   ATR = derive2 { name="ATR"; version="0.1-0"; sha256="0ljrpix3ksi0v38sfb25s2dlfj1yjbvwcz147dk2v2c24cn3r816"; depends=[partykit]; };
   ATmet = derive2 { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; };
@@ -100,13 +102,14 @@ in with self; {
   AWR_Athena = derive2 { name="AWR.Athena"; version="1.1.0-1"; sha256="0p701jj1683npsxa3l5g0cd35yvp9823kadpw9fjvn9ixdfy1nk1"; depends=[rJava RJDBC]; };
   AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; };
   AWR_Kinesis = derive2 { name="AWR.Kinesis"; version="1.7.3"; sha256="1gfjzbb8xxfd2x5zabysqi0x10sb1c9826wqw8y555nsxgksqxz8"; depends=[AWR futile_logger jsonlite rJava]; };
-  AbSim = derive2 { name="AbSim"; version="0.2.4"; sha256="0n90zbm5nsb9ric92p0mp3a4nzivdh8m8dls18051v2dbn5h4z1v"; depends=[ape poweRlaw]; };
+  AbSim = derive2 { name="AbSim"; version="0.2.6"; sha256="16ddjk8b6xw80ch4jis1y751i9561wdxh0gifbf15qiz3vjckq8m"; depends=[ape poweRlaw]; };
   AbsFilterGSEA = derive2 { name="AbsFilterGSEA"; version="1.5.1"; sha256="15srxkxsvn38kd5frdrwfdf0ad8gskrd0h01wmdf9hglq8fjrp7w"; depends=[Biobase DESeq limma Rcpp RcppArmadillo]; };
   Ac3net = derive2 { name="Ac3net"; version="1.2.2"; sha256="1ns4n0xxz6p34c11bj0k7nzgmyqr9mis2b0g5nfz37dbikndyqyz"; depends=[data_table]; };
   AcceptanceSampling = derive2 { name="AcceptanceSampling"; version="1.0-5"; sha256="18krmmyn8pn11aqd81kbvka68lnd36mnpdh7p3pz9r4m4vjj007x"; depends=[]; };
-  AcousticNDLCodeR = derive2 { name="AcousticNDLCodeR"; version="1.0.1"; sha256="16rmwz51fy84w83vwnq2nv9mcrp4gi9ciirj5555gl1224b9i2am"; depends=[seewave tuneR zoo]; };
+  AcousticNDLCodeR = derive2 { name="AcousticNDLCodeR"; version="1.0.2"; sha256="1fgzgwanpv2pzy74xdk3hamc44p8qch467wh163dxby8jr9ik0sb"; depends=[seewave tuneR zoo]; };
   AcrossTic = derive2 { name="AcrossTic"; version="1.0-3"; sha256="03180h79jhjd66ibrnsfp3yyp2jlfysp7cymw46phzj2palghsc0"; depends=[lpSolve treeClust]; };
   Actigraphy = derive2 { name="Actigraphy"; version="1.3.2"; sha256="0y0ccmxhdfhdmi4k6pbfvnqknkqbgvfsf2qf7z7rc4xpfgym6574"; depends=[fda SDMTools]; };
+  ActisoftR = derive2 { name="ActisoftR"; version="0.0.2"; sha256="07nq31r71kg94zlyzshcnsfl99cc3x03fw5q8qgsfkpc92ridikr"; depends=[data_table dplyr ggplot2 lubridate magrittr RColorBrewer scales tibble tidyr]; };
   ActiveDriver = derive2 { name="ActiveDriver"; version="1.0.0"; sha256="10c7ga48fwvpd5mc4dqiyw4kc2l0iz5qn4hg7xk15r1qmm5rsipa"; depends=[MASS]; };
   AcuityView = derive2 { name="AcuityView"; version="0.1"; sha256="0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l"; depends=[fftwtools imager plotrix]; };
   AdMit = derive2 { name="AdMit"; version="2.1.3"; sha256="150zjxl56axhpgm25hzyhwwc5g77pkgi291d2v56zbjjqycfz2v8"; depends=[mvtnorm]; };
@@ -115,19 +118,22 @@ in with self; {
   AdapSamp = derive2 { name="AdapSamp"; version="1.1.1"; sha256="1jayjrsiib2ij4rxxj59g71r3xhzl5yqh0lhi8k6cfy03i7dkvis"; depends=[pracma]; };
   AdaptFit = derive2 { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[cluster MASS nlme SemiPar]; };
   AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.67"; sha256="0s8vv960pkbccpwlfsg1jsfjnfmq9iy8cj1fak5fn2s60zb7nm0a"; depends=[MASS mgcv nlme SemiPar]; };
-  AdaptGauss = derive2 { name="AdaptGauss"; version="1.3.3"; sha256="0f6wk9ds8ayzi0fj1dz1m3755d1sjv4v5vc1hjhfxaim127kmbqh"; depends=[caTools ggplot2 shiny]; };
+  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]; };
   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.2.18"; sha256="0vc8hbqjad9rsssd3ff84bgqxz4q6ad1fbz5gcaq1s08979r3kkk"; depends=[]; };
+  AdvDif4 = derive2 { name="AdvDif4"; version="0.3.18"; sha256="0a7yjz9qsyacwb620pcgax9dxmr1qy7a0vypsr5dw2baxm9y4k6z"; depends=[]; };
   AggregateR = derive2 { name="AggregateR"; version="0.0.2"; sha256="15gxzs3baa6f1rqwv7s7k6zybx0za1mpzc7db1n47jy9rbh2yxb2"; depends=[dummy]; };
+  AgreementInterval = derive2 { name="AgreementInterval"; version="0.1.1"; sha256="1bvinzylvsaipa8mq15f45b6h37znavlrdl0rbrx1pqw52r7z8kv"; depends=[psych]; };
   AhoCorasickTrie = derive2 { name="AhoCorasickTrie"; version="0.1.0"; sha256="0k2lcyxfsavis9g1g5293f0mw7f6jakkr11wkkjvxdlnba9c80r8"; depends=[Rcpp]; };
   Ake = derive2 { name="Ake"; version="1.0"; sha256="1dj598xfdyjqvysc39a0d5gizgk367c5lkddmwmsqa8zjmvpr15a"; depends=[]; };
   AlgDesign = derive2 { name="AlgDesign"; version="1.1-7.3"; sha256="0bl7mx4dnmkgs2x1fj7cqnrp7jx18mqwxyga0rzlniq12h8mc3fz"; depends=[]; };
   AlgebraicHaploPackage = derive2 { name="AlgebraicHaploPackage"; version="1.2"; sha256="1krm5cx609sv2p0g3xm5jaiqs9li06v717lw7ywjvx7myc9x4c07"; depends=[]; };
   AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; };
   AlleleRetain = derive2 { name="AlleleRetain"; version="2.0.2"; sha256="0b6h5giskqbjbrk8nf29i75wrhxsjw1c87laiqzrpbp9n717bl20"; depends=[]; };
+  AlphaSimR = derive2 { name="AlphaSimR"; version="0.8.2"; sha256="0illa9y0k1xlvwmnpmgabbjqa73pl6gvvb29n97vlpbv5zkpfk8l"; depends=[BH R6 Rcpp RcppArmadillo]; };
   AlphaVantageClient = derive2 { name="AlphaVantageClient"; version="0.0.1"; sha256="095m850v945lw7i3qd812p28srdb5hdk9h52zf6bkr166zai1ni0"; depends=[httr xts]; };
   Amelia = derive2 { name="Amelia"; version="1.7.5"; sha256="1mnvms3bgc5i0v7wdmfx7nikr8wxyzmqi36sj2fz4qv5b0mf4zpa"; depends=[foreign Rcpp RcppArmadillo]; };
   AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; };
@@ -138,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.1"; sha256="1v8jlyzqp9k084lzmaihp5nh7mybbgnnxnbbfkydq24b9wskfd4b"; depends=[Rcpp]; };
+  AnaCoDa = derive2 { name="AnaCoDa"; version="0.1.2"; sha256="0z7agi6992prfvc6y1gvy3j3dvy4x5xfgajgv5j76pns54sj3dl8"; 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]; };
@@ -148,23 +154,24 @@ 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.0"; sha256="0pp9ihrkjwzp6zyglkp81ry4fzm1s26r687bhxswx5iz1brzmhdn"; depends=[scatterplot3d shiny smacof]; };
+  AnthropMMD = derive2 { name="AnthropMMD"; version="2.5.1"; sha256="0ria1azmxsw54h5zdfvpyw95rcvqkl3v91d80s7pqzjz6zcz7adg"; 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]; };
   AppliedPredictiveModeling = derive2 { name="AppliedPredictiveModeling"; version="1.1-7"; sha256="1wi0sw5w1c51rmh9z98wdpk5rgzsylkkb6g019djiwxvj92l99hh"; depends=[CORElearn ellipse lattice MASS plyr reshape2]; };
   AquaEnv = derive2 { name="AquaEnv"; version="1.0-4"; sha256="07yx7mbslqgqg7ky67n3xfhskaj7s3w5mvl7xkih48xbsdlmxi4l"; depends=[minpack_lm]; };
-  ArArRedux = derive2 { name="ArArRedux"; version="0.2"; sha256="0ql9yx46sgqkc3jd7yaw3vwg8rnykbsvpcahrgc66753kcxih04q"; depends=[]; };
+  ArArRedux = derive2 { name="ArArRedux"; version="1.0"; sha256="11h88gnj54cn5fbxf163s8kjqc1q452nzb218fjlwsxxwzaz5gbr"; depends=[]; };
   ArCo = derive2 { name="ArCo"; version="0.3-1"; sha256="1afjdmcalx3m19jlvqs83fg5qlds59l5zzg3pzk13qk31r0hz7mk"; depends=[boot glmnet Matrix]; };
   ArDec = derive2 { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; };
   ArchaeoChron = derive2 { name="ArchaeoChron"; version="0.1"; sha256="1qma2432mm73h72g9ah1k02wlcb6yrhc6mpai9nj7v58s126ffxn"; depends=[ArchaeoPhases Bchron coda rjags]; };
   ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.3"; sha256="0012rjbk3bxf6j7p0skp02yrgqzl903dclnmm7c038f941krjcfq"; depends=[coda DT ggalt ggplot2 ggthemes hdrcde readr shiny shinythemes toOrdinal]; };
   ArfimaMLM = derive2 { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[fracdiff fractal lme4]; };
   ArgumentCheck = derive2 { name="ArgumentCheck"; version="0.10.2"; sha256="0mgx7mzbg2wynixcf9hvs0i9p4zka7c3chrfvjmvvvwwgsy24hkc"; depends=[]; };
-  Arothron = derive2 { name="Arothron"; version="1.0.1"; sha256="1zqc73i4bl9mbrijmfix4rl14ljh7sj0j1bdx6d65knscjr522sr"; depends=[compositions doParallel foreach geometry Morpho rgl Rvcg stringr vegan]; };
+  Arothron = derive2 { name="Arothron"; version="1.0.2"; sha256="1nfdy0gwxm0xw0lp6245zz0ma481yf0yw4giisqpkkkg56snjjmx"; depends=[compositions doParallel foreach geometry Morpho rgl Rvcg stringr vegan]; };
   ArrayBin = derive2 { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; };
-  AsioHeaders = derive2 { name="AsioHeaders"; version="1.11.0-1"; sha256="1g226im9aakqdv5gynsl568w0mxcbfrny9lqid7pl984pq8xr8ks"; depends=[]; };
+  AsioHeaders = derive2 { name="AsioHeaders"; version="1.12.1-1"; sha256="0phcagfjxrakkap0kffclcqjspb2rmhq81k934mxgh1qz5a68ksv"; depends=[]; };
   AssayCorrector = derive2 { name="AssayCorrector"; version="2.0.0"; sha256="0d2444if5hyfbzyminnspw686r5l4pf9cdj9k48n2539vd61k452"; depends=[kSamples lattice latticeExtra RColorBrewer RVAideMemoire]; };
-  AssetCorr = derive2 { name="AssetCorr"; version="1.0.1"; sha256="1ls08p120gn7mv7nfslc08dw159d001z57xx9wkyfz7v8r27qhsy"; depends=[boot ggplot2 mvQuad mvtnorm numDeriv Rdpack VineCopula]; };
+  AssetCorr = derive2 { name="AssetCorr"; version="1.0.3"; sha256="0xcyj9xw895p4j03j9c76k7ylhkmf777akg4m90av12ad05njjbv"; depends=[boot ggplot2 mvQuad mvtnorm numDeriv Rdpack VineCopula]; };
   AssetPricing = derive2 { name="AssetPricing"; version="1.0-1"; sha256="0pbb1362dgdipbj3h50ykissl3gdqf1j1mpq53ixprvyc966c5h4"; depends=[deSolve polynom]; };
   AssocAFC = derive2 { name="AssocAFC"; version="1.0.2"; sha256="1rjiiir472dnr15xyvpn81s62nf01gl70khr8mrni65ssp5m30fb"; depends=[CompQuadForm]; };
   AssocTests = derive2 { name="AssocTests"; version="0.0-4"; sha256="1fhqzbj4aj4srkiba79w8wdyc7yy701izklxqqa7lsifnca6gn4j"; depends=[cluster combinat fExtremes mvtnorm]; };
@@ -185,23 +192,24 @@ in with self; {
   BACCT = derive2 { name="BACCT"; version="1.0"; sha256="0bpm4l27vbblzi2hhfbjw2af3ic2jbnyghkvchpq8ww43k8068iv"; depends=[ggplot2 reshape2 rjags]; };
   BACprior = derive2 { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[boot leaps mvtnorm]; };
   BAEssd = derive2 { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; };
-  BALCONY = derive2 { name="BALCONY"; version="0.2.7"; sha256="1xdhldr6y3hrnp4g3zpplfcgiv0n8ci792hkaps9l47799vww03r"; depends=[Biostrings dplyr progress readr Rpdb scales seqinr]; };
-  BAMBI = derive2 { name="BAMBI"; version="2.0.0"; sha256="09ib729h3wz1gbadsrlj2y05xbdwms9m4dhwmq9dfzm9v9qpw9n0"; depends=[bridgesampling coda future future_apply gtools label_switching lattice loo mvtnorm qrng RColorBrewer Rcpp RcppArmadillo rootSolve]; };
+  BALCONY = derive2 { name="BALCONY"; version="0.2.8"; sha256="0qz7kzwglln9xa2ybxl72kkdw3ysc4wx1wxl94mzkgv01sf1bdhb"; depends=[Biostrings dplyr progress readr Rpdb scales seqinr]; };
+  BALD = derive2 { name="BALD"; version="1.0.0-3"; sha256="1azyqami07g3ax60j0ws3d1qha65k0svn2v5c9pisni0qch5xql0"; depends=[lattice logspline rjags]; };
+  BAMBI = derive2 { name="BAMBI"; version="2.0.1"; sha256="0mmigmgh37jbjnaafnisv7i30nfa605r2k3w22mpg1n3lcjdpmdk"; depends=[bridgesampling coda future_apply gtools label_switching lattice loo mvtnorm qrng RColorBrewer Rcpp RcppArmadillo rootSolve]; };
   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.8"; sha256="1nb1xj2v8d54fw4fppfsvai3q8csavqiksrybsc7imb4cfvdkw9h"; depends=[Rcpp survival]; };
-  BAS = derive2 { name="BAS"; version="1.5.1"; sha256="0p1pjv8nx3jkjn8j9r87lngwgwxra3hh8qj6qklppnkznly533hr"; depends=[]; };
+  BART = derive2 { name="BART"; version="1.9"; sha256="16k5cn81bywm9njvfnnid0dhq7fbmf875v4z7a3a90p0jxrgr902"; depends=[Rcpp survival]; };
+  BAS = derive2 { name="BAS"; version="1.5.2"; sha256="1h8n7599svxyvmqd6mamj75w8i1li7q4fscs50a8irv9frhv5979"; 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.3"; sha256="0kcmc4jpiwmdydbyjfm1jx4ravxkqzvqca3p5gp26nx14xglm9hi"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; };
-  BAT = derive2 { name="BAT"; version="1.5.6"; sha256="0m6yfxymhzi8n2l421ngy6cz3qa5v7yrd1jhpi8ymlnf8dysd57x"; depends=[nls2 raster spatstat vegan]; };
+  BASiNET = derive2 { name="BASiNET"; version="0.0.4"; sha256="0pmn4znqhpav729ai7zr027a7sx6bz2lmlk086crmwm1fnwipqq4"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; };
+  BAT = derive2 { name="BAT"; version="1.6.0"; sha256="056ygqpbqznysjzg4z96wrgfa4bwp1lf5qrv9bp6692r3ldq0485"; depends=[hypervolume nls2 raster spatstat vegan]; };
   BAYESDEF = derive2 { name="BAYESDEF"; version="0.1.0"; sha256="030xskgqqg0n85mphjv32ks4ysvxb36f6ayy0176gps14jhmhcp7"; depends=[glmnet gWidgets readxl REdaS]; };
   BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; };
-  BAwiR = derive2 { name="BAwiR"; version="1.1"; sha256="1wdwvghdhlld4iim49ia3k3g1rxrji8qh6jy63klglq6hb1rwx6c"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tidyr xml2]; };
+  BAwiR = derive2 { name="BAwiR"; version="1.1.3"; sha256="0p5hjv2c86y53nmzmrrvg5d706y760r19aiqcc6jqzj9rkq3iivw"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tidyr xml2]; };
   BB = derive2 { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; };
   BBEST = derive2 { name="BBEST"; version="0.1-6"; sha256="1hvgi3679ixpq0c5qbxhkp1j0953k3lklglgxrq9mz2ry6z9n038"; depends=[DEoptim ggplot2 reshape2 shiny wmtsa]; };
-  BBI = derive2 { name="BBI"; version="0.2.0"; sha256="1mv6sh853y8p4by76637bky6yl57qyhmgqmd2n2k7r0cxg8hprcx"; depends=[vegan]; };
+  BBI = derive2 { name="BBI"; version="0.3.0"; sha256="167sndfp3776p8n9zdpihc9xhqqi8wygzpl49dzkfj53gwa77rnn"; depends=[vegan]; };
   BBMM = derive2 { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; };
   BBMV = derive2 { name="BBMV"; version="2.1"; sha256="11d4wd1zx99hrhwagw73jkk088rz5vgkjml6mckssc2iqvhj1dc9"; depends=[ape]; };
   BBRecapture = derive2 { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI lme4 locfit secr]; };
@@ -211,36 +219,37 @@ in with self; {
   BCC1997 = derive2 { name="BCC1997"; version="0.1.1"; sha256="1lqbivjkc7858jn54av1v9bzp0as43klgndbzkr59dc3l128xp12"; depends=[]; };
   BCDating = derive2 { name="BCDating"; version="0.9.7"; sha256="0z3a95sc481p0n33mhg7qlsf1jynbm1vbfds0n03bsjrwvqkzpb2"; depends=[]; };
   BCE = derive2 { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; };
-  BCEA = derive2 { name="BCEA"; version="2.2-5"; sha256="0jiizwnxycbz9x8fmkcw3rcjkgg5b9fawyddf8swvx23cnfm6z8z"; depends=[MASS]; };
+  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=[]; };
   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.51"; sha256="08cc9ab7ipkxm5jxg5qyq40l58jqf5yg02igxi3xbqrb946ynqqx"; depends=[igraph Matrix]; };
-  BE = derive2 { name="BE"; version="0.1.0"; sha256="1mav5hvzsggh13szny0s0iy44di2jna523z8cjcy89s7nv2fqaag"; depends=[]; };
+  BDgraph = derive2 { name="BDgraph"; version="2.52"; sha256="11if4abx2y0x92qwadl34d44qg1qlhmgdbhfqabhirbng553szcv"; 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]; };
-  BEDMatrix = derive2 { name="BEDMatrix"; version="1.4.0"; sha256="0aha33skksh45fx248lx6v8cxwgkiripw3avspb8arbld9rmqwxn"; depends=[BH crochet Rcpp]; };
+  BEDMatrix = derive2 { name="BEDMatrix"; version="1.4.1"; sha256="1g92ayc6igz4qsf8g05m5628za4ipl2hy51khar0d54pkys5l1vw"; depends=[BH crochet Rcpp]; };
   BEQI2 = derive2 { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; };
   BEST = derive2 { name="BEST"; version="0.5.1"; sha256="0yx3bkaaly0lriyd5xr7aay4c381a5iwanfixz9v37cmvs64rs4s"; depends=[coda HDInterval rjags]; };
-  BETS = derive2 { name="BETS"; version="0.4.4"; sha256="0cfndahvqdma95sbyf4r3bhf6hxplkx7dmpcx41s1mqcr0bgnxvp"; 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="1.0.0"; sha256="0xd7xpnvhpyvv6caxyif7wa25llvrnyzmmk4z6rp7absjqbz2alc"; depends=[BEDMatrix bigmemory bit ff LinkedMatrix symDMatrix]; };
-  BGGE = derive2 { name="BGGE"; version="0.6.3"; sha256="0i7dz1j2p3nmqad6ja5b45maa3a1wn1gsh1g7sahyqr72s2bvvkn"; depends=[]; };
-  BGLR = derive2 { name="BGLR"; version="1.0.5"; sha256="14a979rnasaklkfafzpkhr6mqv0ga7fsfxq63scpnlwa2aasgn83"; depends=[]; };
+  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=[]; };
   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]; };
-  BHTSpack = derive2 { name="BHTSpack"; version="0.4"; sha256="15a1xx2j6s94jrhlbbkriqzs7wfbh2nkz564zvmn20czmaf7v5iq"; depends=[R2HTML xtable]; };
+  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.5-44"; sha256="16mgbf2jpz3fkn1gb8xcc8h45k8p74sq5gp2kk8q2g3z7gg697xh"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; };
+  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.0"; sha256="1n14ar765iqafi8ckpghxrafivmpf583yckfxk07haz4186klvss"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; };
+  BIGL = derive2 { name="BIGL"; version="1.2.2"; sha256="0zrp6mrsjmac2z8syh8216zcr7yy60y4yr2xfvmd4cxdnsc198hr"; 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]; };
@@ -249,19 +258,21 @@ in with self; {
   BKPC = derive2 { name="BKPC"; version="1.0.1"; sha256="17gmhf6qq8jn2xzkqvjq60xzy0slz6kgfpd0d6hlpnf30ww7q923"; depends=[kernlab]; };
   BLCOP = derive2 { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; };
   BLModel = derive2 { name="BLModel"; version="1.0.2"; sha256="0l5f2v5ggadmrci3qhhmxm3j9i6jii0anq5rv5vk50y2qzii2q15"; depends=[]; };
-  BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.1.5"; sha256="0wnxfyl8hz1a0k33v5nc3j1ziwcv1fnw8639l0xv92p5rn7n5nc5"; depends=[mvQuad numDeriv randtoolbox Rcpp ucminf]; };
-  BLR = derive2 { name="BLR"; version="1.4"; sha256="0wy3c8nnzkdhwb5s1ygdid47hpdx72ryim36mnicrydy0msjivja"; depends=[SuppDists]; };
+  BLOQ = derive2 { name="BLOQ"; version="0.1-0"; sha256="1ag0dy3cjdxhlspmzfdnpli030g6gwac50n5s30igcyrmw6kl4hf"; depends=[maxLik mvnmle mvtnorm]; };
+  BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.2.5"; sha256="19kxvmwfa9mzq2lxlszai8zbag13m5dp600xhvwjjlmc5pg4fs3g"; depends=[Formula mvQuad numDeriv randtoolbox Rcpp RcppArmadillo]; };
+  BLR = derive2 { name="BLR"; version="1.5"; sha256="1aj4qs0zjca2ifx3y4a0s6c59lbsgracili2an5nr2rxnsl10aw6"; depends=[SuppDists]; };
   BLRPM = derive2 { name="BLRPM"; version="1.0"; sha256="15q0jkw4swz35c58nv23k8g1dy1kkbqh5aydjck7pd0fmppqrhpx"; depends=[R6]; };
   BLSM = derive2 { name="BLSM"; version="0.1.0"; sha256="02xidwp91rh34rcqd0q552wzm2j80axs1nnwwv2aj04g96lf7myj"; depends=[Rcpp RcppEigen]; };
-  BMA = derive2 { name="BMA"; version="3.18.8"; sha256="1a32ghn17ymb3zdh9xv6zvqcxc81m4y478mk6z9bfndq7ihy1ih5"; depends=[inline leaps robustbase rrcov survival]; };
+  BMA = derive2 { name="BMA"; version="3.18.9"; sha256="1lwgjswjiiyzxjpbpr61lcppgkz2d6m3vhgz7qpg33jg2mvdkvjy"; depends=[inline leaps robustbase rrcov survival]; };
   BMAmevt = derive2 { name="BMAmevt"; version="1.0.1"; sha256="1krx8isj2wp3panjcbc2ysrc2pxz2casj12qq9p18imaa326l53y"; depends=[coda]; };
-  BMRBr = derive2 { name="BMRBr"; version="0.1.0"; sha256="1z54annplzydnxvwd0rkhcw5rmfx8r99k28ld5rgh22xq3zdq825"; depends=[rvest xml2]; };
+  BMRBr = derive2 { name="BMRBr"; version="0.2.0"; sha256="0v2ysap5jfkq9fc5blqlfhsv2bs8rqybmp5z4q3g6y3y7qzhypjw"; depends=[rvest xml2]; };
   BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; };
   BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; };
+  BMSC = derive2 { name="BMSC"; version="0.1.1"; sha256="0dpyb01bmfa9qgrj60hdmbgp0mln96zx7ndiljwz7ylpg8myj8sl"; depends=[BH dplyr ggplot2 loo R_utils Rcpp RcppEigen rstan rstantools StanHeaders]; };
   BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; };
   BMhyb = derive2 { name="BMhyb"; version="1.5.2"; sha256="0sf12xibr22i3pqdb7zay1mmgfnvqxdlimsbd8y5pi4ybiqz8bl8"; depends=[ape corpcor DEoptim geiger lhs Matrix mvtnorm numDeriv phylobase phytools TreeSim viridis]; };
   BMhyd = derive2 { name="BMhyd"; version="1.2-8"; sha256="14pv5f621zq5x9i408zjm8k80hcsabkjpdf86gk3ylgw5yqcivrx"; depends=[ape corpcor geiger mvtnorm numDeriv phylobase phytools TreeSim]; };
-  BMisc = derive2 { name="BMisc"; version="1.2.0"; sha256="0mfwa3614xgvlwl44r9p3ic34z9q9qilnhvb8p95s40xi622wphy"; depends=[formula_tools plm]; };
+  BMisc = derive2 { name="BMisc"; version="1.3.1"; sha256="0wh17bf1ii6zan09n59cf9257nb60nh08ig01id9k0bvm9f14ay6"; depends=[formula_tools plm]; };
   BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; };
   BNN = derive2 { name="BNN"; version="1.0.2"; sha256="13h9xqfdqnc9d8brx1xlmvb4nrkpwncwjz98y7i3wijih85wkikd"; depends=[mvtnorm]; };
   BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.2.4"; sha256="06s0cs3anbby93n7pjcin9195agfzfq9im6f9k7ih3cbg8mzfaqy"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; };
@@ -269,10 +280,12 @@ in with self; {
   BNPTSclust = derive2 { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; };
   BNPdensity = derive2 { name="BNPdensity"; version="2017.03"; sha256="0anpi75wwx91dbm937ydgcpd8wchm0nyciy4xdhppsvzq9v3d2hp"; depends=[]; };
   BNSL = derive2 { name="BNSL"; version="0.1.3"; sha256="1918dc73gasac45kzcf4pxvl8iaawzkqdi03ny0napbjr3z8rss2"; depends=[bnlearn igraph Rcpp]; };
-  BNSP = derive2 { name="BNSP"; version="2.0.6"; sha256="0phi41khw525nsrizxak933j2hlhpkgdskvwv8yqljhvyamxgaql"; depends=[coda cubature Formula ggplot2 gridExtra plot3D plyr threejs]; };
+  BNSP = derive2 { name="BNSP"; version="2.0.8"; sha256="03pl4rvcrsd471nb56rsichzyay57ij1pqn3vvi3dpnr6rnfv4xm"; depends=[coda cubature Formula ggplot2 gridExtra mgcv plot3D plyr threejs]; };
   BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
-  BOIN = derive2 { name="BOIN"; version="2.6.3"; sha256="0hvx75zjb5bj005ggj9j67p9f8hpq8p6c0ihidf3avfrirl8g98p"; depends=[Iso]; };
-  BPEC = derive2 { name="BPEC"; version="1.2.1"; sha256="142x0iw3sanvqm0n2hfba8pwndfk8l5qzhgpca9gcya7wkcmmmf7"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools R2G2 sp]; };
+  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]; };
+  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]; };
   BSDA = derive2 { name="BSDA"; version="1.2.0"; sha256="0gs33yyca45jd4f5k5f7qid4ayw2rnl2wl7a6m7vf39dfx7ympm2"; depends=[e1071 lattice]; };
   BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; };
@@ -291,7 +304,7 @@ in with self; {
   BUCSS = derive2 { name="BUCSS"; version="1.0.0"; sha256="133wsv784abrs6s1rhdi65qdrw5wx806r6pf76g3vbsf2qhk51qb"; depends=[]; };
   BVS = derive2 { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; };
   BVSNLP = derive2 { name="BVSNLP"; version="1.1.5"; sha256="1m6cpxm6pd831472qzj370f6q9sf416zd6ixphg3yqvvakgdznv8"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; };
-  BWStest = derive2 { name="BWStest"; version="0.2.1"; sha256="1kwd1s1dd21qca31np49aql839j8325y8bnxlcq84nw48vqv0jgc"; depends=[memoise Rcpp]; };
+  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]; };
   BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; };
@@ -299,24 +312,25 @@ in with self; {
   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.2"; sha256="0a4mb5lwjcy5d3h0ypsqmqniqx3dm64mssj65apgl48wqbm6zvv0"; depends=[Rcpp]; };
-  Ball = derive2 { name="Ball"; version="1.2.0"; sha256="1x3l3bg4mn5kvm98p1ypn7gi61q2wm1224n9d99x1pms1iqhx4zv"; depends=[gam survival]; };
+  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]; };
   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.1"; sha256="1mc35y3zxmijgywfd1qhvlpb66rzc8n6j3ynvfrg5c7z8j8592h3"; depends=[curl dplyr quantmod rvest stringr tidyr XML]; };
+  BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.2"; sha256="0xssci49wf3jg8hhlycf9jy8mdxlizxh1hwr0xacwsbf38wvnas3"; depends=[curl dplyr lubridate quantmod rvest 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]; };
   BayHap = derive2 { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; };
   BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; };
-  BayLum = derive2 { name="BayLum"; version="0.1.2"; sha256="172ynm4z1m8dc954q4x9vwc2lyxqbwmqaxmz8v49jm8r2ifv7h8c"; depends=[ArchaeoPhases coda hexbin Luminescence rjags]; };
+  BayLum = derive2 { name="BayLum"; version="0.1.3"; sha256="0hina84s8ax01zpnji4jqqkdap0phvxr78s4rnab0407xrydbf0w"; depends=[ArchaeoPhases coda hexbin KernSmooth Luminescence rjags]; };
   BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; };
   BayesBD = derive2 { name="BayesBD"; version="1.2"; sha256="10ik2lndqgmy6pvdm6cx4fsxgjb2fgi6hlz5ic35ab7fkpi90ka5"; depends=[jpeg mritc png Rcpp RcppArmadillo shiny]; };
   BayesBinMix = derive2 { name="BayesBinMix"; version="1.4.1"; sha256="1b18qg0mjbmrilwqffrq33gw04fzask2xgj1bp4cli51cjf2slf7"; depends=[coda doParallel foreach label_switching]; };
   BayesCR = derive2 { name="BayesCR"; version="2.1"; sha256="1qav7l64iqqdvr1v6c7hlzvbx7zbvsa55pyisvkq5rsayy1rdsl1"; depends=[mnormt mvtnorm rootSolve truncdist]; };
+  BayesCTDesign = derive2 { name="BayesCTDesign"; version="0.5.0"; sha256="0q37q2mwvg9616chr2xzgd4mrpv9rqsqq9p0lc02gi35ay7hafcp"; depends=[eha ggplot2 reshape2 survival]; };
   BayesCombo = derive2 { name="BayesCombo"; version="1.0"; sha256="01rzjja0xzvqyjivl8a9da13v13ylm4dwv4f27cmgz2znakfg5y8"; depends=[]; };
   BayesComm = derive2 { name="BayesComm"; version="0.1-2"; sha256="1rrbvwcfm93cw0m33g0zn6nyshfjc97kb3fby9cga0zaixc0a8rk"; depends=[abind coda mvtnorm Rcpp RcppArmadillo]; };
   BayesDA = derive2 { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
@@ -324,18 +338,19 @@ in with self; {
   BayesFM = derive2 { name="BayesFM"; version="0.1.2"; sha256="0fiw2x29cpv3prywsbvs1m8a588s2wpi3bwzzjisi2rafbl619xd"; depends=[checkmate coda ggplot2 gridExtra plyr]; };
   BayesFactor = derive2 { name="BayesFactor"; version="0.9.12-4.2"; sha256="1z083v7is21gm0a458jm5ph3xfdm7mh29a6sg2r1njq82f8x3s3g"; depends=[coda gtools hypergeo Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; };
   BayesGESM = derive2 { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; };
-  BayesGOF = derive2 { name="BayesGOF"; version="4.0"; sha256="10y36qyp674kgw08wrb6drd942314frw4ilkwna6qg6nqh07jzbk"; depends=[Bolstad2 nleqslv orthopolynom VGAM]; };
+  BayesGOF = derive2 { name="BayesGOF"; version="5.2"; sha256="17wm0228xq3db431abyi9jr0q1q86nnajsn7hmy4dwzgvrlz5s0i"; depends=[Bolstad2 nleqslv orthopolynom VGAM]; };
   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]; };
   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=[]; };
-  BayesNetBP = derive2 { name="BayesNetBP"; version="1.3.0"; sha256="01blqc48ssgr3dg5bk7yzwpa59n3ja1dggglwm2441dwjxf10vxx"; depends=[bnlearn doBy fields graph gRbase igraph qtl qtlnet RColorBrewer Rgraphviz]; };
+  BayesNetBP = derive2 { name="BayesNetBP"; version="1.4.0"; sha256="007anxk76rxwskc7fvbmaw7ihjnwqad0xmiy6iyv68lwrjifvpc2"; depends=[bnlearn doBy fields graph igraph qtl qtlnet RColorBrewer Rgraphviz]; };
   BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; };
   BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; };
   BayesRS = derive2 { name="BayesRS"; version="0.1.3"; sha256="0fhvnckabp0z1cdsbjgv3ijnzaxwhrk83fwcflgqbhvm3a9lzr77"; depends=[coda ggplot2 metRology reshape rjags]; };
-  BayesS5 = derive2 { name="BayesS5"; version="1.30"; sha256="1nx61sq1d20238hbgr9p9hrmnxsxpsjhnb4sdhmqg1m7klq8qyrw"; depends=[abind Matrix snowfall]; };
+  BayesS5 = derive2 { name="BayesS5"; version="1.31"; sha256="1azxn3r0s52zy6y5qsa6yx331795mkk7fb28fcinv2zx9iyvk33w"; depends=[abind Matrix snowfall]; };
   BayesSAE = derive2 { name="BayesSAE"; version="1.0-2"; sha256="1xbx9hr254agpcqs1fl7qi7h19fd2bbmjszn44l566n2svgvxwf5"; depends=[coda Formula lattice]; };
   BayesSingleSub = derive2 { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda MCMCpack mvtnorm]; };
   BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; };
@@ -350,7 +365,7 @@ in with self; {
   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]; };
-  BayesianTools = derive2 { name="BayesianTools"; version="0.1.4"; sha256="13imh2vc3picfy1ppzfisgkhk2n8w8s0fnhklkni06wz1816h2zd"; depends=[bridgesampling coda DHARMa ellipse emulator IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp tmvtnorm]; };
+  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=[]; };
   BcDiag = derive2 { name="BcDiag"; version="1.0.10"; sha256="1gyinmx5wn2kk70hiy28ghilkhfirfjbfqdrqq5h3wfb4khnq6pz"; depends=[fabia]; };
@@ -359,7 +374,7 @@ in with self; {
   BeSS = derive2 { name="BeSS"; version="1.0.5"; sha256="1gq0zfrzkh2cndly7amhjy0qnfb60lsj7izmdlf2m8h7yrcicjzv"; depends=[glmnet Matrix Rcpp RcppEigen survival]; };
   Benchmarking = derive2 { name="Benchmarking"; version="0.27"; sha256="0y31l3ddxm16sylw7p6dnv39w9ydjkjn92gi0za7s0vx07mzimxp"; depends=[lpSolveAPI ucminf]; };
   BenfordTests = derive2 { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; };
-  Bergm = derive2 { name="Bergm"; version="4.1.0"; sha256="13qdcwycppwy9qqc42zi5fz6wg4a47pfczb3nnfj1bdn2drxqw2x"; depends=[coda ergm Matrix MCMCpack mvtnorm network]; };
+  Bergm = derive2 { name="Bergm"; version="4.2.0"; sha256="04w9brzjl51nvrvyp2zn00xfcbyp1q55h4x6m7d60610fbn7f60m"; depends=[coda ergm Matrix MCMCpack mvtnorm network]; };
   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]; };
@@ -375,12 +390,12 @@ in with self; {
   BigQuic = derive2 { name="BigQuic"; version="1.1-8"; sha256="1kg48jqm62qmz5x0h6fgvd5fs5dvg51x4spsn1q503ag4dqqdjc0"; depends=[Matrix Rcpp scalreg]; };
   BigSEM = derive2 { name="BigSEM"; version="0.2"; sha256="091fdibcxd8a8kf9k4pvc1sah830wh179f28gag9g816h4qclnx9"; depends=[MASS parcor]; };
   BigTSP = derive2 { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; };
-  BigVAR = derive2 { name="BigVAR"; version="1.0.2"; sha256="14vb6nc6bn22dd112sg9zypkchmkv17gnwxs915k0k5vbb9czlr5"; depends=[lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; };
-  BimodalIndex = derive2 { name="BimodalIndex"; version="1.1.5"; sha256="08hkdpvwvi5vczc9hdzbk5qnr6s44wyf6n0xv0zbd51dqcmv2xbk"; depends=[mclust oompaBase]; };
+  BigVAR = derive2 { name="BigVAR"; version="1.0.3"; sha256="0065amdg71i9lmv7illlxgxaiyb7lvpkc68ah5vgflb6l0djisb9"; depends=[lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; };
+  BimodalIndex = derive2 { name="BimodalIndex"; version="1.1.7"; sha256="1mxyrybxxkcm6nah227cx5mhddzq6k2pf1mmm5wl7jv1br43xdm8"; depends=[mclust oompaBase]; };
   BinNonNor = derive2 { name="BinNonNor"; version="1.4"; sha256="00405ww9mh910jqww60w7cb8qbjql2jn13m60ly0bnxilg44r0bb"; depends=[BB corpcor Matrix mvtnorm]; };
   BinNor = derive2 { name="BinNor"; version="2.2"; sha256="03cggpk9fhndnk9vv5i6fzsq4wjxc5405xxlxg3l9gb618kj437f"; depends=[corpcor Matrix mvtnorm psych]; };
   BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.4"; sha256="0qiy0wf9i9r44ycz1jl666nwpsv5yz7vzz1szdy22sk68lz984bv"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; };
-  BinQuasi = derive2 { name="BinQuasi"; version="0.1-5"; sha256="1xjkxf625ggfi5nzj8kvb99xmyvva9qbvl0a3szk0aksqhqlikqi"; depends=[BiocGenerics csaw edgeR GenomicAlignments GenomicRanges IRanges mgcv pracma quadprog RMySQL Rsamtools S4Vectors SummarizedExperiment]; };
+  BinQuasi = derive2 { name="BinQuasi"; version="0.1-6"; sha256="0jf7zf3yqr2kgcm6h35234x2dqf65d2dzsh63b4q8m5l36r77k59"; depends=[BiocGenerics csaw edgeR GenomicAlignments GenomicRanges IRanges mgcv pracma quadprog RMySQL Rsamtools S4Vectors SummarizedExperiment]; };
   Binarize = derive2 { name="Binarize"; version="1.2"; sha256="014iagr76y3v7ljn6zlbg1hxwbwdi889bqxa7hwmqrcybnla22ja"; depends=[diptest]; };
   BinaryEMVS = derive2 { name="BinaryEMVS"; version="0.1"; sha256="1ainp6pg481yqhjc4f1pkxzxczbi3qm0kgq280vndq859ldfkpnh"; depends=[]; };
   BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.2"; sha256="0la8mi2wadcxwrq882n4zxvihyqkp8m383c28gl9gm4fs8cqwlxi"; depends=[expm Formula lmtest numDeriv]; };
@@ -388,34 +403,35 @@ 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.3"; sha256="0mr3qyabr4pwz4cjnig5nzbq0hqqd9rmrpnhmgb1gp3c6l013yk1"; depends=[configr devtools futile_logger git2r R_utils RCurl rvest stringi stringr]; };
+  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]; };
   BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; };
-  BioPET = derive2 { name="BioPET"; version="0.2.1"; sha256="0pwkgffm8hlgvpk3dfzskl50kp9b4rnxc8aj119kwrmlfazhhl50"; depends=[ggplot2 gridExtra pROC VGAM]; };
+  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.1"; sha256="1d7dqmkg6h02x6agc20prj8nkz061pm7f1gqizibsfz13wv5cx6w"; depends=[]; };
+  BiocManager = derive2 { name="BiocManager"; version="1.30.3"; sha256="0mfvx1xzsgiag9p42kdyqg8fvajyakrdy3z2smhdlaawzbi0qmax"; 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.9-2"; sha256="15wa7la36mfr9fi8cahvrkcd5n5gjiar66mj1c1gsaazjwqsfw6n"; depends=[Rcmdr vegan]; };
+  BiodiversityR = derive2 { name="BiodiversityR"; version="2.10-1"; sha256="009xrfpnnplr2i7z8kcxp9q924mf7x8j9pqggczynrx5lb3dlrlj"; depends=[Rcmdr vegan]; };
   Biograph = derive2 { name="Biograph"; version="2.0.6"; sha256="0vklqwbifbac3v9ws9fs22yxpqqk5b3m96qzr8j0irnimb5kgh5p"; depends=[Epi etm ggplot2 lubridate msm mstate mvna plyr reshape survival]; };
   Bioi = derive2 { name="Bioi"; version="0.2.9"; sha256="0kvqvvaws1zc3npxvl3jqidak24n5y8n98ml44mkbh7c5n296z2p"; depends=[assertthat dplyr igraph Rcpp]; };
   Biolinv = derive2 { name="Biolinv"; version="0.1-2"; sha256="0g9vw1jcsjawmddkixssm5gbncy17fdd6a3c5b2qd4hx81kxz8q9"; depends=[classInt fields raster sp spatstat]; };
   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=[]; };
   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]; };
   Bivariate_Pareto = derive2 { name="Bivariate.Pareto"; version="1.0.2"; sha256="1clfknv56zfi9wgzi5bricchvis83mc33i5d4qk3yzf2ryzxag7q"; depends=[compound_Cox]; };
   BlakerCI = derive2 { name="BlakerCI"; version="1.0-5"; sha256="16zj678qzwqih92q19dma7a602d0hif2dhii5hvxdgjymg7hg2bj"; depends=[]; };
   BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; };
-  Blaunet = derive2 { name="Blaunet"; version="2.0.7"; sha256="19p2rqbg44pi0dz2iimjgr69zyrjf0dfsic6spph81dyrri1zyvh"; depends=[cairoDevice ergm foreign gWidgets gWidgetsRGtk2 haven network plot3D plot3Drgl rgl RGtk2 sna statnet_common]; };
+  Blaunet = derive2 { name="Blaunet"; version="2.0.8"; sha256="127nl041a1rbf8c4ffv8sbkn5y03ywaxkp51yd0sahs2anf415y4"; depends=[cairoDevice ergm foreign gWidgets gWidgetsRGtk2 haven network plot3D plot3Drgl rgl RGtk2 sna statnet_common]; };
   Blendstat = derive2 { name="Blendstat"; version="1.0.2"; sha256="04rn5yqkmqrcali75ly476x0dasysbxilynziy48mrm6q3h7xyjy"; depends=[lattice MASS]; };
   BlockCov = derive2 { name="BlockCov"; version="0.1.0"; sha256="102slm6qfhsra5fg2qzwi3ldi4xny596g2cq4csiprpkhl9qwyli"; depends=[Matrix]; };
   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.4"; sha256="0sv42gyv5pzn9w6bn1y361mg6x8z9h1mbgyp8yp5wbv3jl6469s6"; depends=[ape jsonlite phangorn plotrix RSQLite]; };
+  BoSSA = derive2 { name="BoSSA"; version="3.5"; sha256="1z7wspp8bk2zyxjbgfyysqbddwmygxsx51320spk50pn5svg5ckh"; depends=[ape jsonlite phangorn plotrix RSQLite]; };
   BoardGames = derive2 { name="BoardGames"; version="1.0.0"; sha256="1w3ghs29qlnjrd46lvv055snclwwy6a22fgdqszqm377w4favnhm"; depends=[]; };
-  Bolstad = derive2 { name="Bolstad"; version="0.2-38"; sha256="1535cfpn202vb037q027dy51kc4yg5g9mpn4l6x2q1pwrvnnx18f"; depends=[mvtnorm]; };
+  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]; };
@@ -425,17 +441,18 @@ in with self; {
   BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="1.0.0"; sha256="07cgzwcnr3z5qnm1fsc75xh9c61gljgd8s633g336dqls4b7nfan"; depends=[BH Boom]; };
   BootMRMR = derive2 { name="BootMRMR"; version="0.1"; sha256="07am80603pv1dh5ma3zb0idnslkzm5m3ym8sd1nhkh8zbc6qqmzs"; depends=[]; };
   BootPR = derive2 { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
-  BootValidation = derive2 { name="BootValidation"; version="0.1.5"; sha256="0whb13gg2zsx8gzwd1f895jai0z2xpfjifdr91kdxmzpsmw78jxj"; depends=[glmnet pbapply pROC risksetROC survival]; };
+  BootValidation = derive2 { name="BootValidation"; version="0.1.65"; sha256="1q42yqj56by3j1kmq17pjl4aq0sznhph65yxfwav39q28bf5y83r"; depends=[glmnet pbapply pROC risksetROC survival]; };
   BootWPTOS = derive2 { name="BootWPTOS"; version="1.2"; sha256="1860l11xg7444l3x42rq3636csla23gg0mi5in1zibjwn1ddc202"; depends=[fractal wavethresh]; };
-  Boruta = derive2 { name="Boruta"; version="5.3.0"; sha256="181ldma4rfd14bnq5prhhsjji1hpr4jmn69b017cs08w7k0nqdi9"; depends=[ranger]; };
+  BootstrapQTL = derive2 { name="BootstrapQTL"; version="1.0.2"; sha256="1qf93wmrh6znm81jr3gyn1sl8x4i6pdx811r70fg8k026fbfjn3a"; depends=[data_table foreach MatrixEQTL]; };
+  Boruta = derive2 { name="Boruta"; version="6.0.0"; sha256="1pp8zal1vhxlzdhl20phn39m3ffhw5glyqbcgwa0w14zw2mpm6hw"; depends=[ranger]; };
   BosonSampling = derive2 { name="BosonSampling"; version="0.1.1"; sha256="0wxn12h903a0mlrkrr3w4qd9ld2a4bifs95i98cnl2dsb76rwf12"; depends=[Rcpp RcppArmadillo]; };
   BoutrosLab_plotting_general = derive2 { name="BoutrosLab.plotting.general"; version="5.9.2"; sha256="0cyhqglz0mhfi8yk3a1qdry5ljd8rjzayqj1hyw44w9b8xsm6659"; depends=[cluster e1071 gridExtra gtable hexbin lattice latticeExtra MASS]; };
   BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.0-8"; sha256="09c6zdzf5k5x7zv5m6ygl4k5xbprlpb6s3lrq432mmv8rn2yi58z"; depends=[brglm gtools lme4 qvcalc]; };
   BradleyTerryScalable = derive2 { name="BradleyTerryScalable"; version="0.1.0"; sha256="0g12fkfs2sykyd6fzf924zv8gj2js452c4pf0pz2p6156chwrk8c"; depends=[dplyr igraph Matrix purrr Rcpp RcppArmadillo]; };
-  BrailleR = derive2 { name="BrailleR"; version="0.28.0"; sha256="0hg3858aa9zr68rd7xdc1kjapdfp5lgy8rx07qd3brljnhjaxxsz"; depends=[devtools extrafont ggplot2 gridGraphics gridSVG hunspell knitr magrittr moments nortest reticulate rmarkdown whisker XML xtable]; };
+  BrailleR = derive2 { name="BrailleR"; version="0.29.1"; sha256="0n6njampfav84yd68vi4nw8h3dm285m3wfqi048ghiw740sa4rjk"; depends=[devtools dplyr extrafont ggplot2 gridGraphics gridSVG hunspell knitr magrittr moments nortest reticulate rmarkdown roloc rolocISCCNBS whisker XML xtable]; };
   Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; };
-  BreedingSchemeLanguage = derive2 { name="BreedingSchemeLanguage"; version="0.9.5"; sha256="0hw9a3d2wqngvw17bgiwl7l9pn0f7pn8v3da6zz4gpf986pk8blq"; depends=[ggplot2 lme4 Matrix Rcpp rrBLUP snowfall]; };
-  Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-5"; sha256="1ly9fx6mmiwrni52li0c23amsh4k36zjv9h5432igf0fgldhr3pq"; depends=[]; };
+  BreedingSchemeLanguage = derive2 { name="BreedingSchemeLanguage"; version="0.9.6"; sha256="0lj8s42ndqqllnm8v978481zqmc751v31909rir1pkwcsm3irisx"; depends=[ggplot2 lme4 Matrix Rcpp rrBLUP snowfall]; };
+  Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-6"; sha256="1m3ajvcksqfck5l5hj5xiflj4ry6d896ybv4f0xxks8chgnwmv0r"; depends=[]; };
   BrownDog = derive2 { name="BrownDog"; version="0.2.1"; sha256="0wnf1jcf4cakbvj9j1l7jk9mq7gd4j1il1ha2vglghqn04f27938"; depends=[httpuv jsonlite RCurl]; };
   Brq = derive2 { name="Brq"; version="2.1"; sha256="0my9sb0761nq1ivx31k7nwpg8xidqvd0zv3lan57hnsmn7d1i7a9"; depends=[]; };
   Brundle = derive2 { name="Brundle"; version="1.0.8"; sha256="1yj196x6xb75qgi16pgg3dyjmxmjklfjcpxymaki32drhmylf24z"; depends=[DESeq2 DiffBind lattice Rsamtools]; };
@@ -444,32 +461,34 @@ in with self; {
   BurStFin = derive2 { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; };
   BurStMisc = derive2 { name="BurStMisc"; version="1.1"; sha256="0cyi42zkn2dby162x9f95b3hpqxbzx25s7nahb4p86r60xj3a5c0"; depends=[]; };
   BusinessDuration = derive2 { name="BusinessDuration"; version="0.2.0"; sha256="17923n1r3n8kp7qqzr2dv8ffax355yyc3b9f6mv2hxy6k31hrrb8"; depends=[chron]; };
-  BuyseTest = derive2 { name="BuyseTest"; version="1.3.2"; sha256="1wdc2w8pdjnsj2hn902zrn6d734d9y4l4cfxd4hq1m1n7ly6gnnk"; depends=[data_table doParallel foreach lava prodlim Rcpp RcppArmadillo]; };
+  BuyseTest = derive2 { name="BuyseTest"; version="1.6"; sha256="1p5v86xbcl88jmdpxzmwj5wmx6a6h8akzddb2lx03wcn759icx7v"; depends=[data_table doParallel foreach lava prodlim Rcpp RcppArmadillo]; };
   C443 = derive2 { name="C443"; version="1.0.0"; sha256="0d04769m9kkjqpj1cgfhqrri893nwi6qn7fz63z5pkym5cig5yyi"; depends=[cluster ggplot2 gridExtra igraph MASS partykit qgraph RColorBrewer reshape2 rpart]; };
   C50 = derive2 { name="C50"; version="0.1.2"; sha256="1fpspmsm62h077dkdhii23bs3sxlblabfqj4waz794ihw1b9hicg"; depends=[Cubist partykit]; };
+  CA3variants = derive2 { name="CA3variants"; version="1.0"; sha256="006r3a8jhkbgdfpycbdv3q1pfx9pkf102cgi285awgdhs6fhh88s"; depends=[ggplot2 ggrepel gridExtra]; };
   CADFtest = derive2 { name="CADFtest"; version="0.3-3"; sha256="06bwv728ckalzibxginzfica24w18m4g87i0i064m3q89ghmnlqm"; depends=[dynlm sandwich tseries urca]; };
   CADStat = derive2 { name="CADStat"; version="3.0.8"; sha256="0wdglw1vyd5gz70r9ma0mwshvizv39nb4ahp8pvr70c4qqzsfhc0"; depends=[bio_infer car gdata gmodels JavaGD JGR lattice MASS quantreg rJava rpart XML]; };
-  CAISEr = derive2 { name="CAISEr"; version="0.3.0"; sha256="00jj01hyk86f90b8krl3k8pfh98blhq6vmvnizwwhrmkzy7d7bbj"; depends=[assertthat pbmcapply]; };
+  CAISEr = derive2 { name="CAISEr"; version="0.3.3"; sha256="1jbmc2ajmvqs7i1qxx1drx6nqqwl29hxk02qmyf8iamg7ip4adqi"; depends=[assertthat pbmcapply]; };
   CALF = derive2 { name="CALF"; version="0.2.0"; sha256="12w1vr0rk6m4lv6zvqrf45k81d301ln1253wyy9xi6mv1hkabg0v"; depends=[ggplot2]; };
   CALIBERrfimpute = derive2 { name="CALIBERrfimpute"; version="1.0-1"; sha256="1xsnqyj0qdi081rdnpas9ciy9zbhdcjx3lphl6drk0bbmik3znkv"; depends=[mice mvtnorm randomForest]; };
   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.12.0"; sha256="12wnbgrcx9373n5n5wm6scsw8aq1jfrjzfh2f38asn7sxm3ky6ri"; depends=[downloader Hmisc reshape2]; };
-  CARBayes = derive2 { name="CARBayes"; version="5.0"; sha256="0kii28mf75m7ij1l0bz2w93h7m1wwq1xjvv3d3nf3ps9h8rxzi8d"; depends=[CARBayesdata coda MASS matrixcalc MCMCpack Rcpp sp spam spdep truncnorm]; };
-  CARBayesST = derive2 { name="CARBayesST"; version="2.5.2"; sha256="0jww40ghcfiq7laprdicynn1m34ykz9l9navi9rdx8p8d7k76ykc"; depends=[CARBayesdata coda dplyr MASS matrixcalc Rcpp sp spam spdep testthat truncdist truncnorm]; };
-  CARBayesdata = derive2 { name="CARBayesdata"; version="2.0"; sha256="0mlqlqm50k4lqyvbjva7vji9jqa3rwi5ky5521rp5l4nqlj53sfb"; depends=[shapefiles 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]; };
+  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]; };
   CARrampsOcl = derive2 { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; };
-  CASMAP = derive2 { name="CASMAP"; version="0.5.9"; sha256="1rhvc44ngcvwlp12iawry5i4fmdkb1waldb0x3diw3jssim3n6mq"; depends=[Rcpp]; };
-  CAST = derive2 { name="CAST"; version="0.2.0"; sha256="01n4sdk6gsjz2g157h4y04rwkjxwzzsia3pqs0slnmvmf4yzr0b4"; depends=[caret ggplot2]; };
+  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]; };
   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.2"; sha256="1yyz3dc9r2dn16q745374dpwgf56880kv0yg35h6dhmrya3xrprm"; depends=[assertr CombMSC Hmisc magic MASS png rtf season signal]; };
-  CAvariants = derive2 { name="CAvariants"; version="3.4"; sha256="1mrqvcgnxbzah7vhqqqdygds8plwswd2l8w0aq5132byhhc4kiax"; depends=[]; };
-  CBCgrps = derive2 { name="CBCgrps"; version="2.1"; sha256="0cvgcpvdvpvjkzkwapx0y4a666xq54dwm00w4w9n8fhgp05mnkn8"; depends=[nortest]; };
+  CATkit = derive2 { name="CATkit"; version="3.3.3"; sha256="01q2ssyg0jcjgahaslfgpakjsv2wil654lc6xrg5xbbrkx7ccb90"; depends=[assertr CombMSC Hmisc magic MASS png rtf season signal]; };
+  CAinterprTools = derive2 { name="CAinterprTools"; version="1.0.0"; sha256="1ia4qfvj0nzxi6pwqnha2vpfcx3qwaw4vrjqiza11sai274j0pjy"; depends=[ca classInt cluster FactoMineR ggplot2 ggrepel Hmisc RcmdrMisc reshape2]; };
+  CAvariants = derive2 { name="CAvariants"; version="3.5"; sha256="14amvfm4l219zaqi3492433j3gbhrs6dbg7smgkyp7aklnidfw5g"; depends=[ggplot2 ggrepel gridExtra rgl]; };
+  CBCgrps = derive2 { name="CBCgrps"; version="2.3"; sha256="07cy8z1fyr328jpa98sdxwd1vydx8sr93jx79hjn9hgm157240mg"; depends=[nortest]; };
   CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; };
   CBPS = derive2 { name="CBPS"; version="0.19"; sha256="0rb04x8lin5p6h0ziiv2zh98qvah5mkpd3qbgrmhczacavvpb8hl"; depends=[glmnet MASS MatchIt nnet numDeriv]; };
   CBT = derive2 { name="CBT"; version="1.0"; sha256="13h6sf7w03nfq2arqymwww13ywnv9xnqbqazlzn856mj3ggaqda7"; depends=[]; };
@@ -480,15 +499,15 @@ in with self; {
   CCP = derive2 { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; };
   CCTpack = derive2 { name="CCTpack"; version="1.5.2"; sha256="1kkxsk9x4jz2bvldmba7fsri3zc1cjz15z0xicjmfc7lj72ngdig"; depends=[MASS mvtnorm polycor psych R2jags rjags]; };
   CCpop = derive2 { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; };
-  CDECRetrieve = derive2 { name="CDECRetrieve"; version="0.1.1"; sha256="0rxwsyr2j35f52vzpg5v4jn5qi72xn1gbqxnpsfn8c6hhmqdfjwz"; depends=[dplyr glue httr lazyeval lubridate magrittr purrr readr roxygen2 rvest stringr tibble tidyr xml2]; };
+  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.3-45"; sha256="159ahd17ddv0y78xrfrm1zdq5wfwav4jc26b41wd23zli1ljnlj5"; depends=[MASS mvtnorm polycor Rcpp RcppArmadillo sfsmisc]; };
+  CDM = derive2 { name="CDM"; version="6.6-5"; sha256="1gdmhpisy93672qyrbr0m2j3g5jivr3jik9405633pzq24ac8wvi"; 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.9.4"; sha256="194n190szwzxjxfdhiah1f50vp6n7f3q567yky7pq1x2hngna5rs"; depends=[]; };
+  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]; };
   CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; };
@@ -500,15 +519,16 @@ in with self; {
   CHMM = derive2 { name="CHMM"; version="0.1.1"; sha256="07fdvnwhblwvljbl2z0vs42nwki67yl5ly3fj40p50k3rnqqmavj"; depends=[mclust]; };
   CHNOSZ = derive2 { name="CHNOSZ"; version="1.1.3"; sha256="07j1xvv6rn57hirxw1dajnvk9hmj3r9bgk4fckzmmpclf22z4mwq"; depends=[]; };
   CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; };
-  CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.2"; sha256="0s3a9ay0l9n5kc6q0wb7f9625vba4giz1pdg3ikq4h4zhp1ldq62"; depends=[Matrix mvtnorm numDeriv stringr]; };
+  CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.3"; sha256="0yhay4fp5lyf0sdcf807yvys17qz9cr5f5ikim25mq336p7fp03x"; depends=[Matrix mvtnorm numDeriv stringr]; };
   CIEE = derive2 { name="CIEE"; version="0.1.1"; sha256="03kq9cp0v41y0r2l9j5imcrsail2xsvlzhhhsrw454d4s9gqdql9"; depends=[survival]; };
   CIFsmry = derive2 { name="CIFsmry"; version="1.0.1.1"; sha256="1m2m2zvg9ghy3bm2sll7jp4xm2vw58kc5xaxd2c9k82771m3a4j0"; depends=[]; };
   CINID = derive2 { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; };
-  CINNA = derive2 { name="CINNA"; version="1.1.41"; sha256="1s0hcqikb02xnz6kw4aapl5dw6p1dksjnr3yhhnfw6wibbkls1hc"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph network pheatmap plyr qdapTools Rtsne sna viridis]; };
+  CINNA = derive2 { name="CINNA"; version="1.1.50"; sha256="19xh2n73b0qbnj9pihbwxkvaq96d459mj4wrkcnzbh93dj6841an"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph intergraph network pheatmap plyr qdapTools Rtsne sna viridis]; };
   CISE = derive2 { name="CISE"; version="0.1.0"; sha256="10mbi4v8dfdc9ngnrrmxpng8fnig5m8nv7799jksbcf6pnj8yv51"; depends=[far gdata glmnet MASS Matrix rARPACK]; };
   CITAN = derive2 { name="CITAN"; version="2015.12-2"; sha256="08h91q7529q04izgqw3ahm4r0zjpwnwyc0vynykvv9fz2fkbk7wb"; depends=[agop DBI hash RGtk2 RSQLite stringi]; };
   CIplot = derive2 { name="CIplot"; version="1.0"; sha256="0hx3dn7d8hvsh75747d9046iqriy3bjnchph8xllnvlhkrm4di1f"; depends=[MASS multcomp]; };
   CJAMP = derive2 { name="CJAMP"; version="0.1.0"; sha256="0kvmb8vh3dfhdavmvkfmr8293p5lgjws6p7kzmc7r9h6bzmc2hcr"; depends=[optimx]; };
+  CKLRT = derive2 { name="CKLRT"; version="0.2.3"; sha256="1d8sg3ncns3fpjaghz1h1z9nfrl31v09xijrzzsias8xjrpi191b"; depends=[MASS mgcv nlme Rcpp RcppEigen]; };
   CLA = derive2 { name="CLA"; version="0.90-1"; sha256="1rpklm21i9rjw0vfhaz9brq9571yjynwfhpv6dp6fbl3cj7bwb8g"; depends=[]; };
   CLME = derive2 { name="CLME"; version="2.0-10"; sha256="1jlib4pi3ifhfwmvd1jj4kkl6npirykhz0wlvv19nvhf3514y04s"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; };
   CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; };
@@ -516,29 +536,31 @@ in with self; {
   CMF = derive2 { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; };
   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.1"; sha256="172b5pzs6z8rdziqn1cq0s4zcr5hd2ql3wjslf6rv7zn9afkmjdr"; depends=[lme4 lmtest Matching multiwayvcov]; };
+  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=[]; };
-  CNLTreg = derive2 { name="CNLTreg"; version="0.1"; sha256="1fjc45kv2nm902vpfynfxj0n7nm2prazm44nhg2m30vd6l1ijisv"; depends=[adlift miscTools nlt]; };
-  CNLTtsa = derive2 { name="CNLTtsa"; version="0.1"; sha256="0s98ckg6ms3kh49b8la2d8rsdb0m4m0v8gdbj48nqxncdvg25qk4"; depends=[adlift CNLTreg fields nlt]; };
+  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]; };
+  CNVScope = derive2 { name="CNVScope"; version="1.9.7"; sha256="1xj82nwkv27wfwrks9rckdgmhlqfl4n0zmcqqa3f9ryx79jm7zbl"; depends=[BiocManager biomaRt blockseg BSgenome_Hsapiens_UCSC_hg19 circlize ComplexHeatmap data_table doParallel dplyr DT foreach GenomicFeatures GenomicInteractions GenomicRanges ggplot2 heatmaply HiCseg htmltools htmlwidgets igraph InteractionSet IRanges jointseg logging magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl readr reshape2 rslurm rtracklayer S4Vectors shiny shinycssloaders shinyjs shinythemes spatialfil tidyr visNetwork]; };
   CNVassocData = derive2 { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; };
   CNprep = derive2 { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; };
   CNull = derive2 { name="CNull"; version="1.0"; sha256="14hy86zg18hqxi63bfzrpkz70yrzfxp2v2pva5xnrvx9dmlyz820"; depends=[ape Matrix PhyloMeasures Rcpp]; };
   COBRA = derive2 { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; };
   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=[]; };
   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=[]; };
-  CORElearn = derive2 { name="CORElearn"; version="1.52.1"; sha256="0i37dpnphdq9pcb94rzpy80gw88zrfy8diiig94p1gdj0dk57b0f"; depends=[cluster nnet rpart]; };
+  CORElearn = derive2 { name="CORElearn"; version="1.53.1"; sha256="01jjw32awqjlvrn2wanljr3v4nphjb8mknzmz4skyhx0zgdm369x"; depends=[cluster nnet rpart]; };
   CORM = derive2 { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster limma]; };
   COSINE = derive2 { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[genalg MASS]; };
   COUNT = derive2 { name="COUNT"; version="1.3.4"; sha256="02f7779fy0d2bql88x5v9csbxljhnyvl8wb8h83xrmwl7kaxsdpy"; depends=[MASS msme sandwich]; };
   COUSCOus = derive2 { name="COUSCOus"; version="1.0.0"; sha256="1ykqi72v8v1b3g9qy6h34dvk5fynzf1rl2mby65p08axmaba5798"; depends=[bio3d matrixcalc]; };
   CP = derive2 { name="CP"; version="1.6"; sha256="18zblf13riiz3mq3hkvg6vhiwjzpsn6mvgc2p0bqyldy98v4aisd"; depends=[survival]; };
   CPBayes = derive2 { name="CPBayes"; version="0.3.0"; sha256="1vzh9sgij194j7kiwjgba7xsqffiif9zamj9gdv2lk91wdcqaxid"; depends=[forestplot MASS]; };
-  CPE = derive2 { name="CPE"; version="1.4.4"; sha256="09sqp2a0j43jr9ya9piv8575rwd5fdvwmiz4chv75r3mw8p128mn"; depends=[rms survival]; };
+  CPE = derive2 { name="CPE"; version="1.5.1"; sha256="0n3pd6daj0mzhh547syh7nz8iys6q27igqngldb8zd4ib4778603"; depends=[rms survival]; };
   CPMCGLM = derive2 { name="CPMCGLM"; version="1.2"; sha256="07hx2ik5zg05w1h6i94398mp54q958phws9ydgp6syjqlp9dpf1p"; depends=[abind mvtnorm plyr]; };
   CPP = derive2 { name="CPP"; version="0.1.0"; sha256="1kdf43pnavjbmxkvrj78fiwl0ykln9x9ck8pcivhj9q5rsfbhbh4"; depends=[ineq kappalab mc2d]; };
   CPsurv = derive2 { name="CPsurv"; version="1.0.0"; sha256="1r68pp3jbcbwgfac132h30qx6ah780aychr49rlncn17xbdalxsh"; depends=[muhaz survival]; };
@@ -547,18 +569,19 @@ in with self; {
   CRANsearcher = derive2 { name="CRANsearcher"; version="1.0.0"; sha256="09gw1s28gb0l2cn4w3asl6zlr7wfacxwafbdrayajwckyfkjl5dl"; depends=[curl dplyr DT lubridate miniUI shiny shinyjs stringr]; };
   CREAM = derive2 { name="CREAM"; version="1.1.1"; sha256="1lccpwn6c5pmykgf689gvvpqdcilkys4vclpxjhllhanjrfhcs3q"; depends=[]; };
   CRF = derive2 { name="CRF"; version="0.3-16"; sha256="1vw8gkrhymqi7x3p257k8vvn4df4s16w8hhm1myzhcp6bf44jqg4"; depends=[Matrix]; };
-  CRM = derive2 { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; };
+  CRM = derive2 { name="CRM"; version="1.2.4"; sha256="0jv2z1y3zyj1m86p4pmqww58hj8pvid1ss6ym67y46n9srzxsmj5"; depends=[]; };
   CRPClustering = derive2 { name="CRPClustering"; version="1.2"; sha256="19m7jg6ck2gqmry2p35h3vv8msm4w1x7qwwmm746r646q7w9ylml"; depends=[dplyr lucid MASS mvtnorm png randomcoloR]; };
   CRTSize = derive2 { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; };
   CRTgeeDR = derive2 { name="CRTgeeDR"; version="2.0"; sha256="1fzw8618k152b8d4d6wmzp0bfkz2grwp0rqsplwvfdx23nxq437n"; depends=[ggplot2 MASS Matrix]; };
-  CSESA = derive2 { name="CSESA"; version="1.0.4"; sha256="05nijz8x5sgmc4aykxsqg2i1n50zx0kd5lqi5a1fwxbx2miw27sv"; depends=[Biostrings]; };
-  CSFA = derive2 { name="CSFA"; version="1.1.0"; sha256="0dqva3i4jhlbjmqwngxqgl6prfs3cxb219jqc7yvjjk8n4nz8jim"; depends=[elasticnet fabia FactoMineR pls randomcoloR snowFT]; };
+  CSESA = derive2 { name="CSESA"; version="1.1.1"; sha256="1q3rdfw90kjk3incn8wzf57032f63z0p0zcdndw30s2fhv2si7bn"; depends=[Biostrings]; };
+  CSFA = derive2 { name="CSFA"; version="1.2.0"; sha256="1nkyhk8qhrrlx8v26yw86l954m4xfcxma4pqbhgw95jvqql5h3li"; depends=[elasticnet fabia FactoMineR pls randomcoloR snowFT]; };
   CSclone = derive2 { name="CSclone"; version="1.0"; sha256="0lqsqsgh2sf44fr1r7g179556v294yr1wy7x4320g7adxshrwyh5"; depends=[DNAcopy lpSolve mcclust moments]; };
-  CSeqpat = derive2 { name="CSeqpat"; version="0.1.1"; sha256="1vgwkiin485n3bks09bg4ricjfw1l8k5qfv7l0xp50zha3r18g1y"; depends=[NLP tm]; };
+  CSeqpat = derive2 { name="CSeqpat"; version="0.1.2"; sha256="1nqk873cagpn4fba4rmyzb6hni1p5lqcvsr9givrcm0gfx756w1h"; depends=[NLP tm]; };
   CTM = derive2 { name="CTM"; version="0.2"; sha256="0h1lpygjq46nwkn4km49bngvxmgrnh3csrfln3yjr9yyzs7d3lz1"; depends=[jiebaR plyr]; };
   CTRE = derive2 { name="CTRE"; version="0.1.0"; sha256="1v2327g78rva3n7lvn66rznzzf2qbdak0jp8gakgljpl30kpkv5v"; depends=[assertthat MittagLeffleR plyr tea zoo]; };
-  CTT = derive2 { name="CTT"; version="2.3.2"; sha256="1f4ba2qnxx5vlj64sxz4ynby9hv7f32v6ls8yn887z51m33xdxi8"; depends=[]; };
+  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]; };
   CUFF = derive2 { name="CUFF"; version="1.5"; sha256="1cphwhimzmsljfjvfvpld4mixznlsg5azzv7dwrgnh8q4wpnaxpc"; depends=[openxlsx xtable]; };
   CUMP = derive2 { name="CUMP"; version="2.0"; sha256="0rdscywmi4sylpjpr8r472iapddizb1mqyrd532cvw6frxins7w0"; depends=[]; };
@@ -574,10 +597,11 @@ in with self; {
   CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; };
   Cairo = derive2 { name="Cairo"; version="1.5-9"; sha256="1x1q99r3r978rlkkm5gixkv03p0mcr6k7ydcqdmisrwnmrn7p1ia"; depends=[]; };
   Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.3"; sha256="03qg9rnz623dwnp68xhhsh9788s49n6xp0migg1nnjaqhrahlgdd"; depends=[]; };
-  CaliCo = derive2 { name="CaliCo"; version="0.1.0"; sha256="1fz4sx6wsrkmcfjjgjn7z26m266m844qz8ms4vk6bnhx0h1rp6qa"; depends=[coda DiceDesign DiceKriging FactoMineR ggplot2 MASS Matrix R6 Rcpp RcppArmadillo testthat]; };
-  CalibrateSSB = derive2 { name="CalibrateSSB"; version="1.0"; sha256="1r3318rzh29cgq72gdp16z60xkan7hyh1vj4gjg3pzbxy8zawqxx"; depends=[survey]; };
+  CaliCo = derive2 { name="CaliCo"; version="0.1.1"; sha256="16a6hfd3s7dzb6mvpyn4fkdi5irfjsbal7niky2g6p54290va982"; depends=[coda DiceDesign DiceKriging ggplot2 gridExtra gtools MASS Matrix R6 Rcpp RcppArmadillo]; };
+  CalibratR = derive2 { name="CalibratR"; version="0.1.1"; sha256="0ka7amcml15qifwpw4phpn12r9qjn0dvlrlraf3af971yjmwc745"; depends=[doParallel fitdistrplus foreach ggplot2 pROC reshape2]; };
+  CalibrateSSB = derive2 { name="CalibrateSSB"; version="1.1"; sha256="0rqa6xbxzqv0ks3i4pmmzczhf6g3ss6mb96g3d71y9xa6pzdxjjp"; depends=[survey]; };
   Canopy = derive2 { name="Canopy"; version="1.3.0"; sha256="0979hpphzhf4v71jx0shh3l8nffmpsn9l6f8ip2wxzcyx571i1wd"; depends=[ape fields pheatmap scatterplot3d]; };
-  CarletonStats = derive2 { name="CarletonStats"; version="1.3"; sha256="1a8ic2ny2zkqy6xsnzhlc3hybhk200d8jbdbjfy7jav7n757kr0y"; depends=[]; };
+  CarletonStats = derive2 { name="CarletonStats"; version="2.0"; sha256="0pgzvw6gf8kjv8ndprwp4wlgdgh5sb75ga8z5syfw57fb05v7ac3"; depends=[]; };
   CaseBasedReasoning = derive2 { name="CaseBasedReasoning"; version="0.1"; sha256="0hwll17j0br8sr0ci3bfa5rx4r36hr7myq7b5fav664zjxdh9wr4"; depends=[cowplot data_table dplyr magrittr R6 ranger Rcpp RcppArmadillo RcppParallel rms survival tidyverse]; };
   CatDyn = derive2 { name="CatDyn"; version="1.1-0"; sha256="0bdixcf1iwbmjd2axi6csrzms25ghdj4r6223qhk2b54wlmbzaiz"; depends=[BB optimx]; };
   CatEncoders = derive2 { name="CatEncoders"; version="0.1.1"; sha256="1q9wzq06lac8z9y8b65alsxpb48bw8wqmifd893kknk51xq6r9kl"; depends=[data_table Matrix]; };
@@ -596,16 +620,17 @@ 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.6"; sha256="0mpb7br76ng3m9g4ncx2g628zmjyf1rvi3lyxmfsmilpq6vh30n1"; depends=[actuar cplm ggplot2 lattice MASS Matrix reshape2 statmod systemfit tweedie]; };
+  ChainLadder = derive2 { name="ChainLadder"; version="0.2.7"; sha256="15d81hydbgz3j4cv4br35q9jiqlbiz8q27vylqg319y8z1p6wbgb"; depends=[actuar cplm ggplot2 lattice MASS Matrix reshape2 statmod systemfit tweedie]; };
   ChangepointTesting = derive2 { name="ChangepointTesting"; version="1.0"; sha256="1nb78b1jpp0wpy9ah2fxkh53hlmb2f82b68msbfhancb8zp2lclv"; depends=[]; };
-  ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.13"; sha256="1nkz8n3a6f0xl56py45pv0rp0n0kmz3a1m616w38mjjlcypdalwq"; depends=[Rcpp RcppArmadillo]; };
+  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]; };
   Chaos01 = derive2 { name="Chaos01"; version="1.1.1"; sha256="0ibxibmlyc6wkhqj2achwkwdkniin60y8xh8b80nq6ggmm7w9crw"; depends=[]; };
   ChaosGame = derive2 { name="ChaosGame"; version="0.3"; sha256="0nfp2qnhzpncs0yd5rknspin6c4hidqhxdd973ysiivg63wxwz8d"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; };
   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="4.4.97"; sha256="0kdcwv9kncv2r5mabp0mf9bmnajcnxmqavrl2lpn3d2pji6pv1qq"; depends=[plyr]; };
+  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]; };
   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]; };
@@ -619,33 +644,36 @@ in with self; {
   Cite = derive2 { name="Cite"; version="0.1.0"; sha256="1gfjirhswh4dkz88z4gl8m8jznqrvcgd4z3mnszyg1k5w3avlf1q"; depends=[miniUI RefManageR rstudioapi shiny]; };
   CityPlot = derive2 { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
   CityWaterBalance = derive2 { name="CityWaterBalance"; version="0.1.0"; sha256="0nvm6bv2cxszjf33xgn1xcvhrgrgbdcar0jahwf7bs03gdlpmgi1"; depends=[dataRetrieval dplyr EcoHydRology geoknife lubridate reshape2 tgp xts zoo]; };
-  Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.2.1"; sha256="1jx5419r2c55qxh4kfjdm37594bqcalqgdrqihsr8aafxhh96b8z"; depends=[]; };
+  Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.2.2"; sha256="15arwppq78zvjxhvhm4kal0x0a9cwjbgmi5xhq3vch8ppwzvm2mh"; depends=[Rcpp]; };
   ClamR = derive2 { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; };
   ClassComparison = derive2 { name="ClassComparison"; version="3.1.6"; sha256="1y0yx3qnd5mkbqjxyfjjg2y0c0b9jjwn71z97h82ya5ci3fffndi"; depends=[Biobase oompaBase]; };
-  ClassDiscovery = derive2 { name="ClassDiscovery"; version="3.3.7"; sha256="03lp1dbp2mzrzk1hn7nkp7nm1ngs0qndlk3zz7qjh3a67x7xr5p1"; depends=[Biobase cluster mclust oompaBase oompaData]; };
+  ClassDiscovery = derive2 { name="ClassDiscovery"; version="3.3.9"; sha256="0hwaks634vg7lslb4kr5rl9p5y7n0ypp2v088a1ix9r40ag4a75p"; depends=[Biobase cluster mclust oompaBase oompaData]; };
   CleanBSequences = derive2 { name="CleanBSequences"; version="0.4.0"; sha256="12s24v2kfyc32pm34ibw58zzjqhzwlrqrkhl0m70jcqvn50b5r98"; depends=[Biostrings]; };
   ClickClust = derive2 { name="ClickClust"; version="1.1.5"; sha256="0b46f453mffg4ym6yvmh7g3v05mc9gphwfra75j28y1425s87yvw"; depends=[]; };
+  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]; };
   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.3"; sha256="04axd5wrh8xszyvm6kcvhr3qs0rx9nj0z99j26qijf5w80lmhaki"; depends=[e1071]; };
+  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]; };
   ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; };
   ClustOfVar = derive2 { name="ClustOfVar"; version="1.1"; sha256="0grhkab7s58ji4cf7cxh7ahd2dxrj8aqfdf3119b40zxkxbwxcr0"; depends=[PCAmixdata]; };
-  ClustVarLV = derive2 { name="ClustVarLV"; version="1.5.1"; sha256="11zydj3iq15sg84kny6nklpmh8wj9j9nklkknzfqnaagai8jgsmy"; depends=[Rcpp]; };
+  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.2"; sha256="04charq9ydxiy8qvign3nc3ksg5v8d7jq39kdx7nndwgyjsidaic"; depends=[FD ggplot2 gmp gtools OpenImageR Rcpp RcppArmadillo]; };
+  ClusterR = derive2 { name="ClusterR"; version="1.1.5"; sha256="16jx47d1w8yshg2w537399ck3z5wfsazwqfbv0kmvi0iw8ss9bka"; 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]; };
   CoClust = derive2 { name="CoClust"; version="0.3-2"; sha256="04xv807785xv9kdspsspx1302ardv8gda06kd590lgawjixai7dh"; depends=[copula gtools]; };
-  CoDiNA = derive2 { name="CoDiNA"; version="1.0.0"; sha256="1anc127d4xx1yks5kq2glcv8sijs0sfab9wjs7j9g1aqp97hmk33"; depends=[data_table geometry igraph magrittr plot3D plyr reshape2 visNetwork]; };
+  CoDiNA = derive2 { name="CoDiNA"; version="1.1"; sha256="0gmh5s93372hl77s46wpnxp9m2r0zzhb6m1yixpd1450mlkj7rqb"; depends=[data_table igraph magrittr plyr visNetwork]; };
   CoFRA = derive2 { name="CoFRA"; version="0.1002"; sha256="0ldf84dxaanww3qkf64mz5gv3yv2rjp9m6dy64xckds66vw6x0m3"; depends=[gplots stringr]; };
   CoImp = derive2 { name="CoImp"; version="0.3-1"; sha256="0zj152w4cvnbfl144ggs3ixmyywxf9dqhh04jfydmv2a8n6px89n"; depends=[copula gtools locfit nnet]; };
-  CodeDepends = derive2 { name="CodeDepends"; version="0.6.0"; sha256="0gyvafhqrjgy81z3b7ii8p6rxi2zaakvrxb52fnbr616lk8xlmfw"; depends=[codetools graph XML]; };
+  CoRpower = derive2 { name="CoRpower"; version="1.0.0"; sha256="1pndjv2qvnlyi8gj41qp03vwv2m4mbj5srs9038ibnmci9ngybnf"; depends=[osDesign survival]; };
+  CodeDepends = derive2 { name="CodeDepends"; version="0.6.5"; sha256="0l7kiv3awx50glf5cs841b4zzsff1ml90f0zr868ygvwsr4ps1hq"; depends=[codetools graph XML]; };
   CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; };
   CollapsABEL = derive2 { name="CollapsABEL"; version="0.10.11"; sha256="0libm1wv34av3vm2vvbqcnxjh4y1rwfi8qzjca8qdz9490vngags"; depends=[biganalytics bigmemory collUtils dplyr ggplot2 haplo_stats R_utils rJava RSQLite stringr]; };
   CollapseLevels = derive2 { name="CollapseLevels"; version="0.2.0"; sha256="1fn5k83lh0vw5j9vhq0x6ksbkrm25acpslav85wfyknsj9vzmzid"; depends=[dplyr ggplot2 lazyeval magrittr]; };
@@ -659,7 +687,7 @@ in with self; {
   CombinePortfolio = derive2 { name="CombinePortfolio"; version="0.3"; sha256="0w4mw748ix7jyqfirr8bm93i742y7bpir7q5x1j3r9cqpi9h5zfv"; depends=[]; };
   CommEcol = derive2 { name="CommEcol"; version="1.6.5"; sha256="02xra47znnbnsgxy6xinyk2dv8asshd4fgh7bn6qf7m6p4d743pj"; depends=[ape gmp picante vegan]; };
   CommT = derive2 { name="CommT"; version="0.1.1"; sha256="1kimm8z3k7p5lxsjnkb203js2rqn09grywxs890fab1hhgssgv2r"; depends=[ape ggplot2 gridExtra phangorn reshape]; };
-  CommonJavaJars = derive2 { name="CommonJavaJars"; version="1.0-5"; sha256="0kwf504g1izyy7hxss21dgz26w0spxibdlacrjdh7q10z799hfhh"; depends=[]; };
+  CommonJavaJars = derive2 { name="CommonJavaJars"; version="1.0-6"; sha256="0l1zqygklv1s3xr6pjjrji3wmyqg7258qvgwf9c2qjim8p8y8lsr"; depends=[]; };
   CommonTrend = derive2 { name="CommonTrend"; version="0.7-1"; sha256="088pg2hy2g2jgs84xawrnsf7gpvrpqjsimkx7g0i5r5fmkx169f9"; depends=[MASS urca]; };
   CommunityCorrelogram = derive2 { name="CommunityCorrelogram"; version="1.0"; sha256="1wkrm5lil595sc4ih3qsf4sgvfipzlav0n7339ixqw9zxm2pg4nj"; depends=[vegan]; };
   Comp2ROC = derive2 { name="Comp2ROC"; version="1.1.4"; sha256="06hpbid9z1pzg7k4gqp2zn8l7sm375z32fsn54i27qbl3inp7m2d"; depends=[boot ROCR]; };
@@ -682,38 +710,38 @@ 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.3.0"; sha256="15zfaivawk83xr6gx5ij1xc43z5vgci8x0hglxjnhla02zn0zh9f"; depends=[ggplot2 magrittr miceadds mitools stringdist]; };
+  Conigrave = derive2 { name="Conigrave"; version="0.4.1"; sha256="0gralyfz3vq81b34s81mjmblkpbigjqb6r4wkz53xfkd4dbqlchc"; 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.2"; sha256="0761wfjxh26kf4q1qcfzfaj52553yiw1ny6l84r3wzzx4hv893qy"; depends=[caret mclust mixture mnormt mvtnorm]; };
+  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]; };
   ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.1"; sha256="0kl67ds6369mxl2i93h43r00ji12qkg0k9m4jhcxsb0ydd8rfqgp"; depends=[lattice tkrplot]; };
-  CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="1.0-7"; sha256="00x2ijyg1bj2xp679i453d4fd58qp7mfj3pvv3cddh0hl8yfns18"; depends=[geosphere ggplot2 raster rgeos rnaturalearth sp]; };
-  Copula_Markov = derive2 { name="Copula.Markov"; version="1.1"; sha256="0pgzrgd9bzf2qh9b7h0y4mmszlxk1wxdwlid3xh7rk7pif3mw3qd"; depends=[]; };
+  CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="2.0-3"; sha256="1kb21a8mp3blgnvyzqcwh1zz1mkdq6c759g9dlw3dzp2gnpzl5zp"; depends=[dplyr geosphere ggplot2 raster rgdal rgeos rnaturalearth sp tidyselect]; };
+  Copula_Markov = derive2 { name="Copula.Markov"; version="2.1"; sha256="09036bnxb0r0k6lk6sb258yrw4q458nmxinmvnishnq5bifps4v4"; 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]; };
-  CopyDetect = derive2 { name="CopyDetect"; version="1.2"; sha256="1sahrlg1gk1q8ciq0a8hxrlyci5i8jxz8pjpy04alckxdrxfpqbi"; depends=[irtoys]; };
+  CopyDetect = derive2 { name="CopyDetect"; version="1.3"; sha256="1g3bwd805h62x93xvvn67acf9v6vn7s7ghxpvjhwcfdfj7fwzh6l"; depends=[mirt]; };
+  CorDiff = derive2 { name="CorDiff"; version="1.0"; sha256="12rgfhygrdq1ign4ybr8g171wxic8zbp83n1xdsnqpj910k5jdr5"; depends=[mcc]; };
   CorReg = derive2 { name="CorReg"; version="1.2.8"; sha256="18l9aiv2ipvs14ycnzq99yvnkws38wnj42zbk5jqgv33kn37qbx2"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen Rmixmod rpart]; };
-  CorShrink = derive2 { name="CorShrink"; version="0.1-5"; sha256="03g5njb191nqiy0lmk8jrwyrnl3w733b8h0krkbsjh2zravyw1xc"; depends=[ashr corpcor corrplot gridExtra Matrix reshape2]; };
+  CorShrink = derive2 { name="CorShrink"; version="0.1-6"; sha256="15ay6ws9216lv15mpgldank3klw3zz5j4nwvv1s88jjfn2ln5c1l"; depends=[ashr corpcor corrplot glmnet gridExtra MASS Matrix reshape2 SQUAREM]; };
   Corbi = derive2 { name="Corbi"; version="0.4-2"; sha256="0h088iplryaipnfp8svw3djh016z23lv66q51gfbqpvchvjdwypw"; depends=[CRF Matrix mpmi]; };
   CorporaCoCo = derive2 { name="CorporaCoCo"; version="1.1-0"; sha256="1s3wlcy6mnw9riivw5lc4gd6bjbsd77m15ipr95g46isdcrli8zb"; depends=[data_table RColorBrewer rlist]; };
   CorrBin = derive2 { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat dirmult geepack mvtnorm]; };
   CorrMixed = derive2 { name="CorrMixed"; version="0.1-13"; sha256="02zg5kmv5qxnasnz872r3z7x7dmdcniq1x5xyfnnb3niwkdjgxzx"; depends=[nlme psych]; };
   CorrToolBox = derive2 { name="CorrToolBox"; version="1.5"; sha256="1ggrm144zmi54cqb5l2nif7dn1zb1kn31i1xhxc4jwr7fn380iyi"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm psych]; };
-  CorrectOverloadedPeaks = derive2 { name="CorrectOverloadedPeaks"; version="1.2.14"; sha256="1if4qb1d6mg3435pk3znln8id8fj12n3j9sjv4zn104v2fr90mhr"; depends=[caTools digest xcms XML]; };
+  CorrectOverloadedPeaks = derive2 { name="CorrectOverloadedPeaks"; version="1.2.15"; sha256="1hdr2zdms6vbnf6xw079c127diygzp09vqizmmh0yrbc5sx2cmb8"; depends=[bitops digest xcms XML]; };
   CorrectedFDR = derive2 { name="CorrectedFDR"; version="1.0"; sha256="15047cfjniljzhznkbzq3hyq221y9k7fa04f69zm0k0sxr627gxg"; depends=[]; };
   Correlplot = derive2 { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; };
   CosW = derive2 { name="CosW"; version="0.1"; sha256="12l4w8b5jnr8773hxk7khrdn705x6bdbw7s8z8w95bfbbi12dj6v"; depends=[fdrtool pracma]; };
-  CosmoPhotoz = derive2 { name="CosmoPhotoz"; version="0.1"; sha256="04girid6wvgyrk8ha81mdqjx2mmzifz57l1hzcgrdnzmjmm3vlmp"; depends=[arm COUNT ggplot2 ggthemes gridExtra mvtnorm pcaPP shiny]; };
   Counterfactual = derive2 { name="Counterfactual"; version="1.1"; sha256="0mz0h5zsmca8fww7nq08m9cld2zbaydn8qad5f2g6vxn382842p9"; depends=[doParallel doRNG foreach Hmisc quantreg survival]; };
-  Countr = derive2 { name="Countr"; version="3.4.1"; sha256="1qv773psgmk6ndznl4f2364vadh9qimagm38v5a3xzjnn9dpd23b"; depends=[boot car dplyr flexsurv Formula lattice lmtest MASS Matrix numDeriv optimx pscl RColorBrewer Rcpp RcppArmadillo Rdpack standardize VGAM xtable]; };
-  CountsEPPM = derive2 { name="CountsEPPM"; version="2.1"; sha256="1w1l4kbk8c2prq7f38maz0fc44j9za6cmj0vydmcgscb9s6f3mg7"; depends=[expm Formula numDeriv]; };
+  Countr = derive2 { name="Countr"; version="3.5.2"; sha256="0f45pxxl09avf4k6lzlhykd1y07hvpc3d68bc2y7nrxhpipwl5yl"; depends=[boot car dplyr flexsurv Formula lattice lmtest MASS Matrix numDeriv optimx pscl RColorBrewer Rcpp RcppArmadillo Rdpack standardize VGAM xtable]; };
+  CountsEPPM = derive2 { name="CountsEPPM"; version="3.0"; sha256="0iw7sfrb4yyaagwm1f4q9av5zvzia1mp2ns287ppsw3k248lz0kb"; depends=[expm Formula lmtest numDeriv]; };
   CovSel = derive2 { name="CovSel"; version="1.2.1"; sha256="02fsiykbg96ynqw25vfyrams7fs39xjmfhvb23zjbqb7ql6d0xdk"; depends=[dr MASS np]; };
   CovSelHigh = derive2 { name="CovSelHigh"; version="1.1.1"; sha256="0dvvpkqml2k00gicpgp475z1rjspq3s37ys1mam29k54qlshhny6"; depends=[bartMachine bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest tmle xtable]; };
-  CovTools = derive2 { name="CovTools"; version="0.3.1"; sha256="0ph7rip2lm71qb386diw93n84jaqijz6bqn0i6zgd5gg8j3szx46"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes]; };
+  CovTools = derive2 { name="CovTools"; version="0.5.0"; sha256="1skkv1i7q9sw71c95606ikwq93nlj0bs42w7j70jv1zbvq4sdmfz"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes]; };
   CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; };
   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]; };
@@ -723,9 +751,9 @@ in with self; {
   Cprob = derive2 { name="Cprob"; version="1.4.1"; sha256="1m4ys8xpj1jbn3lf8fym935y94dxipiimsf9zxwyw5sy71y7skgq"; depends=[geepack lattice lgtdl prodlim tpr]; };
   CreditMetrics = derive2 { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; };
   CreditRisk = derive2 { name="CreditRisk"; version="0.1.3"; sha256="09ks8xlsrbp3an1drcwmmd6df4fsfz61z21ma2p62a1pk0bnc86c"; depends=[fOptions]; };
-  CrossClustering = derive2 { name="CrossClustering"; version="3.0"; sha256="0l9cdniqf63x4pfkf6y7c2qh056jwadqw45nz9jk78wamqq8hyqv"; depends=[cluster]; };
+  CrossClustering = derive2 { name="CrossClustering"; version="4.0.3"; sha256="05lbdmblwmmv24h46ixxabbrp7mpajyv7raw1p5h0dmsbfbq9hi5"; depends=[assertive cli cluster crayon dplyr flip glue magrittr mclust purrr]; };
   CrossScreening = derive2 { name="CrossScreening"; version="0.1.1"; sha256="1gig80r8p611ysn35ajx7xdjj5wnkcf1vspcf0i06dmh75xpm3w9"; depends=[plyr tables]; };
-  CrossVA = derive2 { name="CrossVA"; version="0.9.1"; sha256="13skbazs1mh5am70qlwxhvxgfx4gwlzzq6zy3vdzaa3zbykkxlvw"; depends=[lubridate]; };
+  CrossVA = derive2 { name="CrossVA"; version="0.9.3"; sha256="1nagbgcih6ix21js91vfpr4yjkhnirblgdmf04nn7ipv2ins8kw6"; depends=[lubridate stringi]; };
   CrossValidate = derive2 { name="CrossValidate"; version="2.3.2"; sha256="1dlvkv712rz3gw03c04qlk0l0mqjyds3m3pnbszk4848zby5ac6r"; depends=[Modeler oompaBase]; };
   Crossover = derive2 { name="Crossover"; version="0.1-17"; sha256="168j8fl6h7x1pia5f5c18yrf0y1lvznib8clq1mv0imb7cjzkkhi"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; };
   CryptRndTest = derive2 { name="CryptRndTest"; version="1.2.2"; sha256="1cg0agwqp1f7pgxdf9wilwparklyfsv900r47fpihnqw3ycvbdai"; depends=[gmp kSamples LambertW MissMech Rmpfr sfsmisc tseries]; };
@@ -734,8 +762,9 @@ in with self; {
   CuCubes = derive2 { name="CuCubes"; version="0.1.0"; sha256="1cpazar85rp8xfjvy0vxivr61grzvxz7a9mirxvhynln964by6ns"; depends=[]; };
   Cubist = derive2 { name="Cubist"; version="0.2.2"; sha256="1m45dpnr5djsfgqlinng6z0f2wbig2vbidlg19r3zcraqwn1agnd"; depends=[lattice reshape2]; };
   CustomerScoringMetrics = derive2 { name="CustomerScoringMetrics"; version="1.0.0"; sha256="166v0hbxy4xgbfqh7sx6zsrv4pghqpimx5xry3h2qwynnvr4ng1a"; depends=[]; };
-  Cyclops = derive2 { name="Cyclops"; version="1.3.4"; sha256="0iv4rsxy6zngjlbvwkx41np8phv49i6gp0f8yzb5k2azwksx2r3j"; depends=[BH bit ff ffbase MASS Matrix Rcpp RcppEigen RcppParallel survival]; };
-  CytobankAPI = derive2 { name="CytobankAPI"; version="1.1.2"; sha256="0mv6f1v6kclz8ima9f0b3qdb7gc85nn2cnfnzb3vqhm9vvibz8ls"; depends=[curl httr jsonlite]; };
+  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]; };
   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]; };
@@ -748,7 +777,7 @@ in with self; {
   DACF = derive2 { name="DACF"; version="1.0.0"; sha256="0hv7c9lk6ivj4iz953yn11iy5p611q4si4ghn9d5a9i229s5hig8"; depends=[]; };
   DAISIE = derive2 { name="DAISIE"; version="1.4"; sha256="16653wwz20lhf3bpzflpj5d1h7j3cqyfaqk5gn24aifga2jc0wbb"; depends=[DDD deSolve Matrix subplex tensor]; };
   DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; };
-  DALEX = derive2 { name="DALEX"; version="0.2.3"; sha256="0v2dmc4nnz28qjc378138j0lri2rlbrmwz97xsn9z557y4hrrmmh"; depends=[ALEPlot breakDown factorMerger ggplot2 ggpubr pdp]; };
+  DALEX = derive2 { name="DALEX"; version="0.2.4"; sha256="0zrgp266bmn0b87bf0gvi4yc2ngj4pvhw9qbmvnhqlifrqb55ir6"; depends=[ALEPlot breakDown factorMerger ggplot2 ggpubr pdp]; };
   DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; };
   DAMOCLES = derive2 { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[ape caper deSolve expm geiger matrixStats picante]; };
   DAMisc = derive2 { name="DAMisc"; version="1.4-3"; sha256="1hic53vi7mj4fvggxjl4d3j4zw8wwczh6pldyi8idrhm45hw2nh4"; depends=[boot car effects gdata lattice MASS nnet pscl QRM sm VGAM xtable]; };
@@ -760,8 +789,10 @@ in with self; {
   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]; };
+  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]; };
+  DCEM = derive2 { name="DCEM"; version="0.0.1"; sha256="0mk9x17c0jhlgcvn1n98mw8cykims0q0qwd067zzbinwhja2d9sv"; depends=[MASS matrixcalc mvtnorm]; };
   DCG = derive2 { name="DCG"; version="0.9.2"; sha256="1s2dz0vnhdhq23fqds1m2jspaz8k5zvd76z1zlbi6nb5ja5n3j3w"; depends=[]; };
   DCGL = derive2 { name="DCGL"; version="2.1.2"; sha256="1dhkdvdglpsr0fzrfrrr6q76jhwxgrcjsiqn56s082y7v366xvs4"; depends=[igraph limma]; };
   DCL = derive2 { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; };
@@ -783,26 +814,27 @@ in with self; {
   DEMOVA = derive2 { name="DEMOVA"; version="1.0"; sha256="09dqhhhihphhdnplmhdq4q5zwc0qvqhirdrxa9x6fr43vwa5zfp4"; depends=[leaps]; };
   DES = derive2 { name="DES"; version="1.0.0"; sha256="16p38i8ykwc8gjw6c9dhdwjjpa1b17n9wqhz3rhkbzjh978pky31"; depends=[]; };
   DESnowball = derive2 { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue cluster combinat MASS]; };
+  DEVis = derive2 { name="DEVis"; version="1.0.0"; sha256="11g7ycvs8z1bnnyl5y6sypgm29pywpp652kg1nzib1x3dyl8cxvl"; depends=[DESeq2 ggdendro ggplot2 ggsci ggthemes gridExtra MASS pheatmap plyr PoiClaClu RColorBrewer reshape2 SummarizedExperiment]; };
   DEoptim = derive2 { name="DEoptim"; version="2.2-4"; sha256="10nlsvms5pf0wmn4z1lj6vnmpwr10q8nhdy5xy9rn7hd1627fm0a"; depends=[]; };
   DEoptimR = derive2 { name="DEoptimR"; version="1.0-8"; sha256="1vz546hyjyhly70z62h5n3mn62b8llhhmim8ffp9y6jnnb0i2sc4"; depends=[]; };
-  DEploid = derive2 { name="DEploid"; version="0.5.0"; sha256="18v1fyxf6pbkanwmncd9jx9l7c9dk3y9dbc89a4cp3qshfn4vbhi"; depends=[htmlwidgets magrittr plotly Rcpp rmarkdown scales]; };
+  DEploid = derive2 { name="DEploid"; version="0.5.2"; sha256="0xjczfql6jl4jxxwvdn3gmwj8bawhj5w6hdamrb0yjdjlhdwb11y"; depends=[htmlwidgets magrittr plotly Rcpp rmarkdown scales]; };
   DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; };
   DGCA = derive2 { name="DGCA"; version="1.0.1"; sha256="1lqqzrsidkli4bk4jikq5f75jzqyzhv94n882yic5ndxgv26p9ic"; depends=[matrixStats WGCNA]; };
   DGM = derive2 { name="DGM"; version="1.7.2"; sha256="0z0f8bazzsahvjkpfif50db700mqb7arcglwsfxcar9qdy082vsn"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; };
   DGVM3D = derive2 { name="DGVM3D"; version="1.0.0"; sha256="17cxv8rm7kmxms7v7hzbwbdwa3xl1hwgiljf97ppwswglqyik9iv"; depends=[rgl]; };
   DHARMa = derive2 { name="DHARMa"; version="0.2.0"; sha256="0jh01z2ygz8hi0vh2fxw52ck0wia4hp44qc7v0bks8776gbwj8il"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qrnn sfsmisc]; };
-  DHS_rates = derive2 { name="DHS.rates"; version="0.3.1"; sha256="1lwmd58q2pqynh2dj3alcrri8zwxayq92nn7hwzwlqw70xr5anqv"; depends=[haven matrixStats reshape survey]; };
+  DHS_rates = derive2 { name="DHS.rates"; version="0.4.0"; sha256="12q5qn9k9svabqsya039axx1lnafcq4mlnnb0nyfdjhklnh7k870"; depends=[haven matrixStats reshape survey]; };
   DIFboost = derive2 { name="DIFboost"; version="0.2"; sha256="0wyjk870n18lq0dwhm9ndsh5vv0d8wkrbcky68w454vzrrw1q9h8"; depends=[mboost penalized stabs]; };
   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=[]; };
   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]; };
   DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; };
-  DLMtool = derive2 { name="DLMtool"; version="5.1.3"; sha256="0n7sx577fffxbxfbwy19py2hm00rb403n4fvn9j6pcdi433mfx59"; depends=[abind coda devtools ggplot2 ggrepel gridExtra knitr MASS mvtnorm openxlsx r4ss Rcpp RcppArmadillo readxl rmarkdown snowfall]; };
-  DMMF = derive2 { name="DMMF"; version="0.4.0.1"; sha256="0fypj0a0kjzfghazs55mxkig9n3ngjmbi3xmdxkpa35jbn71bfdd"; depends=[raster rgdal sp]; };
-  DMR = derive2 { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; };
+  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]; };
   DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; };
   DMRnet = derive2 { name="DMRnet"; version="0.2.0"; sha256="1rbba8w4li240gw5z675d7skm72rh0zxzp4rhsn6ivj72jya7jw4"; depends=[glmnet grpreg]; };
   DMwR = derive2 { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[abind class lattice quantmod ROCR rpart xts zoo]; };
@@ -814,6 +846,7 @@ in with self; {
   DNetFinder = derive2 { name="DNetFinder"; version="1.0"; sha256="0q56c2389qaq3wsqpj8s95ncm0xmbl1slr0jmpixb48hhgk0l0ji"; depends=[flare]; };
   DOBAD = derive2 { name="DOBAD"; version="1.0.6"; sha256="0ifrrfm4yp1416z58qgnak042rgj1xvqby2vvzgrv19z6b3250p3"; depends=[lattice Matrix numDeriv]; };
   DODR = derive2 { name="DODR"; version="0.99.2"; sha256="16ia9j8vab8n2i6a17wz8nfvkfgj2gsyhxvwgxvjg2cz99hsbhdj"; depends=[Matrix npsm Rfit]; };
+  DOS = derive2 { name="DOS"; version="1.0.0"; sha256="0vvkwn4wfvspbk74nb6124hdx9158h6yfksib14xqq7rx7c97ad4"; depends=[MASS]; };
   DOT = derive2 { name="DOT"; version="0.1"; sha256="0qh5n57cp9c2n5yn59q4wggz82943pwfanp3kx869aba2x3sj30i"; depends=[V8]; };
   DOvalidation = derive2 { name="DOvalidation"; version="1.1.0"; sha256="1mzws3w7djpxnfqxjcqwgia7p17kb0qlnzj6qcfg2m1vamb1cn2z"; depends=[]; };
   DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; };
@@ -822,10 +855,11 @@ in with self; {
   DPpackage = derive2 { name="DPpackage"; version="1.1-7.4"; sha256="0lfw55kbjwr1dqkd98p6488p6c0nh5pkfkc9wpds8wsqm38siad6"; depends=[MASS nlme survival]; };
   DPtree = derive2 { name="DPtree"; version="1.0.1"; sha256="0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7"; depends=[MASS MCMCpack plyr Rdpack]; };
   DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; };
-  DRIP = derive2 { name="DRIP"; version="1.3"; sha256="08v6sajgaqa0zvkr9hfzjxsj78acrkj6l9hjxkirbspg3fwqphk7"; depends=[caTools readbitmap]; };
+  DRIP = derive2 { name="DRIP"; version="1.4"; sha256="1rds1161h19waqhiq08hqk5zcn48afccaggmb42xr1zyk31irpi6"; depends=[readbitmap]; };
   DRR = derive2 { name="DRR"; version="0.0.3"; sha256="1yd1fvllfkcrwg9v322n4wkk4q4q84nvy58y4vac9pdr3yf3i4vl"; depends=[CVST kernlab Matrix]; };
   DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; };
-  DSAIDE = derive2 { name="DSAIDE"; version="0.6.0"; sha256="0jg5shgq1f9k0fcpzkpynd87xfcj8ky09xsz8n8yfvy4fw8d77kl"; depends=[adaptivetau deSolve knitr shiny]; };
+  DSAIDE = derive2 { name="DSAIDE"; version="0.7.0"; sha256="0n99d9ry5svp3fpvkzv3z6mfwlnzd7grf4yrsmn6cpw9m2cmy5yz"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra knitr rmarkdown shiny tidyr XML]; };
+  DSAIRM = derive2 { name="DSAIRM"; version="0.4.0"; sha256="1jr4nxhb5b5a7snpi6j1kzd1lfvjm88s9zgx20m2sz37jw1lrsmd"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra knitr lhs nloptr rmarkdown shiny tidyr XML]; };
   DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; };
   DSL = derive2 { name="DSL"; version="0.1-6"; sha256="0fmqxladifqqcs4mpb8a1az74fyb4gb8l2y5gzqaad3dbiz82qih"; depends=[]; };
   DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; };
@@ -841,7 +875,8 @@ in with self; {
   DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; };
   DTRlearn = derive2 { name="DTRlearn"; version="1.3"; sha256="0ngzvjlzn20pff1ihw87nar7riiva4pnfih7hlsr0iszd3v3b1gq"; depends=[ggplot2 glmnet kernlab MASS]; };
   DTRreg = derive2 { name="DTRreg"; version="1.3"; sha256="1144kcqblyrpdqyj9as6y47iq3x99bf76hdw6j43cmgcs11gapc3"; depends=[]; };
-  DTWBI = derive2 { name="DTWBI"; version="1.0"; sha256="001lkjk8dh6mdcysc8mw9c37xp543hjfci0k0py44z7c90b9p2la"; depends=[dtw e1071 entropy lsa rlist]; };
+  DTWBI = derive2 { name="DTWBI"; version="1.1"; sha256="06lp4yc5nhacrgic78l014g2w1ibwgs8dp8zrahk5aripaczl25y"; depends=[dtw e1071 entropy lsa rlist]; };
+  DTWUMI = derive2 { name="DTWUMI"; version="1.0"; sha256="0pybgbfs2yp2ljbs0kra5z70x3llkiwdngp6cadgs3j9rar4vq4q"; depends=[dtw DTWBI e1071 entropy lsa rlist]; };
   DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.7"; sha256="1syxw49pzh36nfq0zfr83cwpac86fnj0b7nlqiin4jb00h8vrf6i"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; };
   DWDLargeR = derive2 { name="DWDLargeR"; version="0.1-0"; sha256="1bxdvgj38xv2xj98njpyhy12b54nccwnc3v92kkpd3i7nwbw48dy"; depends=[Matrix SparseM]; };
   DWLasso = derive2 { name="DWLasso"; version="1.1"; sha256="1i8j8wjfvg69ldr8ahz1zv3m2wgxd701iph94ad22zs9qwqfg16z"; depends=[glmnet hglasso Matrix]; };
@@ -858,14 +893,18 @@ in with self; {
   DataClean = derive2 { name="DataClean"; version="1.0"; sha256="0wkafjyp6c2mx7g1bpz2pbxyl5nm2wba2hly8miizv0fdc762za5"; depends=[xlsx XML]; };
   DataCombine = derive2 { name="DataCombine"; version="0.2.21"; sha256="0iwb4726bk0cjhay694dp43b1553yyk9lpxbncs85kz229b26arm"; depends=[data_table dplyr]; };
   DataEntry = derive2 { name="DataEntry"; version="0.9-3"; sha256="0gfsg7wfwy88x7y1dwpgwi6fkizjnhrzj0a5ij70y4a4sjmyiy55"; depends=[digest gWidgets2 gWidgets2RGtk2 RGtk2]; };
-  DataExplorer = derive2 { name="DataExplorer"; version="0.6.0"; sha256="1vwihlslrcwca3q15hxpa9kvajv0clz7scqycaxhxk9ngdwcqh10"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; };
+  DataExplorer = derive2 { name="DataExplorer"; version="0.7.0"; sha256="0mhynbsiamcxd208pr75n23ccd5sajlry2c3rl0yxyv7wn6axkyj"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; };
   DataGraph = derive2 { name="DataGraph"; version="1.0.1"; sha256="0rvysvkcs926jzhp7iz9d5np0pa31y825ajn9yyzhbdfk5dg2wry"; depends=[Rcpp]; };
   DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; };
-  DataVisualizations = derive2 { name="DataVisualizations"; version="1.1.1"; sha256="1y38q1rw92qzsl22663v730i9c1mlyyw9pb167f8f81snb0x9fda"; depends=[AdaptGauss ggplot2 magrittr Rcpp RcppArmadillo sp]; };
-  DatabaseConnector = derive2 { name="DatabaseConnector"; version="2.1.3"; sha256="00dd9m7qf97ymrjjklg4a0j93wcn6mrmvg7spywm524nickcd4f6"; depends=[bit DatabaseConnectorJars DBI ff ffbase rJava SqlRender urltools]; };
+  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]; };
   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]; };
   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]; };
@@ -876,31 +915,33 @@ in with self; {
   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=[]; };
   DelayedEffect_Design = derive2 { name="DelayedEffect.Design"; version="0.0.4"; sha256="0n1dw9bqisfarg7him49mzqn60gcfr660d5x9k6b37r12dnmy48v"; depends=[msm survival]; };
-  Delta = derive2 { name="Delta"; version="0.1.1.11"; sha256="1fi5sgyrf86xmfxhglqxcc0hq5mpc8ar3nk2s4wx3rw4if3sdxdz"; depends=[]; };
+  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]; };
+  DemoDecomp = derive2 { name="DemoDecomp"; version="1.0.1"; sha256="0m24ld8s3ph8qcbkqma5y5k5nv0d0vgb7wz8q20gxnfbj2kbcvjv"; depends=[Rdpack]; };
   DendSer = derive2 { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; };
-  DendroSync = derive2 { name="DendroSync"; version="0.1.1"; sha256="0lizdkd5izqn3n4iqcj6gyc2p2c3ajljfhv5js4wfl2fljs46wkg"; depends=[ggplot2 gridExtra nlme]; };
+  DendroSync = derive2 { name="DendroSync"; version="0.1.2"; sha256="007lmdwnk6qll13965667fn2a0lfnc85msp0wrgm25gi011z8x37"; depends=[ggplot2 gridExtra nlme]; };
   DengueRT = derive2 { name="DengueRT"; version="1.0.1"; sha256="11qfg4l6y3j8qh4dcsz13xjjj1n0q71c9a3c180nm5lgqv0nwb81"; depends=[drc ggplot2 nlme]; };
-  DensParcorr = derive2 { name="DensParcorr"; version="1.0"; sha256="15w0ifcq1js0wyjscfhlbga77sgzqpmz7zmwa77y92iwna8q66ad"; depends=[clime gplots]; };
+  DensParcorr = derive2 { name="DensParcorr"; version="1.1"; sha256="1ifkg7cpimf27yhr60rks77r16kmhwa5h10wv7b64sbfncnyzfmj"; depends=[clime gplots]; };
   Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; };
-  DepthProc = derive2 { name="DepthProc"; version="2.0.3"; sha256="0zzbk0vbl2qfwr5j203xpzahf6kl0ya4l7xfjdc6diadfnr0w94y"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; };
+  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.24"; sha256="1ns0vqpnfj995dq1l6pmah2wi6l8zacndha6brhy97hyn84mc83k"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; };
+  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]; };
-  DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.5"; sha256="02b6yjgklsdjh3rikc8f5wfx08ymbygr3fyq1c134xhffhykrlgp"; depends=[GGally ggplot2 plyr reshape2 scales]; };
+  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]; };
   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.1.0"; sha256="02kk0qqi9skb2pszfsgasa9fj7iz1brwxgwcw1dq9gf5hxr9zra4"; depends=[]; };
+  DiPhiSeq = derive2 { name="DiPhiSeq"; version="0.2.0"; sha256="11l2inf99vxz9k292307j8c2b25kc1066svy3vxrfl72rrm4fqa7"; depends=[]; };
   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=[]; };
   DiceEval = derive2 { name="DiceEval"; version="1.4"; sha256="06p3v161ig714k7z59iji64xhxw1a68kqhnlwhwpjpyrx7kn137b"; depends=[DiceKriging]; };
-  DiceKriging = derive2 { name="DiceKriging"; version="1.5.5"; sha256="035kbk633v4kfb44wiyb556sayl73c24fc1w09r3f33shqgidzjm"; depends=[]; };
+  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]; };
   DiceView = derive2 { name="DiceView"; version="1.3-2"; sha256="0ny9gbaycrq3lr4gqil1yyhkkyxmabl8w6cmkkzlx3yaara0idkf"; depends=[DiceEval DiceKriging rgl]; };
   DidacticBoost = derive2 { name="DidacticBoost"; version="0.1.1"; sha256="0z1h61n6nfjvb64fgkzi1sq7ag747crhh593hxkx0cpza29778rz"; depends=[rpart]; };
@@ -914,10 +955,11 @@ 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.2"; sha256="0wjlkaq6wwpfllyk9qjmpap3vy0yxgbd12yz4nmmf51fnpqv75a6"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
+  Directional = derive2 { name="Directional"; version="3.3"; sha256="17cf2nrx9kxyrmsg443bnh2dfw0351ab4g0xl5bm7ldbiffqm7sp"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
   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.2"; sha256="0rn92vdxll4r20q0ybqrd3sdpa1bsg9zmbb98zmllfvmh2fgj6a1"; depends=[dplyr magrittr rlang]; };
+  DisImpact = derive2 { name="DisImpact"; version="0.0.3"; sha256="1xmbwhbhb2jyzar8am77zma7l5siyhzna6l69y2068lqrk7l5w32"; depends=[dplyr magrittr rlang]; };
+  DiscreteFDR = derive2 { name="DiscreteFDR"; version="1.1"; sha256="0flirs7m2a8igkf0qvr99i882k886iry8wjzsb2l4zp0f1piwjyy"; depends=[]; };
   DiscreteInverseWeibull = derive2 { name="DiscreteInverseWeibull"; version="1.0.2"; sha256="0vjsvl4m4zccfgizv7mzidbbpzqcm101x448vllcdcrn2xlnkmnq"; depends=[Rsolnp]; };
   DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1.1"; sha256="17w4vjvsm7jacvwckjczyah3hglq044r3m6vqdcrg8haz884rav2"; depends=[]; };
   DiscreteWeibull = derive2 { name="DiscreteWeibull"; version="1.1"; sha256="1rg3ax6jryagf5d3h8m44x9wyhr2qff3srfa9zrk6i64p1ahk9lr"; depends=[Rsolnp]; };
@@ -930,7 +972,7 @@ in with self; {
   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=[]; };
   DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.11"; sha256="0plwvji2rrxmjnf61mj1ijglc9z62n26ijqsf65s35c19qv2g0y1"; depends=[DoE_base]; };
-  DoE_base = derive2 { name="DoE.base"; version="1.0"; sha256="01h2slkrc4vzmz54vilv6qkgfz0f9jhq3bb684rl7cx55smhzr68"; depends=[combinat conf_design lattice MASS numbers vcd]; };
+  DoE_base = derive2 { name="DoE.base"; version="1.1-1"; sha256="1py9ml1gdibjqklqw2gzrppkgcpp2418sxdbg7ciw9vkwivwbrsn"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; };
   DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.9"; sha256="0l4dxb0f4ql5k3x1avfzs1w54qwjxfp8rl9h9vg6p1zhbkz4qz06"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; };
   DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; };
   DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; };
@@ -947,7 +989,7 @@ in with self; {
   DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; };
   DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; };
   DstarM = derive2 { name="DstarM"; version="0.3.0"; sha256="16vcv21dgnymhsy9j5x5pblnipf4hdyscajx6pr8kl6i95hs3hmj"; depends=[DEoptim ggplot2 Rcpp RcppArmadillo rtdists RWiener]; };
-  DtD = derive2 { name="DtD"; version="0.1.0"; sha256="1alkgd2rpjrg1sl1l22qsr5b5d3i4scvfxijhffxb0897yvg71ri"; depends=[checkmate Rcpp RcppArmadillo]; };
+  DtD = derive2 { name="DtD"; version="0.2.0"; sha256="0s6prl8rmpjmsv94ww3pvks11nw716gf7250jyynharvqd9q9aps"; depends=[checkmate Rcpp RcppArmadillo]; };
   DunnettTests = derive2 { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; };
   DySeq = derive2 { name="DySeq"; version="0.22"; sha256="1sx6mg0bcqb5ff6x305k43zx3fwd16rvxc7xb3ai5h3w7fs9zz7y"; depends=[boot MASS TraMineR]; };
   Dykstra = derive2 { name="Dykstra"; version="1.0-0"; sha256="1rc1409ky0ysqr3ccq28yhbs94m6d0z2dfa66k4c7irxjvbagwz6"; depends=[]; };
@@ -955,7 +997,7 @@ in with self; {
   DynNom = derive2 { name="DynNom"; version="4.1.1"; sha256="1c4hykp8fwr6h5y09m4qs23bmbaj6im2c833mv2ymlhy5bwhmnfi"; depends=[BBmisc compare ggplot2 plotly rms shiny stargazer survival]; };
   DynTxRegime = derive2 { name="DynTxRegime"; version="3.2"; sha256="0a6s28vc7kf6r7qmy9xjmxm39fl0ijnbl01d8rzr4w9sbnr3n85l"; depends=[dfoptim kernlab modelObj rgenoud]; };
   DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; };
-  DynamicGP = derive2 { name="DynamicGP"; version="1.0-2"; sha256="1mgipnkf8mlxcr9b6naiy5nq90war1gdp2cm54681b4cx0fv62p2"; depends=[laGP lhs]; };
+  DynamicGP = derive2 { name="DynamicGP"; version="1.1-1"; sha256="14xmsxvzl4jri6727qj7mzs1smlqm1hgq03v5r624dqkkmfbdxkv"; depends=[lhs]; };
   EAinference = derive2 { name="EAinference"; version="0.2.3"; sha256="1kzcfya3z6rf1vqjn72yjymdhrn4dzgmwifh3w6k22cy5jxffzn4"; depends=[hdi limSolve MASS msm mvtnorm Rcpp RcppArmadillo]; };
   EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; };
   EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; };
@@ -963,6 +1005,7 @@ in with self; {
   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]; };
+  ECLRMC = derive2 { name="ECLRMC"; version="1.0"; sha256="01z2hmbpb754s2rsvx3i5wf7kkkr2mvs2g89ih2bqrif7w5rmgyg"; depends=[softImpute]; };
   ECOSolveR = derive2 { name="ECOSolveR"; version="0.4"; sha256="14dpja9wr1qqip388c8b6xvdvdpwwmyq5piv182ir0rwrla5nzdb"; depends=[Matrix]; };
   ECctmc = derive2 { name="ECctmc"; version="0.2.5"; sha256="0prryvc17bm1xrhzlqk2w9nj181bg99j1dph3d36h0n1vfq1d7if"; depends=[Rcpp RcppArmadillo]; };
   ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.13"; sha256="0dq8ja4ydxnc7qx35qhh9ryqgi7ambwz6ka2821mmq3p994crswn"; depends=[jsonlite shiny]; };
@@ -973,20 +1016,22 @@ in with self; {
   EDMeasure = derive2 { name="EDMeasure"; version="1.2.0"; sha256="1gyv86vip0a3939dbbwz29xkqzncw24r68fzykdjnv3b995510iv"; depends=[dHSIC energy rBayesianOptimization]; };
   EDR = derive2 { name="EDR"; version="0.6-6"; sha256="10m92p3fy5z2kca4h9awwmvs4pqri92habkvgjvjl5ira09yvyi7"; depends=[sm]; };
   EEM = derive2 { name="EEM"; version="1.1.1"; sha256="0w20kakgcpyhfi7fcrss4w67pbaj87hi2scy7g05q3sg2ygac7gj"; depends=[colorRamps ggplot2 R_utils reshape2 sp]; };
-  EFAutilities = derive2 { name="EFAutilities"; version="1.2.2"; sha256="1gknnfyhv16a16wgach0ps9wd08d75bach4p80vjq6ld9fjvpw2h"; depends=[GPArotation mvtnorm plyr]; };
+  EFAutilities = derive2 { name="EFAutilities"; version="1.2.3"; sha256="1r2ma22r1bs5yn0k4c4p2ks571vp6bzmr4wsd25w535k5qfjx2np"; depends=[GPArotation mvtnorm plyr]; };
   EFDR = derive2 { name="EFDR"; version="0.1.1"; sha256="0jgznwrd40g9xmvhrd7b441g79x41ppfdn6vbsbzc0k5ym1wzb1p"; depends=[doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; };
   EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; };
-  EGRET = derive2 { name="EGRET"; version="2.6.0"; sha256="0alr47pmq1ml64j500vkqwmvrqa3i1ccbf3w7w44fbbjy1vfp04a"; depends=[dataRetrieval fields lubridate survival truncnorm]; };
-  EGRETci = derive2 { name="EGRETci"; version="1.0.2"; sha256="15jf4bgxvqqz64y4i6ncfj0ymgwmhahxlhdnfps4zj7gwxgcbvqh"; depends=[binom EGRET lubridate]; };
+  EGRET = derive2 { name="EGRET"; version="3.0.0"; sha256="1zl93cf8wmbxc095bsw0ngsfalgrydgn3mvnsnpzg3bp18idvwsw"; depends=[dataRetrieval fields foreach survival truncnorm]; };
+  EGRETci = derive2 { name="EGRETci"; version="2.0.0"; sha256="1jndrkg3wn46d2fxb6l4f77v65vvq0ir91zr3iyh01lhlksnf33j"; depends=[binom EGRET]; };
   EHR = derive2 { name="EHR"; version="0.1-3"; sha256="1y12j0sjr1zp3bzha1p31f903js674l6ifjccw0y9718sry8dbv2"; depends=[logistf]; };
   EIAdata = derive2 { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[plyr XML xts zoo]; };
   EILA = derive2 { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; };
   EKMCMC = derive2 { name="EKMCMC"; version="0.1.0"; sha256="0sfj6w8780fik0ar9bg8zrxkj10wqagvwrngd58g50fc0z4lhr53"; depends=[numDeriv]; };
   EL = derive2 { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; };
-  EL2Surv = derive2 { name="EL2Surv"; version="1.0"; sha256="1vrm0w9rmy4vfkpzq804p216cxw4vvp91g77k4vvzv4z87gkqfhq"; depends=[survival]; };
+  EL2Surv = derive2 { name="EL2Surv"; version="1.1"; sha256="0bn2481rf61qnia468y7k95hhazjaghrv919a2y9ar5wcz5nq2kk"; depends=[survival]; };
   ELMR = derive2 { name="ELMR"; version="1.0"; sha256="0pd3drv485xbdyfwm28kjpd0nd0zv1khfwzki1gh5p1gz9ndwr2x"; depends=[]; };
+  ELMSO = derive2 { name="ELMSO"; version="1.0.0"; sha256="0bsqx2630m817hi5p0rz8cfp5gyzqxyrysba5nm189h556k4c3a4"; depends=[]; };
   ELT = derive2 { name="ELT"; version="1.6"; sha256="0vbrf912m6f80sqyyrp0z4jhq38fnmcy6hgwy0qh8wgk3p1aqm7c"; depends=[lattice latticeExtra locfit xlsx]; };
-  ELYP = derive2 { name="ELYP"; version="0.7-3"; sha256="1d91r59m85k91kcjjlvhvbsa9855fyd702bwj7drvk36ssfr8qb9"; depends=[survival]; };
+  ELYP = derive2 { name="ELYP"; version="0.7-5"; sha256="1j2vwcs443x3pf4zypyvbkn8fb5if9b9hf1s821jjjpgach573sc"; depends=[survival]; };
+  EM_Fuzzy = derive2 { name="EM.Fuzzy"; version="1.0"; sha256="0sz4zkjn6rdzdqmkq6j24bd4sj91y5lan31bldxdfskgz0jpzhbr"; depends=[DISTRIB FuzzyNumbers]; };
   EMA = derive2 { name="EMA"; version="1.4.5"; sha256="16iq5a3yrilchqmkyb4g5bmmgpw6psm88n52gmlax75xbiwk8261"; depends=[affy AnnotationDbi Biobase biomaRt cluster FactoMineR gcrma GSA heatmap_plus MASS multtest siggenes survival xtable]; };
   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]; };
@@ -996,23 +1041,25 @@ in with self; {
   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]; };
   EMMIXgene = derive2 { name="EMMIXgene"; version="0.1.0"; sha256="1jadasvngxczyyc7gxpcw3jxhxai3p88l8lmj1jmdns5vdi2n4rl"; depends=[BH ggplot2 mclust Rcpp RcppArmadillo reshape scales]; };
+  EMMIXmfa = derive2 { name="EMMIXmfa"; version="2.0.7"; sha256="178j76acdksajnh65l60l94zd4l8s3xmrj2am1h4i5g3jmmrj16i"; depends=[]; };
   EMMIXskew = derive2 { name="EMMIXskew"; version="1.0.3"; sha256="05y1ivbzbsfab90925l3ahzd3b8y5kjfk3f0p2s9s3sfyxphqah7"; depends=[KernSmooth lattice mvtnorm]; };
   EMMIXuskew = derive2 { name="EMMIXuskew"; version="0.11-6"; sha256="0japf0l0sj84jna7b5kirp6pgqa4c923ldwphb16ch2xxrgk5n5k"; depends=[MASS]; };
   EMMLi = derive2 { name="EMMLi"; version="0.0.3"; sha256="1b36kyzvrdljmkysggv8jyaip78pj32ms0xhj2y568hd419lkh2p"; depends=[]; };
   EMMREML = derive2 { name="EMMREML"; version="3.1"; sha256="0qwj4jlfhppjxwcjldh49b6idnagazrxybaid3k2c269wvxwvddq"; depends=[Matrix]; };
   EMP = derive2 { name="EMP"; version="2.0.2"; sha256="0l9wyxmcl8b6jiykc4mim6npmz5wrsapk2wgxbfhg27dwdb847ha"; depends=[ROCR]; };
   EMSC = derive2 { name="EMSC"; version="0.9.0"; sha256="13d915g7iyv724x35i9mr8msy5mhrpqhhva21vdinxbjdy6vdlr9"; depends=[pracma]; };
+  EMSHS = derive2 { name="EMSHS"; version="1.0.0"; sha256="1lpv3243z5765b1dihqz9hc3dpw76nwy14mmd4253sw8xpy25w41"; depends=[Rdpack]; };
   EMSaov = derive2 { name="EMSaov"; version="2.3"; sha256="1hpvwimhkl7za5s8j9n4a8883vy89jrxrhlh0k3cfprnndh4zz05"; depends=[shiny]; };
   EMT = derive2 { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; };
   EMVS = derive2 { name="EMVS"; version="1.0"; sha256="10ksrj1aav062cszg4ymnwsgib7a9hlnkksfcvmy26nx5gj2g7zl"; depends=[Rcpp RcppArmadillo]; };
   EMbC = derive2 { name="EMbC"; version="2.0.1"; sha256="0id68ws6l858nvyy790m17j9gddxmm97z66x24w5r58dxi6yfcrp"; depends=[maptools mnormt RColorBrewer Rcpp RcppArmadillo sp]; };
-  ENMeval = derive2 { name="ENMeval"; version="0.2.2"; sha256="1w8mjcmxxkx8lxxzzbjpv1i7cm6l8hhml7ynp80s9yiprr04bq9c"; depends=[dismo doParallel foreach raster rJava]; };
+  ENMeval = derive2 { name="ENMeval"; version="0.3.0"; sha256="0q5s8nxig8kbr0cblfmf3k20ri19fjs770a0fnzsk0kwlac414hw"; depends=[dismo doParallel foreach maxnet raster]; };
   ENiRG = derive2 { name="ENiRG"; version="1.0.1"; sha256="0yjy7g0pia4g18h7mawkxn77dnnqcajnbml21rrv63qwlr347355"; depends=[ade4 fgui gdata miniGUI raster rgrass7 sp]; };
   ENmisc = derive2 { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc RColorBrewer vcd]; };
   EQL = derive2 { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[lattice ttutils]; };
   EQUIVNONINF = derive2 { name="EQUIVNONINF"; version="1.0"; sha256="103wrry0cmikprihmgx8y4kk1pnbjis7rs1xw13w14v902xkr2rq"; depends=[BiasedUrn]; };
-  ERP = derive2 { name="ERP"; version="2.0"; sha256="0y476ir8j54q20ibzpkla32wxp6yjv04ca67ry9kajq64ibflh7w"; depends=[corpcor fdrtool irlba mnormt pacman]; };
-  ERSA = derive2 { name="ERSA"; version="0.1.0"; sha256="063i9fmdccyrbap7fgas9371zv13gpcgzhlsphsn8jw9nmzpdii4"; depends=[broom car combinat dplyr ggplot2 leaps modelr purrr RColorBrewer shiny tidyr]; };
+  ERP = derive2 { name="ERP"; version="2.1"; sha256="0l3vgg7szfgi7a6qh93lh2sjnkwkhw02laxdl7x87jirmmsx3157"; depends=[corpcor fdrtool irlba mnormt pacman]; };
+  ERSA = derive2 { name="ERSA"; version="0.1.1"; sha256="1b76rfjndw7s0z4qb6rc2s95z0hr9xn4d5qaja9bd721r0g5862k"; depends=[broom car combinat dplyr ggplot2 leaps purrr RColorBrewer shiny tidyr]; };
   ES = derive2 { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; };
   ESEA = derive2 { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph parmigene XML]; };
   ESG = derive2 { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; };
@@ -1022,11 +1069,12 @@ in with self; {
   ETAS = derive2 { name="ETAS"; version="0.4.4"; sha256="0s0j7r1nyf82qz3lavsvyd11hl0jkq69c70wh00nfy93n2ygp376"; 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.4"; sha256="09b66sck5r2ysjxpjhwgjcapx6wj1jg3v56b0x48dk7bqzmmizsd"; depends=[devtools ggplot2 metafor msm]; };
+  EValue = derive2 { name="EValue"; version="1.1.5"; sha256="0lfm3458mh1rfcxhr4gm8gls9lssy277fxi5rbkysls88282j4dc"; depends=[devtools ggplot2 metafor msm]; };
   EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; };
   EWGoF = derive2 { name="EWGoF"; version="2.2.1"; sha256="0n1fx6k9ndb2s9ybzizbqz662c9s1f48q6v697pqhnfy9si1nplz"; depends=[Rcpp]; };
   EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; };
-  Eagle = derive2 { name="Eagle"; version="1.0.2"; sha256="0n36h23jkac93d9f13bdwvac0fv198fjmh3981z32cn9glz0xbl8"; depends=[data_table matrixcalc Rcpp RcppEigen shiny shinyBS shinyjs shinythemes]; };
+  EZtune = derive2 { name="EZtune"; version="1.0.0"; sha256="0a74wnmxbvnm1zil0slg4kphvqc1n03y26zp1a0gpawpkfxcmbch"; depends=[ada doParallel e1071 GA gbm mlbench]; };
+  Eagle = derive2 { name="Eagle"; version="1.1.0"; sha256="1n2aqp6pd7cglhmnhf8g086xv4468hhqx6qvlwjbvj6diwhym35c"; depends=[data_table matrixcalc Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; };
   EasyABC = derive2 { name="EasyABC"; version="1.5"; sha256="17qv6y8sf2iwwqcv5wfg6sii259gv5jyr72dnfpir2bw78wb3mqx"; depends=[abc lhs MASS mnormt pls tensorA]; };
   EasyHTMLReport = derive2 { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; };
   EasyMARK = derive2 { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[coda doParallel foreach MASS random rjags stringr]; };
@@ -1035,30 +1083,32 @@ in with self; {
   Ecdat = derive2 { name="Ecdat"; version="0.3-1"; sha256="1lvfp2ih8ng3kn3cia687j5fd27iwiak7gk3bhgjp8bnlgblqq02"; depends=[Ecfun]; };
   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"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[DEoptim operators topmodel XML]; };
+  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=[]; };
-  EcoNetGen = derive2 { name="EcoNetGen"; version="0.2.0"; sha256="194gry90h6m91zjvv7na8gyf3rws3mzv7rk5xhwrr2znlgcalzis"; depends=[ggplot2 igraph]; };
+  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.0"; sha256="1adhxwi22psr81xh1szjvn6ycv4zw31xjnswk65iazk3sc4vz7wc"; depends=[]; };
+  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]; };
   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]; };
-  EffectTreat = derive2 { name="EffectTreat"; version="0.3"; sha256="1y8b1867idjbd7i39hhryg4nyijlv6d828z0jspp80fka3sp8xpw"; depends=[]; };
+  EffectTreat = derive2 { name="EffectTreat"; version="0.4"; sha256="05r8frrir2dnivj21raczchf9qligqdccnnpj1kwi0zgr5h4spz6"; depends=[]; };
   EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; };
   EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.4"; sha256="1s0i9a2vk2g4f5gadsvzjfkw91hcjsrbyjg2vgnj1v17xrwgp40w"; depends=[]; };
   ElastH = derive2 { name="ElastH"; version="0.3.1"; sha256="1xgmz0xirvdyjz8l31zb2j91nj0g8ffhvzp44b97473fsj06n1g6"; depends=[dlm]; };
   ElemStatLearn = derive2 { name="ElemStatLearn"; version="2015.6.26"; sha256="0r8d0fm4yx7iawcsikksd7i01kbyqz3xkdls74f3ngkvj4iq1rqc"; depends=[]; };
   EloChoice = derive2 { name="EloChoice"; version="0.29"; sha256="1r54laim7i8hzgyir47xq7qw8hxzsdw1ss10sljq1rm2lpsci6wk"; depends=[Rcpp RcppArmadillo]; };
+  EloOptimized = derive2 { name="EloOptimized"; version="0.3.0"; sha256="185vh8h6r5wqcbaq3glq8k3fr8jp6h3q2h2ly54agi6bi3fvbs05"; depends=[BAMMtools dplyr lubridate magrittr reshape2 rlang rlist]; };
   EloRating = derive2 { name="EloRating"; version="0.43"; sha256="0gzpi4qjiqn0lzjwy37pkz6fg7dkp2hv2dfqgzfk32wsj0bswgab"; depends=[zoo]; };
   ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; };
   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.7"; sha256="09m5h0fgj7pavfxwh4anihpq69dkqay9z4xdj0c3rbqvsxgq4bx3"; depends=[data_table lwgeom ncdf4 raster sf sp units]; };
+  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]; };
+  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]; };
   EnsCat = derive2 { name="EnsCat"; version="1.1"; sha256="1rp354fqq2ihjrmqw9j1qdy86md80xml5sgh2zbyabw3zddmgyn2"; depends=[dendextend ggdendro ggplot2 seqinr]; };
@@ -1068,12 +1118,12 @@ in with self; {
   EnsemblePenReg = derive2 { name="EnsemblePenReg"; version="0.7"; sha256="00218yh0vzlb5g94asq5nz4i8blppskdzz9fl4c0v3fld3kxz2md"; depends=[EnsembleBase glmnet]; };
   EntropyEstimation = derive2 { name="EntropyEstimation"; version="1.2"; sha256="13kb83lfpkw6yq687j0ci23yn5c9dqjibybyyaplk6jixy08lrvy"; depends=[]; };
   EntropyExplorer = derive2 { name="EntropyExplorer"; version="1.1"; sha256="02ljnq9ayxg4lrrnb6nlxr1k5ki8dd5i8hjb9fvvb19hwr2id5h4"; depends=[]; };
-  EnvCpt = derive2 { name="EnvCpt"; version="1.0"; sha256="0rdcxb924ij3rdcnzfz8pxahvwza2qi2siqpxsafjkg2mrqil9kj"; depends=[changepoint forecast MASS zoo]; };
+  EnvCpt = derive2 { name="EnvCpt"; version="1.1.1"; sha256="10j0hsy2ff1zj6bb03cngrw19ynyz65rcpxyk6vpqdqcdkpf3zf9"; depends=[changepoint MASS zoo]; };
   EnvNicheR = derive2 { name="EnvNicheR"; version="1.4"; sha256="0hxx9wmzlw0clvdgdsy8msc78nvm81j3naxr57i7lqqa360sjy3a"; depends=[IDPmisc]; };
-  EnvStats = derive2 { name="EnvStats"; version="2.3.0"; sha256="0f0sda26in2a25vq8xr6pkskjk10q2pg463h9c1xap3bghq4xgc3"; depends=[ggplot2 MASS nortest]; };
+  EnvStats = derive2 { name="EnvStats"; version="2.3.1"; sha256="0ang2s222znrvzvidyvj2sa2bqx95bxicff64p6w2a7z88mx8lyp"; depends=[ggplot2 MASS nortest]; };
   EnviroPRA = derive2 { name="EnviroPRA"; version="1.0"; sha256="0yirh3vy7wap0qmm3kvjz9y68gcvp9i8qshv80wh8aijxwklpr8n"; depends=[fitdistrplus kSamples MASS truncdist]; };
   EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; };
-  Epi = derive2 { name="Epi"; version="2.30"; sha256="0gfq4zg2c9cnwh7islsbbzaw80a2wwnh3kjv3wr1fvp11hhhdknk"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival zoo]; };
+  Epi = derive2 { name="Epi"; version="2.32"; sha256="14n24xlm7pwdc54w2hlpjhfal1zpzm87rv3rjfckiz47d3w7dwqm"; depends=[cmprsk data_table etm MASS Matrix mgcv numDeriv plyr survival zoo]; };
   EpiBayes = derive2 { name="EpiBayes"; version="0.1.2"; sha256="1qfir0dl085c9ib1acsygmj7gihc4ar98k5niqdsgnmji88h17y2"; depends=[coda epiR scales shape]; };
   EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.12.0"; sha256="1i84fslz8sdngvkv34zhzjwzrzzxx6f4s31p8f5smmf028jlpyys"; depends=[]; };
   EpiCurve = derive2 { name="EpiCurve"; version="2.1-1"; sha256="0y6llpxa8xyfn9cxhq35mzfp1gc7la1708q85q4hz0l115abvk92"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; };
@@ -1082,12 +1132,13 @@ in with self; {
   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]; };
-  EpiStats = derive2 { name="EpiStats"; version="1.1"; sha256="0xd9b3miyk2jijraph7zac7k7hqm0vn9wg1fsccfl17xy6h2wq2w"; depends=[dplyr epiR]; };
+  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=[]; };
-  Equalden_HD = derive2 { name="Equalden.HD"; version="1.0"; sha256="19b529yaffls43fr5vrcrrvkia27mjrcx69r9svafk61z96i6pfm"; depends=[]; };
+  Equalden_HD = derive2 { name="Equalden.HD"; version="1.1"; sha256="16cs9hmr14byy11dapkh8c7ygpkks00lirbbpmy5bxgi4pvif8a3"; depends=[]; };
   EstCRM = derive2 { name="EstCRM"; version="1.4"; sha256="1p99hmmyiy3havj72jd4xksr1j9gfmy0i7z7f3vqs5sqp72alq1k"; depends=[Hmisc lattice]; };
   EstHer = derive2 { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; };
+  EstMix = derive2 { name="EstMix"; version="1.0.1"; sha256="13zwhxm0qm83c8k5k4slvq2snkmbq1zz3i5cqvxxwhvkb4b8aja4"; depends=[PSCBS Rcpp RcppArmadillo]; };
   EstSimPDMP = derive2 { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; };
   EstimateGroupNetwork = derive2 { name="EstimateGroupNetwork"; version="0.1.2"; sha256="148srhlpzh0scvnkjbkyia1pr8a2ridabm3dahw4zn7p3cryiyb1"; depends=[igraph qgraph]; };
   EthSEQ = derive2 { name="EthSEQ"; version="2.1.2"; sha256="0w75d8kw1bf4mfgk8rrx6vzq002z2588kxgadyfag0vk9s4akxi3"; depends=[data_table gdsfmt geometry MASS plot3D SNPRelate]; };
@@ -1096,11 +1147,12 @@ in with self; {
   EvalEst = derive2 { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; };
   EvaluationMeasures = derive2 { name="EvaluationMeasures"; version="1.1.0"; sha256="0b65y4rb650hhlgc18z0sm0danrrawqkazzdl9krl877djrgx87g"; depends=[]; };
   Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.12"; sha256="065rd8hwbzanfd0px0nli9szj9afm06a07vxl9bwj9n744whi3r3"; depends=[zoo]; };
+  EventDetectR = derive2 { name="EventDetectR"; version="0.3.1"; sha256="1nh859q9d2k9fpgyj9g7dvhbhbychhng174mlmyl8x9l7dvmiydx"; depends=[forecast imputeTS]; };
   EventStudy = derive2 { name="EventStudy"; version="0.34"; sha256="04w8cjmpy0ndcrad20ni9wa03pds8bvirks258pxyflx2kdvj0bf"; depends=[curl data_table dplyr ggplot2 httr jsonlite magrittr miniUI openxlsx purrr RColorBrewer readr rstudioapi scales shiny stringr testthat tidyquant]; };
   EvoRAG = derive2 { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; };
   EvolutionaryGames = derive2 { name="EvolutionaryGames"; version="0.1.0"; sha256="1v6xpxk4kbjbmv8vh517rd76gyrd9znpxqdh4jqz8lvdpnpla4wv"; depends=[deSolve geometry ggplot2 interp MASS reshape2 rgl]; };
   Evomorph = derive2 { name="Evomorph"; version="0.9"; sha256="1br2fyggwz2mxpic8sk384xq1lpbpv0j5gf6xyzhkn2n7kfpf6d5"; depends=[geomorph ggplot2 reshape2 stringr]; };
-  ExPanDaR = derive2 { name="ExPanDaR"; version="0.2.0"; sha256="1iwkzrfdvxgik5c1vq04351var0micf4vh6zmkzyd8qbyvxwnnch"; depends=[CodeDepends corrplot dplyr DT ggplot2 Hmisc kableExtra lfe PKI scales shiny shinycssloaders stargazer tictoc tidyr]; };
+  ExPanDaR = derive2 { name="ExPanDaR"; version="0.3.0"; sha256="1d6jzgdyawyvs72jxlw4dxkk6566ya67p6lsj70wdakmaixwfsmj"; depends=[corrplot dplyr DT ggplot2 Hmisc kableExtra lfe lmtest multiwayvcov PKI rio scales shiny shinycssloaders stargazer tictoc tidyr]; };
   ExPosition = derive2 { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; };
   Exact = derive2 { name="Exact"; version="1.7"; sha256="0d0h406w2l99gxq6pmh9crxxrvdidcajk7bqzmifl7nfb77vp1av"; depends=[]; };
   ExactCIdiff = derive2 { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; };
@@ -1127,16 +1179,15 @@ in with self; {
   FBN = derive2 { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; };
   FCGR = derive2 { name="FCGR"; version="1.0-0"; sha256="015nnnc9fasx0qjrc3lbxv14rqwyx36xzsw9076grwm5pqahrdsb"; depends=[kerdiest KernSmooth MASS mgcv nlme pspline sfsmisc]; };
   FCMapper = derive2 { name="FCMapper"; version="1.1"; sha256="1yjh8rs65nqslvwv7x4rif469zds41s7v3vhq6pca1y17kvj2in1"; depends=[igraph]; };
-  FCNN4R = derive2 { name="FCNN4R"; version="0.6.2"; sha256="089vq8kaag4j6xl3h9pb3ch8lfg0mmi96jgm4xhgr40rr0m3ijma"; depends=[Rcpp]; };
   FD = derive2 { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; };
   FDGcopulas = derive2 { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[numDeriv randtoolbox Rcpp]; };
   FDRSeg = derive2 { name="FDRSeg"; version="1.0-3"; sha256="0dh6m5vlx664kryh56jzi3zxydjwa5217nhbwn6adp0q5qdh6d8a"; depends=[Rcpp stepR]; };
   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-1"; sha256="1bwf3kkx912386ljb210hci1y2vg0wcd6v6i6arhzzbr7gc0y39q"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; };
-  FENmlm = derive2 { name="FENmlm"; version="2.1.1"; sha256="00cm1k5lqa7i2aginhkw4f430gigr7cj7g6shr83z61axqfmwdg4"; depends=[MASS Matrix numDeriv Rcpp]; };
+  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]; };
   FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; };
-  FFTrees = derive2 { name="FFTrees"; version="1.3.5"; sha256="0qz3w7qh8lgl4fn2hmrd4mnp17vaz5yf7kcpcrm038xvqq3w5c5k"; depends=[circlize e1071 igraph progress randomForest rpart stringr yarrr]; };
+  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=[]; };
   FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; };
   FGalgorithm = derive2 { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; };
@@ -1148,17 +1199,19 @@ in with self; {
   FILEST = derive2 { name="FILEST"; version="1.0.3"; sha256="0i622rfr9sb22c922kk0gg4l1akx54m6zx7wy3w1p5xrr1zjjyvp"; depends=[KRIS rARPACK]; };
   FIT = derive2 { name="FIT"; version="0.0.5"; sha256="1hky7m5b7n0d7lm79b7l7p055f8zfl7gsjdvbq09c4iwdli8h33n"; depends=[gglasso MASS Rcpp RcppEigen XML]; };
   FITSio = derive2 { name="FITSio"; version="2.1-0"; sha256="021xmbavigg70m96xw1bvsdasi5yj2wmafgb6xw4b09fmyv9hvjp"; depends=[]; };
+  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="5.2"; sha256="1px9n0rnjg32ngy8bs0z1jzmspnkn15q273w74vxjykqfd5xayfd"; depends=[Rcpp RcppParallel]; };
-  FLightR = derive2 { name="FLightR"; version="0.4.6"; sha256="0q1azhpdkasjsca5z4p0gnp5iirs6f9dyg6pn8269x7k1mw0pib4"; depends=[bit CircStats circular fields GeoLight ggmap ggplot2 ggsn maptools mgcv nlme raster RcppArmadillo rgdal rgeos sp truncnorm]; };
+  FLSSS = derive2 { name="FLSSS"; version="7.6"; sha256="1cjhzjl8s4bnx457v4pal945j2ij75s8gdbbr9a3cambh0sc821y"; 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"; sha256="1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj"; depends=[]; };
+  FNN = derive2 { name="FNN"; version="1.1.2.1"; sha256="1n61jrcmakqif8f827x4qnlhm2jqpj5fgjj65c4p0kdd8lzw8pqp"; 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]; };
   FPV = derive2 { name="FPV"; version="0.5"; sha256="0pxa8lbcxw2hx2n0frkx0pdndlcfm7gnh9qay9q53cf5gqzzwvvc"; depends=[FuzzyNumbers FuzzyNumbers_Ext_2]; };
   FRACTION = derive2 { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; };
@@ -1167,14 +1220,14 @@ in with self; {
   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]; };
-  FRK = derive2 { name="FRK"; version="0.2.1"; sha256="042j6n3yx46123d0qsghbynjf1h0iri4kfd92z5nbcgv7wggk4d3"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime sparseinv]; };
+  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]; };
   FSAdata = derive2 { name="FSAdata"; version="0.3.6"; sha256="0r4g3s4a7hizxj7zlp8wb5sldnx6kc99vak8ww715bhzpzq40qf8"; depends=[]; };
   FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; };
   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.1.10"; sha256="1i844k8qacbxv4hzv2d8d0jxijf2p2r1xh1ihcp4dijc9ap8wvg8"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; };
+  FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.2.1"; sha256="1xzb59p3byby5wbas48qpzkmsai7xk0nk1g1iz80m22b9p521n85"; 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]; };
@@ -1182,7 +1235,7 @@ in with self; {
   FWDselect = derive2 { name="FWDselect"; version="2.1.0"; sha256="0w0hkmhcz7h1lixk7p3yffbbalgxwh2lv463vqz361k80sri6wz7"; depends=[cvTools mgcv]; };
   FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; };
   FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
-  FactoClass = derive2 { name="FactoClass"; version="1.2.4"; sha256="0rzbzl32hk4mrs6njm4cnj84ifsf52ms5khy43m9bfmwwmadbilr"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; };
+  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=[]; };
@@ -1203,12 +1256,11 @@ 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.2"; sha256="1ky03qc6vc2q8v9inanm0bmybjjcx53izjfylszhmnlgph1fp6n8"; depends=[DESeq2 destiny lle locfit pheatmap princurve randomForest RColorBrewer rgl Rtsne som zoo]; };
+  FateID = derive2 { name="FateID"; version="0.1.4"; sha256="1v3zgxr8qydpkxzpbxn3spqy4xadf1h0wx3nk4ia9dkmxz6qq5hy"; 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.4"; sha256="18j98l3bx8psd13nb47y7qrs58ds1i1pbib1d6q1178pf1k474i3"; depends=[curl data_table devtools dplyr foreach Hmisc httr igraph lubridate magrittr ncdf4 raster readr rgdal rgeos sf soilDB sp stringr]; };
+  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.4"; sha256="0k5pafgrcb7smklgzgw2mf6npj55nm5fsr6k0xp6ji380rvdxc0y"; depends=[data_table devEMF ggplot2 gridExtra plyr png ReporteRs 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=[]; };
@@ -1218,16 +1270,16 @@ in with self; {
   FinancialMath = derive2 { name="FinancialMath"; version="0.1.1"; sha256="11nhphvd7bvbc7xfs85rib763r1mpvxmsj6hgzfib5aifib5k5js"; depends=[]; };
   FindAllRoots = derive2 { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; };
   FindIt = derive2 { name="FindIt"; version="1.1.4"; sha256="1rnkxngkqsmqs0d0m8ihscpsigxbjgl5ga5nyfwf97b1hrbv4j37"; depends=[arm ggplot2 glinternet glmnet igraph lars lmtest Matrix quadprog sandwich]; };
-  FinePop = derive2 { name="FinePop"; version="1.5.0"; sha256="0dis6nxdlgvznsv0817hnfc4nirv7vvzi0n1wd378zdn60j2fwbv"; depends=[]; };
+  FinePop = derive2 { name="FinePop"; version="1.5.1"; sha256="184707yvh2mydx42vxrdgv0n4v2dad4an7c4yvlyb9d7z6h0sw2x"; depends=[]; };
   FisHiCal = derive2 { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph Rcpp RcppArmadillo]; };
-  FishResp = derive2 { name="FishResp"; version="0.3.0"; sha256="1rn4vpg33q7x7j0srjndz3c16gzl97f31pvcqcnbnp1c687irb6l"; depends=[chron lattice mclust respirometry rMR]; };
+  FishResp = derive2 { name="FishResp"; version="1.0.2"; sha256="0ljibh3nchrlyq2bihaxacpqvw0simw6q4i9rv8lf04viyrbvi6y"; depends=[chron lattice mclust respirometry rMR]; };
+  FisherEM = derive2 { name="FisherEM"; version="1.5.1"; sha256="1s7gfdw840f51mn76jvcnwpwcf3dzf2w81wlyxqkij45sink92yz"; depends=[elasticnet MASS]; };
   FitAR = derive2 { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[bestglm lattice leaps ltsa]; };
   FitARMA = derive2 { name="FitARMA"; version="1.6"; sha256="1r9mqrqkm4wh3nd6v9wmpj23gw21i4p89p6z4c7639kn4f590ldk"; depends=[FitAR]; };
   FixSeqMTP = derive2 { name="FixSeqMTP"; version="0.1.2"; sha256="0v1cwq8gapgandm7wiw8p6av6qigydlpmwi6w02p1y7f0hf5ifnp"; depends=[]; };
   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-3"; sha256="0766ghwbdd7r4yj5xf31hnknn775ziw1hhrn13wf8bibyd8blz70"; depends=[nlme]; };
   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]; };
@@ -1235,14 +1287,16 @@ in with self; {
   ForIT = derive2 { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; };
   ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; };
   ForeCA = derive2 { name="ForeCA"; version="0.2.4"; sha256="1i19lmhl1kgfnd7zipjr6xp5ir9rvjy13sbq321jaf8ya60bjdd9"; depends=[ifultools MASS reshape2 sapa]; };
-  ForecastComb = derive2 { name="ForecastComb"; version="1.2"; sha256="1sx151a37aadvki3bvlya4g5mbd8ns9644n4mc6f6mhglikx5y2g"; depends=[forecast ggplot2 Matrix mtsdi psych quadprog quantreg]; };
+  ForecastComb = derive2 { name="ForecastComb"; version="1.3.1"; sha256="07cbiv172mpkwvg6svhwgavlfy2144ir3y1l7w37wbd0ygs514id"; depends=[forecast ggplot2 Matrix mtsdi psych quadprog quantreg]; };
   ForecastCombinations = derive2 { name="ForecastCombinations"; version="1.1"; sha256="07vzgm2jy992p1l9b8rsv2lbc8cbfzvql85n5ah4p4l3zjxdxgk9"; depends=[quadprog quantreg]; };
   ForecastFramework = derive2 { name="ForecastFramework"; version="0.9.0"; sha256="131h9f148wn89znzsnym43amlvf4s7jzg4f2p7ld9ns7727sf56q"; depends=[abind dplyr lubridate magrittr R6 reshape2]; };
   ForestTools = derive2 { name="ForestTools"; version="0.2.0"; sha256="0q9nk9n001bnz5hd8cxj6wmaf8c7g0kwfkpa0hk6ap42666rrrah"; depends=[APfun imager raster rgeos sp]; };
   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]; };
-  FourScores = derive2 { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; };
+  FossilSim = derive2 { name="FossilSim"; version="2.0.0"; sha256="1kv737bpq4vii2q32jljdiv3dlcvj05xkxkd5s0d5961ypgvm04d"; 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]; };
   FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; };
   FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.1.1"; sha256="0l015v99hzmiyic0klvq71ljk9f8ipr57ki7x4cjyz1gam9f84p5"; depends=[]; };
@@ -1250,7 +1304,7 @@ 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-1"; sha256="10472bclx40ha5nz15csyk3j3kwdzfb22wx64zc1s16s903w9jhw"; depends=[BH Rcpp]; };
+  FunChisq = derive2 { name="FunChisq"; version="2.4.5-2"; sha256="1a5ladzpm62cap8gdz11kjlwyzkq84nx2xbnbjc36x2skzlqpcza"; 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]; };
@@ -1279,15 +1333,15 @@ in with self; {
   GANPA = derive2 { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; };
   GANPAdata = derive2 { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; };
   GAR = derive2 { name="GAR"; version="1.1"; sha256="12xgk87bndinx7ibaasn51a9fad3ymvpjmixa7l18pfy99l3pcll"; depends=[httr jsonlite]; };
-  GAS = derive2 { name="GAS"; version="0.2.6"; sha256="18a3hagwfy0xa7abkwgf2pk5l2n0bxg4kr8y0m5iapkbc3gx5rvz"; depends=[MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; };
+  GAS = derive2 { name="GAS"; version="0.2.9"; sha256="1h588g4khqhc0laxdqmzjz4zilb2gww9xkm0p7d59k9b70k7wbcx"; depends=[cubature MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; };
   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]; };
   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.2"; sha256="1gb3qhqa212vy85qscnfssvb4rk8fq5j6zs779jq9c6jzvlfv6wb"; depends=[]; };
+  GCD = derive2 { name="GCD"; version="4.0.3"; sha256="0c1l1xz0jjjib5cqszq6rg3rh19441npjgy6xnvlrhddjyihhrs4"; depends=[]; };
   GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; };
-  GCalignR = derive2 { name="GCalignR"; version="1.0.1"; sha256="1p1zxf5s75ckyj7a61n43ix314p3b99knyg6z5d4sn5n417h2m42"; depends=[ggplot2 pbapply readr reshape2 stringr]; };
+  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]; };
@@ -1295,7 +1349,8 @@ in with self; {
   GDINA = derive2 { name="GDINA"; version="2.1.15"; sha256="1cndib7frd40199l8zijspnidwig9jvhhk3s5dbbhlgxswq6idsz"; 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]; };
-  GENEAread = derive2 { name="GENEAread"; version="2.0.2"; sha256="0nkza3srfa67mmxnvhhq2wg3zm7ij73r7rpgssjaaijcxqm7qyvl"; depends=[bitops GGIR mmap]; };
+  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]; };
   GENLIB = derive2 { name="GENLIB"; version="1.0.6"; sha256="0xyq3ggi814vi3x5kxffhi7ygvzcfj3pg0kfi7whcjpi3pjg05h8"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; };
   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]; };
@@ -1306,16 +1361,17 @@ in with self; {
   GEint = derive2 { name="GEint"; version="0.1.4"; sha256="0xwp8hqds4lf6nb8hcbvsj2000w7f90bi62b1v3iry0y6cbpwbjg"; depends=[bindata geepack mvtnorm nleqslv pracma rje speedglm]; };
   GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; };
   GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; };
-  GFD = derive2 { name="GFD"; version="0.2.5"; sha256="14bhqk5hi9w2078nn382ksgw37bx5r1jadizcrwbisglccxa0ncd"; depends=[magic MASS Matrix plotrix plyr]; };
+  GFD = derive2 { name="GFD"; version="0.2.6"; sha256="1z98j6nvaa4vrh840q1iy5r0h9ns4xbrk3qfkq51l2kmbrck8r7a"; depends=[magic MASS Matrix plotrix plyr]; };
+  GFE = derive2 { name="GFE"; version="0.1.0"; sha256="0ywrg23z13kp8ggw4wbm4jvr2rvb6kra7ma0mgfj8xzkrxs6vi6m"; depends=[data_table dplyr TeachingSampling]; };
   GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.3"; sha256="0pqx5fr039izhwi2kdzq9v6nlviyjclzddd092g8mkadj36diwk5"; depends=[cmprsk compound_Cox joint_Cox]; };
   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.5-23"; sha256="06bz8zlw3b2m1lb884jcbh935wxjri8hsa25aw4x7h3n70sgza25"; depends=[data_table Rcpp]; };
+  GGIR = derive2 { name="GGIR"; version="1.6-7"; sha256="1kwrynyb0r6y9vdsdv1s75pg1v2q4lj10dvvwbdk4sy3m8z7dhsv"; 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.2"; sha256="0kkdg8d4ib862v6y9xjczh4v52fzzcv5c31hdf44jw4lc7npwc82"; depends=[abind psych Rdpack viridis xlsx]; };
+  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]; };
   GHap = derive2 { name="GHap"; version="1.2.2"; sha256="1qwv4llcixklr9d6lq4ljzbs8al80xnvqkcajnh8dbf3axmlmr5b"; depends=[bigmemory lme4 Matrix]; };
@@ -1327,7 +1383,7 @@ in with self; {
   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.2-0"; sha256="06ppv7clwqd817aas9dkq1ry8vz9rbss5rdgwzc65y715r0y906k"; depends=[MASS nlme]; };
+  GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.3-0"; sha256="0447j35a5nq3v6fkcynmrxvxqlry51b6fx05dwrdncbnq3sm5f6j"; 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=[]; };
   GLSME = derive2 { name="GLSME"; version="1.0.4"; sha256="1bh56dv4czl89dm9b6syfpsbds4wni03d5vamvjbp6wblhysxnpm"; depends=[corpcor mvtnorm]; };
@@ -1336,47 +1392,47 @@ in with self; {
   GMDH = derive2 { name="GMDH"; version="1.6"; sha256="093glyz73246m5f2xb2xgbgi80haj4fanmr325byr99dnf4x35yn"; depends=[MASS]; };
   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.4"; sha256="14m4rygb24k4prkiqsqv3w5v0gv98pqpqdmgimk5wi33npxy2c2b"; depends=[shiny shinydashboard shinyjs]; };
-  GNE = derive2 { name="GNE"; version="0.99-1"; sha256="1avsl54xdlqq8pw16g84igcwms7if7lvdblqvfc2cn3sk8qi5xdv"; depends=[alabama BB nleqslv SQUAREM]; };
+  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]; };
+  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]; };
   GOplot = derive2 { name="GOplot"; version="1.0.2"; sha256="1y8dv0kbzpr9za91njw0x233vx5d13vqml9hmpddcyi9s6va5nix"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; };
   GPArotation = derive2 { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqqwx47ara6glilzha87rnih0hs5fsz0jjqwv6wr1gw26rm"; depends=[]; };
   GPB = derive2 { name="GPB"; version="1.0"; sha256="18cdgz00j0j1rchzn2l253rii3b0iv9ipnh5sk3yvmwrqiabmrf8"; depends=[]; };
-  GPCMlasso = derive2 { name="GPCMlasso"; version="0.1-1"; sha256="1qlbs9xxdn7q90afh5zc6fgp213fxyh3xmmhz5dm6azbwx92x3la"; depends=[car caret cubature ltm mirt mvtnorm Rcpp RcppArmadillo statmod TeachingDemos wordcloud]; };
+  GPCMlasso = derive2 { name="GPCMlasso"; version="0.1-2"; sha256="03xa68aydlgah7y922k9i07qwwz0ygzidrc3xl0iylcwbwcanifd"; depends=[caret cubature ltm mirt mvtnorm Rcpp RcppArmadillo statmod TeachingDemos]; };
   GPCSIV = derive2 { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; };
   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.1"; sha256="0sqr2s9wcqh2giyslvkgprn22b4aigalx2dd9y57lz7kfljvril7"; depends=[lattice lhs randtoolbox]; };
-  GPPFourier = derive2 { name="GPPFourier"; version="2.1"; sha256="1wlzpiqlg5zx3rv29l1ql3apcaykvk72zc0anwxr152qlk910l2q"; depends=[mFilter Tides]; };
+  GPM = derive2 { name="GPM"; version="1.0.2"; sha256="0b7431fapg09xad8rc3b9vwrs55ja24yv12kfxb2y65gij940ms7"; depends=[lattice lhs randtoolbox]; };
+  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]; };
   GPfit = derive2 { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lattice lhs]; };
-  GPoM = derive2 { name="GPoM"; version="1.1"; sha256="0n1fnmwiygispihqgcx762wkvp28pnm8kcwlx9vxhpafswsp112q"; depends=[deSolve rgl]; };
-  GPrank = derive2 { name="GPrank"; version="0.1.3"; sha256="118v08kyp0s8j24cmfyyzj8klgd4g3jqi1x5l76w1iznnlpyd6kf"; depends=[gptk matrixStats RColorBrewer tigreBrowserWriter]; };
+  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]; };
   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.0"; sha256="1nzy8v4xjvaw5zsmbfxljfmy78njd3mw7rkgh6k6c0mf30mrb51i"; 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]; };
-  GROAN = derive2 { name="GROAN"; version="1.1.0"; sha256="06xcbdcg3rmb9939d9ansy75jn0axy0c36rmgjhcji8gf959kmyz"; depends=[plyr rrBLUP]; };
+  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]; };
+  GROAN = derive2 { name="GROAN"; version="1.2.0"; sha256="14n3k1wwz5pn82wcj00cdns4bp699f58k1nj8hp8jn0q7xr2sgv5"; depends=[plyr rrBLUP]; };
   GRS_test = derive2 { name="GRS.test"; version="1.1"; sha256="1ap9453rj5zan6c3ix7jb1qxhxh42bfv295dgqbgjpdygjdlbm6n"; depends=[]; };
   GRTo = derive2 { name="GRTo"; version="1.3"; sha256="1xkcx2agvrpfnmplgaqx70vz303v8rhwnxdyr4hmdlf4h92lbv8i"; depends=[bootstrap]; };
   GSA = derive2 { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; };
   GSAQ = derive2 { name="GSAQ"; version="1.0"; sha256="1p1rab2dlh4h9bfg464nhx708p7kc4q01ifccdh5756lq1qh2kzv"; depends=[]; };
   GSAfisherCombined = derive2 { name="GSAfisherCombined"; version="1.0"; sha256="1xhq5nc3kbz3ml9qkdxm6m0c65fybabfhgqlwii2105jl0ll7qy5"; depends=[]; };
   GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; };
-  GSCAD = derive2 { name="GSCAD"; version="0.1.0"; sha256="0a5smd1prfi6n58ghhz5v81p88v3cnmk2v6r0nn9gy7sa1r2z8xc"; depends=[fields Matrix Rcpp RcppArmadillo]; };
   GSE = derive2 { name="GSE"; version="4.1"; sha256="00pvpramk7n3195i3vkmp982igyc1b0xzjqs7xdsvzsnfv7kpcbh"; depends=[cellWise ggplot2 MASS Rcpp RcppArmadillo robustbase rrcov]; };
-  GSED = derive2 { name="GSED"; version="1.7"; sha256="1w8kim7qfrx28bx4l4qkfghwysmyhm7xa0pjagvrh5ar35m4ga67"; depends=[memoise rootSolve survival]; };
+  GSED = derive2 { name="GSED"; version="1.10"; sha256="1i3xrf01620m7vwa9kpzl620kxh60yhsbxyshna4kkv6d68i9fzy"; 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.1"; sha256="0nmr5pmwxmriaf16r39hs85g2qfzz3k176klgvlmp4shg4ln2p64"; depends=[curl dplyr magrittr purrr R_utils readr rlang tibble]; };
+  GSODR = derive2 { name="GSODR"; version="1.2.3"; sha256="12fa4grgar7b8pxr1jjqrjbzmil0dwn04mq5dawj86v6g65xnky9"; depends=[curl dplyr 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.3.1"; sha256="02chn2mzh6smmiv8rp00cq5rff18bqszazbk8svmvvlgn0a25pj4"; depends=[rpanel tkrplot]; };
+  GUIDE = derive2 { name="GUIDE"; version="1.2.7"; sha256="0klaczmn3jnlzyh45yaqlc897irjfk467f4w03awmflaiwan3h6v"; depends=[rpanel tkrplot]; };
   GUILDS = derive2 { name="GUILDS"; version="1.3"; sha256="0zl6x0vn93ybps63fqazvd93f2zwdq0rqqrp7d6n5rnamx99mm8d"; depends=[pracma Rcpp]; };
   GUIProfiler = derive2 { name="GUIProfiler"; version="2.0.1"; sha256="10m4d7f2rhw6cmkrnw3jh4iqlkfphf4v7mpfwzw17laq0ncmsx5r"; depends=[graph MASS Nozzle_R1 proftools Rgraphviz rstudioapi]; };
   GUIgems = derive2 { name="GUIgems"; version="0.1"; sha256="0lmx8hw0496vk437p32l933cdb4vpi94f4kz58x20jj07c20maz6"; depends=[ggplot2 igraph MASS msm plyr rpanel stringr]; };
@@ -1384,12 +1440,12 @@ in with self; {
   GUniFrac = derive2 { name="GUniFrac"; version="1.1"; sha256="1vgij7c9b0afl5wzwcn0pjdvn8gqz2jxk5q0gchd9zk1qd10a1vl"; depends=[ape matrixStats vegan]; };
   GWAF = derive2 { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[coxme geepack lme4]; };
   GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
-  GWASinlps = derive2 { name="GWASinlps"; version="1.1"; sha256="1041yb5zn27a9srylmawj2kbkcsjz65x0apa413wyb32pz73l6ni"; depends=[horseshoe mombf]; };
+  GWASinlps = derive2 { name="GWASinlps"; version="1.2"; sha256="036lv8f58kz6qdwaviyk1q1qsgcj9cimipq1cjrfpn8snkn7s1gh"; depends=[horseshoe mombf speedglm]; };
   GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; };
   GWLelast = derive2 { name="GWLelast"; version="1.2.1"; sha256="1g6xmw93jl9cv3c7p76wk3lq8qhqxgjhmn1cgiyyy5jbf14gbasv"; depends=[doParallel foreach geosphere glmnet sp spgwr]; };
   GWRM = derive2 { name="GWRM"; version="2.1.0.3"; sha256="16ahlf1pbcpgha50a7ml2c336by50r287kihwshiazshifi5p3n3"; depends=[doParallel foreach]; };
   GWSDAT = derive2 { name="GWSDAT"; version="3.0.1"; sha256="1v93fbbpmbcigi1m9vyzrgcbnrrpgh7h963vicwy9ilzc06vhm68"; depends=[deldir digest geometry Kendall lattice MASS Matrix officer readxl rhandsontable sf shiny shinycssloaders shinydashboard shinyjs sm sp splancs zoo]; };
-  GWmodel = derive2 { name="GWmodel"; version="2.0-5"; sha256="1v0a2fxs1nfm84vrggj1zmbij6kqzc5mgmqlvrh80hj3w87zpiry"; depends=[maptools Rcpp RcppArmadillo robustbase sp spdep]; };
+  GWmodel = derive2 { name="GWmodel"; version="2.0-6"; sha256="04im9va0imj8wsl5fzjw7jx7xxvwdr71wqj2m5ar2x3c1k91k2na"; depends=[maptools Rcpp RcppArmadillo robustbase sp spacetime spdep]; };
   GWsignif = derive2 { name="GWsignif"; version="1.2"; sha256="0bss5s3ijnlckz44p7jj49bn2r8nwqckpzwzcv0vci915q8jfsj2"; depends=[]; };
   GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; };
   GameTheory = derive2 { name="GameTheory"; version="2.7"; sha256="0vb7sjia5s58gw9zpkzddps8knxvbrz7fbi3m6digl8bf5vwhxxw"; depends=[combinat gtools ineq kappalab lpSolveAPI]; };
@@ -1398,7 +1454,7 @@ in with self; {
   GauPro = derive2 { name="GauPro"; version="0.2.2"; sha256="127agnhqbbavcf7sx0zq1c8ldh3w1d1iz5bpd1ixxkyaapmiq4qy"; depends=[lbfgs R6 Rcpp RcppArmadillo]; };
   GeDS = derive2 { name="GeDS"; version="0.1.3"; sha256="1ddq4hnyl3m3s4cchccxiqphi742ljcm86zqpa01a5nrjbnr87x6"; depends=[Matrix Rcpp Rmpfr]; };
   GeNetIt = derive2 { name="GeNetIt"; version="0.1-1"; sha256="1xjz22m4yn642m0bqa33w4m2rygpxjwg43c54lw168jck9zzgv1f"; depends=[nlme raster rgeos sp spatialEco spdep]; };
-  GenAlgo = derive2 { name="GenAlgo"; version="2.1.4"; sha256="1mgdvzc5dd7d1wlk8c7d8gd9b2di16mjmyd2i3am05jfw3q26ahv"; depends=[ClassDiscovery MASS oompaBase]; };
+  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=[]; };
   GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; };
   GenKern = derive2 { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; };
@@ -1416,6 +1472,7 @@ in with self; {
   GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; };
   GenomicMating = derive2 { name="GenomicMating"; version="2.0"; sha256="02v1pkarmardf7g8hf2n4jj4cq4707g5lcc7gnwsiyyh7pknd1y6"; depends=[dplyr emoa kohonen LowRankQP magrittr plotly qtl Rcpp RcppArmadillo scatterplot3d SOMbrero]; };
   GenomicTools = derive2 { name="GenomicTools"; version="0.2.6"; sha256="19illcfcm34vr90kh4cbdwf7k8hy700dlzylsaicv3h4xi7iydgs"; depends=[circlize data_table gMWT Rcpp RcppArmadillo snpStats stringr]; };
+  GenomicTools_fileHandler = derive2 { name="GenomicTools.fileHandler"; version="0.1.2"; sha256="1snv2z95v7lyvzpssjsjpy4163k6imfjbb0svm8icsb85mpyj7af"; depends=[data_table snpStats]; };
   GeoBoxplot = derive2 { name="GeoBoxplot"; version="1.0"; sha256="164dh49ac3fx38fdglv32lmz92ca8jdd98cbhz6mxsk8r0jcladw"; depends=[]; };
   GeoDE = derive2 { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[MASS Matrix]; };
   GeoGenetix = derive2 { name="GeoGenetix"; version="0.0.2"; sha256="0rrc8rdf6whpd830s2g9ybz82jcd0il9kkfrjh3xza3b86fasdvg"; depends=[RandomFields]; };
@@ -1424,24 +1481,26 @@ in with self; {
   GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; };
   GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; };
   GerminaR = derive2 { name="GerminaR"; version="1.2"; sha256="10x22xl3r93i5mc6w7m5mqm3z386dsffwrb8h9c1bznrnynnsy63"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr readxl shiny shinydashboard tibble tidyr]; };
-  GetDFPData = derive2 { name="GetDFPData"; version="0.7"; sha256="0c8cdx0hgcnrsppmq7vk70ivhczlb4blqfghqb9rni295r3hzd47"; depends=[curl dplyr readr reshape2 stringr tibble xlsx XML]; };
-  GetHFData = derive2 { name="GetHFData"; version="1.5"; sha256="1lm2k37y86fn45hhvyswj60dql0m33kia0wirs3zc981s4nsxp0i"; depends=[curl dplyr lubridate RCurl readr stringr]; };
+  GetDFPData = derive2 { name="GetDFPData"; version="1.2"; sha256="1v87xln890rvgklylziarqp3d4qwkppa9m54v2n9a6cbrfs4v3v9"; depends=[curl dplyr readr reshape2 stringr tibble xlsx XML]; };
+  GetHFData = derive2 { name="GetHFData"; version="1.6"; sha256="1yhj97ag817jd2qzfbk363vmy4qpv1p6343krm3z0c9wjp2i97n5"; depends=[curl dplyr lubridate RCurl readr stringr]; };
   GetITRData = derive2 { name="GetITRData"; version="0.7"; sha256="0cmqbncd5bjxgb1r9yvdv2hkx4qdmnpn2a62bgndnaya1yk5050l"; depends=[curl dplyr readr reshape2 stringr tibble xlsx XML]; };
-  GetLattesData = derive2 { name="GetLattesData"; version="0.9"; sha256="1rqhs8039m3ar76nail7gavw6678zs20r9dg98rp5igqx5jjys73"; depends=[curl dplyr readr stringdist stringr XML]; };
+  GetLattesData = derive2 { name="GetLattesData"; version="1.2"; sha256="0mwbyb3wk2l4nrzx4n6gbx4h4a1fz7p8kmysbihysdlz8brnr0av"; depends=[curl dplyr readr stringdist stringr XML]; };
   GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; };
   GetTDData = derive2 { name="GetTDData"; version="1.3.1"; sha256="1a8f22nxs85g2zznh1ma37lmycypg8f7d5kdhyb5vrirvrpi5p05"; depends=[bizdays curl RCurl readxl stringi stringr tidyr XML]; };
   GetoptLong = derive2 { name="GetoptLong"; version="0.1.7"; sha256="1fl3w2n602ldybc5qj7qw4xmzzb804bsjkqwf6dswzj0vf0qiadr"; depends=[GlobalOptions rjson]; };
   GiNA = derive2 { name="GiNA"; version="1.0.1"; sha256="0his7wsgnggyv9526blxzxa1ni8hwq2ws64wkmha45nvvnm3dsiw"; depends=[doParallel EBImage foreach png]; };
   GiRaF = derive2 { name="GiRaF"; version="1.0"; sha256="02356cq0g6v5m72fy5z83bw3nsb7kpc9sy7sykk97735n928z92n"; depends=[BH Rcpp RcppArmadillo]; };
   GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; };
+  Gifi = derive2 { name="Gifi"; version="0.3-8"; sha256="04kprdfh74gyc5p8x6ycgv2m6gm47imhf3v4vlxgqj3lmjm2vxp0"; depends=[colorspace]; };
   GillespieSSA = derive2 { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; };
   GiniWegNeg = derive2 { name="GiniWegNeg"; version="1.0.1"; sha256="1wqwjalsyp55si839cil6na3khigm0mwn6qkg0kjylq10pabfk2a"; depends=[]; };
   Giza = derive2 { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[lattice reshape]; };
   GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; };
   GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; };
   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.2"; sha256="15ax691xk14y7qxnr1d0qbzb7y3ikv0x4qgsn4ss9z6b0hqclc84"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown XML]; };
+  Gmisc = derive2 { name="Gmisc"; version="1.6.4"; sha256="1hqpxrff0nhbgin8x69ip3lnsj13g3alm4y8l2hv0rnxibxd4x4z"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown 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]; };
@@ -1454,11 +1513,14 @@ in with self; {
   GrapheR = derive2 { name="GrapheR"; version="1.9-86"; sha256="1iizknyrpgiz1fh1fjls58n5v5fpki25j7kfbwfkp5ijf1q54ml6"; depends=[]; };
   GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; };
   GreedyEPL = derive2 { name="GreedyEPL"; version="1.0"; sha256="19b8fwxsjd6shwjxhpawa8pmlj6yn0j4577g6b93xbcs76wgrvd1"; depends=[Rcpp RcppArmadillo]; };
+  GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.2"; sha256="1x3hnyqq75krlygg82qm0ldd8nsv071nzgr63zkjmifc7hgi0nvb"; depends=[GreedyExperimentalDesignJARs rJava]; };
+  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]; };
   GroupSeq = derive2 { name="GroupSeq"; version="1.3.5"; sha256="0c74nlsqa5ly0kf6p4n7gfvd0ygkq78bx851ryniwpnnalvsq8l7"; depends=[]; };
   GroupTest = derive2 { name="GroupTest"; version="1.0.1"; sha256="1v2230mw0irsr5y8n45g8sd362jp7f6dy2r532mhflfdqy6i2khs"; depends=[]; };
   GrpString = derive2 { name="GrpString"; version="0.3.2"; sha256="14ss6assqk6s9kv4bvzlydm8qrbnslm4vj876q5dn2dw4k50dai1"; depends=[cluster plyr Rcpp]; };
@@ -1469,10 +1531,13 @@ in with self; {
   HAC = derive2 { name="HAC"; version="1.0-5"; sha256="0dc79qjhyydq0k4d8wvg970hs56i9yhxjrh5ky9a178ya61vw208"; depends=[copula numDeriv]; };
   HAP_ROR = derive2 { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[ape hash]; };
   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]; };
   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=[]; };
@@ -1481,11 +1546,14 @@ in with self; {
   HDMD = derive2 { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[MASS psych]; };
   HDPenReg = derive2 { name="HDPenReg"; version="0.93.2"; sha256="0blmp7cwsklp8aqdcyyjmv419cgc7iz0pb4629y8slqw0zq2n6gm"; depends=[Matrix Rcpp rtkore]; };
   HDclassif = derive2 { name="HDclassif"; version="2.1.0"; sha256="1d79wki03yyr3hqz44xlx07msmxb59sm2mrq2za34fdbvvrmw58v"; depends=[MASS rARPACK]; };
+  HDclust = derive2 { name="HDclust"; version="1.0"; sha256="1wdnigpsvwi7kpmnmv1zzkdjlb2iff76x83g06y9fbrdywhjcbgh"; depends=[Rcpp RcppProgress]; };
+  HDcpDetect = derive2 { name="HDcpDetect"; version="0.1.0"; sha256="0ai35d9df5pmva52sb1rr20f11h0mbal6d179g865b7w6n90kfr1"; depends=[]; };
   HDoutliers = derive2 { name="HDoutliers"; version="1.0"; sha256="0pby640bad0jcf1lkwg2g6flassb1pimnjm411c6x8rgvmiphc23"; depends=[FactoMineR FNN mclust]; };
-  HDtest = derive2 { name="HDtest"; version="0.1"; sha256="0vlwpx9l6r0izfcf9fgna72w39w64b95s3q527mapjb6a3676avg"; depends=[checkmate doParallel expm foreach MASS mvtnorm]; };
+  HDtest = derive2 { name="HDtest"; version="2.1"; sha256="1c9x4s59762sp7drbm5h1xv22kpifq7p0x3dkrfcd0ficbbma5v8"; depends=[checkmate clime doParallel expm fastclime foreach MASS mvtnorm]; };
   HDtweedie = derive2 { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; };
-  HEMDAG = derive2 { name="HEMDAG"; version="2.1.3"; sha256="110c37y08ivqvh5qcn6plsxf7ariqwdx6my7xv83kj2v570a4qiw"; depends=[graph PerfMeas precrec preprocessCore RBGL]; };
-  HGNChelper = derive2 { name="HGNChelper"; version="0.3.6"; sha256="1bm6zxwafbp65p6w4rk2y1bw7ig60br2mk75c4frdzqw3yw0zwxd"; depends=[]; };
+  HEMDAG = derive2 { name="HEMDAG"; version="2.2.5"; sha256="0j4zq8lhpscay8gvlvgzpxiwaka2hgx15lx3v16k17iwafm6b3fw"; depends=[doParallel foreach graph iterators plyr precrec preprocessCore RBGL]; };
+  HGNChelper = derive2 { name="HGNChelper"; version="0.5.2"; sha256="02hqd1jajbmilwyzgpy74xy8n1406zpkha9hpzzar5pmjda41nn9"; depends=[]; };
+  HGSL = derive2 { name="HGSL"; version="1.0.0"; sha256="1p453xr3d1bmqc6mrmzb0hz9p0gp25m6v6qr0l3bapcf71vzbvq1"; depends=[]; };
   HH = derive2 { name="HH"; version="3.1-35"; sha256="0sykmmipbph9x7k371liiyj2vmqv0as2hr9x6yrn38ls6bscjlj4"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
   HHG = derive2 { name="HHG"; version="2.2"; sha256="114nfpdjdisryil9l8cws885qdskgrjm2cclx543hh4cdhpnkxnp"; depends=[Rcpp]; };
   HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
@@ -1497,22 +1565,25 @@ 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]; };
-  HMDHFDplus = derive2 { name="HMDHFDplus"; version="1.1.8"; sha256="15z0war5isw9xnln7py3di8f45pwvdw6x6wljl18fcxpmanmlfcf"; depends=[RCurl XML]; };
+  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.0"; sha256="19iwy0nj0vw3cslrfdai1l1yg84c5diyxpy65jd2f419ag3rmki3"; depends=[Rcpp RcppArmadillo Rdpack]; };
+  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]; };
+  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]; };
   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]; };
   HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; };
-  HRM = derive2 { name="HRM"; version="0.9.1"; sha256="0pv3lly5rm620868mkka3m0hp5k2yrpymwdjdh19s4vdj4xjnb15"; depends=[data_table ggplot2 MASS matrixcalc plyr pracma reshape2 xtable]; };
+  HRM = derive2 { name="HRM"; version="1.0.2"; sha256="0krd27raa2ys2gsgqpbxpfnmigj8s6mk3al7fh3czx5l0d73iqy1"; depends=[data_table doBy ggplot2 MASS matrixcalc mvtnorm plyr pseudorank Rcpp reshape2 xtable]; };
   HRQoL = derive2 { name="HRQoL"; version="1.0"; sha256="1gr9rhr8gdnh7bw2v3r0xc3yhmzrx2gzgsd8wd5mmsp81ph0h5lz"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; };
   HSAR = derive2 { name="HSAR"; version="0.4.2"; sha256="0rxb2klmyynr8rzq6ka8p40lw81wjd0jkw2wg3vg90zny0zps98j"; depends=[Rcpp RcppArmadillo spdep]; };
   HSAUR = derive2 { name="HSAUR"; version="1.3-9"; sha256="0b2hyn59lr2pma87fcj7mli3qmrbnfhgd8fv02fa317rj52399qz"; depends=[]; };
   HSAUR2 = derive2 { name="HSAUR2"; version="1.1-17"; sha256="0jc554lz5lj7180vd4rbrjkywar4bh38c7i9kyxhd5clg4afxpw8"; depends=[]; };
   HSAUR3 = derive2 { name="HSAUR3"; version="1.0-9"; sha256="1rpvblak0xvkavbvbd35zq1lcsl5z1zp30vn70wqbkdj7szhj9b4"; depends=[]; };
+  HSDiC = derive2 { name="HSDiC"; version="0.1"; sha256="0wiixb1ylx0l8qfgh5ark6alkdq87xaak1jlxizw1m589vghvqfp"; depends=[glmnet Matrix ncvreg quadprog]; };
   HSSVD = derive2 { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; };
   HTMLUtils = derive2 { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; };
   HTSCluster = derive2 { name="HTSCluster"; version="2.0.8"; sha256="0wnbfh6hdx8692jilgmv8sys1zm6fqc6mim7vvjhyqlmpm8gm0kg"; depends=[capushe edgeR plotrix]; };
@@ -1528,13 +1599,15 @@ in with self; {
   HandTill2001 = derive2 { name="HandTill2001"; version="0.2-12"; sha256="1rijjv27zwdznznvwlb5hahixmfxayr6vs11p1mzwqma8qhsn5ak"; depends=[]; };
   Hankel = derive2 { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; };
   HapEstXXR = derive2 { name="HapEstXXR"; version="0.1-8"; sha256="00p8pziy8q6vki7brpd57c7ckc9zw41c90h47yp9vb3ndanfqavp"; depends=[survival]; };
+  Hapi = derive2 { name="Hapi"; version="0.0.3"; sha256="0jqjhfq38k161kqff5cx0vxpsmjm2y5ca7049mvqiwqwvi4fp08m"; depends=[ggplot2 HMM]; };
   Haplin = derive2 { name="Haplin"; version="7.0.0"; sha256="1hdclx33ndjgz4xvg8myngzslcrmvc994nlgf3hp3km3591j62rj"; depends=[ff ffbase MASS mgcv snow SuppDists]; };
   HaploSim = derive2 { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
   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]; };
-  HelpersMG = derive2 { name="HelpersMG"; version="3.0.0"; sha256="1y5q4z9yxap16bkcjsybm2754wm0x31hfqdnp2bb4gbvhz1jhas6"; depends=[coda]; };
+  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]; };
   HiCglmi = derive2 { name="HiCglmi"; version="1.3"; sha256="17vwdhnf36cg56vidq7d85s4vgk2pnn5py1y2wsl2dm41vdl0847"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; };
@@ -1542,8 +1615,9 @@ in with self; {
   HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
   HiDimDA = derive2 { name="HiDimDA"; version="0.2-4"; sha256="0gxkxzys9mcy33xvsim8klaqmb2xwvy5bvgkn9r400j4qfjd3cgg"; depends=[]; };
   HiLMM = derive2 { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; };
-  HiResTEC = derive2 { name="HiResTEC"; version="0.52"; sha256="1kci3kxrf96ba9vawh2ln1rhpzyfkj259v8iyhrdrnhq58xrvkf5"; depends=[beeswarm Biobase InterpretMSSpectrum openxlsx plyr Rdisop xcms]; };
+  HiResTEC = derive2 { name="HiResTEC"; version="0.54"; sha256="1qzdhwyrxiiwkz0j9c3pd0vdccgvhrh66sd0rc9qnh34cmqxjd6b"; depends=[beeswarm Biobase InterpretMSSpectrum openxlsx plyr Rdisop xcms]; };
   HiddenMarkov = derive2 { name="HiddenMarkov"; version="1.8-11"; sha256="1yh85pdb9r90qxcl5gxslyplxzrx8knrrsl2q65l57zfkqj185ja"; depends=[]; };
+  HierDpart = derive2 { name="HierDpart"; version="0.1.2"; sha256="115irjz5pfx3yd8saap57zsy0ssjhadkqmv7wadsnzwlpsv2wb1z"; depends=[adegenet diveRsity dplyr entropart GGally ggplot2 hierfstat reshape2 tibble]; };
   HierO = derive2 { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; };
   HighDimOut = derive2 { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; };
   HistDAWass = derive2 { name="HistDAWass"; version="1.0.1"; sha256="1lc9pz3f6akzyisgwzfl4m5z400bailv1bmsb3snha8nhpqdk3nk"; depends=[class FactoMineR ggplot2 ggridges histogram Rcpp RcppArmadillo]; };
@@ -1556,11 +1630,11 @@ in with self; {
   Homeric = derive2 { name="Homeric"; version="0.1-3"; sha256="1vcs8fj39zpz45p7gph0mnx65hgr35na0b79i8llyw7i1h7zqzxr"; depends=[]; };
   HomoPolymer = derive2 { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[deSolve MenuCollection RGtk2]; };
   HotDeckImputation = derive2 { name="HotDeckImputation"; version="1.1.0"; sha256="1mqfn6yw5846ynrcgzka0m6ikfppa5civjkhj42rhp2v2xk25li7"; depends=[Rglpk]; };
-  Hotelling = derive2 { name="Hotelling"; version="1.0-4"; sha256="1ncq74ifdn1ha6wbkvygbwi2n0nwaj1lifyqp36sy0hql3ahrac9"; depends=[corpcor]; };
+  Hotelling = derive2 { name="Hotelling"; version="1.0-5"; sha256="1ism2lzi2kmi62gp319qsi64pj2kj5sfh50f1qnv8vgdkb76bdx5"; depends=[corpcor]; };
   HyPhy = derive2 { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; };
   HybridFS = derive2 { name="HybridFS"; version="0.1.2"; sha256="05skml3v2zm5hmd6slpmx3lfwi6x5wfgbx7cnhc6l077b11jpdd9"; depends=[caTools FSelector InformationValue ROCR woeBinning]; };
   HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; };
-  HydeNet = derive2 { name="HydeNet"; version="0.10.7"; sha256="001ifh5ddg7q4rckhi662zd9a8milfi3v2gmgy76x0wq2xph7yrj"; depends=[checkmate DiagrammeR dplyr graph gRbase magrittr nnet pixiedust plyr rjags stringr]; };
+  HydeNet = derive2 { name="HydeNet"; version="0.10.8"; sha256="0rb456rfx3jgvjkbn50v38aq7chi6482wxk4mm26l9n537rhdpjz"; depends=[checkmate DiagrammeR dplyr magrittr nnet pixiedust plyr rjags stringr]; };
   HydroMe = derive2 { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[minpack_lm nlme]; };
   HyperbolicDist = derive2 { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; };
   IAPWS95 = derive2 { name="IAPWS95"; version="1.1.0"; sha256="03kggkcyvbgh7l9haa1ljg0sv6f2rs06r6j0w2x7cpm31qmc3yzl"; depends=[ggplot2 pander Rcpp]; };
@@ -1570,14 +1644,14 @@ 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.3-2"; sha256="16ynw5p26cyji6g5k7nhq56p5h86rrkrh9xr85kajb1f3dr6rmyw"; depends=[lsa tidyr]; };
+  IBCF_MTME = derive2 { name="IBCF.MTME"; version="1.4-2"; sha256="07qs8jwyxl03mslgdpnxscg67js6a6lp9sdn2gp3ahyckbb0ni74"; 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]; };
   IBrokers = derive2 { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; };
   IC2 = derive2 { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; };
   ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; };
-  ICAOD = derive2 { name="ICAOD"; version="0.9.6"; sha256="1c9zlskhsz5w1a5lkfcxclnsgxbvkgcgnbzvc3xk1mpa2zb2pvap"; depends=[cubature mnormt nloptr Rcpp RcppEigen sn]; };
+  ICAOD = derive2 { name="ICAOD"; version="0.9.7"; sha256="1x1x5z5kn55vbgx6hx44f99sp666v3wlzc26q1ap1rb8j48vz2wr"; depends=[cubature mnormt nloptr Rcpp RcppEigen sn]; };
   ICBayes = derive2 { name="ICBayes"; version="1.1"; sha256="1bmxba3bv9szzxvjf1blwxwdhw87h7s04cfn63c1gqpnpwsmr03y"; depends=[coda HI survival]; };
   ICC = derive2 { name="ICC"; version="2.3.0"; sha256="0y8zh9715cp9bglxpygqwgigrarq37sj845lk1xl0ydwinl0a6kk"; depends=[]; };
   ICC_Sample_Size = derive2 { name="ICC.Sample.Size"; version="1.0"; sha256="1w6v1jp8bfvf6c49ikswkc5527gdx5cyqnw95x00pgmm6riwlsp9"; depends=[]; };
@@ -1593,19 +1667,18 @@ in with self; {
   ICSOutlier = derive2 { name="ICSOutlier"; version="0.3-0"; sha256="1vj1y4zw8pkghkg4qnmx0yk1yw4zzl9075n5czrna9ckk2p29fmh"; depends=[ICS moments mvtnorm]; };
   ICSShiny = derive2 { name="ICSShiny"; version="0.5"; sha256="0a13vps0mkv5qs6qnl7ar0mdbkbd7i1c6kgwahmkb3id3n9bw0cl"; depends=[DT ICS ICSNP ICSOutlier rrcov shiny simsalapar]; };
   ICV = derive2 { name="ICV"; version="1.0"; sha256="1na87i39jy5d8ibldqcqz3a072ihkgcl0k629sxch9hk6v6j5lly"; depends=[]; };
-  ICcalib = derive2 { name="ICcalib"; version="1.0.7"; sha256="1p224srs1jakl7iyybcn9f6r9kcwxyrikdrfa9wjgkhz60pv88fs"; depends=[fitdistrplus icenReg ICsurv MASS msm numDeriv Rcpp RcppArmadillo survival]; };
+  ICcalib = derive2 { name="ICcalib"; version="1.0.8"; sha256="1y2w12ka0qxh9dg6dlcrnndz1xrv8gkppan64qkyk5vjrh18ajz4"; depends=[fitdistrplus icenReg ICsurv MASS msm numDeriv Rcpp RcppArmadillo survival]; };
   ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; };
   ICtest = derive2 { name="ICtest"; version="0.3-1"; sha256="10wxx2b8m5h0k8f6lgf0z1xhvhr14dyrda2pf46w03fa23f5mb7l"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey]; };
   IDCard = derive2 { name="IDCard"; version="0.3.0"; sha256="06b5zqmgh4clni3mv6ab2a52r4z34isbz0hd1i61793gps9fkc0y"; depends=[stringr]; };
-  IDE = derive2 { name="IDE"; version="0.1.0"; sha256="0z8nc2h3ivy7prxh9ndg8q3inh6rmjg7x969gj7z6qbml3122zq8"; depends=[DEoptim dplyr FRK ggplot2 Matrix sp spacetime sparseinv tidyr]; };
+  IDE = derive2 { name="IDE"; version="0.2.0"; sha256="13n6zsqb78mz9gpa0vvxc73fyhf7n79bcs0j0asg3fs4iy43q6qp"; depends=[DEoptim dplyr FRK ggplot2 Matrix sp spacetime sparseinv tidyr]; };
   IDF = derive2 { name="IDF"; version="1.1"; sha256="19fx04gvzwzkxbd453l3wx46s22dbnh0nxdrmsr4f7l67kihbwdr"; depends=[evd ismev]; };
   IDPSurvival = derive2 { name="IDPSurvival"; version="1.2"; sha256="0hifs8vw3rxlb5vlxs1433pcv2dh7p0mxpgb2n03d98f20vkdwfw"; depends=[gtools Rsolnp survival]; };
-  IDPmisc = derive2 { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; };
+  IDPmisc = derive2 { name="IDPmisc"; version="1.1.18"; sha256="02f5zy69y76sn9zm8i8fhcfbppnh767csza3m4j9mzpnac4n9393"; depends=[lattice]; };
   IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.3.5"; sha256="05wxymvv1p7dik5y227qnp4w1lpdmqfp17zrk6iah8gyv9yjsvbh"; depends=[doParallel foreach igraph spatstat]; };
   IDetect = derive2 { name="IDetect"; version="0.1.0"; sha256="1q1jwgildhx6sp883ni7vcsa3gj997855v5ky41dyf34kv7hvdl1"; depends=[]; };
-  IDmining = derive2 { name="IDmining"; version="1.0.4"; sha256="1jjxw9pdhd3wx5qnjnssf0j3bg91li1ar5ps02dhv0c49hslg0x0"; depends=[data_table doParallel foreach]; };
+  IDmining = derive2 { name="IDmining"; version="1.0.5"; sha256="1i6wclsp97sdbj4jp6wmpf0bkj21r8y08rvmgxcsw36rmr8kd1pa"; depends=[data_table doParallel foreach]; };
   IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; };
-  IFSPlot = derive2 { name="IFSPlot"; version="1.0"; sha256="0sydm9g54v5xy6m5rikx7q020aqvsilzcbg6c4vl79g9d2r8q07s"; depends=[gplots jsonlite Rcpp RcppArmadillo reshape2 rgl]; };
   IGG = derive2 { name="IGG"; version="1.0"; sha256="1cibb9z18xc1zx1813lk14n6p5am84hm7w0hkrsif4j3p89lrwif"; depends=[GIGrvg glmnet MASS Matrix pscl]; };
   IGP = derive2 { name="IGP"; version="0.1.0"; sha256="0xv89gmyfgnq5kzcmjbp5nx9zbr3gbdzkvffp99bxbkvf759m255"; depends=[PythonInR R6]; };
   IHSEP = derive2 { name="IHSEP"; version="0.1"; sha256="1djc5509b5iyi6y0i36h77l6sq1h0w721v2isxqldcqk3gb0bx11"; depends=[lpint Rcpp]; };
@@ -1618,25 +1691,28 @@ in with self; {
   IMP = derive2 { name="IMP"; version="1.1"; sha256="0ilvgz2bngffyx6ifqqx1snsn6mmq7rx3wg44093yrviaw39qdfv"; depends=[dplyr ggplot2 shiny tidyr]; };
   IMPACT = derive2 { name="IMPACT"; version="0.1.1"; sha256="0ai22gvmfj9j00cw742szfqqay63b5lmnszkwwdfdvidls43v0bm"; depends=[]; };
   IMTest = derive2 { name="IMTest"; version="1.0.0"; sha256="0n0swbi051cr7mrjmszqg79hxa38ccyq69ws8c37ixwb0lpxmx48"; depends=[lme4 ltm MASS reshape2]; };
-  IMak = derive2 { name="IMak"; version="1.2.0"; sha256="0h9hs9zpi7glf1i4gjl8xvz5hq23ask81mxpmfjpyxv03j1bwdih"; depends=[]; };
+  IMak = derive2 { name="IMak"; version="1.2.1"; sha256="0yvmwqxp4y1bsbv37sdw3aa5w1j1hyqs5fs7nf2kkr6wj6ixq7ny"; depends=[]; };
+  IMmailgun = derive2 { name="IMmailgun"; version="0.1.2"; sha256="09acmi6xj186fb8nhj8q0nxmkp2p32a1l95glzvz84gax4xakhz8"; depends=[httr]; };
   INCATome = derive2 { name="INCATome"; version="1.0"; sha256="1gbmcirs49ydmk5rg2vl5gdy39dfx9psw5mijibzjszcfjar3kqs"; depends=[genefilter limma multtest RankProd siggenes]; };
   INDperform = derive2 { name="INDperform"; version="0.1.1"; sha256="08wp7zn0s61nl2r99r3712cxkhqp9xy2vghpjjcvr5y48dkw7kzf"; depends=[cowplot dplyr ggplot2 htmlwidgets jsonlite lazyeval magrittr mgcv nlme purrr RColorBrewer rhandsontable shiny stringr tibble tidyr vegan]; };
-  INLABMA = derive2 { name="INLABMA"; version="0.1-8"; sha256="13r89r14xpihfqddwzkhxg4jgxyl59826x2insrall3mj2yffj90"; depends=[Matrix sp spdep]; };
+  INLABMA = derive2 { name="INLABMA"; version="0.1-11"; sha256="0wzyb3c7zpksqz198kigi4rpblvk0rjamngmyabw5xdpizxdg6zi"; depends=[Matrix sp spdep]; };
   INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; };
   IPCAPS = derive2 { name="IPCAPS"; version="1.1.5"; sha256="0d1nws86k1yph2f4drwrh4jvmmc9nnqmmswpwirmgsp3ma58kc42"; depends=[apcluster expm fpc KRIS LPCM MASS Matrix Rmixmod]; };
-  IPEC = derive2 { name="IPEC"; version="0.1.0"; sha256="1dcmjvqsz3hlfymnlsld9psalfvq7z51yx39dkd11d25cj1mf8na"; depends=[MASS numDeriv]; };
+  IPEC = derive2 { name="IPEC"; version="0.1.2"; sha256="1fglr5hs61n13251145wqzvxy362fx32yzral96xd8li76ljxiic"; depends=[MASS numDeriv]; };
   IPMRF = derive2 { name="IPMRF"; version="1.2"; sha256="1zvwwhiy0p134zvm5ldc92pdd1ap72bhbrlf02rz9m2hlsxmwy67"; depends=[gbm party randomForest]; };
   IPMpack = derive2 { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[MASS Matrix nlme]; };
+  IPSUR = derive2 { name="IPSUR"; version="3.0"; sha256="0nlxlmp2vjj17pxvx9nly85wnwgv19qs1a3fsw7p1c5jrk6daqqi"; depends=[actuar aplpack binom boot coin distrEx e1071 HH Hmisc lmtest mvtnorm prob qcc RcmdrPlugin_IPSUR reshape scatterplot3d TeachingDemos vcd]; };
   IPWsurvival = derive2 { name="IPWsurvival"; version="0.5"; sha256="0lmw0ifj8cds8lzyjkkv0i0zim23p0a3pawlhmhdm3nfvwawb853"; depends=[survival]; };
   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.0"; sha256="033j0dba1bzbbjn7q827h4d1rw91z8gbr2bb119lds4v8zkkfpxx"; depends=[dplyr IRISSeismic RCurl seismicRoll signal stringr XML]; };
-  IRISSeismic = derive2 { name="IRISSeismic"; version="1.4.8"; sha256="0j419gn9jv9zpd2rzgsc6flz6k22gr11kany1av02cvs5dymwb4p"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
+  IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.1.2"; sha256="02ikg1ahz0yanq92mby00s9s1njph410mqalpzfv2pbppipw26dh"; 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.5.0"; sha256="1jwhcp9dp1kdqcx8zq6lzbczsm9rg5qlb8sd9aznpvn9a2745d9x"; depends=[repr]; };
+  IRdisplay = derive2 { name="IRdisplay"; version="0.6"; sha256="1w49gbdf9gj66r9kx1s0gckl9lymmz864f8x9f96mrcwxkkchdc7"; depends=[repr]; };
+  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]; };
   ISLR = derive2 { name="ISLR"; version="1.2"; sha256="1bfay6cs40crhh34v2ksn4zdxivimfyjvk19wqbnjr7vs837l3xh"; depends=[]; };
@@ -1646,9 +1722,8 @@ 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.6"; sha256="0acrm15vb1r0nnp0bp5zf8g27i3sy3d7bpd50lj0w1rl6dgwfznh"; depends=[data_table Fgmutils ggplot2 gsubfn plyr randomcoloR rbokeh sqldf]; };
-  ITNr = derive2 { name="ITNr"; version="0.2.0"; sha256="1bpnijwlrjg2l2qi9m5dlywq8xpb019kiqw288fzv6njm1yvwy56"; depends=[animation blockmodeling circlize comtradr cowplot dplyr fastmatch GGally ggplot2 GoodmanKruskal igraph intergraph maps Matrix ndtv network networkDynamic plyr RColorBrewer reshape2 sna statnet tnet WDI xergm xergm_common]; };
-  ITRSelect = derive2 { name="ITRSelect"; version="1.0"; sha256="0zwgvcbjjd9wg19d36ygzsdkm04ndv91wg20wc3d78dbvyzy2kmh"; depends=[Formula Matrix ncvreg Rglpk svMisc]; };
+  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]; };
+  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]; };
   Iboot = derive2 { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; };
@@ -1656,15 +1731,16 @@ in with self; {
   IgorR = derive2 { name="IgorR"; version="0.8.1"; sha256="1lkiz3gxj8i1xbr5jp69z21rpk7kz3a68h29inp1qa7zi7gikmgx"; depends=[bitops]; };
   ImaginR = derive2 { name="ImaginR"; version="0.1.7"; sha256="12ypfrqw6xym84i1axd3h0qd2md96rc0glas3rgzpdhdyw4lbfmn"; depends=[imager jpeg]; };
   Imap = derive2 { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; };
+  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]; };
   InPosition = derive2 { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[ExPosition prettyGraphs]; };
-  InSilicoVA = derive2 { name="InSilicoVA"; version="1.2.0"; sha256="12fqnim6n8ha1bm8vs6ni21s5h0jb9sny88hn0xy6nsgzzzwpw5i"; depends=[coda ggplot2 InterVA5 rJava]; };
-  IncDTW = derive2 { name="IncDTW"; version="1.0.3"; sha256="19ppjpczbjv1bpzyyyasr5szblrsjimpc04hazhdgqzhil0v5sj2"; depends=[ggplot2 Rcpp scales]; };
+  InSilicoVA = derive2 { name="InSilicoVA"; version="1.2.4"; sha256="0118xmywm0dxia8pn807njb67fcag54ysz0679kwvjyfwkb47sra"; 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=[]; };
-  IndepTest = derive2 { name="IndepTest"; version="0.1.1"; sha256="1fiyafi22zs8cd42pnkf1psv4nxnrj7nk088pvk99hgasb7wjhpq"; depends=[FNN mvtnorm Rdpack]; };
+  IndepTest = derive2 { name="IndepTest"; version="0.2.0"; sha256="017jasqsxm5m13rhfy9gxvd8nfib5k5y5c8520p3hcffqrxr683p"; depends=[FNN mvtnorm Rdpack]; };
   IndependenceTests = derive2 { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; };
   IndexNumR = derive2 { name="IndexNumR"; version="0.1.0"; sha256="1385j7a1hz8i5g00x1p1rd32gq243w2zrzvk781zjqdq7az33fsw"; depends=[]; };
   IndianTaxCalc = derive2 { name="IndianTaxCalc"; version="1.0.2"; sha256="1fxw884wj9n8drk2xz3rgr4f7b4fckh5firrf5gdz6d1nk9hdvc1"; depends=[]; };
@@ -1676,16 +1752,18 @@ in with self; {
   Information = derive2 { name="Information"; version="0.0.9"; sha256="0pszwzj3r7vdvdsy9w1qz95zxp7y2bsyg36b58mm4qcvcvymd4kn"; depends=[data_table doParallel foreach ggplot2 iterators plyr]; };
   InformationValue = derive2 { name="InformationValue"; version="1.2.3"; sha256="1b5g2wyp7x5cdhmf4325n3q7afa6i352lh80j28c8s4356pr3w9j"; depends=[data_table ggplot2]; };
   InformativeCensoring = derive2 { name="InformativeCensoring"; version="0.3.4"; sha256="145k4hggymra2jnxkcck795xk280yyldfzh9ls2irnsxmxfszr52"; depends=[boot dplyr survival]; };
-  Infusion = derive2 { name="Infusion"; version="1.2.0"; sha256="00l12balvdypcypqj8b61lfbksh6jnayai4bxchnxv99h3jq4l24"; depends=[blackbox mvtnorm numDeriv pbapply proxy spaMM viridis]; };
+  Infusion = derive2 { name="Infusion"; version="1.3.0"; sha256="0z6yils8ckfk0wdi45iav2yijz2cxn1zfkg3q9l6149czlnhvws1"; depends=[blackbox foreach mvtnorm numDeriv pbapply proxy spaMM viridis]; };
   InjurySeverityScore = derive2 { name="InjurySeverityScore"; version="0.0.0.1"; sha256="13h2a95bzibszpbr6sjhm3hj03b4znrrczm8pvni70ln2lcskri0"; depends=[dplyr rlang tidyr]; };
   InspectChangepoint = derive2 { name="InspectChangepoint"; version="1.0.1"; sha256="1wirdbz4v7hk7znpjhw9j3l596lmfcrlr4wxayw7klbbdhcwq5qs"; depends=[MASS]; };
-  IntClust = derive2 { name="IntClust"; version="0.0.2"; sha256="1n0ywickky1w5m8swfidiprdnkrv0mrh9z5294bimxj5ppi1yl8v"; depends=[a4Core ade4 analogue Biobase cluster e1071 FactoMineR ggplot2 gplots gridExtra gtools limma lsa plotrix pls plyr prodlim SNFtool]; };
+  IntClust = derive2 { name="IntClust"; version="0.1.0"; sha256="0whmc084gq5zip82vnwailnwvw9jawk9rx4wqiz1lr693w9xbq66"; depends=[a4Core ade4 analogue Biobase circlize cluster data_table e1071 FactoMineR ggplot2 gplots gridExtra gtools igraph limma lsa plotrix pls plyr Rdpack SNFtool]; };
   IntLik = derive2 { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; };
+  IntNMF = derive2 { name="IntNMF"; version="1.2.0"; sha256="09qzyvv7d4wr68qrlhcd4ivr65is3mypv1vaxpswwcjmcmyr4gzp"; depends=[cluster InterSIM MASS mclust NMF]; };
   IntegrateBs = derive2 { name="IntegrateBs"; version="0.1.0"; sha256="1pkx4wpahd1sabzx55law3710x3vbh9yi6kii8gs2xfq3cb1llmq"; depends=[]; };
   IntegratedJM = derive2 { name="IntegratedJM"; version="1.6"; sha256="0fv24z7vidhn09ljk09pjzkrlg2rlwxcrhfjc53ybjjgsgay99z6"; depends=[Biobase ggplot2 nlme]; };
   IntegratedMRF = derive2 { name="IntegratedMRF"; version="1.1.9"; sha256="0kklgc48cib4bjfs9qbw13nkp8xyjdazrg6z15x69jylnxyakic7"; depends=[bootstrap ggplot2 limSolve MultivariateRandomForest Rcpp]; };
+  InterSIM = derive2 { name="InterSIM"; version="2.2.0"; sha256="14yccan88szf26w1hg1lkvmssids961gng7il3bjr2f1l0k8vd3b"; depends=[MASS NMF]; };
   InterVA4 = derive2 { name="InterVA4"; version="1.7.5"; sha256="0la99ylx8fnn4kpqa364nhs12y2hzp3sm0awsx5sfdv6n7m9js33"; depends=[]; };
-  InterVA5 = derive2 { name="InterVA5"; version="1.0.1"; sha256="1wsaf48ajqnb9cb7h13jrinmszk6ayqim15fkgxbirmp88hcy9k1"; depends=[]; };
+  InterVA5 = derive2 { name="InterVA5"; version="1.0.2"; sha256="0mjfvkpnl46kzas6ch8x3liffqixifdrdjc7vxfyc1a4az7kn8vq"; depends=[]; };
   Interact = derive2 { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; };
   InteractiveIGraph = derive2 { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; };
   Interatrix = derive2 { name="Interatrix"; version="1.1.1"; sha256="1ljxgiia0y8wv1rlm5brd0yvs1r7r5wyrs6nykmwrwwya4k34mpz"; depends=[MASS tkrplot]; };
@@ -1694,7 +1772,8 @@ in with self; {
   Interpol_T = derive2 { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[chron date]; };
   InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="1.2"; sha256="1iaw4i14l2vp1f163g2q4pwv9cnqrx14ik4s8zw0iha4zwcrc3ja"; depends=[DBI doParallel enviPat foreach plyr Rdisop RSQLite]; };
   IntervalSurgeon = derive2 { name="IntervalSurgeon"; version="1.0"; sha256="0dpgfgnnx6r29y8y3pac1rgi503wvlwggx5dh6fhqnxw5yfink61"; depends=[Rcpp]; };
-  InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.7-1"; sha256="1pz06l50fm8327n1v8wnvh8q51g97crb4c07si3hywd5y1hkiwkp"; depends=[glmnet linprog mboost RColorBrewer]; };
+  IntrinioStockAPI = derive2 { name="IntrinioStockAPI"; version="0.0.1"; sha256="0gvkynyi2iag2kwwb51b8125md8kw65b48zk9qdf8pppg9s1r46a"; depends=[gtools httr jsonlite stringr]; };
+  InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.7-2"; sha256="08s1jhyyb60cjk314q9n24niq55n21h83ml3q9a2xhr956kch8ms"; depends=[glmnet mboost]; };
   InvasionCorrection = derive2 { name="InvasionCorrection"; version="0.1"; sha256="1wwx2kssjysl1lraac36pvxq34vg8qm0vwi861rs1iipfc35i84j"; depends=[lattice]; };
   Inventorymodel = derive2 { name="Inventorymodel"; version="1.1.0"; sha256="1l87xghdksgmb2k3a8j382p7ffi2pma38a6pn31sfjsa6bgmrdnk"; depends=[e1071 GameTheoryAllocation]; };
   IrishDirectorates = derive2 { name="IrishDirectorates"; version="0.2.0"; sha256="1m3c3dj4729chk1n3k7awvi1jdfnds2w36vm268azg53j6c7l4b6"; depends=[]; };
@@ -1704,8 +1783,8 @@ in with self; {
   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="1.3"; sha256="1c7m48vj4884xzxilgv8ykginaayy8mp35xf6xaw7v0f4x2w3bk9"; depends=[MASS]; };
-  IsoriX = derive2 { name="IsoriX"; version="0.7.1"; sha256="1x2vdgvnfkrgcrm7pdrdvr7m72y0274dab5cyhz31j8l2gqxw9la"; depends=[latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; };
+  IsoplotR = derive2 { name="IsoplotR"; version="2.1"; sha256="03fwa4agyrk5l5n42i083j36k22752vb4r87qpcw7l68h87jnbv7"; 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]; };
@@ -1714,8 +1793,9 @@ in with self; {
   JFE = derive2 { name="JFE"; version="1.2"; sha256="1jfdphn9435f9nmwnb4x2wj8fv7c2i432n9wyvrlqcm424ql0cml"; depends=[BurStFin fAssets fBasics fPortfolio iClick MASS PerformanceAnalytics quantmod rugarch tcltk2 timeDate timeSeries xts zoo]; };
   JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; };
   JGL = derive2 { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; };
-  JGR = derive2 { name="JGR"; version="1.8-4"; sha256="0zfjfqlfrsz4wjdq78zasvgd3ldgcx20h16bbar1l7wv843j71ym"; depends=[JavaGD rJava]; };
+  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]; };
   JMbayes = derive2 { name="JMbayes"; version="0.8-71"; sha256="0vbw3z1njl3jm4qixzh5fs3gmiqz7n3kz3a4a9sdxj498z063svj"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; };
   JMcmprsk = derive2 { name="JMcmprsk"; version="0.9.3"; sha256="0bjaiygn2sq40f2cwa1c6j73748j2cx5q69pd4jgfgbpm9r25r4f"; depends=[MASS Rcpp]; };
   JMdesign = derive2 { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; };
@@ -1724,28 +1804,28 @@ in with self; {
   JPEN = derive2 { name="JPEN"; version="1.0"; sha256="12rvp5bmlkwyr1gg336k655hp09gym0d2wwry70c1rz30x1sf2zs"; depends=[mvtnorm]; };
   JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; };
   JSM = derive2 { name="JSM"; version="0.1.3"; sha256="1p5vlk2fcrb42pi7srkymjacfg05vlaspvhaw94lq1rhvxdw87yl"; depends=[nlme Rcpp RcppEigen statmod survival]; };
-  JWileymisc = derive2 { name="JWileymisc"; version="0.2.1"; sha256="0cli204f1b5hj3qz62fycww12a6dv7xxxszkxgrxirw6mpdf858c"; depends=[cowplot data_table devtools foreach ggplot2 Hmisc lavaan MASS mgcv mice multcompView plyr]; };
+  JWileymisc = derive2 { name="JWileymisc"; version="0.3.1"; sha256="1683sq0fb8ms0kzfc46azkjfsk2khhq43y265k1g920s5pc7bn8q"; depends=[cowplot data_table devtools emmeans foreach ggplot2 ggthemes lavaan lme4 lmerTest MASS Matrix mgcv mice multcompView nlme psych quantreg rms robustbase VGAM zoo]; };
   JavaGD = derive2 { name="JavaGD"; version="0.6-1"; sha256="13n6xzbbjgd0bpwv2xgm3dlscg87wh32q6fcq50kk6byp6yv05sc"; depends=[]; };
   Jdmbs = derive2 { name="Jdmbs"; version="1.3"; sha256="0jjnn1lrrakai34srp9ks8a563amd1rp9vd4ydnpmgfma5qlify0"; depends=[igraph png]; };
   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.2.0"; sha256="1y3mvj1m2mi6ss3svfrlk5lbyh3zp1mkyjgl7fv317n3xjg006s2"; depends=[coda MASS mcmcse rjags]; };
+  JointAI = derive2 { name="JointAI"; version="0.3.0"; sha256="1xav3ngg4jfxbji1wqqwazywx9fhxm8snkssv8rbqvnmyc0nj49x"; 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.14.0"; sha256="1zrj1jn55qxxg95h1rfbfgzd7dn3hxm7gkwbin6zkcxi8qdc3690"; depends=[R6 Rcpp]; };
+  JuliaCall = derive2 { name="JuliaCall"; version="0.16.1"; sha256="11ganlkc65i4vljdjzhr419p1rw3dr4pw2jk6gvb8jk8pasfs36h"; depends=[Rcpp]; };
   JumpTest = derive2 { name="JumpTest"; version="0.0.1"; sha256="1d5zmjwmajzdg5d1ws40zchx9wiaav01fby1v3irym2mx30jgbqn"; depends=[MASS Rcpp RcppEigen]; };
-  JuniperKernel = derive2 { name="JuniperKernel"; version="1.4.0.0"; sha256="0yjfdpilz08cbnn35bxiqbn0d312mfxzdkb643db0zl34x5akxpa"; depends=[data_table gdtools jsonlite pbdZMQ Rcpp repr]; };
+  JuniperKernel = derive2 { name="JuniperKernel"; version="1.4.1.0"; sha256="1zghlfwh4wsjjp7ldp5y86ffyzc27ccl5j9lcwlp1di9slaqjign"; depends=[data_table gdtools jsonlite pbdZMQ Rcpp repr]; };
   KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; };
   KENDL = derive2 { name="KENDL"; version="1.1"; sha256="05vsh3x0li964a485q3n19c7fahcprvg1bnrvffagkxf8w1iz153"; depends=[]; };
   KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; };
-  KFAS = derive2 { name="KFAS"; version="1.3.2"; sha256="11ikpac63as1c4mz6kdrynjyy4wrfr4qrk1m2g4gbcrg10dnc06q"; depends=[]; };
+  KFAS = derive2 { name="KFAS"; version="1.3.3"; sha256="026nrlwsmal9n76za4sjlfb5ybw88ricnazg018nc195c345ql04"; depends=[]; };
   KFKSDS = derive2 { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; };
   KGode = derive2 { name="KGode"; version="1.0.1"; sha256="05g8zr3jm13cl6wk9m693gxa3fn5cjppm56j7ih4zzswzk9b67h9"; depends=[mvtnorm pracma pspline R6]; };
   KMDA = derive2 { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; };
   KMgene = derive2 { name="KMgene"; version="1.2"; sha256="1yj9l1mqhvyhicyycnkd639q3zkrx15ba11z9911l4c0gql8syf1"; depends=[CompQuadForm coxme kinship2 MASS Matrix mgcv nlme survival]; };
   KMsurv = derive2 { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; };
-  KODAMA = derive2 { name="KODAMA"; version="1.4"; sha256="0qzpgj6ljzd8n8vgmf53pmblsmypl86j7njd3pz0d370bxfchsqj"; depends=[Rcpp RcppArmadillo]; };
+  KODAMA = derive2 { name="KODAMA"; version="1.5"; sha256="1pb7qba7dp25x4znhvihc21z5jk6bgk6sg0v24gbvqhv5irm7kwf"; depends=[Rcpp RcppArmadillo]; };
   KOGMWU = derive2 { name="KOGMWU"; version="1.1"; sha256="0n07wrpmmvxflxpmhkp3gm40xz2w4j0l8dsljhmfiyxcf5y7kq2g"; depends=[pheatmap]; };
   KRIG = derive2 { name="KRIG"; version="0.1.0"; sha256="1hpmjzzrh5b042xh14dgxvn5x5ini63vq5jz1i6rjgvsdf734f98"; depends=[Rcpp RcppArmadillo Rdpack]; };
   KRIS = derive2 { name="KRIS"; version="1.1.1"; sha256="0v2xgdwd8lp399il6grjkysq2gj38fmjlxlvg5ciq3g3cp7cdy3m"; depends=[rARPACK]; };
@@ -1753,7 +1833,7 @@ in with self; {
   KRMM = derive2 { name="KRMM"; version="1.0"; sha256="0wxzhrrc4lx20nxjny7rcfw3bya7drn88zbrlzx9f531298xwbrk"; depends=[cvTools kernlab MASS robustbase]; };
   KSD = derive2 { name="KSD"; version="1.0.0"; sha256="0wqmbr51yv7f87pnhph2nrj9y2d5jql2agizcaq6lax23lj6xfb7"; depends=[pryr]; };
   KSEAapp = derive2 { name="KSEAapp"; version="0.99.0"; sha256="1gfgpa2d32y6bzvf4ww70sm7niq34sqmyrhi0phlqxshqq9xviqc"; depends=[gplots]; };
-  KScorrect = derive2 { name="KScorrect"; version="1.2.3"; sha256="1i69glkyi3ydzfgd8d6zrbgjq7gy9laq00jdppbqnl13i1n14sp7"; depends=[MASS mclust]; };
+  KScorrect = derive2 { name="KScorrect"; version="1.2.4"; sha256="16qdmvgx3y170i495vmph2bhnc3j1z5232jibr3yzxl9i887kk0f"; depends=[MASS mclust]; };
   KSgeneral = derive2 { name="KSgeneral"; version="0.1.1"; sha256="1ldk3fvwbr6hw7x3ydgzixgc41a0fbbic699zjlnpj5x4mjg1qby"; depends=[dgof MASS Rcpp]; };
   KTensorGraphs = derive2 { name="KTensorGraphs"; version="0.1"; sha256="1hsndxslqgca0ay4q277zjwnwz8bzwfkzz915dgqvjd2v4afrvzx"; depends=[]; };
   KappaGUI = derive2 { name="KappaGUI"; version="2.0.2"; sha256="0vklny804xpd9r60j4a01j2gak8jizwjw0abf7yvbcalv3zbpb3k"; depends=[irr shiny]; };
@@ -1764,7 +1844,7 @@ in with self; {
   KernSmooth = derive2 { name="KernSmooth"; version="2.23-15"; sha256="1xhha8kw10jv8pv8b61hb5in9qiw3r2a9kdji3qlm991s4zd4wlb"; depends=[]; };
   KernSmoothIRT = derive2 { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[plotrix Rcpp rgl]; };
   KernelKnn = derive2 { name="KernelKnn"; version="1.0.8"; sha256="1xiz90n9wggn5fv42h8c6gd3j6vmkwyq1433wwnmzrz5kw7f6vgb"; depends=[Rcpp RcppArmadillo]; };
-  Kernelheaping = derive2 { name="Kernelheaping"; version="2.1.8"; sha256="03m5dwgm98x6ncifyyp2yxln4bm87rkrx84bdihywjd0x73pbklv"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; };
+  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]; };
@@ -1772,8 +1852,8 @@ in with self; {
   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]; };
   KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.2.1"; sha256="0yzilmiiyzd2x3v0cnjphf0wdwiblh37kgrvmfrdy49qly48pvi2"; depends=[dplyr ggplot2 magrittr tibble]; };
-  KrigInv = derive2 { name="KrigInv"; version="1.3.1"; sha256="0fcfv2vl572l8qp1ilhjai6zrw15bf1z41qm7xlfspfbj611ga7k"; depends=[DiceKriging pbivnorm randtoolbox rgenoud]; };
-  L0Learn = derive2 { name="L0Learn"; version="1.0.2"; sha256="0igfmw4kpc5m6r1kj944ch48sdyx82c8imid3vrk67q2pcwqqc1a"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; };
+  KrigInv = derive2 { name="KrigInv"; version="1.4.1"; sha256="0x12xff7lgr1v2243shfz9a8r02qs56p7i0b8j2s6bmrzj1abrwb"; depends=[anMC DiceKriging mvtnorm pbivnorm randtoolbox rgenoud]; };
+  L0Learn = derive2 { name="L0Learn"; version="1.0.8"; sha256="1d29qy7b4msb6iii9gw4i3xblyb150pvnp99jm7pl2ayh0c1vnlr"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; };
   L1pack = derive2 { name="L1pack"; version="0.38.19"; sha256="09n1045lsx1ap47mhzcqghmwwhj24kvpjjr3ysprj058jp5g7ri0"; depends=[]; };
   LAGOSNE = derive2 { name="LAGOSNE"; version="1.1.0"; sha256="08sf4mm40gv9mr57pxsl1b62s2dqvbvrhy2irzqspyqk5ai2aw0m"; depends=[curl dplyr lazyeval magrittr purrr rappdirs sf stringr]; };
   LAM = derive2 { name="LAM"; version="0.3-48"; sha256="12a38rvb0krfl0yffhyn7nmxcgkga46kfn4h7wzvnr0hpl5a7kjf"; depends=[CDM coda MASS numDeriv Rcpp RcppArmadillo sirt TAM]; };
@@ -1781,7 +1861,7 @@ in with self; {
   LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; };
   LBSPR = derive2 { name="LBSPR"; version="0.1.2"; sha256="09jvdjagf4icnigbfw18z36ya4llg84fa6j2khd22cl60y81r5i3"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; };
   LCA = derive2 { name="LCA"; version="0.1"; sha256="14nhx2fs18558zljnw56mdz3qx30v394llhzswxhznjfiiqc9z5h"; depends=[]; };
-  LCAextend = derive2 { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6gj8js89qblb2z93k4mg4jmw0wgkyv6mysfc"; depends=[boot kinship2 mvtnorm rms]; };
+  LCAextend = derive2 { name="LCAextend"; version="1.3"; sha256="1l75y3vkbsmsm3pjd5pwy0hlv6gz5ryxs4pkx9aiyhxz2y9wnhpb"; depends=[boot kinship2 mvtnorm rms]; };
   LCAvarsel = derive2 { name="LCAvarsel"; version="1.1"; sha256="0aqc9rbrc8n6s9xllmamby219qsnxd4ajvffjr21qlkhkaklirb1"; depends=[doParallel foreach GA MASS memoise nnet poLCA]; };
   LCF = derive2 { name="LCF"; version="1.7.0"; sha256="1n5gwnkj26b7w6bzapda049bd4aqb317cip05nf0vy04xjc8giyc"; depends=[quadprog]; };
   LCFdata = derive2 { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; };
@@ -1792,7 +1872,7 @@ in with self; {
   LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; };
   LDRTools = derive2 { name="LDRTools"; version="0.2-1"; sha256="05srfyplsypi3whfa71lx7pnad23irpf0p7rxmrpv28jgdmrz6wf"; depends=[]; };
   LDcorSV = derive2 { name="LDcorSV"; version="1.3.2"; sha256="0lvk3xz400yd3w0cjdfi6hir1ym1mffd504vycwgck5fkzljpcvx"; depends=[]; };
-  LDheatmap = derive2 { name="LDheatmap"; version="0.99-4"; sha256="1xdvpydnrlzb6q4hm0rcflf0vysww1xszj6ynly6a32xqmhg0sbq"; depends=[genetics snpStats]; };
+  LDheatmap = derive2 { name="LDheatmap"; version="0.99-5"; sha256="0il3g3n3bzv74lz7dlhyiwc2x2417v6yhx2g47pahxdzqa09kf4s"; depends=[genetics snpStats]; };
   LDtests = derive2 { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; };
   LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; };
   LEAP = derive2 { name="LEAP"; version="0.2"; sha256="1yrhanxvr7krvllqzv17qkc4wvmd7mgl57am8sn53773dbfipfc4"; depends=[]; };
@@ -1808,17 +1888,17 @@ 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.0"; sha256="0nxp1sfnhgf0iqfhwqvr7a0mvs3swsj2l0shcyrb3zliyd23g5ax"; depends=[digest ggtern rootSolve svDialogs XLConnect]; };
+  LLSR = derive2 { name="LLSR"; version="0.0.2.1"; sha256="0sspsj12ccaxbs37dlwa2y3dnq47xdhbxskx4qj81nxb9il7151d"; depends=[digest ggplot2 rootSolve svDialogs XLConnect]; };
   LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[fields LCFdata lme4 Matrix mgcv rgl]; };
-  LMest = derive2 { name="LMest"; version="2.4.2"; sha256="0a0azn3lyy0n1882c0zxf7f1b0h26rcck8mmsbh2wxg7r3nckkrd"; depends=[MASS MultiLCIRT]; };
-  LMfilteR = derive2 { name="LMfilteR"; version="0.1.1"; sha256="0wjrnzki6mnar3lxfr2mcvk98b58qkqpbb9xx7vgrw567g1ga1ig"; depends=[MASS]; };
+  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]; };
   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=[]; };
   LPGraph = derive2 { name="LPGraph"; version="2.0"; sha256="1d3czxihaz3f09bfb34knqb6prhcx50kh8y4qrhhakic999z6ifw"; depends=[car PMA SDMTools]; };
-  LPKsample = derive2 { name="LPKsample"; version="1.0"; sha256="0vxps8zd9zg1aw4p2qd8wamcjkbl68yvppnlvshm2ry5dahwz1wk"; depends=[apcluster igraph mclust]; };
+  LPKsample = derive2 { name="LPKsample"; version="2.0"; sha256="1jg99025vk42rnjdymh3nj71npn4pmdsmk6rvnx3lykpi72f85dz"; depends=[apcluster igraph mclust]; };
   LPM = derive2 { name="LPM"; version="2.7"; sha256="1anjgflj1272xrghn3s9a21f2dfggppnzjqh3p8zaid91bzg0g34"; depends=[fracdiff MASS QRM]; };
   LPR = derive2 { name="LPR"; version="1.0"; sha256="16kmfm6p7cwnzpd054ik0cy0ipif6zssdfyxyfm0cijz8z4z40x7"; depends=[doParallel foreach glmnet iterators lattice Matrix slam]; };
   LPS = derive2 { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; };
@@ -1830,13 +1910,13 @@ in with self; {
   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"; sha256="0i1b409bhvlm4hpcgm4bhd7pqk4bkcyy48d7bci254ppcr7z1m9q"; depends=[geoR LS2W matrixStats RandomFields spdep]; };
+  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]; };
   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.2.0"; sha256="1aab4djk510q35gr6vj5vx1p7jhqg2ph6fw4sjbsg60bjnr3nyyi"; depends=[abind car DiceKriging kSamples LSDinterface randtoolbox rgenoud sensitivity tseries]; };
+  LSDsensitivity = derive2 { name="LSDsensitivity"; version="0.3.0"; sha256="07sjb02wx28a1zvzvapvraq9wzhn3yh111amkns3j62yrznj29hz"; 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=[]; };
@@ -1844,10 +1924,12 @@ 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]; };
   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]; };
-  LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.2"; sha256="08jm419cf22z144csif2ndf53743v1xl9zpa6zamd3df2snr59x2"; depends=[data_table maptools rgdal rgeos sp spdep]; };
+  LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.2.2"; sha256="16v9vwy7g7vj38pbikrinvhx2b5xdl0vd9i6yr9hhdrgqls0c243"; depends=[data_table maptools rgdal rgeos sp spdep]; };
+  LadR = derive2 { name="LadR"; version="1.0.4"; sha256="04wg7p9whjna1szdkqhy5m2nbqxllwfd9q2s6h85diby7r3akglz"; depends=[L1pack]; };
   Lahman = derive2 { name="Lahman"; version="6.0-0"; sha256="1616iaa28z6wrxcvvmnic5awj33b7km9yxnn8bnll9yw99ks6qk6"; depends=[dplyr]; };
   LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.5.0"; sha256="06mvdrdyl0rh9rwd0jxww0sycadcp7cj08hq35q6vyzq0jkxn2xf"; depends=[plyr rLakeAnalyzer]; };
   Lambda4 = derive2 { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; };
@@ -1858,15 +1940,16 @@ in with self; {
   LassoBacktracking = derive2 { name="LassoBacktracking"; version="0.1.2"; sha256="1z1cnj6r6cq3b8xa9qck3ijfmzsr70r2p9m1ndakijb36pgwrzcs"; depends=[Matrix Rcpp]; };
   LassoSIR = derive2 { name="LassoSIR"; version="0.1.1"; sha256="0ap8335ms12nsc7jvd48244zya54w05wj91qkhb0i63730r508c3"; depends=[glmnet]; };
   Laterality = derive2 { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; };
+  LatticeDesign = derive2 { name="LatticeDesign"; version="1.0-1"; sha256="1wlchqa7914401r0mzca4fffps99nfbj0jym1jxkclnjivdgcn24"; depends=[]; };
   LatticeKrig = derive2 { name="LatticeKrig"; version="7.0"; sha256="04waq7dpp86rpa8qgrjbpl72k6vhkd300vxfc1xxy5z7k36pinqh"; depends=[fields spam]; };
   Lavash = derive2 { name="Lavash"; version="1.0"; sha256="0cjl8crk0rdkyzp069fk4k0sapcjmqm3q40z5mgl0i1n59kn4s07"; depends=[glmnet MASS pracma]; };
   LeArEst = derive2 { name="LeArEst"; version="0.2.0"; sha256="1492r6l0azs4ga6ia02bggk1jsx6q6rg05ins9ng6f41h04v6q3m"; depends=[conicfit doParallel foreach jpeg opencpu]; };
   LeLogicielR = derive2 { name="LeLogicielR"; version="1.2.1"; sha256="0jd280ial4wfj5j6sbxgl2cbxabycsgmh2zsad7v7hcwbhhdd09i"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
   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.3"; sha256="0fqf5k3gsdxwyfcbkypqiq0ir8ay8r9bdy8iljhj308ammq0mxzk"; depends=[RgoogleMaps]; };
+  LearnGeom = derive2 { name="LearnGeom"; version="1.4"; sha256="0qalhy4g47ik8cq2m1zajhv79rla8g72dmcwhnizwn6afhm6fnpm"; depends=[]; };
   LendingClub = derive2 { name="LendingClub"; version="2.0.0"; sha256="13qh5p4ksvgd1pmc4mdp8p44ra34fvp3s5p5vhlkpclkv5d4mxq2"; depends=[dplyr httr jsonlite plyr readr]; };
-  LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.1.2"; sha256="0ziy86l6q01l471lmpldhs48xqlyw1va75np5hkzaq5wapr9pfk4"; depends=[data_table quanteda scales stringdist stringi]; };
+  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]; };
   LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; };
   LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; };
@@ -1880,13 +1963,15 @@ in with self; {
   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]; };
-  LinkedMatrix = derive2 { name="LinkedMatrix"; version="1.3.0"; sha256="1p5rg50g1pq700cx9jk4ackiyin5c2nanxq677cn840w6r11vm2g"; depends=[crochet]; };
+  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=[]; };
-  LncFinder = derive2 { name="LncFinder"; version="1.0.0"; sha256="1ygbmazjm2jk0wrd13khpx8rkwd51cb50qxs2zdad0w09705mpsx"; depends=[caret e1071 seqinr]; };
+  LncFinder = derive2 { name="LncFinder"; version="1.1.3"; sha256="15zsll766n97q5rf3xvc3m5s7faxiybayxjzyfhsh7q9x12qnnd7"; depends=[caret e1071 seqinr]; };
   LncMod = derive2 { name="LncMod"; version="1.1"; sha256="08001y7s93i3k3478jqfh9zsgpq6ym1xmdmldi7s76zbfr1nknvy"; depends=[pheatmap survival]; };
-  LncPath = derive2 { name="LncPath"; version="1.0"; sha256="1cihwlj5sv000qg2wa931yx4ca6nixgihjna4g3fh7nr5aiv6cfn"; depends=[igraph samr]; };
+  LncPath = derive2 { name="LncPath"; version="1.1"; sha256="1cpsy681yq96867nr9g75xb0dilb016shqlhxpdn5xyiakrgjl4v"; depends=[igraph]; };
   LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; };
   LocalControl = derive2 { name="LocalControl"; version="1.1.1"; sha256="1fshqm6ag0scjawf2vn8zz9vrx4fv0shk2qyk60adb1ms85y8rrq"; depends=[cluster gss lattice Rcpp]; };
+  LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.3.1"; sha256="0hghj1vpfwxk1w7pc61y5l3jbsp8419nyfa9xviw99m6nyrkpma3"; depends=[cluster lattice]; };
   Lock5Data = derive2 { name="Lock5Data"; version="2.8"; sha256="17awskq78h23z2dy96d7hziljhnkx5phpd48q7cppxidyvzfywim"; depends=[]; };
   Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; };
   LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-1"; sha256="1hy7fnahncpsgqxfy352lxk298i69w7drlspsgdvpzdbghca3y3i"; depends=[MASS mclust mvtnorm rgl tkrplot]; };
@@ -1900,24 +1985,25 @@ in with self; {
   LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; };
   LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; };
   LumReader = derive2 { name="LumReader"; version="0.1.0"; sha256="1h2r3c9xkwlnaicn65085bdx7y86ha2fpd5mxirqax5lm6d8lirc"; depends=[gridExtra lattice plotly shiny]; };
-  Luminescence = derive2 { name="Luminescence"; version="0.8.5"; sha256="01fd7hwridcrc0vi8cmj2pvpmbqdgqnh1qjnj7mq6cxcyijzd6sg"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; };
+  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"; sha256="1w2jbiki6d14y32p8a50b8g53m1iva2kgik14yg27z5hx1rwwq97"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; };
-  MAINT_Data = derive2 { name="MAINT.Data"; version="1.2.2"; sha256="12ha0lznk14ijjamp6y30srkvn8y1ppn8k4dvb4b8gaip5zzj0pp"; depends=[MASS mclust miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; };
-  MALDIquant = derive2 { name="MALDIquant"; version="1.17"; sha256="047s6007ydc38x8wm027mlb4mngz15n0d4238fr8h43wyll5zy0z"; depends=[]; };
-  MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.11.1"; sha256="1aj6gakhbpis576b264s43w55dhmd5rszj54z910plybxq8hzmir"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; };
+  MADPop = derive2 { name="MADPop"; version="1.1.1"; sha256="07fwzpdkh2ayvx4wkmdr93jql11rf8b31abp0gghmlbysaqnv8gp"; 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]; };
   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=[]; };
-  MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.2.1"; sha256="1pq1mkanp1jxyygw09p4x8cgfbkrks7g6qvzfdjgdy8kli1b3mmw"; depends=[ellipse magic MASS Matrix plotrix plyr]; };
+  MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.3.1"; sha256="0lxqv85hc299r28m5z4id3xdgd2dism1b1zs09qly3i6byndn4gw"; depends=[ellipse magic MASS Matrix multcomp plotrix plyr]; };
   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]; };
   MARX = derive2 { name="MARX"; version="0.2"; sha256="1rc87hz719khl8mclbkfdix499nsc4nyihaaavd73nany7iprm02"; depends=[fBasics matlab metRology stabledist tseries]; };
-  MASS = derive2 { name="MASS"; version="7.3-50"; sha256="16hasv9k4n773jsyzvh8s3gbga49hwdj8n5hxij6zqisy4i0kxq6"; depends=[]; };
+  MASS = derive2 { name="MASS"; version="7.3-51"; sha256="0yp5ssfm9mahrp30y1hkqgjg70mzs6w065ba8h7j5ky1z6msdsdy"; 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=[]; };
@@ -1925,9 +2011,9 @@ in with self; {
   MAVE = derive2 { name="MAVE"; version="1.3.8"; sha256="0zr8i21z6c4jwgqdyx7kya8k9016b7fffk4fjjxgas6yg6k2x1la"; depends=[mda Rcpp RcppArmadillo]; };
   MAVIS = derive2 { name="MAVIS"; version="1.1.3"; sha256="02hi3n2rligmgg9afqwkpdny2kl68simkaqdd6k1swzlrih0fs4s"; depends=[compute_es ggplot2 irr MAc MAd metafor quantreg SCMA SCRT shiny shinyAce shinyBS weightr]; };
   MAVTgsa = derive2 { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach MASS multcomp randomForest]; };
-  MAc = derive2 { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; };
+  MAc = derive2 { name="MAc"; version="1.1.1"; sha256="1dawqmziffaz8wgcqzwc0yifdq65abgn24vafkrwa9850048c26f"; depends=[]; };
   MAclinical = derive2 { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[e1071 party plsgenomics st]; };
-  MAd = derive2 { name="MAd"; version="0.8-2"; sha256="0mhys27rmzb0kal4jr8j2y44z4qq46fw260sxl8da9qqvplcwq1p"; depends=[]; };
+  MAd = derive2 { name="MAd"; version="0.8-2.1"; sha256="096vdhfsp7bd3zvv6ydai6p230r16jx8zlqc4hlhnzma8rqypm35"; depends=[]; };
   MBA = derive2 { name="MBA"; version="0.0-9"; sha256="06kmrdkhwwvr3kd5w8ws6r528hhpvbhixyj98lv36kkwlx14x06g"; depends=[BH]; };
   MBC = derive2 { name="MBC"; version="0.10-4"; sha256="1fp06xx9jpz5mcxs0yppzzhch9w9c1qbsdbb60r4izrxnrhggpf7"; depends=[energy Matrix]; };
   MBCluster_Seq = derive2 { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; };
@@ -1936,7 +2022,6 @@ 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="1.0.1"; sha256="0zak19pdk0wwkhl4kj1jbwx0qmqcgpmmqv3vk0wg8nwgf1l65idy"; 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=[]; };
@@ -1948,26 +2033,28 @@ in with self; {
   MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.3"; sha256="0b9n793spljmsb58jp41vnl9c753xqaw1g4wbi4ax348cvi09jk8"; depends=[coda ggplot2 MCMCglmm]; };
   MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.1"; sha256="06p6xdbja7vrdq4vnhybpkmyf4rkaihcmy9sc81sb0h2wa21vcq0"; depends=[evir]; };
   MCMCglmm = derive2 { name="MCMCglmm"; version="2.26"; sha256="0dx3464mihnm8pf2vwr409ca5m7mvm2054x9jigazg66zsd3fxyj"; depends=[ape coda corpcor cubature Matrix tensorA]; };
-  MCMCpack = derive2 { name="MCMCpack"; version="1.4-3"; sha256="0rmz1rr1y7ycxj293hhy72vajbyblnrjgqvc2qgb63xfs5svi8qq"; depends=[coda lattice MASS mcmc quantreg]; };
-  MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.8"; sha256="1qyhxljfcnyj7450vik4j81qilvphwc1b2xv48fnx1pnapfl45wz"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; };
-  MCMCvis = derive2 { name="MCMCvis"; version="0.11.0"; sha256="099sa541xrskn1jipx16hrgasriv4jy7jgjq9vyjwcagzh2hljz3"; depends=[coda overlapping rstan]; };
+  MCMCpack = derive2 { name="MCMCpack"; version="1.4-4"; sha256="1xzrgib2mjz0xpqranhdyc5m4fmg2fir9mcf51ciw5pp53b97qcp"; depends=[coda lattice MASS mcmc quantreg]; };
+  MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.9"; sha256="1zmlz2kwrp1qiyvq3v5vv1rsy3s2idlifmckmgznk4nkqds5ifwh"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; };
+  MCMCvis = derive2 { name="MCMCvis"; version="0.11.2"; sha256="1b81sqvmnqmbm363llgrm61zm2yy0d0myzvv28sf6pibjijdznq8"; depends=[coda overlapping rstan]; };
   MCPAN = derive2 { name="MCPAN"; version="1.1-21"; sha256="0q1m0xg8825q9zjwxcz2h2n0dyr21q5bk29qbqpdhirlwm6f1a51"; depends=[magic MCMCpack multcomp mvtnorm plyr]; };
   MCPMod = derive2 { name="MCPMod"; version="1.0-10"; sha256="0ns74qhm9bzi70m9bn61zs4mmqmmxxi77f49pdrcnr8wrrnn1kdn"; depends=[lattice mvtnorm]; };
   MCPerm = derive2 { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; };
   MCS = derive2 { name="MCS"; version="0.1.3"; sha256="1kiz1jq1bm2n8f33nsybp5jfrzzl9xbsi3m9l8818ybmph99xms6"; depends=[]; };
+  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=[]; };
   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]; };
-  MDSMap = derive2 { name="MDSMap"; version="1.0"; sha256="15557ca83bvsqcmsa48vispagg9a05658i22cqk706shjsp782n5"; depends=[princurve reshape rgl smacof]; };
+  MDSMap = derive2 { name="MDSMap"; version="1.1"; sha256="0knrkfwgl763fwdb3ln3g5y3rarnpqdfgzxf4m045664m7gkipsg"; depends=[princurve reshape rgl smacof]; };
   MDimNormn = derive2 { name="MDimNormn"; version="0.8.0"; sha256="080m0irx5v8l45fg9ig5yzcj92s3ah8a9aha288byszli1cchgpn"; depends=[]; };
   MDplot = derive2 { name="MDplot"; version="1.0.1"; sha256="1xijh18hrkb807nfkdr7g642aspn5psc8nw29q387jl5hly2w8s9"; depends=[gplots gtools MASS RColorBrewer]; };
   MED = derive2 { name="MED"; version="0.1.0"; sha256="0fy0qmxirkdz5kigy2r7l5czjzws0fhjxy13kv1kqh628ldrp109"; depends=[]; };
   MEET = derive2 { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[Hmisc KernSmooth Matrix pcaMethods ROCR seqinr seqLogo]; };
+  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="1.0"; sha256="171pzhz4z0373663mfnfi5cqd9gnj0aamwr56ag16dxm8xfyppcj"; depends=[MASS plyr pracma]; };
+  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]; };
   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]; };
@@ -1976,10 +2063,10 @@ in with self; {
   MFDFA = derive2 { name="MFDFA"; version="1.0"; sha256="1gy1v49525i2bhr14nvpz8rqcz3lchfnvm0g53qlln55jdndgsx4"; depends=[]; };
   MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; };
   MFKnockoffs = derive2 { name="MFKnockoffs"; version="0.9.1"; sha256="1bcdqfzmllp3dri1phy365wgc9c37wlag65pzljn4p3mf43w10nq"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; };
-  MFPCA = derive2 { name="MFPCA"; version="1.2-3"; sha256="0zhmhk1cihk5h4c0qpcna5m687169qxlanbjc92scwab3q8hs2i9"; depends=[abind foreach funData irlba Matrix mgcv plyr]; };
+  MFPCA = derive2 { name="MFPCA"; version="1.3-1"; sha256="00kr64ih16ymigyd1w5ijkk7clif18dg5fq9g3vd9j773zqg7dh2"; depends=[abind foreach funData irlba Matrix mgcv plyr]; };
   MFT = derive2 { name="MFT"; version="1.3"; sha256="029apjg1fqrqfg98jczbxfy267m3f68qxvxqjzbsw1xisq4j7wc0"; depends=[]; };
   MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; };
-  MGLM = derive2 { name="MGLM"; version="0.1.0"; sha256="06gaz82nn7fbfv7bm9xx6dsk95xq3gircvh6knzm963r1bw8f1pk"; depends=[]; };
+  MGLM = derive2 { name="MGLM"; version="0.2.0"; sha256="0yyqm53lvp59zy8lkffw9x3zhqrnh29j5v3yyzk6qrgj2slnc7nk"; depends=[]; };
   MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; };
   MGSDA = derive2 { name="MGSDA"; version="1.4"; sha256="0grwl740yvz2av5nkvmyyrr8ji5f39sjs1c5gxp6lp9p36i2wc32"; depends=[MASS]; };
   MHCtools = derive2 { name="MHCtools"; version="1.1.0"; sha256="03y6m3a46bzazxkrxdrii2p1fyc26il09z5676c63rk8wz9wcxa0"; depends=[rlist]; };
@@ -1999,13 +2086,14 @@ in with self; {
   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=[]; };
-  MKmisc = derive2 { name="MKmisc"; version="1.0"; sha256="1ykzj9flq1nx8k7aybd2sh5rd8a2hzk4gwz0iqqsl18k1khzbdla"; depends=[ggplot2 RColorBrewer robustbase]; };
-  ML_MSBD = derive2 { name="ML.MSBD"; version="1.0.0"; sha256="1myr4pnznkypb7jjpyr5iv4yh29q9kv6g8gmfh9x3wy96xy15wmz"; depends=[ape]; };
+  MKmisc = derive2 { name="MKmisc"; version="1.1"; sha256="1di9dbfnbi69psk3qnrfnc62amx3ifvirw2bb783y775zpg07gz7"; depends=[ggplot2 RColorBrewer robustbase scales]; };
+  ML_MSBD = derive2 { name="ML.MSBD"; version="1.1.0"; sha256="0r9v6dkfarwzryai53c4z5i5isdh8clgwfpzmjsh430zbf9vkdk2"; depends=[ape]; };
   MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1"; sha256="07fhbhfnlmllxxdpdqiaz6d72y4pj3vrz6lw5rnlb2m7vknx51ik"; depends=[limSolve MASS MultiLCIRT]; };
   MLDS = derive2 { name="MLDS"; version="0.4.5"; sha256="1a5y031kd6zx0zqlk6dvxzsv3isbvg9jap4gqad2jwryh0a9x3c1"; depends=[MASS]; };
   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.2.1"; sha256="055gps9zv8cv08lkf14p22d7r3kidwkwkhfv45xlg6i4fzcgllxb"; depends=[]; };
+  MLML2R = derive2 { name="MLML2R"; version="0.3.0"; sha256="0dwhxb20f6y8daaq5684dzwcl5qpvmbqzlmwa6nkbbchpdcphjhz"; 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]; };
@@ -2015,6 +2103,7 @@ in with self; {
   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]; };
+  MMDvariance = derive2 { name="MMDvariance"; version="0.0.9"; sha256="1yiqabifym7gdknqrhfnql6qc8p163npzrrckbyqjry3yvkqr5wi"; depends=[Biobase lawstat MASS]; };
   MMMS = derive2 { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[glmnet survival]; };
   MMPPsampler = derive2 { name="MMPPsampler"; version="1.0"; sha256="1lk5hh4ihclldrbx2pbfzxvspjaywh7mg6nhs2mjr5dcdj2h0hky"; depends=[cowplot ggplot2 gtools MASS Rcpp RcppArmadillo]; };
   MMS = derive2 { name="MMS"; version="3.0.11"; sha256="0gc4iz371bi65sp49gvjh99f8jvii8l0k12kn1vbpzk4a3cw7iad"; depends=[glmnet Matrix mht]; };
@@ -2023,10 +2112,10 @@ in with self; {
   MNP = derive2 { name="MNP"; version="3.1-0"; sha256="06qs2vsmjs6rcpqlwfc1n5y5hzxf7pngbdmiza1wijm9hh54ikh0"; depends=[MASS]; };
   MNS = derive2 { name="MNS"; version="1.0"; sha256="0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb"; depends=[doParallel glmnet igraph MASS mvtnorm]; };
   MOCCA = derive2 { name="MOCCA"; version="1.3"; sha256="1ffpnqcrkrr7vh0f1fyyai0c2wq3v8sk2qhnhds49z7p6xrsmh21"; depends=[cclust class cluster clv]; };
-  MODIS = derive2 { name="MODIS"; version="1.1.2"; sha256="1iww1rnxv2xw63b5bz7xrxb3q8dmgqzbw704gshislkhjwn37q87"; depends=[bitops devtools mapdata mapedit maps maptools ptw raster RCurl rgdal rgeos sf sp XML]; };
+  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.5"; sha256="0mk39dvr0msx8xas6zxpzq95bg2whk8r2dc1zggh61rfi9r9d9mn"; depends=[bitops data_table gdalUtils gWidgets gWidgetsRGtk2 httr jsonlite pacman raster rgdal rgeos sp stringr xml2 xts]; };
+  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]; };
   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]; };
@@ -2037,7 +2126,9 @@ in with self; {
   MPDiR = derive2 { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; };
   MPINet = derive2 { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; };
   MPLikelihoodWB = derive2 { name="MPLikelihoodWB"; version="1.1"; sha256="0xgj349jkv29ldia4lmsiwnkhrk99aqcrvyiy3si5knmi1jvx9q0"; depends=[MASS survival]; };
+  MPN = derive2 { name="MPN"; version="0.1.0"; sha256="1hhdr9c3diy889cw4lnfiv5zy3sqdxfywy2mz58hd3ny2iql5rs1"; depends=[]; };
   MPR_genotyping = derive2 { name="MPR.genotyping"; version="0.8"; sha256="0lsrbks7nhfnrmk8kclh09rc132j3divjxrzjfrg8zijbzkfx1pn"; depends=[qtl]; };
+  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]; };
   MPV = derive2 { name="MPV"; version="1.53"; sha256="14qnvcqqscd9hwn2mxf5dclv3ncj7w6vc3blxaml3rflriha6rls"; depends=[]; };
@@ -2046,8 +2137,11 @@ in with self; {
   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]; };
   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]; };
+  MRPC = derive2 { name="MRPC"; version="2.0.0"; sha256="1gy755y2xq9fdnbgwxi32l4abyirm8q9pqwbk8rrc2c26nhdi5fb"; depends=[bnlearn compositions dynamicTreeCut fastcluster GGally graph gtools Hmisc mice network pcalg Rgraphviz sna WGCNA]; };
   MRQoL = derive2 { name="MRQoL"; version="1.0"; sha256="0isn4g3jpz7wm99ymrshl6zgkb7iancdzdxl2w98n8fbxsh5z6sw"; depends=[]; };
   MRS = derive2 { name="MRS"; version="1.2.4"; sha256="1sksg70zb72ys1b7vi8amjaqarmdh8vf2l1rb0rasrlvrip3z3br"; depends=[igraph Rcpp RcppArmadillo]; };
   MRSP = derive2 { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[Formula matrixcalc]; };
@@ -2055,21 +2149,24 @@ in with self; {
   MRsurv = derive2 { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; };
   MRwarping = derive2 { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; };
   MSCMT = derive2 { name="MSCMT"; version="1.3.3"; sha256="1962lc6p5cy8pkbshzbl3jnd2pqnk9afs4lmp4qb7fqkmb4xpka3"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; };
+  MSEtool = derive2 { name="MSEtool"; version="1.1.0"; sha256="0cckn56n8zn7srhzi6bczlg2i4qhfws43nwzjbc3har07n4h56sj"; depends=[coda corpcor DLMtool gplots MASS mvtnorm pryr r4ss RcppEigen reshape2 snowfall TMB]; };
   MSG = derive2 { name="MSG"; version="0.3"; sha256="181kzkbw69bs3vir6dzgq7jzp8xcpg1p4isfb660vgnd1flb03ix"; depends=[RColorBrewer]; };
   MSGARCH = derive2 { name="MSGARCH"; version="2.3"; sha256="0dax3cx0dzmg086vhymnm5x5s7ljdnxx1k52xnnvrm6pprhdgaqn"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; };
   MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; };
   MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; };
+  MSMwRA = derive2 { name="MSMwRA"; version="1.3"; sha256="0b0fqfv6iick1brqik4rqz2936nfa51i6xlfavs65r9692wks73q"; depends=[]; };
+  MSPRT = derive2 { name="MSPRT"; version="1.0"; sha256="1ciiqfqpl25xvyrfp005gnkxildqkxsnzmb2slxnr8h1an0clb2g"; depends=[doParallel foreach ggplot2 iterators nleqslv]; };
   MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; };
   MST = derive2 { name="MST"; version="2.1"; sha256="16mnsn2an02k4jrqb6yj0n1i563zny5v10ngfq1y28fqaw6h8yyq"; depends=[Formula MASS partykit survival]; };
-  MSbox = derive2 { name="MSbox"; version="1.1"; sha256="0hal7cqfmmcsckysxnwr2qsa2b61ck4zgbdl52w1iqkkvm8qq1x9"; depends=[stringr]; };
+  MSbox = derive2 { name="MSbox"; version="1.1.1"; sha256="1bw1c6yf3lnvd0rb3nwcrq3yckwnnrvck96mdq64njjldap8i152"; depends=[magick stringr xml2]; };
   MScombine = derive2 { name="MScombine"; version="1.1"; sha256="0kgz1l4jlhcada3fp02dscf4zx6a22cjxj251838lfz65f512hrn"; depends=[plyr]; };
   MSeasy = derive2 { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap cluster clValid fpc mzR xcms]; };
   MSeasyTkGUI = derive2 { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; };
-  MSwM = derive2 { name="MSwM"; version="1.3"; sha256="1ny7rzpq6x6yy0iz3ad51vwdh7i4sy60pvgdxda3jcz5wal3hgqm"; depends=[nlme]; };
+  MSwM = derive2 { name="MSwM"; version="1.4"; sha256="1zhfar02s7hm4gjs1flkh9a4526d98hik8bqrksy75758baiqg7l"; depends=[nlme]; };
   MTA = derive2 { name="MTA"; version="0.1.2"; sha256="1149xjq6ybjv6llzlq67j5xc6dspb4mvd72n62nlbq3zz80x7f84"; depends=[igraph rgeos sp]; };
   MTDrh = derive2 { name="MTDrh"; version="0.1.0"; sha256="0ass3b90nr4i0y7v30hk8xhq3hj9bxaxcsr4f8wfi0lnvzfv6aaa"; depends=[]; };
   MTE = derive2 { name="MTE"; version="1.0.0"; sha256="009mrl9dgxafl4hrgfzvsfvgx3dljb0rbbs74j2cxc5ray87kp55"; depends=[parcor quantreg]; };
-  MTS = derive2 { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[fGarch mvtnorm Rcpp]; };
+  MTS = derive2 { name="MTS"; version="1.0"; sha256="09pypanjmqrvxbrrckydxyyswsgjx4nhb052x4llk7va9w4lbcjs"; depends=[fBasics fGarch mvtnorm Rcpp]; };
   MTSYS = derive2 { name="MTSYS"; version="1.2.0"; sha256="04dkan3hxl3difflskp7d1lw1bvxhg4s28ssy2v4m7z7wbpj3v1m"; depends=[]; };
   MTurkR = derive2 { name="MTurkR"; version="0.8.0"; sha256="0q498chr2s67ai7lfxi6kdficqbs5sxj9asyv69z2a37fmsr4va7"; depends=[base64enc curl digest XML]; };
   MTurkRGUI = derive2 { name="MTurkRGUI"; version="0.1.5"; sha256="1rlgz80na0v1nx70cda1fzyswlb1lg5kcx64zl9dcqy6accsrpmp"; depends=[curl MTurkR XML]; };
@@ -2079,15 +2176,17 @@ in with self; {
   MVB = derive2 { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; };
   MVLM = derive2 { name="MVLM"; version="0.1.4"; sha256="1zcj405dc4jbiqw6p0fcbam8yc9d6yjpmrx5wjw5zjvig3iqb91k"; depends=[CompQuadForm]; };
   MVN = derive2 { name="MVN"; version="5.5"; sha256="05jl9g7jyx6a5fc8bw5si393s7f9swygma8h461v8abqbakihb2q"; depends=[boot energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; };
-  MVR = derive2 { name="MVR"; version="1.32.1"; sha256="03dbd5nib8cx0rwdi4g9fihbkdxazpvbdjh7sfnavsyyrgnqa31m"; depends=[statmod]; };
+  MVNBayesian = derive2 { name="MVNBayesian"; version="0.0.8-11"; sha256="1iaxyp480v91887cn4w3l74907wvbzs3ay4cjgzd8xk2dp47w8bg"; depends=[mvtnorm plyr]; };
+  MVR = derive2 { name="MVR"; version="1.33.0"; sha256="1ygz47a2p5r5axql5zsxvsn25pcqyxz6mpw50zfmzrcqdrfa3bg8"; depends=[statmod]; };
   MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; };
   MVar = derive2 { name="MVar"; version="2.0.2"; sha256="0h1sm2vzjg86v3sv43pbf9fxjx5d6bxx519aa25y0r27nh9fif5y"; depends=[]; };
   MVar_pt = derive2 { name="MVar.pt"; version="2.0.2"; sha256="0b7qgfa180vv2m6l5vqxqc96700srdzzix2kwccfvjimby522a1b"; depends=[]; };
   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.3.5"; sha256="0pmv6qya38kxsys39qzdgh7zqjz7i052f25xmqwc5fa4l08jmm6a"; depends=[bigmemory doParallel dplyr energy foreach geepack hash knitr lme4 MASS nnet ordinal quantreg relations Rfast survival visNetwork]; };
+  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]; };
   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]; };
   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=[]; };
@@ -2095,7 +2194,7 @@ in with self; {
   ManlyMix = derive2 { name="ManlyMix"; version="0.1.14"; sha256="0zpcc74965n435d4fah41r9nz0kjyn46hkjl1s0kvlllqj6n69wg"; depends=[]; };
   ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; };
   Map2NCBI = derive2 { name="Map2NCBI"; version="1.1"; sha256="19gafyql767f1p4fxdw7d5a8z1b4vg7jfrvzaml5x16fj6c78fjm"; depends=[]; };
-  MapGAM = derive2 { name="MapGAM"; version="1.1"; sha256="0sh7qnzzahaz09nmld5p8df93my6k5vpvgmvqdlz84vghcfbfpa2"; depends=[colorspace gam maptools sp survival]; };
+  MapGAM = derive2 { name="MapGAM"; version="1.2"; sha256="1909l0b5yf6c0ri8aylarkjmjnh16cjf1a4plc95yrkjk4y0ckvl"; depends=[colorspace gam maptools sp survival]; };
   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]; };
@@ -2113,26 +2212,27 @@ in with self; {
   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=[]; };
-  MatrixLDA = derive2 { name="MatrixLDA"; version="0.1"; sha256="19q6wl8fc6jzn7544qnlpzfh9v0xlg9cr78l6k8kx6kzjnbnyh9z"; depends=[glasso plyr Rcpp RcppArmadillo]; };
+  MatrixLDA = derive2 { name="MatrixLDA"; version="0.2"; sha256="0fixq35gp0fzmin75sfld2ln0zvnjgzrhk3b5yi7wdqzp99200yy"; depends=[glasso plyr Rcpp RcppArmadillo]; };
   MatrixModels = derive2 { name="MatrixModels"; version="0.4-1"; sha256="0cyfvhci2p1vr2x52ymkyqqs63x1qchn856dh2j94yb93r08x1zy"; depends=[Matrix]; };
-  MaxPro = derive2 { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; };
+  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]; };
-  MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.5.2"; sha256="0k64yzn7qnjxkxxqg5yrgq1ksdp37qfx0yc8a2n1zrdwj9f9ba2i"; depends=[dplyr lubridate rgdal rgeos rmapshaper rvest sp stringr xml2]; };
-  MazamaWebUtils = derive2 { name="MazamaWebUtils"; version="0.1.5"; sha256="065l1n2nr5jsc0mdlxj10plzp8m09025hzbd8if3pn6gsl520b6l"; depends=[dplyr futile_logger stringr webutils]; };
+  MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.1.1"; sha256="007m6irbkmgzaraghwg9gq5rv0vhn19dlg2vi02bs1b6h3s63wix"; 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]; };
   Mcomp = derive2 { name="Mcomp"; version="2.8"; sha256="1wz5fr3dhxn4s0qvxm2mzq9dbz3x0vgh6pixjrgk9d4i9w2p7s60"; depends=[forecast ggplot2]; };
   MeanShift = derive2 { name="MeanShift"; version="1.1-1"; sha256="02zf27xvk2zlmgxfyl5pwl2rdq8c30fb52x1mbpvlhmxjbhg6fsn"; depends=[wavethresh]; };
   MedDietCalc = derive2 { name="MedDietCalc"; version="0.1.0"; sha256="1gggia97ww4kiqhh2lnsmadgdxvpr36mdx1yrbgarj0sp6ilrd3l"; depends=[]; };
   MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
   MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; };
-  Mediana = derive2 { name="Mediana"; version="1.0.6"; sha256="0cx2bkz5m96dirqknfsi9944rhnn14wwdimw1hq1p8c073z40i7a"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; };
+  Mediana = derive2 { name="Mediana"; version="1.0.7"; sha256="136yzp8c9yiiw0x8y3ym516sxx36ca3wa945xmhjwkbvz33cc22j"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; };
   Mega2R = derive2 { name="Mega2R"; version="1.0.4"; sha256="1c51bway05rqywvw05022cjlqzciidqz9xwz17iwf536gndc348p"; depends=[AnnotationDbi DBI gdsfmt GenomeInfoDb pedgene Rcpp RSQLite SKAT]; };
   MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.3.0"; sha256="1nnj4nmzrvdj2arq74bg5ckhmll2z9ydnd75ds48njbhxla2645l"; depends=[ggplot2 iterpc knitr Matrix plotly rmarkdown robustbase]; };
   MenuCollection = derive2 { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[gplots RGtk2 RGtk2Extras]; };
   MergeGUI = derive2 { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; };
   MetABEL = derive2 { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; };
-  MetFns = derive2 { name="MetFns"; version="3.2.0"; sha256="1nm7yv0cl0kl9dn284fja8a9lf77a2xaqv6v53b2f9sravj5pkfv"; depends=[astroFns lubridate plotrix pracma]; };
+  MetFns = derive2 { name="MetFns"; version="3.2.2"; sha256="15fd2d0yysibi2x43qv6b8i1pa18l7z4n0zpmrqhsmvqkgy8sla0"; depends=[astroFns lubridate plotrix pracma]; };
   MetNorm = derive2 { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1avs3ji0a2nlrrljz5d0l66zfh4474jb4"; depends=[]; };
   MetProc = derive2 { name="MetProc"; version="1.0.1"; sha256="1z6538pij1rq5wv9s8rjcn0sck15y26asv4vamav8a6s4135ia3q"; depends=[fastcluster gplots]; };
   MetSizeR = derive2 { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[cairoDevice gWidgets gWidgetsRGtk2 MetabolAnalyze mvtnorm]; };
@@ -2140,14 +2240,15 @@ in with self; {
   MetaAnalyser = derive2 { name="MetaAnalyser"; version="0.2.1"; sha256="0k58325nb7svihhpga7kdbryr9bi5470qsb8aa5llpiggs8j7sfz"; depends=[DT ggvis rstudioapi shiny]; };
   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="1.0.3"; sha256="0611k497ixy0f51lmqzs08zqqq5krrxrm7m0xqdl18gkwrw3w656"; depends=[Biobase DBI GEOmetadb GEOquery ggplot2 gplots multtest preprocessCore reshape rmeta Rmisc RMySQL RSQLite stringr]; };
+  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]; };
   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]; };
-  MetaSubtract = derive2 { name="MetaSubtract"; version="1.42"; sha256="070j46fp0kb5g9iyd7x4nnaqi1sqxsly3fmka361nzik4pr2x8a3"; depends=[]; };
+  MetaStan = derive2 { name="MetaStan"; version="0.0.1"; sha256="1byxgap5ky8z7mi7cpgv1lkm3xpc9g3pgkhcdcazx5sv4dj6rimf"; 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]; };
   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]; };
@@ -2160,21 +2261,22 @@ in with self; {
   MethodCompare = derive2 { name="MethodCompare"; version="0.1.0"; sha256="0zl20v8k8bhn3skbpzdiglywrqghwf0r42q2jn8zmq4x0drvjzpl"; depends=[nlme]; };
   Methplot = derive2 { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; };
   MethylCapSig = derive2 { name="MethylCapSig"; version="1.0.1"; sha256="16ch9aldr6a9jn42h387n7qvnzs0yx28f2yj6xq0kp476q7rf4ql"; depends=[geepack]; };
-  Metrics = derive2 { name="Metrics"; version="0.1.3"; sha256="1mpqbi1lihxgndfpm8b6c5hiibvnscz1b5xjgi16x2fqk3cz4i0z"; depends=[]; };
+  Metrics = derive2 { name="Metrics"; version="0.1.4"; sha256="0fh8qbjlwzagh272lgwr4bxcqcjb1qpz53mgs8rzlvncax6nk5bk"; depends=[]; };
   MfUSampler = derive2 { name="MfUSampler"; version="1.0.4"; sha256="0i5siq1jacxbfvakb97qnj3h7pk471rrx8ckwm0d8nl3j586s36y"; depends=[ars coda HI]; };
   MiRAnorm = derive2 { name="MiRAnorm"; version="1.0.0"; sha256="154wv0j82xyc4y5cd2czh0q8kzhgrk6qsn0ahc1zn3fnrzc9fgz0"; depends=[ArgumentCheck cluster dendextend ggplot2 MASS npmv plyr reshape2]; };
   MiRKAT = derive2 { name="MiRKAT"; version="1.0.1"; sha256="1adhy9ysjm8xa45sb4x17ryznvg91c9xdf0irpcgc7rbg34rxf5x"; depends=[GUniFrac MASS PearsonDS survival]; };
   MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; };
   MiSPU = derive2 { name="MiSPU"; version="1.0"; sha256="1l6q0fm5z5i6gigr940h8kc5rka08psmhcprp8grmsxk3qy2kply"; depends=[ape aSPU cluster Rcpp RcppArmadillo vegan]; };
   MiST = derive2 { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; };
-  MicSim = derive2 { name="MicSim"; version="1.0.12"; sha256="186m0p08h6x8zhk82sm1hsyrqdl3p872xn03ysv3g5bldglc9677"; depends=[chron rlecuyer snowfall]; };
+  MicSim = derive2 { name="MicSim"; version="1.0.13"; sha256="16j2ffl6379afhk9dx7z2lci79ywq1nhmjk070kfknlrabl8cs2n"; depends=[chron rlecuyer snowfall]; };
   MicroDatosEs = derive2 { name="MicroDatosEs"; version="0.8.2"; sha256="0k0hmi3ciipizmgjw1i5rrsg34yx21s1msn40vc4qc9s1n4wd8dl"; depends=[readr]; };
   MicroMacroMultilevel = derive2 { name="MicroMacroMultilevel"; version="0.4.0"; sha256="1q5cyqr4hdl1wp2isk6p4p084i83kg6hd406wdp1nj9lv5i0xvgw"; depends=[]; };
   MicroStrategyR = derive2 { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; };
   MigClim = derive2 { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[raster SDMTools]; };
   MindOnStats = derive2 { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; };
   Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; };
-  Miso = derive2 { name="Miso"; version="0.1.1"; sha256="151klf07k5f670ssclg6bba18vfamyclz1sq3x0l9bzdvkng0lak"; depends=[S4Vectors]; };
+  Minirand = derive2 { name="Minirand"; version="0.1.0"; sha256="0iahhshqxpkxhpchb4hiv7d9rir2d3zxazs2nz7ymzdlhnn41xi1"; depends=[]; };
+  Miso = derive2 { name="Miso"; version="0.1.5"; sha256="1d36rnacw3rrjbrk4h0jlg13qk5d9lw77axbypbk5ng4wk47bcdp"; depends=[dplyr plotly S4Vectors]; };
   MissMech = derive2 { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l4wxlahk2gmawzv9rhyibwzf0yp60cb1sv9"; depends=[]; };
   MissingDataGUI = derive2 { name="MissingDataGUI"; version="0.2-5"; sha256="0drbm87ka17avg6fmswjilgnz9c3azwd0236s8yfms24k9k77vnd"; depends=[cairoDevice GGally ggplot2 gWidgetsRGtk2 reshape]; };
   MitISEM = derive2 { name="MitISEM"; version="1.2"; sha256="0dn398vrxh16gmy7ghh5000dgk7cbhb3gi3myrxp5dfri3ysjxcj"; depends=[mvtnorm]; };
@@ -2194,37 +2296,40 @@ in with self; {
   MixtureInf = derive2 { name="MixtureInf"; version="1.1"; sha256="12qcflmrpzh4w5b40xq5qicks6p0cwqpf5k84pwabkjb168afddv"; depends=[quadprog]; };
   MixtureRegLTIC = derive2 { name="MixtureRegLTIC"; version="1.0.0"; sha256="052gyk4gqv49fa2rxbxnib29f1vjxiw4q8llkfhsv8kw5pw38699"; depends=[]; };
   MlBayesOpt = derive2 { name="MlBayesOpt"; version="0.3.3"; sha256="0aazcf94gckgxd51r21hv3msa18br5xcq8xp03w448di546qzbnn"; depends=[data_table dplyr e1071 foreach Matrix ranger rBayesianOptimization rlang xgboost]; };
-  MmgraphR = derive2 { name="MmgraphR"; version="0.2"; sha256="0al65hsqpak44w5zvdzhyh6l1q981lzyvx37hbcy0z0qn3vz16kn"; depends=[colorspace march TraMineR]; };
-  MoEClust = derive2 { name="MoEClust"; version="1.1.0"; sha256="1442x2ajiib1fgj6bc3zlqy9q3bjnhnn29f7fjin99lq7c5r132p"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; };
+  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]; };
   ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; };
-  ModelMap = derive2 { name="ModelMap"; version="3.3.5"; sha256="1rmm1a2nw91kzvxpvq9qhlag0dhihis7mgscgslqia6z8fr86qvs"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; };
-  ModelMetrics = derive2 { name="ModelMetrics"; version="1.1.0"; sha256="119xxmzb5biq7k1yxqsf0jmmarmfn6lds9x9hfgv593xlpym6za8"; depends=[Rcpp]; };
+  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]; };
   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]; };
   Momocs = derive2 { name="Momocs"; version="1.2.9"; sha256="13pgn31hv529z33mi020w8wm8ya7hyi5yfsp45a78wdhinqas9mm"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp]; };
   Mondrian = derive2 { name="Mondrian"; version="1.0-0"; sha256="07r64q518diphai951pw4vfaw4sd6bqwhi6q5cp4pcl3aqjynkmj"; depends=[RColorBrewer]; };
   MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.1"; sha256="1r7vki0rrzwcrfg4f2lfx30g614vf2xi62qb1rs21a9j5741lxlx"; depends=[codetools DBI digest]; };
-  MonetDBLite = derive2 { name="MonetDBLite"; version="0.5.1"; sha256="01gcwr5r47dkmr1y2q387xv1qr2fryq9574aijx1a39ywhvcm8pq"; depends=[codetools DBI digest]; };
+  MonetDBLite = derive2 { name="MonetDBLite"; version="0.6.0"; sha256="1nwjnl40lmpykgjrhq39yldd7dn7xncg7gfcjczza680v47wxgj2"; depends=[codetools DBI digest]; };
   MonoInc = derive2 { name="MonoInc"; version="1.1"; sha256="14rykw3bfj0vznz0rw4vsg1k4vanfv9cy867vspw966ncl4bw70h"; depends=[compare doParallel foreach iterators sitar]; };
   MonoPhy = derive2 { name="MonoPhy"; version="1.2"; sha256="0997kg8hfwgsc9s155z0wrf7rrhn3vf6681j9psjl3hsspg08z2r"; depends=[ape phangorn phytools RColorBrewer taxize]; };
   MonoPoly = derive2 { name="MonoPoly"; version="0.3-9"; sha256="130hv05fwsskk1bvr7fk8bmafq26vimkfgssjdk3zaz0hm3pxrp4"; depends=[quadprog]; };
   MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.5"; sha256="0a62wq448kq10mf1nhdr0nybzzz7d63nxakggpzmkzz4fz0l67bd"; depends=[abind codetools reshape rlecuyer snow snowfall]; };
   Morpho = derive2 { name="Morpho"; version="2.6"; sha256="11v0lv1mfyp252y20jxlr9bym3rh8mcr2v25qhvq1133jr420lyd"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; };
   MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
-  MortCast = derive2 { name="MortCast"; version="1.2-0"; sha256="1lmkqywcb3acfmbknxpl62n87rv4qz7hq2kyl98x8l62w6swabr6"; depends=[wpp2017]; };
-  MortalityLaws = derive2 { name="MortalityLaws"; version="1.4.0"; sha256="1440fhwhmg72q7nv3cpnb658vhlkz586i17h82jjwr4v63almq8m"; depends=[minpack_lm pbapply RCurl]; };
+  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]; };
   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]; };
+  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]; };
   MuChPoint = derive2 { name="MuChPoint"; version="0.6.1"; sha256="15bqsc7bsjg55qxjwxh58bxbwz61a6wv4xxph994g4020b98l01x"; depends=[capushe Matrix Rcpp shiny]; };
   MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; };
-  MuMIn = derive2 { name="MuMIn"; version="1.40.4"; sha256="1xw7b74qg0ivgk3l1krjn2wrl969c41hr0y2nk0z8fw94xcfggyr"; depends=[Matrix]; };
+  MuMIn = derive2 { name="MuMIn"; version="1.42.1"; sha256="1g0pp8g9d3cfk2n0g4rd3lvwg4gsqshdk1nzwb5m041iyl5j8zps"; depends=[Matrix nlme]; };
   MuViCP = derive2 { name="MuViCP"; version="1.3.2"; sha256="1wkiwdz4bblxf1zr57khljqkga9ks9aj1lnidvmhib94q6b8fnf4"; depends=[gtools MASS sm]; };
   MullerPlot = derive2 { name="MullerPlot"; version="0.1.2"; sha256="0am5brdmbh2mw74fbw9nha6h4qlhj8psg3142mql1ad99bd0zg4w"; depends=[RColorBrewer]; };
   MultAlloc = derive2 { name="MultAlloc"; version="1.2"; sha256="0c3sqfaa08s8mk4yz77kh6q6v9ic5xp52g9prfw1k2kv4nw1k2qd"; depends=[Rglpk]; };
@@ -2232,6 +2337,7 @@ in with self; {
   MultNonParam = derive2 { name="MultNonParam"; version="1.2.6"; sha256="1w9kp7qswz38r2xfi8sc52kc52c8hi2jzjsh8gj4491ds1lilv0r"; depends=[]; };
   MultiBD = derive2 { name="MultiBD"; version="0.2.0"; sha256="1qjfr8hx8sr5m8370yzi09r8jnh3i6907wzj3v4h83vmjh81db71"; depends=[BH Rcpp RcppParallel]; };
   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]; };
   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]; };
@@ -2243,7 +2349,7 @@ in with self; {
   MultiVarMI = derive2 { name="MultiVarMI"; version="1.0"; sha256="1mlaprg3cfmfwrq7wh64fmyv1wpdnil7wpcrcg3921qydk65py6z"; depends=[BinOrdNonNor corpcor CorrToolBox Matrix moments norm PoisNonNor]; };
   MultiVarSel = derive2 { name="MultiVarSel"; version="1.1.2"; sha256="07qdi43bg03xyr99361c0565m1i5kzqjbvlc2npnyjyc2ygr386d"; depends=[glmnet Matrix tidyverse]; };
   MultinomialCI = derive2 { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; };
-  MultipleBubbles = derive2 { name="MultipleBubbles"; version="0.1.0"; sha256="1g6yqp53dbd96jcjgmif39zb3a7f9zil10dhqi3vz3qv6r2vsnkj"; depends=[foreach MASS]; };
+  MultipleBubbles = derive2 { name="MultipleBubbles"; version="0.2.0"; sha256="047a1pql3jf500gwlap6ws5z7mx0sqmdq6jbql24nl5iypi9jqpf"; depends=[foreach MASS]; };
   MultiplierDEA = derive2 { name="MultiplierDEA"; version="0.1.18"; sha256="1d7cqa44yayyhwkl5wkp68b7vxakfnlwkprs811z8c2fmfm8vk5r"; depends=[lpSolveAPI]; };
   MultisiteMediation = derive2 { name="MultisiteMediation"; version="0.0.2"; sha256="1z9nh8iywlsjsrrmpm6h8hcnaqvh93dldn5rhp4wnj3c7db8qscy"; depends=[ggplot2 lme4 MASS psych statmod]; };
   MultivariateRandomForest = derive2 { name="MultivariateRandomForest"; version="1.1.5"; sha256="0mww4x1hqraiyvmw2f9s6h180kplmj36hb7zfg7xlkmgdf4apk8d"; depends=[bootstrap Rcpp]; };
@@ -2253,14 +2359,14 @@ in with self; {
   Myrrixjars = derive2 { name="Myrrixjars"; version="1.0-2"; sha256="1hhfg83z5kl6l250z3lippx3qc68k1wj1qlfzd6m66rgmk699gyl"; depends=[rJava]; };
   NADA = derive2 { name="NADA"; version="1.6-1"; sha256="1jjlm6rljk4nv6b7l2w3xnj31j61wq30sp5pnna8wav6gyjqjfmb"; depends=[survival]; };
   NAEPprimer = derive2 { name="NAEPprimer"; version="1.0.1"; sha256="19p1livdnayfcl88f8r9x1vg30x522q8lgx66pfgwpkxjzvrqa2l"; depends=[]; };
-  NAM = derive2 { name="NAM"; version="1.6.1"; sha256="1cyi5vc2ppwfd7bixm21cyy4z9alcx2dz316zgwnc5n3jy0wdb81"; depends=[randomForest Rcpp]; };
+  NAM = derive2 { name="NAM"; version="1.6.4"; sha256="0b5dcjcn8qg9lmjfr33n8y0c67iv2yvqk0wascl71hgphqrcypm4"; depends=[randomForest Rcpp]; };
   NAPPA = derive2 { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[NanoStringNorm plyr]; };
   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=[]; };
   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="2.0"; sha256="08951mmmpziljclwzmbni1s5a62wr9s80iyfsr07gkdz4sx3cvqf"; depends=[gplots KernSmooth quantreg sfa]; };
+  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]; };
   NCutYX = derive2 { name="NCutYX"; version="0.1.0"; sha256="0r2ghnvrbya3p1d8rb5bsnz5v852vvc6rq65yafn2xzr7886wrg2"; depends=[fields glmnet MASS mvtnorm Rcpp RcppEigen]; };
@@ -2272,16 +2378,16 @@ in with self; {
   NHANES = derive2 { name="NHANES"; version="2.1.0"; sha256="0aphv3rakfcfrv2km1xyxpj1bxiazy6gwrvs7lyhxmq468fk4c9a"; depends=[]; };
   NHEMOtree = derive2 { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[emoa partykit rpart sets]; };
   NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; };
-  NHMSAR = derive2 { name="NHMSAR"; version="1.7"; sha256="14jc0zfl39yn7vkprcnv80mk1i4vp8w4wk7nz6f34cf473xbf49d"; depends=[caTools glasso lars ncvreg ucminf]; };
-  NHPoisson = derive2 { name="NHPoisson"; version="3.1"; sha256="1gr682kxgw227yqw9w0iw9lrijsz5iszhnfk0mdhi6m1w9s28kcn"; depends=[car]; };
+  NHMSAR = derive2 { name="NHMSAR"; version="1.12"; sha256="034cjzbwyf5jkj24wf9s6dij7g416psd2iz7fjrg34q9ax2kzyyl"; depends=[glasso lars ncvreg ucminf]; };
+  NHPoisson = derive2 { name="NHPoisson"; version="3.2"; sha256="0k6m6ampp7g95d0jm5msvrgc12rqirpanb1ykbdf1ii027pqpwsn"; depends=[car]; };
   NIPTeR = derive2 { name="NIPTeR"; version="1.0.2"; sha256="0ll6amqyw33a93xiccihidrnbaqlx1q7kqcd4wks7cvqawd8pgv1"; depends=[Rsamtools S4Vectors sets]; };
   NIRStat = derive2 { name="NIRStat"; version="1.0"; sha256="1hi8201zslp1f7m3jci8q03y3f1zlcck2x3i793l7lsyl7qbzd1z"; depends=[ggplot2 gridExtra mgcv]; };
   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.0"; sha256="0cqs48jy9ydivjpmx76dyxxdhh3lww7qrmx5s8jcsxxxnn93lq8m"; depends=[checkmate dplyr fasterize purrr RandomFields raster sf spatstat tibble]; };
-  NLP = derive2 { name="NLP"; version="0.1-11"; sha256="15v50gxzmpqx49wzkwxfpb5xjpg9y829a0ifys372kf1cfj521aq"; depends=[]; };
-  NLPutils = derive2 { name="NLPutils"; version="0.0-4"; sha256="1dqbf8xmrzx81ybmp5qkd5a5rw3c19l2wxfnpddij4a1n074bwym"; depends=[NLP qdap SnowballC]; };
+  NLMR = derive2 { name="NLMR"; version="0.3.2"; sha256="09z0spxr8wh06qmbnypqll87fhv9i0vyamqv26dcdhhrhgmidg56"; depends=[checkmate dplyr fasterize RandomFields raster 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=[]; };
   NMF = derive2 { name="NMF"; version="0.21.0"; sha256="1qq25n3k5sgh3srlshb3ic6q92s12c1ilqf5cd5anvq6cqfchc1v"; depends=[cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; };
   NMFN = derive2 { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; };
@@ -2296,21 +2402,22 @@ 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]; };
-  NPBayesImpute = derive2 { name="NPBayesImpute"; version="0.6"; sha256="09cs6nj1pw4wv4w8bd1c4rilidzx12ymjzah9d0c412bwv0gmdyl"; 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]; };
-  NPMLEcmprsk = derive2 { name="NPMLEcmprsk"; version="2.1"; sha256="1v15ylgflbdr03pgh55fan1l6mymd1d5n6h9jhbcqahjlcsxkwq3"; depends=[]; };
+  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=[]; };
   NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; };
   NPflow = derive2 { name="NPflow"; version="0.13.1"; sha256="0sq47frh665m8mibif1w3i2z5pb577v1ngdjirbya0a9chpmwc3s"; depends=[ellipse fastcluster ggplot2 gplots pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; };
   NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; };
+  NRejections = derive2 { name="NRejections"; version="1.0.0"; sha256="103cs5hlqqk4s5h63lmrqdvajgxwy6ffn3mvy0ayd0n0arppr9ry"; depends=[doParallel foreach matrixcalc mvtnorm StepwiseTest]; };
   NSA = derive2 { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[aroma_affymetrix aroma_core DNAcopy MASS matrixStats R_methodsS3 R_oo R_utils]; };
   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=[]; };
+  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=[]; };
   NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.2.1"; sha256="05r1hvrxwi2mcq3pv6b699291qg120ijad96s5dah2f6cwx7gm7j"; depends=[gdata vsn XML]; };
@@ -2324,33 +2431,37 @@ in with self; {
   NetComp = derive2 { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; };
   NetData = derive2 { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; };
   NetIndices = derive2 { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; };
-  NetLogoR = derive2 { name="NetLogoR"; version="0.3.3"; sha256="1msln8k3rllsb414c35pw90bral039vijjrfhd7xzk9267jcv7vk"; depends=[abind car CircStats data_table Hmisc matrixStats plyr quickPlot raster rgeos sp SpaDES_tools]; };
+  NetLogoR = derive2 { name="NetLogoR"; version="0.3.4"; sha256="0vsbd650mfqwqqhsd1h92yfwc3rrirr2m29ffv8a9cwppmhkmfqp"; depends=[abind car CircStats data_table Hmisc matrixStats plyr quickPlot raster rgeos sp SpaDES_tools]; };
   NetOrigin = derive2 { name="NetOrigin"; version="1.0-3"; sha256="162dhyx7z1nd3z14lfvm3dz0qwwvrc3n17zswbnwcfj6g1b1p2f1"; depends=[colorspace Hmisc igraph]; };
   NetPreProc = derive2 { name="NetPreProc"; version="1.1"; sha256="0r51dqymf2nqm86py4zwdlf7qf120j0bg9r6a9c0gsyyijh4z40p"; depends=[graph]; };
   NetRep = derive2 { name="NetRep"; version="1.2.1"; sha256="0adlnq22nslp8ildbrf0z26783kzgz4cyn45a981qyjbw4c42hin"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo RhpcBLASctl statmod]; };
   NetSwan = derive2 { name="NetSwan"; version="0.1"; sha256="1mwdy3ahagiifj2bd1ajrafvnxzi74a1x1d3i2laf1hqpz3fbgld"; depends=[igraph]; };
   NetWeaver = derive2 { name="NetWeaver"; version="0.0.2"; sha256="0wsmz7db8q2fycz6rfbbfs67ccj857y9zs4d80k1gnqazgj5whkn"; depends=[]; };
-  NetworkChange = derive2 { name="NetworkChange"; version="0.3"; sha256="1brpa6fhmrgafmk1iw19g0pppwxi0ld0nyhx9c0fgnkn9m82isjk"; depends=[abind ggplot2 ggvis LaplacesDemon MASS MCMCpack mvtnorm RColorBrewer Rmpfr]; };
+  NetworkChange = derive2 { name="NetworkChange"; version="0.4"; sha256="0vl0w7f34fxh32gi521hzyd0a47q7l9fyn53d1g5bsl5w5l9bym1"; depends=[abind ggplot2 ggvis LaplacesDemon MASS MCMCpack mvtnorm plyr RColorBrewer Rmpfr tidyr]; };
   NetworkComparisonTest = derive2 { name="NetworkComparisonTest"; version="2.0.1"; sha256="09fqlnpdibf9jr5mw2pzmwi66f6cjz8rmm8jay0cv2bami7jhy2a"; depends=[IsingFit IsingSampler qgraph reshape2]; };
-  NetworkDistance = derive2 { name="NetworkDistance"; version="0.1.0"; sha256="0k11crn1wiisw4qrc2yidrhdvscx59skqy4ckxdiykpb1jh5a7s4"; depends=[doParallel foreach igraph Matrix network Rcpp RcppArmadillo Rdpack RSpectra]; };
+  NetworkDistance = derive2 { name="NetworkDistance"; version="0.3.0"; sha256="1s406jj0hg7aijacwcvp5li5lvdsiiba2vg5qmkdlgmvxw8zb3q8"; depends=[doParallel foreach igraph Matrix network pracma Rcpp RcppArmadillo Rdpack RSpectra]; };
   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.1.2"; sha256="1wgiwbackqwdis1mw3nyrv3wgi8c8s49cl16f8l46yn7763nkskf"; depends=[corrplot doSNOW fdrtool foreach igraph IsingFit MASS Matrix ppcor psych pwr qgraph R_matlab]; };
-  NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.1"; sha256="1dsjv0vm45skw74x1fz3gd7g6p52ayfwz85bh92j29mfxbnacbnn"; depends=[ggplot2 nnet reshape2 scales tidyr]; };
+  NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.2.1"; sha256="08a2kk8gmgawr18n38z95imaf82lp453b8dam3nn1hsa3abl5c95"; 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]; };
   Nippon = derive2 { name="Nippon"; version="0.7.1"; sha256="1nw0kaqw5my2bx7i82q4j2qlsmc95kgjnbm9r9np3swhq6wizrmq"; depends=[stringr]; };
   NipponMap = derive2 { name="NipponMap"; version="0.2"; sha256="0jk3zz05vhximbbm15h7ngb0ffxp5w8zhisifipkdgvg1hpi7pb7"; depends=[sf tibble]; };
+  NitrogenUptake2016 = derive2 { name="NitrogenUptake2016"; version="0.2.3"; sha256="13mh63z3x8yqd31v5a4d10bhzk4y67ac38flwk2msv7qcx37sny6"; depends=[car MASS zoo]; };
   NlcOptim = derive2 { name="NlcOptim"; version="0.5"; sha256="0chrf9ac3x1a0b86lf6wjzdsjcv5n08rav88b7xf4c31lflf1rd1"; depends=[MASS quadprog]; };
-  NlinTS = derive2 { name="NlinTS"; version="1.3.2"; sha256="1isr6ci6dsbbx804y3hc8aqvhggfs7ix5yiz32dby69i85b6lj5a"; depends=[Rcpp Rdpack timeSeries]; };
+  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]; };
   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.3"; sha256="14wvr17p0dza11p97vmjcn27l73vmw5ms3gbrgxcxm33ybwya63n"; depends=[]; };
+  NonCompart = derive2 { name="NonCompart"; version="0.4.4"; sha256="0m62jwp572z7gn4rykyr47b6cfi4sy9hxxghhlkjdclkxw7bjxx9"; depends=[]; };
   NonpModelCheck = derive2 { name="NonpModelCheck"; version="3.0"; sha256="13qk2wbgpdf763q5xg29p2hxwqpml23pcgxrzmx12vnapnqfh71k"; depends=[dr]; };
-  Nonpareil = derive2 { name="Nonpareil"; version="3.3.1"; sha256="0ldl90h499wwm992cj71phf3ryqvjnq0ygarcxf7h85krr4j3sx2"; depends=[]; };
+  Nonpareil = derive2 { name="Nonpareil"; version="3.3.3"; sha256="02w4qxgg3snl32p41c4vg5ip7pmqcn0k3c753k5mvz41ln821sj5"; depends=[]; };
   NormExpression = derive2 { name="NormExpression"; version="0.1.0"; sha256="1j4q8mb70ig40acfd9kfy12vxdvq3qpf53rxh47kkw8mywnd0449"; depends=[]; };
   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]; };
   NormalizeMets = derive2 { name="NormalizeMets"; version="0.25"; sha256="0hnyr2aklibbvs6b6q4l0zbb9g8qmp2ds4lqic8a9alqn66sfnf2"; depends=[AUC crmn e1071 GGally ggplot2 htmlwidgets impute knitr limma plotly rmarkdown]; };
@@ -2371,10 +2482,9 @@ in with self; {
   OGI = derive2 { name="OGI"; version="1.0.0"; sha256="0qw55jamkvdf3vfa5c0ygbymbs4d9q15dihiqz691hdfnyjvc2mk"; depends=[lpSolve]; };
   OHPL = derive2 { name="OHPL"; version="1.3"; sha256="0hm229nyv96s3sjljn5rwh89g1n6wsf24qm3ll5ccb0q2pcwnd7r"; depends=[glmnet mvtnorm pls]; };
   OIdata = derive2 { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[maps RCurl]; };
-  OIsurv = derive2 { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[KMsurv survival]; };
   OLScurve = derive2 { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; };
   ONETr = derive2 { name="ONETr"; version="1.0.3"; sha256="14l56qcmyyk2ivcfkfv7j2k4i1mfrngpi9zcc88w6xfhz5qlb548"; depends=[plyr RCurl XML]; };
-  OOBCurve = derive2 { name="OOBCurve"; version="0.2"; sha256="1dr2mp2wi2dir1h5w3rw17154byfy3gx02x2kz1r67l9dfgrr505"; depends=[mlr randomForest ranger]; };
+  OOBCurve = derive2 { name="OOBCurve"; version="0.3"; sha256="1i7prybs3b60ipl34zrq6mcr6w9kc1d44b14mxcd752k42k6xs2r"; depends=[mlr randomForest ranger]; };
   OOR = derive2 { name="OOR"; version="0.1.2"; sha256="1zw7g0365znyn828qqsn83l2a837wwj9cx7dzcbns28vhqmsn6hm"; depends=[]; };
   OOmisc = derive2 { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; };
   OPDOE = derive2 { name="OPDOE"; version="1.0-10"; sha256="04z944i4f3i0cjnxh32wf7n2dfyynnvkz4lxdkn90flam2np58yv"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; };
@@ -2385,6 +2495,7 @@ 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=[]; };
   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]; };
@@ -2397,10 +2508,11 @@ in with self; {
   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-9"; sha256="12a7zfrk3rdvfby5qa511w3nk5jpnsd5gg2z46b5s97rxb3qq7za"; depends=[ICS ICSNP Rcpp]; };
+  OjaNP = derive2 { name="OjaNP"; version="0.9-10"; sha256="1kljbnwky6b9d6sakarhw6ckrjbrpw117d81ykgl5z7l4p6cvvsh"; 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]; };
+  Omisc = derive2 { name="Omisc"; version="0.1.0"; sha256="1dii0hr9sbza0vgxqgr3mzsbmx8b5189x9qi4is8zkn5nsl78pk8"; depends=[MASS psych]; };
   OnAge = derive2 { name="OnAge"; version="1.0.1"; sha256="1zby5sf92c185b5m19jv4ndgbv6mz107nc47zn1d6bijrypzpc20"; depends=[]; };
   Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; };
   OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="1.0.3"; sha256="0q8g33s1jq0ipvwq83xhrly8idsh68licgyivxc628zbm1id5p38"; depends=[Rcpp]; };
@@ -2409,13 +2521,14 @@ 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.0.8"; sha256="1j7p1wrzznrisbzw8j1qsxyyv3zr5hk6q9yxw97y6lrfh3c26ig1"; depends=[jpeg png Rcpp RcppArmadillo shiny tiff]; };
+  OpenImageR = derive2 { name="OpenImageR"; version="1.1.1"; sha256="0g2s3qgzbfmz89qiybflzqxsx60n9rr3718vg155hg117xnchr5c"; 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.9.9"; sha256="02p125r83r63zjysd94s1wvmxp1gh38dpqs3r8ly5qzdx5jzk5yf"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
+  OpenMx = derive2 { name="OpenMx"; version="2.11.5"; sha256="19vsy1dc25jix0jxysdwbgsv0d8yv1p62jzvv8zvrwapk0rfyy0z"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
   OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.12"; sha256="02p9b2y99z9yrrm2pl86p0yqwah0yjic2wdcd4k0mhccimmmkaip"; depends=[abind colorspace GPArotation openxlsx plyr psych pvclust rgl stringr XML]; };
   OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.3"; sha256="099vdyq0vw9xl5v7zggdb8yd4zl7x8imvvbj5j2f5hrspgg131pz"; depends=[ggplot2 raster rgdal rJava sp]; };
   Opportunistic = derive2 { name="Opportunistic"; version="1.2"; sha256="0kaj11ziij1v65l972x4kbr7vzkx4dwa27ymabiip4dg57a976wr"; depends=[]; };
+  Opt5PL = derive2 { name="Opt5PL"; version="0.1.1"; sha256="0v3ibfzmkfnkhxylhaqcd3yqygsk7027ga12vb6gj4h4zcccf17f"; depends=[matrixcalc Rcpp]; };
   OptGS = derive2 { name="OptGS"; version="1.1.1"; sha256="1acwwjng5ri5vganv7b5pagp7524ifr0q8h1pbfb5g6z3x6w08kh"; depends=[]; };
   OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; };
   OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; };
@@ -2442,9 +2555,9 @@ in with self; {
   OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; };
   OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; };
   P2C2M = derive2 { name="P2C2M"; version="0.7.6"; sha256="07ycl22v03b2xdaw4v0l6layqhab431ma38qywzm96hkl3ywvl49"; depends=[ape ggplot2 rPython stringr]; };
-  PAC = derive2 { name="PAC"; version="1.0.10"; sha256="0cr34vjd6dr5jkbv1hhd7ln35ih8h62fmz2q8h2plbxaww88zcjf"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; };
+  PAC = derive2 { name="PAC"; version="1.1.0"; sha256="03xwrnb540487xmai34mgjvwi67szp03vmczv0aq410m6g08p5m9"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; };
   PACBO = derive2 { name="PACBO"; version="0.1.0"; sha256="1v3j5bgvf0wh8s4d2yyz0fkc3acdwjlicwnbh1r241b1742x79cb"; depends=[mnormt]; };
-  PAFit = derive2 { name="PAFit"; version="1.0.0.4"; sha256="178hxn376q911kc6nsbkbgi7s26nhw5clzv7iiq6c7ns6dg7npr7"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; };
+  PAFit = derive2 { name="PAFit"; version="1.0.0.7"; sha256="0yr5d7286c6k885lrh5445q5vwsl1nkgag2zwixyavk606nr5ldm"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; };
   PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
   PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; };
   PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; };
@@ -2461,6 +2574,7 @@ in with self; {
   PBIBD = derive2 { name="PBIBD"; version="1.3"; sha256="0zh73bsiwmsqw1vhs2dazndsf0894kfv3vfv88wr4fnh7njysz6r"; depends=[]; };
   PBImisc = derive2 { name="PBImisc"; version="1.0"; sha256="18gjp66q6l0w6vsgm6d5sjgpa906z1gyyp6yf58lq5vyg1bnfmcl"; depends=[lme4 Matrix]; };
   PBNPA = derive2 { name="PBNPA"; version="0.0.3"; sha256="1wmgcmspilfv6pjy7696j2xmq8m41p27plnr1qr0fnzyz66pf37m"; depends=[metaRNASeq]; };
+  PBRF = derive2 { name="PBRF"; version="1.0.0"; sha256="1ibwywgbxnxcb3z2kl2bgh7fz512nhgy2zcdym67asp76c6rkqg6"; depends=[]; };
   PBSadmb = derive2 { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; };
   PBSddesolve = derive2 { name="PBSddesolve"; version="1.12.2"; sha256="12pl95mcak88524s8zvk9dzib2g40fwaz6iz7igx9wg6vib9d1sj"; depends=[]; };
   PBSmapping = derive2 { name="PBSmapping"; version="2.70.5"; sha256="15h28lb0zriaf4020l3a069plrklbvbg5x231r5fqflshj6v8a9f"; depends=[]; };
@@ -2477,27 +2591,30 @@ in with self; {
   PCIT = derive2 { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; };
   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-1"; sha256="0pirra4fx2s4ks34ng7fc2vjcmzym3ffpld901glf8hppycsgf6c"; depends=[bcp caret changepoint chipPCR ecp fda_usc FFTrees magrittr MBmca pbapply plotly pracma qpcR randomForest robustbase testthat visdat zoo]; };
+  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=[]; };
   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]; };
   PEMM = derive2 { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; };
   PET = derive2 { name="PET"; version="0.5.1"; sha256="1gdq7ai8hgl9h53b72j7sfk09l7yr2b84pdy9bl1z3x8zxbsp8br"; depends=[adimpro]; };
   PGEE = derive2 { name="PGEE"; version="1.5"; sha256="1qcxbqnbpplnfjy83nm9fj9y4abzgbxnsggzx7ix3vb9qs18cdwh"; depends=[MASS mvtnorm]; };
   PGM2 = derive2 { name="PGM2"; version="1.0-1"; sha256="03282pcq7gw47awc2mxjsbz6w3zpqjhqd7fzg8la4p00cd0vvmr4"; depends=[]; };
   PGRdup = derive2 { name="PGRdup"; version="0.2.3.3"; sha256="1s0v44922zpxl3w9kzn9xzvs5jldg35gjrnlf89f89i3rs59gg98"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; };
   PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; };
+  PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.0.8"; sha256="0ihsll6lkmg152z0r4gcckkz4f8j2vhrdiy6c7j6s4dk84s0nfcp"; depends=[dplyr rlang]; };
   PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.10"; sha256="17q760k5519alr2skvpnghz3c9jgw07lh5fpw4xf6hjk3qlqq82c"; depends=[]; };
-  PHeval = derive2 { name="PHeval"; version="0.5.3"; sha256="1zq4ks6w5vrhy1f170fv16zgrgi1lfxmkpfkg75sjin7asw4i7a9"; depends=[survival]; };
+  PHeval = derive2 { name="PHeval"; version="0.5.4"; sha256="06fy5dm4mnp29f01163rw1d1hyl7rlcp4pfw18s87ckpr931qyma"; depends=[survival]; };
   PIGE = derive2 { name="PIGE"; version="1.1"; sha256="0pc24rvvxzpgrsx7xsj98n5vd462hjggakzwp36qdkib69yyr4bn"; depends=[ARTP snowfall survival xtable]; };
   PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; };
-  PINSPlus = derive2 { name="PINSPlus"; version="1.0.1"; sha256="02yxv1x06p6vr50g4amj4wwjlk04wadic74d1wpkxxg69zpv35lz"; depends=[cluster doParallel entropy foreach pbmcapply]; };
+  PINSPlus = derive2 { name="PINSPlus"; version="1.0.2"; sha256="0awwrrrs6vfdprlc91116qa1jsqwizf7xwhwygsi2wqx9qhsxk96"; depends=[cluster doParallel entropy foreach pbmcapply]; };
   PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
   PK = derive2 { name="PK"; version="1.3-4"; sha256="1zkjq64p34gzbsbmbdqphssnplzz65wpl486qf4yhawnb4wnkj1v"; depends=[]; };
   PKI = derive2 { name="PKI"; version="0.1-5.1"; sha256="1xs3jxbczhkxnp7cyw2yh1jcwha92y9pdsbka1ligbla70bnvxyj"; depends=[base64enc]; };
@@ -2514,40 +2631,42 @@ 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.2.0"; sha256="13gn16k6gg7fv9rjx5bf6q3zfx3499s52m5k59n053nr4i5d8215"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; };
-  PMmisc = derive2 { name="PMmisc"; version="0.1.0"; sha256="12nw64x88cb1amqgdpcdmkiwcg3vs3kdlxlz0kw7frwgaw3l0l06"; depends=[robust]; };
-  PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.4.1.1"; sha256="038xylgq3mp1nl5rf11swprv08khvzfw0jg5bmd0yvqmygr082jq"; depends=[dplyr magrittr RCurl readr readxl survey timeDate]; };
+  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]; };
+  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]; };
   POET = derive2 { name="POET"; version="2.0"; sha256="0w3jhj45sxisyrpcsazbrbcsz7rmraw71jjm0zixbcgc4klb98ar"; depends=[]; };
   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=[]; };
   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.2"; sha256="1k6kbln0h1wkzg594k1db6r3nk5dqwhg8gm1hgval05dsdhp8j8b"; depends=[rARPACK]; };
+  PPCI = derive2 { name="PPCI"; version="0.1.4"; sha256="18q9jjmmmmghwyzpj42k7xa55anvbg1jnqs2y6c5jzlb2cw3ga4h"; depends=[rARPACK]; };
   PPQplan = derive2 { name="PPQplan"; version="0.1.0"; sha256="06v4agq8bd3ssbfnl1jyfzy5xi4jwj6wqfmj9qalrv9kllh839mv"; depends=[ggplot2 plotly tolerance]; };
   PPforest = derive2 { name="PPforest"; version="0.1.1"; sha256="0iplbw5b2vhqbp6gc123ykzmilwa80akljkv3jzfmi90ckm4k08m"; depends=[doParallel dplyr magrittr plyr Rcpp RcppArmadillo tidyr]; };
   PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
   PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.3"; sha256="1x5rcls49jz19y3h98n2k4kypm8mv8p586clhdj62bvp2nl8wg3x"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; };
-  PQLseq = derive2 { name="PQLseq"; version="1.0"; sha256="1r4zxwb3rw7k9jixv1wqkgdq5zjlwf85xrc0np8j96k1gdwals72"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; };
+  PQLseq = derive2 { name="PQLseq"; version="1.1"; sha256="1h8baf0apxvimarr2qwlh6pdzv88ib1dzw927swsyimjg44wjbfc"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; };
   PRIMME = derive2 { name="PRIMME"; version="2.2-0"; sha256="1iwwh871v87fz6j6q9nvfiq8x8nz2v87n52l80a15d5rvvxv2rbi"; depends=[Matrix Rcpp]; };
-  PRIMsrc = derive2 { name="PRIMsrc"; version="0.7.5"; sha256="12wfb4p8ra1b8xwq42350cxl2fy9gsrp5m7inyxnh31vplgripy9"; depends=[glmnet Hmisc quantreg superpc survival]; };
+  PRIMsrc = derive2 { name="PRIMsrc"; version="0.8.2"; sha256="04g1saf511xs26m1iv9xfsmfs15fdfaxh5qlbay2mcb198270pd8"; depends=[glmnet Hmisc quantreg superpc survival]; };
   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.1"; sha256="1qk9cljk52m8rcasck8cl7gwzhcsx0p58jn31izy2j027w0rns7j"; depends=[DiagrammeR]; };
+  PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.0.4"; sha256="0rsffbmaaqa6zkgh7bg1l91xfk8ri7b1w6ghid44xvj3k22y0kj6"; depends=[DiagrammeR]; };
   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.0"; sha256="0aib10kalc8y1vdkbd8ipdkg9wyb984pwf979fm8d6jjbdhp0sa7"; depends=[ald BH cluster data_table gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; };
+  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]; };
   PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
-  PSCBS = derive2 { name="PSCBS"; version="0.63.0"; sha256="0pgha1rvb9nfxkr8fxc17zgws781qwmrl01rss7bd0sf2n2lw2k2"; depends=[DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; };
+  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]; };
   PSIMEX = derive2 { name="PSIMEX"; version="1.1"; sha256="0cndzasvg4y49incyd9nfz8y3z88ywbc7xk0zzjir665pv2xn23b"; depends=[knitr MCMCglmm pedigree plotrix]; };
   PSLM2015 = derive2 { name="PSLM2015"; version="0.2.0"; sha256="1f8kzlqil2ac8a9fbj9fhdni2narh2yaaz044mlx7gsv2ns3ai19"; depends=[dplyr ggplot2 magrittr]; };
   PSM = derive2 { name="PSM"; version="0.8-12"; sha256="0h83b7bhslgnrq4442464i9iil6gjhw3pwxvgz5313pfk2km30vg"; depends=[deSolve MASS numDeriv ucminf]; };
-  PSPManalysis = derive2 { name="PSPManalysis"; version="0.2.0"; sha256="0vya2zlsmgf6zmkk9k9aaaqkx7qprknl0wazqlqd7zdp8z0zj39j"; depends=[devtools]; };
+  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]; };
   PSW = derive2 { name="PSW"; version="1.1-3"; sha256="0ahm7rp795d7j88n15b3q0gl573p3g0krc7jd1zv87g4bsdc9b5x"; depends=[gtools Hmisc]; };
@@ -2558,11 +2677,11 @@ in with self; {
   PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; };
   PVR = derive2 { name="PVR"; version="0.3"; sha256="0pcnazkiwmicr3k6k70r8skqk0pd46fcqhhxghawxjs4slgnygkj"; depends=[ape MASS splancs]; };
   PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; };
-  PWEALL = derive2 { name="PWEALL"; version="1.2.1"; sha256="08a7ih9yyp0dqw89n1qhwbxhgiks91c3wjbaz08b6ck6cv6gzy6k"; depends=[survival]; };
-  PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.0.20"; sha256="0g15ib0zks6q7swpd9s5zyl3sp83r54959ckvc88wn19bmn8dj9l"; depends=[cluster dplyr dygraphs futile_logger ggmap httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaSpatialUtils openair png raster RColorBrewer readr reshape2 rgdal RgoogleMaps sp stringr xts zoo]; };
+  PWEALL = derive2 { name="PWEALL"; version="1.3.0"; sha256="0nb0v6wvj9ay90qcbrr9drg2g84fb7a9m78pzb69wp8789i8ixhk"; depends=[survival]; };
+  PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.1.3"; sha256="0wybb5ygcvz5w2sl26rwm7hg6681lzcyr5v1nl7lb72z565f1wqw"; depends=[cluster dplyr dygraphs futile_logger ggmap httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaSpatialUtils openair png raster RColorBrewer readr reshape2 rgdal RgoogleMaps rlang sp stringr tibble tidyr xts]; };
   PabonLasso = derive2 { name="PabonLasso"; version="1.0"; sha256="158xg9i13nqy1bnpch8r6a7yas01hsdidmcypgccmyh7d7l52mr1"; depends=[]; };
   Pade = derive2 { name="Pade"; version="0.1-4"; sha256="1kx5qpxd3x43bmyhk8g2af44hz3prhnrzrm571kfjmak63kym741"; depends=[]; };
-  PairViz = derive2 { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[graph gtools TSP]; };
+  PairViz = derive2 { name="PairViz"; version="1.3.2"; sha256="01nzf7as848i3vpwgdm450x3f5lapfh2vgd59sy6qr80c19nfjl9"; depends=[graph gtools TSP]; };
   PairedData = derive2 { name="PairedData"; version="1.1.1"; sha256="07y5fd4fkwfp0lbacf41ya8cn7x4n1haxl0cln9iibjffc1mbr5q"; depends=[ggplot2 gld lattice MASS mvtnorm]; };
   PairwiseD = derive2 { name="PairwiseD"; version="0.9.62"; sha256="19qjms99gf7s39nwwgj56n8426d0gw80dipz165sk3km4zb2mcwv"; depends=[openxlsx xlsx]; };
   PakPC2017 = derive2 { name="PakPC2017"; version="1.0.0"; sha256="196jvhv7pv4pvnnz9izk6icxv3aml26mif0w6g4907izyszf8cal"; depends=[dplyr magrittr]; };
@@ -2575,7 +2694,7 @@ in with self; {
   Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
   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.0"; sha256="16mwfylpk7r6cy87vb1d1h8mkwn32cmygpqvy5kk538lj9b8jcdl"; depends=[jsonlite snow XML]; };
+  ParallelLogger = derive2 { name="ParallelLogger"; version="1.0.1"; sha256="01wb7rqlyp07ahcr4gs0jh92z56v9dsgkbp18y2xdnl7z533fjbh"; depends=[jsonlite snow XML]; };
   ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; };
   ParallelTree = derive2 { name="ParallelTree"; version="0.1.2"; sha256="0x99x1iycx8ik8cih972awnxifvmhbrmjrf2csmnn9fw4rsqn0p5"; depends=[ggplot2]; };
   ParamHelpers = derive2 { name="ParamHelpers"; version="1.11"; sha256="181p2r4zh53v6hjdr8fn7m1g65rl4svql8h1zjz25y1chk0g850n"; depends=[backports BBmisc checkmate fastmatch]; };
@@ -2589,18 +2708,18 @@ in with self; {
   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=[]; };
-  PeakSegJoint = derive2 { name="PeakSegJoint"; version="2017.08.11"; sha256="1xp0gxdwsy6z06kbfg5ca2qm0kwva8scxbg22km20cikwpgdi6rm"; depends=[data_table PeakError penaltyLearning]; };
+  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=[]; };
   PearsonDS = derive2 { name="PearsonDS"; version="1.1"; sha256="0rqh9ji0bah3n1c6fcg7krgqs65qla9p3xrnc4jr7va6ph104im9"; depends=[]; };
   PearsonICA = derive2 { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; };
   PedCNV = derive2 { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; };
-  PeerPerformance = derive2 { name="PeerPerformance"; version="2.1.2"; sha256="07as5csvrlr3a55miadhbcvjrjag7g69wxmb8z7rpipppa8f9q7y"; depends=[lmtest sandwich snow]; };
+  PeerPerformance = derive2 { name="PeerPerformance"; version="2.2.1"; sha256="1igh8svdbxkcfgi2s70cpwdcy7jb4yhxias80vck203skyiq97vx"; depends=[lmtest sandwich]; };
   PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.1"; sha256="0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7"; depends=[Matrix Rcpp RcppArmadillo survival]; };
   PepPrep = derive2 { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[biomaRt stringr]; };
   PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; };
   Peptides = derive2 { name="Peptides"; version="2.4"; sha256="1i5p0z4zhis4p1czwz3cryr64lys4dp2fddnmmasgspl8fyz8p05"; depends=[Rcpp]; };
-  PerFit = derive2 { name="PerFit"; version="1.4.2"; sha256="147f2fbcjb0639h0bmiikli05r3jlbp559hj9v9af3s09l1l6v8y"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
+  PerFit = derive2 { name="PerFit"; version="1.4.3"; sha256="0qmh78wrx3vzz41z30db3bb62n325blphjhpzdzykfx77gr8plyr"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
   PerMallows = derive2 { name="PerMallows"; version="1.13"; sha256="0ny2vc8f0npixaw1kp2d93xr4g46nsg8jjwvi6afv9xjvaz0i6wy"; depends=[Rcpp]; };
   Perc = derive2 { name="Perc"; version="0.1.2"; sha256="0p6l4b536jjz4lmgsdrxqsh77lx4vkb6hbyd6vhbc102m5x3b1yc"; depends=[]; };
   PerfMeas = derive2 { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[graph limma RBGL]; };
@@ -2611,18 +2730,20 @@ in with self; {
   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.5"; sha256="05yvzx0sf6dq47nr5bk1kd2icndf20z39y9fj90zqdm3ay2hi586"; depends=[Rcpp RcppArmadillo survival]; };
+  Phase123 = derive2 { name="Phase123"; version="1.8"; sha256="0n3prfbsav36an13q5bkxprchqf7i8m1mv1nivkcqxngiah8z1md"; depends=[Rcpp RcppArmadillo survival]; };
   PhaseType = derive2 { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
-  PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.2.2"; sha256="1mr4jq44ijdiabp3simfjh9zcl9anp1w0dili6w5sq8dzgids8gj"; depends=[data_table dplyr ggplot2 mvtnorm optparse R_utils Rcpp reshape2 snpStats zoo]; };
+  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]; };
   PhyInformR = derive2 { name="PhyInformR"; version="1.0"; sha256="10d720ww909b1xmdrms554pnn0757nzppnrniar4n157mh0qw7ms"; depends=[ape doParallel foreach geiger ggplot2 gplots gridExtra hexbin iterators PBSmodelling phytools RColorBrewer]; };
+  PhySortR = derive2 { name="PhySortR"; version="1.0.8"; sha256="19426xjdii74qds0wmq5sa88zys81nyqb9lvf9pfihbjgrjr770a"; depends=[ape phytools]; };
   PhyloMeasures = derive2 { name="PhyloMeasures"; version="2.1"; sha256="01axs78s10y1bkx8dbs9vvnphdzik7hpibkwyib1x9mznmyg90hr"; depends=[ape]; };
-  PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.1.0"; sha256="0ji78zx0gp1nd5assrmwxdkxryfjijnn9g34w2g2qv32s1fdj6ak"; depends=[ape capushe foreach glmnet grplasso LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; };
+  PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.2.1"; sha256="0mrlyaj15y1dzlnn13phjq64immad08wn99sv9zdixf7ybdvwwnv"; depends=[ape capushe foreach gglasso glmnet LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; };
   PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.0"; sha256="0gmqh700cf6aiagb45iyyf85pgp3b86fx7fbv9lrsm4mda0r8h75"; depends=[chron lubridate stringr]; };
   PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.2-2"; sha256="14z6plgwyr46vs9m997rvlz8sdglfs9g087an8668zqkzzs2w4ln"; depends=[]; };
   PieceExpIntensity = derive2 { name="PieceExpIntensity"; version="1.0.4"; sha256="023hq0gg1vi0j3yf8p5lisgs8wfp5qwyd4akxxzx7wad2985gxb3"; depends=[Rcpp RcppArmadillo]; };
   Pijavski = derive2 { name="Pijavski"; version="1.0"; sha256="1027lmmk17br9zxah980j6l3k2p92065bwigw6gpy9g0g5jjl4f1"; depends=[Rcpp]; };
   PivotalR = derive2 { name="PivotalR"; version="0.1.18.3"; sha256="14l7y57zmfr7h4bq01j83am2plxx320kkhbsh0x2ypif9dni4rf2"; depends=[Matrix]; };
+  PkgsFromFiles = derive2 { name="PkgsFromFiles"; version="0.5"; sha256="1fbvnlw6hxg6zndyrssiw5yyp6hz3ln985by3vwp34sfwdcwjakl"; depends=[curl dplyr readr stringdist stringr XML]; };
   PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-3"; sha256="1w2ihclnh3x83ip4hh95bchv5j832cqy6n140q5q1dbfz6fy1bxv"; depends=[igraph MASS Matrix partykit psychotools psychotree qvcalc rARPACK sandwich]; };
   Planesmuestra = derive2 { name="Planesmuestra"; version="0.1"; sha256="0v7l4hrfckcf7zmk0ihq2ij0qli7x12j17vd6752d1yjk27fgk57"; depends=[]; };
   PlasmaMutationDetector = derive2 { name="PlasmaMutationDetector"; version="1.7.2"; sha256="0qra7q2pzw212qylyrfhv6zjcsldfw84b93cari0qjqnw4gyfph2"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
@@ -2648,7 +2769,7 @@ in with self; {
   PolynomF = derive2 { name="PolynomF"; version="1.0-2"; sha256="0zczryvjykr7yifb5isvys2mzgi0yj92j3p3xixn2qzzq9cr0h9a"; depends=[]; };
   Pomic = derive2 { name="Pomic"; version="1.0.4"; sha256="0xy5fgimbgqqac3n7akhwyvnrvd9fpvx9h8nk4spxrxc8x0km1w7"; depends=[]; };
   PooledMeanGroup = derive2 { name="PooledMeanGroup"; version="1.0"; sha256="0i9s7qskjnji3mf6clsi69rnni57v8cysgr9gh3hvxjzlf1sq8y7"; depends=[]; };
-  PopED = derive2 { name="PopED"; version="0.3.2"; sha256="1lvzqpij4dqbw144ya25bhlx96mwaxz932r0bl3jsx1si9ijb8xz"; depends=[codetools dplyr ggplot2 MASS mvtnorm]; };
+  PopED = derive2 { name="PopED"; version="0.4.0"; sha256="1cj6nj5w4ckvnldpc7g4mxdps619zlhzsdibd9ih8i2lxh1xbrfz"; depends=[boot codetools dplyr ggplot2 magrittr MASS mvtnorm purrr stringr tibble tidyr]; };
   PopGenKit = derive2 { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; };
   PopGenReport = derive2 { name="PopGenReport"; version="3.0.0"; sha256="0z4g7ll3dk9mgawnn7k0ysgj8w55adivc4zcrr898x399g7vnfx4"; depends=[ade4 adegenet calibrate data_table dismo gap gdistance genetics GGally ggplot2 knitr lattice mmod pegas plyr R_utils raster reshape rgdal RgoogleMaps sp vegan xtable]; };
   PopGenome = derive2 { name="PopGenome"; version="2.6.1"; sha256="074vfyfhlqnc38jb0shwp5a4ikvb4jflfghmg88h3a2za3nj4abs"; depends=[ff]; };
@@ -2659,26 +2780,26 @@ in with self; {
   PortfolioEffectHFT = derive2 { name="PortfolioEffectHFT"; version="1.8"; sha256="0y4x0d91j6g52136d921hfs5swzf85gkxafxfkf3c15dl5ns120v"; depends=[ggplot2 rJava zoo]; };
   PortfolioOptim = derive2 { name="PortfolioOptim"; version="1.0.3"; sha256="1s9msqjxqxqafhncc3hi5prhzl5cj0incd5rc9fxc23l5l4n9xjx"; depends=[Rglpk]; };
   PottsUtils = derive2 { name="PottsUtils"; version="0.3-3"; sha256="165k4sjh3kqkb8bzi68wx00yl77yfbgs70fcbpzmsmcw4g4hdpzn"; depends=[miscF]; };
-  PoweR = derive2 { name="PoweR"; version="1.0.6"; sha256="0p2v07wp1hqmmbf7b3mh0v4n5hbbcms9xkdhjzdfxkkbafxybc24"; depends=[Rcpp RcppArmadillo]; };
+  PoweR = derive2 { name="PoweR"; version="1.0.7"; sha256="040wc7hxa8y6bm1rs7ip2skdxmmwksxkyb6xzqgdjp8m7a25fppb"; depends=[Rcpp RcppArmadillo]; };
   Power2Stage = derive2 { name="Power2Stage"; version="0.5-1"; sha256="155w5yp0pdq4g3638m0c54i81lfk0g0f339hzbxpkxhs8ds7g2zv"; depends=[cubature mvtnorm PowerTOST]; };
   PowerNormal = derive2 { name="PowerNormal"; version="1.2.0"; sha256="1kryqcjvgwk0l4z3gqxdiz47mha3jw5583jlb9z7ml6v7cam06sm"; depends=[]; };
   PowerTOST = derive2 { name="PowerTOST"; version="1.4-7"; sha256="02k6jn5dw70518g55bchax0l5gkci827lqwwyxwnn6rzs3mx4ybs"; depends=[cubature mvtnorm TeachingDemos]; };
-  PowerUpR = derive2 { name="PowerUpR"; version="1.0.0"; sha256="04lc6xjwwy9wxd7pg1wm5vg0bq3194cp0r7i72da7c10b31frdh1"; depends=[]; };
-  PracTools = derive2 { name="PracTools"; version="0.9"; sha256="0yra18is5pdwzw3vc5sk53g89n5rz1hpn8zlvcx541nxr43i69sd"; depends=[]; };
+  PowerUpR = derive2 { name="PowerUpR"; version="1.0.1"; sha256="1m7w3851kpnf7nnajh9w427cjpyiz18gmqhqvd4gz4gdwqpl6chz"; depends=[]; };
+  PracTools = derive2 { name="PracTools"; version="1.1"; sha256="19yyhri8wr7ki62zhl9bhpf0wbx9fhrfph44j4l65kx68aphl22d"; depends=[]; };
   PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; };
   PreProcess = derive2 { name="PreProcess"; version="3.1.5"; sha256="049gdrp4kwvsid2bn12f61557qgpfv8cpzrd1b4ml47jpw8w0xdk"; depends=[oompaBase]; };
   PreciseSums = derive2 { name="PreciseSums"; version="0.3"; sha256="02w0pa9dd196sg6zg9w2fp4b0k6wibbw9rbvasr3aphh98kbd6ch"; depends=[]; };
   PredPsych = derive2 { name="PredPsych"; version="0.3"; sha256="0bqc2vl32z9wzby7ncrab742cajy4w5kq7wv2gh2jjqdnv9nkia7"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; };
   PredictABEL = derive2 { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; };
+  PredictionR = derive2 { name="PredictionR"; version="1.0-11"; sha256="1dljdbya93dirx715yqs4vz7hbbcwpgrsvyfgikkm2fj28nnn6k9"; depends=[fitdistrplus]; };
   PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
   PresenceAbsence = derive2 { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; };
-  PrevMap = derive2 { name="PrevMap"; version="1.4.1"; sha256="1hmvfk5zpflwncaiy2rr0jr2gr2gk66na6ks82b6dfgk8xdc8xmk"; depends=[geoR Matrix maxLik numDeriv pdist raster splancs truncnorm]; };
+  PrevMap = derive2 { name="PrevMap"; version="1.4.2"; sha256="0iblmr2qapkhk2156xgkbr19fgz902vb79ssjpsm1w62f1i5ka9r"; depends=[geoR Matrix maxLik numDeriv pdist raster splancs truncnorm]; };
   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.1.2"; sha256="0z8prfmjx9zs7cqd316pc5iy3mg9vldcl12d3mk8llpvynn86ja3"; depends=[celestial cubature fftw FITSio LaplacesDemon magicaxis RColorBrewer Rcpp]; };
-  ProFound = derive2 { name="ProFound"; version="1.0.1"; sha256="0ym8ggzm0b8zpfsq8xjjnwa09826gssaqhrqjyq88pwbhzh0y4pl"; depends=[celestial data_table FITSio magicaxis]; };
-  ProNet = derive2 { name="ProNet"; version="1.0.0"; sha256="10r0gcxv0djrw99nd6a1jrnwvqmidw10ll645gvkp8l39li0107n"; depends=[igraph linkcomm MCL Rcpp]; };
+  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]; };
   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]; };
@@ -2688,9 +2809,9 @@ in with self; {
   ProgGUIinR = derive2 { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; };
   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.0"; sha256="1baf4v9c2pqqmlgxs1jf7fhwqbsw0l1g7rdiia21acxix2j3b7wj"; depends=[]; };
+  ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.1"; sha256="03ipsbs8pfwr8wsx7j2y9c67ic4qcady7xpa47l8dr14ff63cfk7"; depends=[]; };
   PropCIs = derive2 { name="PropCIs"; version="0.3-0"; sha256="1ywzi88igzaj2wnbrqa08cy7pw886z2m0x3j7rk45rin9mgpfdfd"; depends=[]; };
-  PropClust = derive2 { name="PropClust"; version="1.4-3"; sha256="0k1wn62vlrddzhknyjpizpqxzrgl38frncql3mrlwakkn0kh8l5z"; depends=[dynamicTreeCut flashClust]; };
+  PropClust = derive2 { name="PropClust"; version="1.4-6"; sha256="1p15n98b6qprphgbhdqgnsxy9d9kik19h6j9f2dy6x1hkinrzsfa"; depends=[dynamicTreeCut fastcluster]; };
   PropScrRand = derive2 { name="PropScrRand"; version="1.1"; sha256="0cj62dzg4zm8d1g8h7qmviiwm93cwplppbi0p674fmmf1wy84v9s"; depends=[]; };
   ProteinDescriptors = derive2 { name="ProteinDescriptors"; version="0.1.0"; sha256="1ydm8aym1wwxmfh4krh84nmj1wkgb574igg1sywl58l3qlnhya0l"; depends=[]; };
   Przewodnik = derive2 { name="Przewodnik"; version="0.16.12"; sha256="1aq80aqflfm1ypqa51h10mc3g0qdr651j6g1b7008k7h0ryq42gv"; depends=[PBImisc PogromcyDanych]; };
@@ -2703,9 +2824,9 @@ in with self; {
   Publish = derive2 { name="Publish"; version="2018.04.17"; sha256="0dbcql2mi2qsxzcgcqa58yqynfq1800fa06ikyay2dm6gdyf0apq"; depends=[data_table lava multcomp prodlim survival]; };
   PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
   PwrGSD = derive2 { name="PwrGSD"; version="2.3"; sha256="1iisib4bnb3fp0nwxnal13fgd0fs1vckchr4cj716k72jh6k7slm"; depends=[survival]; };
-  PxWebApiData = derive2 { name="PxWebApiData"; version="0.1.0"; sha256="0rd82kmpija4kkyl283b1z61q0abasimz4z7rki3kvfr0afa44j3"; depends=[httr jsonlite rjstat]; };
-  PythonInR = derive2 { name="PythonInR"; version="0.1-4"; sha256="0krr5k0y9rggzq8f74nc6pyf47g8va1lvva31vc774hbb0rmr7gf"; depends=[pack R6]; };
-  QCA = derive2 { name="QCA"; version="3.2"; sha256="1bjsc24b3g7xdb1fi3f4y1297g185gasl3xsgqxibck2zjlagl11"; depends=[fastdigest shiny venn]; };
+  PxWebApiData = derive2 { name="PxWebApiData"; version="0.2.0"; sha256="0mpasacnlrwb37n221j04fzms63b63nj9z8d4h21nhkhmclrsxgg"; depends=[httr jsonlite rjstat]; };
+  PythonInR = derive2 { name="PythonInR"; version="0.1-6"; sha256="0m5ppiklg4rqc3czkkb6xvkiw3bv3g6c9qcvs70i7l9gxh34xghv"; depends=[pack R6]; };
+  QCA = derive2 { name="QCA"; version="3.3"; sha256="1h5vjcm3rhrs2jxrfx2h81rvbzh35slhpkn0mf13hln5c1hh0s0g"; depends=[fastdigest shiny venn]; };
   QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; };
   QCApro = derive2 { name="QCApro"; version="1.1-2"; sha256="1glfb1x1h05cs07nq5glqvlil58wp3c0kaxi1l7k94y797i8r7hq"; depends=[lpSolve]; };
   QCAtools = derive2 { name="QCAtools"; version="0.2.3"; sha256="1q49l2mf02hqvz2ahqjdx7i3yxniy7dn2s74xjl9l6zdq8bypfw2"; depends=[directlabels ggplot2 QCA stringr]; };
@@ -2713,6 +2834,7 @@ 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=[]; };
   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]; };
@@ -2726,7 +2848,7 @@ in with self; {
   QRank = derive2 { name="QRank"; version="1.0"; sha256="1f924r5bf5vjfl12hk1n5m3f94g30f6vmvzq2bn8295dflyndck0"; depends=[quantreg]; };
   QRegVCM = derive2 { name="QRegVCM"; version="1.2"; sha256="0fcydkf6r2qxd59ylr8vn76bkxks91v58gfzvq3rjd5mqf9vsaaq"; depends=[quantreg SparseM truncSP]; };
   QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; };
-  QTL_gCIMapping = derive2 { name="QTL.gCIMapping"; version="3.0"; sha256="1yk4sl4hlapcjajwq85jwcmpli4myib9862sz7ary676giq1vp18"; depends=[data_table doParallel foreach MASS openxlsx parcor qtl Rcpp stringr]; };
+  QTL_gCIMapping = derive2 { name="QTL.gCIMapping"; version="3.1"; sha256="14zdq8a352jvgzq1wp0jj2wx3hs3cr5dpryyvlhv2c0syldlw7xl"; depends=[data_table doParallel foreach MASS openxlsx parcor qtl Rcpp stringr]; };
   QTL_gCIMapping_GUI = derive2 { name="QTL.gCIMapping.GUI"; version="1.0"; sha256="05v93p3s9kncyzhiqgmd79h6b61xrr2k9vpgv9hjj0pkhsyanqc1"; depends=[data_table doParallel foreach MASS openxlsx parcor qtl Rcpp shiny stringr]; };
   QTLRel = derive2 { name="QTLRel"; version="1.0"; sha256="0hlnh04w45imf0f7rm9pg1whlps5zxh00qvvn81hip16bv48cw79"; depends=[gdata lattice]; };
   QUIC = derive2 { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; };
@@ -2734,8 +2856,9 @@ in with self; {
   QZ = derive2 { name="QZ"; version="0.1-6"; sha256="1vgqwv3rbnmz2sgbmbivgnxcwy5dzgk6ivqskdnqkil4f10zflmi"; depends=[Matrix]; };
   Qtools = derive2 { name="Qtools"; version="1.3"; sha256="1vbjydacgczjlsf8b8id25n3k0cq74i43nsvax22k8hbvj4g0b94"; depends=[boot MASS mice quantreg]; };
   QuACN = derive2 { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; };
+  QuClu = derive2 { name="QuClu"; version="0.1.0"; sha256="0a2malh9vz5jcjgdx4d98k0c61vz3ip8ynqh5i85x8hzcby11qgj"; depends=[]; };
   QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; };
-  Quandl = derive2 { name="Quandl"; version="2.8.0"; sha256="0n1c4343ki8nia7qrq2m9zb7b05qr3yjwvk1ji7m44sa613w6y5l"; depends=[httr jsonlite xts zoo]; };
+  Quandl = derive2 { name="Quandl"; version="2.9.1"; sha256="1pifih9p6bzr11vw3pgfjx4nfjp7ap3a49mvfgys994bkai5mhhr"; depends=[httr jsonlite xts zoo]; };
   QuantNorm = derive2 { name="QuantNorm"; version="1.0.3"; sha256="1kc8qfa5fwdmk4nfzlkd22968zn44ggr65ysm1l31bhbgjh59ly3"; depends=[]; };
   QuantPsyc = derive2 { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; };
   QuantTools = derive2 { name="QuantTools"; version="0.5.7"; sha256="069rvh4yfar5dh6aj6p0q61gasvs9wr72x9pnj00lvyjlnv06p5n"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; };
@@ -2744,21 +2867,19 @@ in with self; {
   QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.6"; sha256="1520jgkzp8g7gv7ggqhvlrdnpdyhygqjgsd1my5jq30afdqj6qmp"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; };
   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.15.1"; sha256="09gmzb87n1ybqwyp4jdpih3w3s7nqkr4hd1qhcqr57kp2pj9jp9x"; depends=[base64enc 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]; };
   R_filesets = derive2 { name="R.filesets"; version="2.12.1"; sha256="0grd3wk5xh7jgp10m78knj0snqyxqv7yir6wvz2wq5rabvcn9mab"; depends=[digest future_apply R_cache R_methodsS3 R_oo R_utils]; };
   R_huge = derive2 { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; };
-  R_matlab = derive2 { name="R.matlab"; version="3.6.1"; sha256="013qi3iikikgib23cqg74vpp2ymsbw1zd6zny7m1km2js6gmfchh"; depends=[R_methodsS3 R_oo R_utils]; };
+  R_matlab = derive2 { name="R.matlab"; version="3.6.2"; sha256="1fw6ny8xb2j088k3s9lzd15av3j6xc2bvbccyrp7yjx2f3s3i8qv"; depends=[R_methodsS3 R_oo R_utils]; };
   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.42.0"; sha256="1zcq0hzi0j7fvj2rs796a1i120wbr0387vck17rrd644awwbsbm0"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; };
-  R_utils = derive2 { name="R.utils"; version="2.6.0"; sha256="03j7hrs03kyj9qrjxyp5kqv4lpqqpk6xwbkzx6j15d8928yrjr2x"; depends=[R_methodsS3 R_oo]; };
+  R_rsp = derive2 { name="R.rsp"; version="0.43.0"; sha256="0ax6781kfylx0acz0i3sqnpkxmrq73x29wwfic59ng7vj0ws0gyd"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; };
+  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=[]; };
   R2BayesX = derive2 { name="R2BayesX"; version="1.1-1"; sha256="1ff8cscl839ykp7l34sscc8zqp516mh64igk7dfv9n02l40w8ypf"; depends=[BayesXsrc colorspace mgcv]; };
-  R2Cuba = derive2 { name="R2Cuba"; version="1.1-0"; sha256="1zmlsambajzxkc9dawlqb0png8s502hwblq0vyhqgc08yf29b43w"; depends=[]; };
   R2DGC = derive2 { name="R2DGC"; version="1.0.3"; sha256="0f84fmpf3m2s2p6bllvjs8rgnhwjy54adblv02dq8gakwvb4j2aw"; depends=[]; };
   R2DT = derive2 { name="R2DT"; version="0.1"; sha256="0zydrdx6xdlacq6s01jwv4rv6ydmbwmiif40rilp8h76bim0kdbr"; depends=[data_table devFunc plyr]; };
-  R2G2 = derive2 { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; };
   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]; };
@@ -2771,7 +2892,7 @@ in with self; {
   R3port = derive2 { name="R3port"; version="0.1.1"; sha256="0ww0sqjx0la03qx353h0y5wr5qpc5fir3gjy4fsxkw6jrsyx9vaz"; depends=[plyr reshape2 whisker]; };
   R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.5"; sha256="1wd1yqbs8m4zqvdm6x7mrcyk5b5pr4azm3r49nrilg8fnr2bk9rz"; depends=[bitops RCurl RJSONIO]; };
   R4dfp = derive2 { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; };
-  R6 = derive2 { name="R6"; version="2.2.2"; sha256="13xfdr19ca7ymisidsanm6w7hsk3qmy5l8c0mlz3nk48f7s5cxq8"; depends=[]; };
+  R6 = derive2 { name="R6"; version="2.3.0"; sha256="1jgshp0x8a65rwyvk31slnfp7l153dk5826y2rxcd5lpclby3d85"; depends=[]; };
   RAC = derive2 { name="RAC"; version="1.5"; sha256="0q0kk9j3blrnhv0rfmryc35lli5j4kds2vmjdpg77znagb45609k"; depends=[maps maptools matrixStats ncdf4 plotrix raster rgdal rgeos rstudioapi sp]; };
   RAD = derive2 { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; };
   RADanalysis = derive2 { name="RADanalysis"; version="0.5.5"; sha256="1py07p24i1pky8wwyy8ajmkg6h2n7nbpxp1w6lrkiyl0p2kgjm20"; depends=[scales sfsmisc]; };
@@ -2780,20 +2901,21 @@ in with self; {
   RAMP = derive2 { name="RAMP"; version="2.0.1"; sha256="1n8h58j6v1xs6adrr4w4ha7pn1q2fh14dyg7zgpp2smv0j2b33dr"; depends=[]; };
   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.5.1"; sha256="0il5i99vbcagnxvb15af5n37g04a4q1x96bz73zh3jhki9fpw9vm"; depends=[]; };
-  RANN_L1 = derive2 { name="RANN.L1"; version="2.5"; sha256="0sjf92hdw9jczvq1wl5syckhvik7wv0k9vrrgw4nnnsabc25v9pf"; depends=[]; };
+  RANN = derive2 { name="RANN"; version="2.6"; sha256="1r6rivh9ba4gwnzryip0aiwsbm46zma7nvd9z5y456p2dgzp9lii"; depends=[]; };
+  RANN_L1 = derive2 { name="RANN.L1"; version="2.5.1"; sha256="0npkbphdk5m8lpga874yv8vld38ikn2rk8r5ysg0n4vcd1jxr1ac"; 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]; };
   RAdwords = derive2 { name="RAdwords"; version="0.1.17"; sha256="1w6fkg7a5dp6s80fzcgs65f0d7qp43l4yawh00ly0b750f2fnxvp"; depends=[RCurl rjson]; };
-  RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.3"; sha256="0g5sdq6sl7cvsj9fgqhcdxjkrfi53078r0mbzvf69cvz38y5x3sm"; depends=[]; };
+  RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.4"; sha256="0z08xwdn3vzwmprx5yh2xip5bqk13zrd47lwnsa2yin2phz6yry1"; depends=[]; };
   RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; };
   RAppArmor = derive2 { name="RAppArmor"; version="2.0.2"; sha256="18zmqqh4rnbnaiwi60jfp4xi8fp63ydr3jk9w4ijmy6s4hkpp75g"; depends=[]; };
   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-3"; sha256="0pink9jza2pfm1vqmzgp0pcyg9a4ak4c9igcxj692np82mv8hi0j"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 lme4 mvtnorm Rcpp RcppEigen rstan StanHeaders]; };
+  RBesT = derive2 { name="RBesT"; version="1.3-4"; sha256="1p74vn1651vyc9ydrp80fimj13p5bwmc56paxbh91liqsw0sd4b2"; 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]; };
@@ -2810,8 +2932,8 @@ in with self; {
   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.10"; sha256="02pyh6kvsfbwgccf8v77aa3ky21kps1rpgaii20wmridrgqj90vg"; depends=[bitops]; };
-  RCzechia = derive2 { name="RCzechia"; version="1.2.6"; sha256="03zp8y76084l2zjzf9bbfhig7gi01a21gnjfiajzi8q851nfgl29"; depends=[httr lwgeom magrittr sf]; };
+  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]; };
   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]; };
@@ -2821,13 +2943,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.0.0"; sha256="0al0502h1iyd03c4hsy35nxz3nbvvfshi5jxxvxlh1x4bxvpy1vs"; depends=[]; };
+  REAT = derive2 { name="REAT"; version="2.1.0"; sha256="16yrpdvy33arjcdn6zq674vhkm4m819a6i6ls1scwd8ag9fv3zxj"; 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.0.2"; sha256="1njyvc818rwwg109ry8nb2p05rf9yh6zsydvww2ribynlsr2rir1"; depends=[aroma_affymetrix aroma_core biomaRt data_table GenomeGraphs lmtest MCMCpack RColorBrewer]; };
+  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]; };
   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]; };
@@ -2852,10 +2975,12 @@ in with self; {
   RGCCA = derive2 { name="RGCCA"; version="2.1.2"; sha256="0zcxakqnmih0243y5b6r9nmcfanzxd6q344pd5bca5pnm3y43wr0"; depends=[Deriv MASS]; };
   RGENERATE = derive2 { name="RGENERATE"; version="1.3.5"; sha256="12dq04xpl06zhkzwqx3zy0bkpvb5phbdj2inxsyczf6d4dk209mb"; depends=[RMAWGEN]; };
   RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2"; sha256="1w28yfzk3ilbz1r9fsc76cigyrnzzhsfm3a81ff8g26za7cb8vjp"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; };
-  RGF = derive2 { name="RGF"; version="1.0.3"; sha256="00s360kba9w58bzyhikh487gymryq0g62zhyr3zd2vfm4x0rl0ms"; depends=[Matrix R6 reticulate]; };
+  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]; };
   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]; };
   RGoogleAnalyticsPremium = derive2 { name="RGoogleAnalyticsPremium"; version="0.1.1"; sha256="0d22pdd5kvnrspikfb66ny07pgx96rvykr0zi78rwn6g1symdb4q"; depends=[httr jsonlite lubridate]; };
   RGoogleFit = derive2 { name="RGoogleFit"; version="0.3.1"; sha256="0g4r5vb9zv6mqym1mh028ic9hkmlpklrhq4ks5sys7y60ps893k1"; depends=[bit64 httr jsonlite RCurl]; };
   RGraphics = derive2 { name="RGraphics"; version="2.0-14"; sha256="0bv95g17pvpq3nji0akphdaznh9k85hf5z78qypxwfqr76brxd05"; depends=[ggplot2 lattice]; };
@@ -2878,18 +3003,19 @@ in with self; {
   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="1.9-3.1"; sha256="0iz4p9kl9i61sd23cqfwgwmqb48nz882mvir7p7sg5ysm0b65ijd"; depends=[rJava zoo]; };
+  RJSDMX = derive2 { name="RJSDMX"; version="2.1-0"; sha256="1z1fhm6as9m35v11n5npv3mlaaal7w5c04g4yl2p26ljsmssfbsh"; depends=[rJava zoo]; };
   RJSONIO = derive2 { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; 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]; };
   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]; };
   RKEELdata = derive2 { name="RKEELdata"; version="1.0.5"; sha256="1swzqw6j006ya48ahg6n1g8faxhqiv9v5q1zrnihpzj6868lf7y3"; depends=[]; };
   RKEELjars = derive2 { name="RKEELjars"; version="1.0.18"; sha256="0gnjpqkm0bl6wpy9fhma6gfm6ngw786jv01kkbxz072hp1swrgmx"; depends=[downloader]; };
   RKlout = derive2 { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; };
   RLRsim = derive2 { name="RLRsim"; version="3.1-3"; sha256="1r0xqay3jfg435dh9fqc6yy73wjffp658da194rx63vpfhshgz8w"; depends=[lme4 mgcv nlme Rcpp]; };
-  RLT = derive2 { name="RLT"; version="3.2.1"; sha256="14im1lvsfpl1vlhc3fmmi4vq41br48mlgqqnwnj0qqxawzzs5738"; depends=[]; };
+  RLT = derive2 { name="RLT"; version="3.2.2"; sha256="1a8cip975z99g8ljng4y86wv1gf1xwg0sqnxz79wj6zxpw8fk37c"; depends=[]; };
   RLeafAngle = derive2 { name="RLeafAngle"; version="1.0"; sha256="1anks22hn6qpac556p99kilkhc80h572dvcyz3wj1nqffdrhgrh3"; depends=[]; };
   RLogicalOps = derive2 { name="RLogicalOps"; version="0.1"; sha256="1qyn80x3x3bb5wgzyzw6pxs8a6q26yq1fkmkz7f5wywsnrj8hzfj"; depends=[rstackdeque stringr]; };
   RLumModel = derive2 { name="RLumModel"; version="0.2.3"; sha256="059nqbvy13jjgzhp4n9afqkc3dbv06aml5v5ffkhpx8kcmv48xp1"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; };
@@ -2898,20 +3024,18 @@ in with self; {
   RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
   RM2006 = derive2 { name="RM2006"; version="0.1.0"; sha256="1qjvdh89jql1fl6ia76g766y1igkshlv0slqmpi0y3bn40413snb"; depends=[]; };
   RMAWGEN = derive2 { name="RMAWGEN"; version="1.3.3"; sha256="0spc0vszbxfpfp3kqdj0gnb90nvn50qwalq3mw8151b8h1swmf3l"; depends=[chron date vars]; };
-  RMC = derive2 { name="RMC"; version="0.2"; sha256="1sc4nsjmaw2ajm8bka7r4mf73zxqhnvx23kl4v20pfpy9rhgd0h6"; depends=[]; };
-  RMCriteria = derive2 { name="RMCriteria"; version="0.1.0"; sha256="19i7idpkl7ipqcib6rlmbi77n1il9v2hy6s9yyia6m9sz1smxakl"; depends=[dplyr ggnetwork ggplot2 gridExtra linprog lpSolve network pastecs Rcpp RcppEigen RcppNumerical]; };
+  RMCriteria = derive2 { name="RMCriteria"; version="0.1.1"; sha256="195kamlc9qfpnv5vbimqn3m0qzac8ixy2b26xm533m51rv5k9njd"; depends=[dplyr ggnetwork ggplot2 gridExtra linprog lpSolve network pastecs Rcpp RcppEigen RcppNumerical]; };
   RMKdiscrete = derive2 { name="RMKdiscrete"; version="0.1"; sha256="0b4adw46sn98qmy4nxv5l5svcjrp5532x7slfhhgsskqx408lzjf"; depends=[]; };
-  RMOA = derive2 { name="RMOA"; version="1.0"; sha256="01mrl6544wv2jc8b8gk1whs865sbv4id5sywnf1hq3r7g8wgs8lp"; depends=[rJava RMOAjars]; };
-  RMOAjars = derive2 { name="RMOAjars"; version="1.0"; sha256="0k3w37dwyyvfxh7a9l76cyjm27qq1clxppc5h16li2m8x68fvpjq"; depends=[rJava]; };
+  RMOA = derive2 { name="RMOA"; version="1.0.1"; sha256="1ppbwqdfxzk1ayms0rqw22l0r8vkk8av39spwpq8avgl6vssw8c4"; depends=[rJava RMOAjars]; };
+  RMOAjars = derive2 { name="RMOAjars"; version="1.0.1"; sha256="0qzpwsbndn8fw9560z9h9w9ff9bx6xj7mr50683q1n3dpn5z637i"; depends=[rJava]; };
   RMRAINGEN = derive2 { name="RMRAINGEN"; version="1.0"; sha256="175kd803a44yblq2jw5mrn2qv4piiy249577lf684bmmajf4ird4"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN]; };
   RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; };
   RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; };
   RMallow = derive2 { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; };
   RMariaDB = derive2 { name="RMariaDB"; version="1.0.6"; sha256="19pjxgz9h3bb89ra6ha6mbnzyz1sagmm82qd57y0rbrsvwn0pk2i"; depends=[BH bit64 DBI hms plogr Rcpp]; };
-  RMark = derive2 { name="RMark"; version="2.2.4"; sha256="1vns8bl3fnk6hkwmm0wl2c6lgyv3vabsk07kkxrxrl1nzy11wj3a"; depends=[coda matrixcalc msm]; };
+  RMark = derive2 { name="RMark"; version="2.2.5"; sha256="16nbm8fl8zdllgkx2hcjziakfrdwahxzn6d5mwigd4wcyvygkzzv"; depends=[coda matrixcalc msm]; };
   RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; };
-  RMixpanel = derive2 { name="RMixpanel"; version="0.6-3"; sha256="025fg36jwq44y5m7msmjql3m0avc0hl0iw49wap0fvmzy5qn24qq"; depends=[base64enc jsonlite RCurl uuid]; };
-  RMongo = derive2 { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
+  RMixpanel = derive2 { name="RMixpanel"; version="0.7-1"; sha256="1xwmmfvky49n1l0w3kwcyaf2h4rhzz4k5icjwvpc90fqk8sxib6a"; depends=[base64enc jsonlite RCurl uuid]; };
   RMySQL = derive2 { name="RMySQL"; version="0.10.15"; sha256="0bmc7w5fnkjaf333sgc0hskiy332m9gmfaxg0yzkjxscpizdw43n"; depends=[DBI]; };
   RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.2"; sha256="07wk0i8iz3cvkiqawxhm61g3nka8adw0zrrv60zx329gg49w0ycl"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; };
   RNAsmc = derive2 { name="RNAsmc"; version="0.3.0"; sha256="15k88skwqcd0m4m502fipdl1iind4mzizqdz4h63izpqfxijl3iz"; depends=[RRNA]; };
@@ -2921,15 +3045,15 @@ in with self; {
   RND = derive2 { name="RND"; version="1.2"; sha256="1rl5apgw43c841z0lapi9z2jn979dvqh4x1qkqx1ad77zcq87c85"; depends=[]; };
   RNGforGPD = derive2 { name="RNGforGPD"; version="1.0"; sha256="11n7fl1rrgnknn61qw6dh74amhakkjk5wyg0rms554lw9cn86x2v"; depends=[corpcor Matrix mvtnorm VGAM]; };
   RNHANES = derive2 { name="RNHANES"; version="1.1.0"; sha256="045ykpgxvc22blbp47ysbk6a6x4akjd39pjr114cr23s7f48g6h4"; depends=[dplyr foreign rvest survey xml2]; };
-  RNOmni = derive2 { name="RNOmni"; version="0.4.0"; sha256="1dk7ydbdhz92ixgm7carsalsdah4s3mshlkri3b69r9maxakkkjr"; depends=[abind foreach mvtnorm plyr Rcpp RcppEigen]; };
+  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.1"; sha256="1hnw7m5sasbs7si3aivrg984fpjpya093zzk0jjigba2gq375x4p"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr tidyr uuid XML xml2]; };
+  RNeXML = derive2 { name="RNeXML"; version="2.1.2"; sha256="0ax5mm8fa4rh1lqnhr9jspwnb6a098yja7ycssjj1lac0z7cs3c6"; 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.8.1"; sha256="1m1hw6mq47afa7kk36xkk3sb0yv28qwz503a7wq5c4djyp262mgh"; depends=[Rcpp]; };
+  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]; };
   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]; };
@@ -2955,25 +3079,26 @@ in with self; {
   ROI_plugin_lpsolve = derive2 { name="ROI.plugin.lpsolve"; version="0.3-1"; sha256="0i1skxk88s8cgxbr2hl5z8h88aqchrfs3206dfb92libw3yi1vas"; depends=[lpSolveAPI ROI]; };
   ROI_plugin_msbinlp = derive2 { name="ROI.plugin.msbinlp"; version="0.3-0"; sha256="00zvjqq2sj7iaymc0lrf5lmqfbqilwh8llmq841lvsmbps45w41k"; depends=[ROI slam]; };
   ROI_plugin_neos = derive2 { name="ROI.plugin.neos"; version="0.3-0"; sha256="0hs64qbna8ggmn83g903kbxiyv5ghh2454xca0caf14x9lszv02j"; depends=[ROI xml2 xmlrpc2]; };
-  ROI_plugin_nloptr = derive2 { name="ROI.plugin.nloptr"; version="0.3-0"; sha256="0niq0q08033vcm59wflilii7lciqixcpf13a93hgdaypdca8lxcw"; depends=[nloptr ROI]; };
+  ROI_plugin_nloptr = derive2 { name="ROI.plugin.nloptr"; version="0.3-1"; sha256="1cy6q0cchd4rqmd2gxmg83q7cg93w6nnafjqsjxlj13773jr46f0"; depends=[nloptr ROI]; };
   ROI_plugin_optimx = derive2 { name="ROI.plugin.optimx"; version="0.3-0"; sha256="0hwjgwmaclq6y5mfmykjrchpyb632qzwcvvs1nnanmrh3yhfmpg9"; depends=[optimx ROI]; };
   ROI_plugin_qpoases = derive2 { name="ROI.plugin.qpoases"; version="0.3-1"; sha256="0ph6l85hrsc40wl443kkxywb2i0cjyh38g20000rnzhygl8kd7db"; depends=[Matrix Rcpp ROI slam]; };
   ROI_plugin_quadprog = derive2 { name="ROI.plugin.quadprog"; version="0.2-5"; sha256="1c4fd16kgg60gfs52xc64ii4kzl8fb8qz3rpy69d08avb4q6grir"; depends=[quadprog ROI slam]; };
   ROI_plugin_scs = derive2 { name="ROI.plugin.scs"; version="0.3-0"; sha256="0krlrmw85j1g35pvh4ig10djb6y6akyrfymkfk4dqg751w7mb4fm"; depends=[Matrix ROI scs slam]; };
   ROI_plugin_symphony = derive2 { name="ROI.plugin.symphony"; version="0.2-5"; sha256="1kpa82g33i2fdcnkpcqdpslj14ilrl7cp0fq1jmp4vj8ddz1s9g5"; depends=[ROI Rsymphony slam]; };
   ROMIplot = derive2 { name="ROMIplot"; version="1.0"; sha256="1njbsvnz7wrsv9l1p70p1ygmckaibz5i6jmvb0sfalp5jdcgl85n"; depends=[MortalitySmooth RCurl]; };
+  ROP = derive2 { name="ROP"; version="1.0"; sha256="12gh83r3hp1qdmw3p5rr1wfhsh90pirx67q456gl9ai6zgd8nkq8"; depends=[ROCR]; };
   ROSE = derive2 { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; };
   ROlogit = derive2 { name="ROlogit"; version="0.1.2"; sha256="09j9c24f7plzpnnhpmzdi4gapb7w1377ksjwk6i2xpyr4bfsrr5k"; depends=[evd survival]; };
   ROpenDota = derive2 { name="ROpenDota"; version="0.1.2"; sha256="17s73yj2w5hlpy09ad83m4s2d9shg5h4zg64wvbp1ivyvpp7l308"; depends=[jsonlite RCurl]; };
   ROpenFIGI = derive2 { name="ROpenFIGI"; version="0.2.8"; sha256="0fvd25vsqkgi3jv4s2lnfag5qksyzyb48d7rhfw6z8piz37n4xaj"; depends=[httr jsonlite]; };
   ROpenWeatherMap = derive2 { name="ROpenWeatherMap"; version="1.1"; sha256="0h1yw93v06bx8svhghh1fsrf837qax9896klh64b06djpgg9ngb9"; depends=[httr jsonlite RCurl]; };
-  ROptEst = derive2 { name="ROptEst"; version="1.0.1"; sha256="0160xs3bmk1bdan7gkibc50qfzxlmi413grvs0bib74xlr0x2kgj"; depends=[distr distrEx distrMod RandVar RobAStBase startupmsg]; };
-  ROptEstOld = derive2 { name="ROptEstOld"; version="0.9.2"; sha256="0blf34xff9pjfy983xm7a27xqkh9173nk64ysas6f0g4h31gh8ax"; depends=[distr distrEx evd RandVar]; };
-  ROptRegTS = derive2 { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[distr distrEx RandVar ROptEstOld]; };
-  ROptSpace = derive2 { name="ROptSpace"; version="0.1.2"; sha256="0g5v4kf5kkylc3agizv2r534dnbgkjap1x146hdgl4jx2ggddnfk"; depends=[Rdpack]; };
+  ROptEst = derive2 { name="ROptEst"; version="1.1.0"; sha256="147418w2njjqb9f9iga4ap7vmxi80y1np6ksgx8g546daswmdclp"; depends=[distr distrEx distrMod MASS RandVar RobAStBase startupmsg]; };
+  ROptEstOld = derive2 { name="ROptEstOld"; version="1.1.0"; sha256="0wmwijzh614angm272glyikn8g64arj11an58knrgnvjc3lz8rx6"; depends=[distr distrEx evd RandVar]; };
+  ROptRegTS = derive2 { name="ROptRegTS"; version="1.1.0"; sha256="1kjmyn182283llb02kf0ky1fyvw5l4p21q9s64y3hi5pahrqmr1v"; depends=[distr distrEx RandVar ROptEstOld]; };
+  ROptSpace = derive2 { name="ROptSpace"; version="0.2.0"; sha256="119b3q43rkqhyprs0vx9wwsddq3awbj2mizzwqhpjjzz4gp5v866"; depends=[Rdpack]; };
   ROptimizely = derive2 { name="ROptimizely"; version="0.2.0"; sha256="059zfn6y687h989wryvpqwgnp9njrrr4ys0gf1ql4pw85b2c50dy"; depends=[httr jsonlite]; };
   ROracle = derive2 { name="ROracle"; version="1.3-1"; sha256="07zqzwaq5iqkjcmns2ahl1l71xjlznialb3dbyl4lwsh3p3fhf2n"; depends=[DBI]; };
-  RPANDA = derive2 { name="RPANDA"; version="1.3"; sha256="0rah5l5nfjs65zxgsgsy3q3vaph6qkr7p41x3arfhjsyma96p0zn"; depends=[ape BioGeoBEARS cluster corpcor deSolve fpc igraph mvMORPH mvtnorm phytools picante pspline pvclust TESS]; };
+  RPANDA = derive2 { name="RPANDA"; version="1.4"; sha256="005dc04h0lv2fi6i3qspyqyd0c134ad9c80ar3m6ahqzk369kq6w"; depends=[ape BioGeoBEARS cluster corpcor deSolve fpc geiger glassoFast igraph mvMORPH mvtnorm phytools picante pspline pvclust TESS]; };
   RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
   RPEXE_RPEXT = derive2 { name="RPEXE.RPEXT"; version="0.0.1"; sha256="0m5ml8ywxrf66mjz6m3xp1lajd7wdq9g7xsaln8n7ykq7h5615fc"; depends=[]; };
   RPEnsemble = derive2 { name="RPEnsemble"; version="0.4"; sha256="0y9g22swcz0m5jbzi87ahxw27fb3jlf3iwvxb73kkzixqlvksw9y"; depends=[class MASS]; };
@@ -2981,41 +3106,42 @@ in with self; {
   RPMM = derive2 { name="RPMM"; version="1.25"; sha256="1j48dh434wfhfzka0l21w6f73qlwfm70r9gdddhn504i2d5m4jph"; depends=[cluster]; };
   RPPairwiseDesign = derive2 { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; };
   RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.5"; sha256="0cf4mb7mjp7x3k7083c8n8fjbvrmcgq359wh6pdyj817mgkanqzv"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; };
+  RPS = derive2 { name="RPS"; version="1.0.1"; sha256="16n6wknw2m56kwi6rswgxjwjqblhaz5gyw94f96a7l6navqnvlp4"; depends=[ape geomorph Gmedian igraph MASS matlab]; };
   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.0"; sha256="01w832ia4c44nhir5rzw33qa8h7afmf04vkfdlg32jaqi1gv5861"; depends=[DBI httr jsonlite openssl Rcpp stringi]; };
-  RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.11"; sha256="0q05hdlbgbjydi0x80kgfayfkisalvmb9wy1n6afcw66pbikyb4l"; depends=[Rcpp RCurl]; };
+  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]; };
   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]; };
   RQDA = derive2 { name="RQDA"; version="0.3-1"; sha256="1kqax4m4n5h52gi0jaq5cvdh1dgl0bvn420dbws9h5vrabbw1c1w"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
-  RQEntangle = derive2 { name="RQEntangle"; version="0.1.1"; sha256="1bkx95x1dwa8w6w1qj2aflcsvapa6sipfvqpgngwbp93m0fc10ws"; depends=[iterators itertools]; };
-  RQGIS = derive2 { name="RQGIS"; version="1.0.3"; sha256="0wrzjfxwciirl838lakcw7f6qyqyykqd999c9krll5krqzyq7c3c"; depends=[raster RCurl readr reticulate rgdal sf sp stringr XML]; };
-  RQuantLib = derive2 { name="RQuantLib"; version="0.4.4"; sha256="1pki0c265nmgph9dbz2pyrq8h7295mxswavfdwsr7m1lpbpzk8s5"; depends=[Rcpp zoo]; };
-  RRF = derive2 { name="RRF"; version="1.8"; sha256="09y9f3zx9jcn7rs6an7b0hvjavy2li7rl5nknxzxfx7qnlqajnld"; depends=[]; };
+  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]; };
+  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.2.0"; sha256="0wi7b9vwghw96d7v46mq3rpi4iggm1h6948rkbj32zqnxg7sfq3r"; depends=[]; };
+  RRPP = derive2 { name="RRPP"; version="0.3.0"; sha256="0f9p6z8lx63d3d34x6lbpiqq26mipa2rbffkk21z7r3qgb7adzil"; depends=[]; };
   RRTCS = derive2 { name="RRTCS"; version="0.0.3"; sha256="1riz1gjx3c0pf17xwybizb94nm5zgmfsnv6np3afvw831mb1x3l9"; depends=[sampling samplingVarEst]; };
   RRate = derive2 { name="RRate"; version="1.0"; sha256="1q3f2gphdf50aijnk5xqfpxcqfd4jq7byb1gpb0vcnaxgi3a9lwm"; depends=[]; };
   RRedshiftSQL = derive2 { name="RRedshiftSQL"; version="0.1.2"; sha256="03jbml8d19hcg6achnyc4hcnl5j10yvsx59j80r46zyn0flsnizq"; depends=[DBI RPostgreSQL]; };
   RRphylo = derive2 { name="RRphylo"; version="1.0.0"; sha256="1h167w16lky8aa18fc90rgclx1by3qa9d69n72dxmjzy0d14zjc6"; depends=[ape doParallel foreach geiger lmtest mvMORPH phangorn phytools pvclust R_utils rlist scales smatr]; };
-  RRreg = derive2 { name="RRreg"; version="0.6.8"; sha256="1x8jn7wn1vr4wqk1wjmgk7v5lg20giin735gnvf2mm56ji5amq4d"; depends=[doParallel foreach lme4]; };
+  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]; };
-  RSAP = derive2 { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[reshape yaml]; };
   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.4"; sha256="1pmqwrwjmw5fsvx3aiy8q4w4w0zh81l1118ny5g3rrb5g6ybnrxs"; depends=[abind dplyr FactoMineR ggplot2 glmnet lazyeval nloptr pander princurve purrr RColorBrewer RJSONIO rlang scales scatterplot3d sqldf stringr tibble tidyr tidyselect XML xtable]; };
-  RSEIS = derive2 { name="RSEIS"; version="3.8-1"; sha256="0i4wlym8glsg90fxmzagji45xni2s04jzyrbakkil09n9rpsrl6n"; depends=[RPMG Rwave]; };
-  RSGHB = derive2 { name="RSGHB"; version="1.1.2"; sha256="0b2v17p3a3sy8jc4vy0nq65sdkxyf0b8sf5f78yvdcn5knydah6c"; depends=[]; };
+  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=[]; };
+  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]; };
   RSKC = derive2 { name="RSKC"; version="2.4.2"; sha256="0r9gpwhzscb6rbba3dg13p78pvskahgvsd59biag0shyii3xvwpm"; depends=[flexclust]; };
-  RSNNS = derive2 { name="RSNNS"; version="0.4-10"; sha256="1khsv1sy8jgsl9s5fypcg77lzj811xzrygwnq6ki9v375sk383gh"; depends=[Rcpp]; };
+  RSNNS = derive2 { name="RSNNS"; version="0.4-11"; sha256="0z27rgbqa1lsxvcqyl1456mb0pigvkrx099hdqv7zr4ax4k33547"; depends=[Rcpp]; };
   RSNPset = derive2 { name="RSNPset"; version="0.5.3"; sha256="1llx6anwkl4as0hdyvmsrlg9z8mkn9p1qxgs6kqs39w87gyx0j36"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; };
   RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; };
   RSQLite = derive2 { name="RSQLite"; version="2.1.1"; sha256="1giwk4335sc6yhj3rs8h070g1mwy38kyqyqv6vcfxvskykj7vp6z"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; };
-  RSSL = derive2 { name="RSSL"; version="0.6.1"; sha256="03f0i0v0nygkcci42h4bh7jngxz15wsd78cn2zkzbrqadz1c61r5"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; };
+  RSSL = derive2 { name="RSSL"; version="0.7"; sha256="0sir01ri4j5igwqm5bj9i99s35gli7yzxxpw1fwi83gdmhh800ap"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; };
   RSSOP = derive2 { name="RSSOP"; version="1.1"; sha256="119xrxpaf68qdb2kj2pbaja6im2nbxsgibb1bnlpnc3fcxkmqcsf"; depends=[]; };
   RSSampling = derive2 { name="RSSampling"; version="1.0"; sha256="0p10l7qmksx4ysz1jb84f9nbqzig8wxhwy33yk8hq29nb5i4c9ik"; depends=[LearnBayes]; };
   RSVGTipsDevice = derive2 { name="RSVGTipsDevice"; version="1.0-7"; sha256="0jdr8l0hp4kzsvlgs8j1m74sr98z4v2lmiqinmc238m406nhppab"; depends=[]; };
@@ -3023,7 +3149,8 @@ in with self; {
   RSauceLabs = derive2 { name="RSauceLabs"; version="0.1.6"; sha256="1p7hw6vnlg6w5ggmfpc3q3s6n1fikjkjnxzz97jifiy0zwn5dp9i"; depends=[data_table httr jsonlite whisker xml2]; };
   RSclient = derive2 { name="RSclient"; version="0.7-3"; sha256="07mbw6mcin9ivsg313ycw2pi901x9vjpmi6q7sms1hml4yq50k6h"; depends=[]; };
   RSeed = derive2 { name="RSeed"; version="0.1.60"; sha256="0rvb6w4z5c2wcdgx5w6vv7c8il8d0096pgv3fyvw21ag25z605jc"; depends=[graph RBGL sybil]; };
-  RSentiment = derive2 { name="RSentiment"; version="2.2.1"; sha256="0djp530yzj5a6y5nqk98pdvsgy9apqcqvkz0yjqx6856d9wrycm0"; depends=[NLP openNLP plyr stringr]; };
+  RSelenium = derive2 { name="RSelenium"; version="1.7.4"; sha256="0djd6bgy2vr85pmcvnq0h2dji20laz852kpn9q8rswxgqb59lqk2"; depends=[binman caTools httr openssl wdman XML]; };
+  RSentiment = derive2 { name="RSentiment"; version="2.2.2"; sha256="15d1llzxg1apkwykpb7pic2d5lfj9i9a55hab067wrz2yq5jsyfa"; depends=[NLP openNLP plyr stringr]; };
   RSiena = derive2 { name="RSiena"; version="1.2-12"; sha256="1bc0vdqqzkf3q3b6rzqiwd29lcq8vbvlj2qkxbx6v8wjphycz6rw"; depends=[lattice MASS Matrix]; };
   RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.15"; sha256="13mrqf458m43g435g4pbg49pid63f4ap1r8jzl84mvj1b36hy4q6"; depends=[base64enc digest httr jsonlite plyr stringr]; };
   RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.2"; sha256="0phkk79ng4r54w3d4ajl505gs8svlzdf1g6q50lhraq2cbllbvgx"; depends=[RCurl]; };
@@ -3034,6 +3161,7 @@ in with self; {
   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]; };
   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]; };
   RSurvey = derive2 { name="RSurvey"; version="0.9.3"; sha256="0yk969jdvpgv01zbmk4zyxcmrbdizh37bddj1k128ndyf191z37x"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; };
   RSvgDevice = derive2 { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; };
@@ -3044,7 +3172,8 @@ in with self; {
   RTaxometrics = derive2 { name="RTaxometrics"; version="2.3"; sha256="02446y86g21i37ycavg0xc1ggxk0k93d38n71fis9fav06lywxx3"; depends=[]; };
   RTextTools = derive2 { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[caTools e1071 glmnet ipred maxent nnet randomForest SparseM tau tm tree]; };
   RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
-  RTransProb = derive2 { name="RTransProb"; version="0.3.0"; sha256="010nsw97b0yi5l6fkwx04aacv47fww9lp7pgjdm8nb7gg9yif2bx"; depends=[caret chron e1071 expm MASS Matrix matrixStats neuralnet nnet pracma Rcpp RcppArmadillo zoo]; };
+  RTransProb = derive2 { name="RTransProb"; version="0.3.3"; sha256="1fl8ag7aizj7k7j5ypx632qa98jp3wp8z3mp5z490n1277ajzrkb"; depends=[caret chron e1071 expm MASS Matrix matrixStats neuralnet nnet pracma Rcpp RcppArmadillo zoo]; };
+  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]; };
@@ -3052,12 +3181,13 @@ in with self; {
   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=[]; };
   RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.12"; sha256="1x3pq6cnkjashf49imrw76xkw9nzqgn9132l03l9v4vacgh0s47m"; depends=[Rcpp]; };
-  RVsharing = derive2 { name="RVsharing"; version="1.7.0"; sha256="1z1jwj6dzyib8sxpz4p4wpiizfhxz6sp62nnig779rhnv7wfkqqf"; depends=[kinship2]; };
   RVtests = derive2 { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet pls spls]; };
   RWBP = derive2 { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[igraph lsa RANN SnowballC]; };
+  RWDataPlyr = derive2 { name="RWDataPlyr"; version="0.6.2"; sha256="1928hyfmy21s586nafd5qajbypqslc96zfmxbi42rcmvzim16v3k"; depends=[data_table dplyr feather Rcpp tibble tidyr xts zoo]; };
   RWebLogo = derive2 { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; };
-  RWeka = derive2 { name="RWeka"; version="0.4-38"; sha256="1c0jvz2d04h31g4mp8sg9vrp5138n97gavji18yiij7pd11g5qda"; depends=[rJava RWekajars]; };
-  RWekajars = derive2 { name="RWekajars"; version="3.9.2-1"; sha256="006n7m3qxnzvfhkzcr0nbwqdlhygzdhyp8x3534dx6075bm00v0f"; depends=[rJava]; };
+  RWeightedKmeans = derive2 { name="RWeightedKmeans"; version="1.1.0"; sha256="07qnwcg4b4dls6jgk1jz23s4y11ml86hs9ghmd3hdh5rcmri879s"; depends=[clusterCrit fpc]; };
+  RWeka = derive2 { name="RWeka"; version="0.4-39"; sha256="00sg0k7pcm654agm7dd6sq6yhwk65q6pfp7m92d825m2wpzlzn0d"; depends=[rJava RWekajars]; };
+  RWekajars = derive2 { name="RWekajars"; version="3.9.3-1"; sha256="16syvpc9qfn19sjdp3jikmzccj198ybr8dar7fajfaqsfms2kgfw"; depends=[rJava]; };
   RWiener = derive2 { name="RWiener"; version="1.3-1"; sha256="0w12xvc18l002m8q6ad3laa667xzqjbcfqf0vvcmicgw2j3bbq6h"; depends=[]; };
   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]; };
@@ -3069,19 +3199,20 @@ in with self; {
   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]; };
   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]; };
   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.1.1"; sha256="0jx3ch42ilcf6baw0pv42cs9lbhharma78bd8vps403p69ray4z8"; depends=[crosstalk htmltools htmlwidgets knitr]; };
+  RagGrid = derive2 { name="RagGrid"; version="0.2.0"; sha256="0crnpd75lyhd0awzqzqy7bzw4ydgxpyhy1ybb1ff4qsnisbjdbba"; depends=[crosstalk htmltools htmlwidgets knitr]; };
   Ramble = derive2 { name="Ramble"; version="0.1.1"; sha256="0225za85i5nvf8l89i5bz7nxsxykd3v9fp1wgihmncca6n8vhgpl"; depends=[]; };
-  Rambo = derive2 { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; };
+  Rambo = derive2 { name="Rambo"; version="1.1.1"; sha256="036rvjj6gcnf2gg5xl55n5p8j1pzifb9wmlpwnymz1csxgkl477i"; depends=[sna]; };
   RandMeta = derive2 { name="RandMeta"; version="0.1.0"; sha256="0bh3rkdfmwqym47q8f90pw3mmx7q8jyp4rz16ggqrmk1b5bdyqjb"; depends=[]; };
   RandPro = derive2 { name="RandPro"; version="0.2.0"; sha256="1bhbg6lvgr9h6rq3g3ljm2422ngjb18maj80l7f659ql88c8h6mj"; depends=[caret e1071]; };
-  RandVar = derive2 { name="RandVar"; version="1.0.1"; sha256="0vj0p46xmj4129m6r5zg85fnvb5kx1ardwwk55nqypkxd0v58a4j"; depends=[distr distrEx startupmsg]; };
+  RandVar = derive2 { name="RandVar"; version="1.1.0"; sha256="1kb7b12laf2vvc2m3xfh8wdxb0vcapns52qfbkpn8hg6ba75s1px"; depends=[distr distrEx startupmsg]; };
   RandomFields = derive2 { name="RandomFields"; version="3.1.50"; sha256="0j7852wvclglp820y2x5r19gsr6ciygbbpl5qvwj1khnlz1hfsid"; depends=[RandomFieldsUtils sp]; };
   RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.3.25"; sha256="0nxk7jhr61l9h76hf96f7ypakl4wip144c0gzr6rqsja6m75rjz3"; depends=[]; };
-  RanglaPunjab = derive2 { name="RanglaPunjab"; version="2.3.1"; sha256="0hmami515jv916lxdwv31w3w2bjn954qwibvgw1qlqn8d5swndiw"; depends=[jpeg shiny tidyverse]; };
+  RanglaPunjab = derive2 { name="RanglaPunjab"; version="2.3.4"; sha256="01j3gww9kil02d44jwlkz6j7lwn2him830bnshkly0s7mgh22pgr"; depends=[jpeg shiny tidyverse]; };
   RankAggreg = derive2 { name="RankAggreg"; version="0.6.5"; sha256="031mff1zydxqygx8bn3g0qpwq08kaq5bpmzy6z2y0fa03hgsxz5c"; depends=[gtools]; };
   RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
   Rankcluster = derive2 { name="Rankcluster"; version="0.94"; sha256="0ak6cpm073ym4h9l3j7pq0ks9h4is1hzxfjn52j23nc5ifq3fjpq"; depends=[Rcpp RcppEigen]; };
@@ -3096,6 +3227,7 @@ 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]; };
   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=[]; };
@@ -3104,8 +3236,8 @@ in with self; {
   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]; };
   Rclean = derive2 { name="Rclean"; version="1.0.0"; sha256="065jq957xsk9p1nnzf8ilp9swjfxhydgc7xg57lfcg9hz99ckwfr"; depends=[formatR igraph jsonlite]; };
-  Rcmdr = derive2 { name="Rcmdr"; version="2.4-4"; sha256="0n15wkhn8hfhcpz0n2ngxkfaysjsizksxxr1fhpfjmlpy4wxxnx0"; depends=[abind car effects RcmdrMisc relimp tcltk2]; };
-  RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-10"; sha256="1fxcm0iwxdqh9qv2g6w7sqbg23zgl5z5ib2x69j5n10fglx89m8f"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; };
+  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]; };
   RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.1"; sha256="1sdc8ibggz8wpn77g7hddyl7lg86dbyw8qax63p6cqx1pfhb4rra"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr rqubic s4vd superbiclust viridis]; };
   RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; };
   RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; };
@@ -3121,25 +3253,22 @@ in with self; {
   RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-5"; sha256="069kpvhflk0rwwll0vyxfdrln1lzr1zhzfzm39si63ji6v7l6msb"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; };
   RcmdrPlugin_MA = derive2 { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; };
   RcmdrPlugin_MPAStats = derive2 { name="RcmdrPlugin.MPAStats"; version="1.2.2"; sha256="1ynj42p12ncgrbghd8w7mkyys2cq9r9dpbir57rj3k5l46yzj7d5"; depends=[ordinal Rcmdr]; };
-  RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.8"; sha256="1s7947zvrhjrc7vchvaajp2q7xdqfg5vsmg6r7ym416cqq39i5kd"; depends=[MASS mixlm phia pls Rcmdr xtable]; };
+  RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.9"; sha256="1lwxmhla66nxrb6ph81vxa60pzga80z0vniq725y37w5zlqzgmcq"; depends=[MASS mixlm phia pls Rcmdr xtable]; };
   RcmdrPlugin_OptimClassifier = derive2 { name="RcmdrPlugin.OptimClassifier"; version="0.1.2"; sha256="0gisjw1iniihy2c2mr9f9pxfnfr2dc0s482wb9yfn88vknx8d0rn"; depends=[OptimClassifier Rcmdr RcmdrMisc]; };
   RcmdrPlugin_PcaRobust = derive2 { name="RcmdrPlugin.PcaRobust"; version="1.1.4"; sha256="17rq3sv8payazjjn5j37cgd6df5b62d2y8al3grw6hw5nfba7lvn"; depends=[Rcmdr robustbase rrcov tkrplot]; };
   RcmdrPlugin_RMTCJags = derive2 { name="RcmdrPlugin.RMTCJags"; version="1.0-2"; sha256="04g5a1dpch54k5ckfkrg4vsap1nc3af1i0i559qigv3hy8n7pm80"; depends=[coda igraph Rcmdr rjags rmeta runjags]; };
   RcmdrPlugin_ROC = derive2 { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[pROC Rcmdr ResourceSelection ROCR]; };
-  RcmdrPlugin_RiskDemo = derive2 { name="RcmdrPlugin.RiskDemo"; version="1.9"; sha256="014x9w9qhi0fl8y35k918m25ml1sr1pndcrdih7v3dibzy18qbbn"; depends=[demography Rcmdr rgl]; };
-  RcmdrPlugin_SCDA = derive2 { name="RcmdrPlugin.SCDA"; version="1.1"; sha256="0pd765ndh8d7hy6spds3r4pi09i0ak4b1ygwczp6yr2zcs1aikbc"; depends=[Rcmdr SCMA SCRT SCVA]; };
+  RcmdrPlugin_RiskDemo = derive2 { name="RcmdrPlugin.RiskDemo"; version="2.0"; sha256="1mclhcb138f13p7ghiggdm8zjrgxqrn3zn8biygfy6yvhw2j396p"; depends=[demography ftsa Rcmdr rgl]; };
+  RcmdrPlugin_SCDA = derive2 { name="RcmdrPlugin.SCDA"; version="1.1.1"; sha256="0lky4vmia97vcpwsvzprgmkwkdwjwnmi8bdjx3r3w6rrc2lqb6a8"; depends=[Rcmdr SCMA SCRT SCVA]; };
   RcmdrPlugin_SLC = derive2 { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; };
-  RcmdrPlugin_SM = derive2 { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[car colorspace Rcmdr RColorBrewer vcd]; };
   RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.1-0"; sha256="0fgl1v1g74ca14pf3mmbv26j09v7jy6ddyap5qavgiy9s8qrwrh8"; depends=[Rcmdr rgl TeachingDemos tkrplot]; };
-  RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="4.2-4"; sha256="17ivr48y0wh89nphjzfmgdgpsfsxw4n6bfwjln0crvqhm4xh6qmh"; depends=[randtests Rcmdr TeachingDemos tseries]; };
+  RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="4.2-5"; sha256="1skqqkii44ajdwqj6svk19n4z2vi9lp36j7bdhasd9ay3k8f9wgh"; depends=[randtests Rcmdr TeachingDemos tseries]; };
   RcmdrPlugin_aRnova = derive2 { name="RcmdrPlugin.aRnova"; version="0.0.5"; sha256="0ys3565pcbr554yb1gi2h149vhvwc0gdfmh7mz8zzd4367hqn553"; depends=[Rcmdr]; };
   RcmdrPlugin_coin = derive2 { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[coin multcomp Rcmdr survival]; };
   RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[depthTools Rcmdr]; };
-  RcmdrPlugin_doex = derive2 { name="RcmdrPlugin.doex"; version="0.2.0"; sha256="0l3c8vwifyl8a7qkfaqxm7cws2cg1g501qa93w5svcgp03yf98mj"; depends=[multcomp Rcmdr]; };
-  RcmdrPlugin_epack = derive2 { name="RcmdrPlugin.epack"; version="1.2.5"; sha256="1577qhac4rldifax5x3l39cddan6dhq2dv4iv2n64nadgrl0259w"; depends=[abind forecast MASS Rcmdr TeachingDemos tseries xts]; };
   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.5"; sha256="1rjlc5v9ksndmzcdw5lkqvzxpsanvglm20ppbw49nna8rsylkj08"; depends=[orloca orloca_es Rcmdr]; };
+  RcmdrPlugin_orloca = derive2 { name="RcmdrPlugin.orloca"; version="4.6"; sha256="1n48yckr76j3wrspwyji0jvfn65cmpxplczx403x61sd0b4836xi"; 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]; };
@@ -3151,21 +3280,22 @@ 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.17"; sha256="08xg8h3w25sdb3xr18g9pa0x8cirkdgljqapxmw56ss1j9fc89s2"; depends=[]; };
+  Rcpp = derive2 { name="Rcpp"; version="0.12.19"; sha256="10mmiaawv9iwglc6z4y51mdpsfb1sivqmwr6xnfqkllcnpabdbk3"; depends=[]; };
   Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
-  RcppAPT = derive2 { name="RcppAPT"; version="0.0.4"; sha256="0xbaamv3bg08ymbmiq6kwh86p17y6qzgydq02syig2a3ykp0042c"; depends=[Rcpp]; };
-  RcppAlgos = derive2 { name="RcppAlgos"; version="2.0.3"; sha256="0m1hj249hyn6vwhqn2jismqkd07glk7nxqxwpq81rph9wp50ji0a"; depends=[Rcpp]; };
+  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.8.600.0.0"; sha256="15wqk6lnaxf6az9ccvmzpx6pi2cs19ng8j3qvk5zw1niljpp8n3k"; depends=[Rcpp]; };
+  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.100.5.0"; sha256="1iyjqhfjip1nxrkllzh7r1m01jjnx7cahqkf3s557w34p987f2l1"; 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.3"; sha256="0cb04filbr0mymcg891lc0dw2b3fnjmhn8z50xcilb3v72ccrvqg"; depends=[Rcpp]; };
-  RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.9"; sha256="0c6vdrf16f8fyaczzwapzn513wrdklsc8izmzfmfbc58s5500gvk"; depends=[Rcpp]; };
-  RcppCWB = derive2 { name="RcppCWB"; version="0.2.4"; sha256="00zgxdakjza8i0wi6zj7lri8ma0pxnsgccm9q16i2nqqndvk4q34"; depends=[Rcpp]; };
-  RcppClassic = derive2 { name="RcppClassic"; version="0.9.10"; sha256="1q0vld06dp00d2qdwnnrga4n9abiymqw74zpci2kx813n5z1l0yc"; depends=[Rcpp]; };
+  RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.5"; sha256="03r7qfhxmn20925yjvqs5cbm255yk4kbrvw16dl2r98argblcmmk"; depends=[Rcpp]; };
+  RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.10"; sha256="175bn75akwgz3vcp0n59kiqqz7q9cwkvih241nj8v810cp4gpmkp"; depends=[Rcpp]; };
+  RcppCWB = derive2 { name="RcppCWB"; version="0.2.6"; sha256="0vfv9v213v7z3y8rg0kn7w6vwvwxg8gmm2s8h8aa44xfi9q1wia2"; depends=[Rcpp]; };
+  RcppClassic = derive2 { name="RcppClassic"; version="0.9.11"; sha256="0aap391fh84342s64v5k43a1vy3cwzg01q3g6ry7mmd2d5h1vv1g"; depends=[Rcpp]; };
   RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.2"; sha256="0dr2104miy7psr73nicfs84652ai0d5liw6wxcwyrx7fmys3p638"; depends=[Rcpp RcppClassic]; };
   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]; };
   RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; };
   RcppExamples = derive2 { name="RcppExamples"; version="0.1.8"; sha256="15iw2vx6ygb03siq743418whhqvfrxk2i4nqn7p9yg1m3jwafxna"; depends=[Rcpp]; };
@@ -3178,38 +3308,39 @@ in with self; {
   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]; };
+  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.0"; sha256="1gjqmkzsi1fi0vss1nvq6i77j3aixdxd047mw9vf4l60z2ypr3h1"; depends=[BH]; };
+  RcppParallel = derive2 { name="RcppParallel"; version="4.4.1"; sha256="1y37bpn6ifvlh8ilp78qx518dmal6s0lc16gk029hvy1rdlkr2ga"; depends=[BH]; };
   RcppProgress = derive2 { name="RcppProgress"; version="0.4.1"; sha256="0yk01hfv961zyp569682k9igvhnwqyg5j0n5fm63sxigj82l2xhi"; depends=[]; };
   RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.2"; sha256="1si5njb8g4g6fjrkqbp3y6z23yxs901nq9kmiwwbqs8di6svc5q3"; depends=[BH Rcpp]; };
-  RcppRedis = derive2 { name="RcppRedis"; version="0.1.8"; sha256="05c4c65ayiqyzmkj2mrgwwflgjk54rf9nmb3rhickj16yy9b071q"; depends=[BH RApiSerialize Rcpp]; };
+  RcppRedis = derive2 { name="RcppRedis"; version="0.1.9"; sha256="08c2c5d3rn3z89yhlymbr8w145y85hlz1bq3g6kz0kwkjfnkbs1x"; depends=[BH RApiSerialize Rcpp]; };
   RcppRoll = derive2 { name="RcppRoll"; version="0.3.0"; sha256="0srzfhzkk42kzrdjnhbb37946jp1p688rgysy6k3i2is8jb21zyb"; depends=[Rcpp]; };
   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.3"; sha256="0krw4104m8drgyf53aq22kl5q0abrd0y4j1fvrwsj1dkbkybas05"; 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]; };
   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.7-0"; sha256="0r8s3d4dby9vn0qc5lbhab4vh3yl5yifi7ipxafsgffdxislnsdw"; depends=[data_table doParallel foreach httr selectr xml2]; };
+  Rcrawler = derive2 { name="Rcrawler"; version="0.1.8-0"; sha256="03fp1yi8363zwzbzbw1v763r0d65352pp2wzfk6yq8f5h6jhiaxr"; depends=[data_table doParallel foreach httr selectr 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.6.2"; sha256="1hkqy97mh68yzkh4bawjrgf1rlhkh3jz2ky84rg3wgz1mkvrrsx2"; depends=[formatR roxygen2]; };
+  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.3.2"; sha256="0wk6sv2ahxscy4nsk826c9rlq8vxgnflg9banwdxhs6qlqhipnlb"; depends=[ADMM CVXR Matrix Rcpp RcppArmadillo Rcsdp Rdpack RSpectra Rtsne]; };
-  Rdistance = derive2 { name="Rdistance"; version="1.3.2"; sha256="1ajmr58lgc74727jiydfrh4j6ra7vq8hp8nm3l2s3g2mc8n1mqk5"; depends=[]; };
-  Rdpack = derive2 { name="Rdpack"; version="0.8-0"; sha256="0r4mcg7mqb7h0c6pn0vh622vw7kvdpmy51qvhgf753yywfznkwq6"; depends=[bibtex gbRd]; };
-  Rdrools = derive2 { name="Rdrools"; version="1.0.3"; sha256="1y805j2xrv8kgh42s5lig07mb76fcz5yrxal0zaykj16cvid8287"; depends=[Rdroolsjars rJava]; };
+  Rdimtools = derive2 { name="Rdimtools"; version="0.4.0"; sha256="0wlzzhs9a154r2p06zwn6pgvpall7gp56z6a2ish9gyb9152gsij"; 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]; };
   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]; };
   Rdtq = derive2 { name="Rdtq"; version="0.1"; sha256="114pyf95nl132014ygn84xi41c2zf1ii2wfgd1acwnnmfzvdw24s"; depends=[Matrix Rcpp]; };
   Rduino = derive2 { name="Rduino"; version="0.1"; sha256="0r1yy3a2n8a4niasfjn77gv130a062i802r7xhbg0abljv5m6ra5"; depends=[serial]; };
   ReCiPa = derive2 { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; };
-  ReIns = derive2 { name="ReIns"; version="1.0.7"; sha256="1r28wyb7yh5aymlnd3yxkqmn4lnfnipfsnpbgl71zql763fchwlg"; depends=[doParallel foreach Rcpp survival]; };
+  ReIns = derive2 { name="ReIns"; version="1.0.8"; sha256="1piwmjav32cwki3jhxzv3ld59gddlm5y5dwc8smwk5gzpfypdzm6"; depends=[doParallel foreach Rcpp survival]; };
   ReacTran = derive2 { name="ReacTran"; version="1.4.3.1"; sha256="05c9jfvj134gy3by7m3r1fbar0m39vaydr7d2py9cakzs44fqfpj"; depends=[deSolve rootSolve shape]; };
   RealVAMS = derive2 { name="RealVAMS"; version="0.4-1"; sha256="13x8yryl5vp3rn6n2hd14ng6cgr3bxkps4y1vanimbwv4faa8116"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
   Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; };
@@ -3235,16 +3366,15 @@ in with self; {
   RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; };
   Replicate = derive2 { name="Replicate"; version="1.0.1"; sha256="110pvissyv3dx1wpwpngcg18mpmpml49gcmdykip55s1d3ljf791"; depends=[metafor]; };
   RepoGenerator = derive2 { name="RepoGenerator"; version="0.0.1"; sha256="0d6s2sqyycaqrg32xdkp3pr5i7qmvwrfrjcd7f94a9y3lz4bz5b5"; depends=[git2r httr rmarkdown rstudioapi]; };
-  ReporteRs = derive2 { name="ReporteRs"; version="0.8.10"; sha256="18ivgd3736zcrimcyzfkh5d6h9s1srh7xdz597y596dsssx1lmc6"; depends=[gdtools htmltools knitr png R_utils ReporteRsjars rJava rvg shiny xml2]; };
-  ReporteRsjars = derive2 { name="ReporteRsjars"; version="0.0.4"; sha256="0q11jcbkv9ibmkqr3mka0w5d797s8xb0155kcs5inlcacirp6wvy"; depends=[rJava]; };
   ResistorArray = derive2 { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; };
   ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-2"; sha256="08b1aa3183k1y30dwabnd6x353mdp2sn5b908cpv84bs3fdzlrdp"; depends=[MASS Matrix pbapply]; };
   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.0"; sha256="1v43vakp3bqka4k295imyl95f3hkvnpkbwj61gbm37yxamxvx0s4"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
+  Rfast = derive2 { name="Rfast"; version="1.9.1"; sha256="1kd0ifiw5dd2rl6n5dq9i3bfr0f5r8pxfz8j1sxazf3xsq0zpini"; 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=[]; };
   Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; };
   Rgb = derive2 { name="Rgb"; version="1.6.1"; sha256="0qs3dlv4g45dqphqjm23ky3w6rxh8ff2q6b17kvf57skyf1b1yn8"; depends=[]; };
   Rgbp = derive2 { name="Rgbp"; version="1.1.3"; sha256="1340h5rzb4631h6aanrdjl4x4l0h6l5x61qqmckrdf08fw2625lp"; depends=[mnormt sn]; };
@@ -3252,15 +3382,15 @@ in with self; {
   Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; };
   RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.2"; sha256="112mdm53qx92n2m4ms02sbppckp44l1z19vy99j6gw3jrdprjydl"; depends=[png]; };
   Rgretl = derive2 { name="Rgretl"; version="0.2.2"; sha256="18jyp4bxs96ri1a4ifd52aj0q6kd2dygz8pkajbd9whq7bn5ick6"; depends=[lubridate png xml2]; };
-  Rhpc = derive2 { name="Rhpc"; version="0.18-185"; sha256="1clw2afvqx8bdz8f5fzqs0ybh95afp5n178hspp36awab34fpd9p"; depends=[]; };
-  RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.18-185"; sha256="0s950rildshsnfny6kxfw3jls4i50rfmzbg1zma4ilbwswzp7kpq"; depends=[]; };
+  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=[]; };
   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=[]; };
-  RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.1"; sha256="1kn0vb4nhm3bxlmk5y2nl5m7a7hdvz3nz0yp8rdigpl6b2dp79w1"; depends=[MASS nloptr quadprog]; };
+  RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.2"; sha256="10kgr05npq9gyhglvpzk49hsr44rgscnygkv3b0gz7f6jxqkfj9z"; depends=[MASS nloptr quadprog]; };
   Ritc = derive2 { name="Ritc"; version="1.0.2"; sha256="03smhxjhjfkc9pxhlgg54b6v2jznpmnws8373qpvn9a9ky5bcq2l"; depends=[minpack_lm]; };
   RiverBuilder = derive2 { name="RiverBuilder"; version="0.1.1"; sha256="06cd1m4liv2bsh2sxplq2zl45g9zq8gsgvh14d0zr0pqm8z4dsyw"; depends=[]; };
   Rivivc = derive2 { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; };
@@ -3268,11 +3398,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.1"; sha256="1nsaab7nysld1gdqnpxd9g68vzs363szyinbfn6j2c7ch0vqcrka"; depends=[httr Rcpp rjson]; };
+  Rlabkey = derive2 { name="Rlabkey"; version="2.2.3"; sha256="02srz4726qkc0700fzdk4mk88dl8m84b0ysyrim19jq7yyhx3da0"; 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.2.0"; sha256="08ib0jjqicscn4mx5yv25q0x66iycx8jhazvjb47nqvn24mirprp"; depends=[BH bigmemory Matrix Rcpp RcppArmadillo Rdpack]; };
+  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]; };
   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]; };
@@ -3280,28 +3412,30 @@ in with self; {
   Rmixmod = derive2 { name="Rmixmod"; version="2.1.2"; sha256="06d8iwnjd9n4rfmcsnqzhi5ai0rxlc1qwij5s7ixkncq8c402a2k"; depends=[Rcpp RcppEigen]; };
   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-0"; sha256="0jpj3nl76jd6vc2p1xwr8jl62q8ckwsdaxqnk9b20srkq63mfrig"; depends=[gmp]; };
+  Rmpfr = derive2 { name="Rmpfr"; version="0.7-1"; sha256="0172px5ryi7i0gyyin9z2bzif8vnj292gk0s1w5p3c12g9hj2c4v"; depends=[gmp]; };
   Rmpi = derive2 { name="Rmpi"; version="0.6-7"; sha256="1b62gs7w1xqadqd7ir41jnxlcf14gcqfxd0915kn9ckdlsdrh0sw"; depends=[]; };
   RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.4"; sha256="1k1gnkghap878fck0bbz9mm0fr4cli6lh1d11r0cf47fvl6cc4gr"; depends=[]; };
-  RndTexExams = derive2 { name="RndTexExams"; version="1.4.1"; sha256="1gi96hfd7dkvmbvy6hj25g1l7nwk4yhxkdjx1l3ws3c2zpi27cvj"; depends=[CopyDetect data_table stringi stringr]; };
-  Rnets = derive2 { name="Rnets"; version="0.9.8"; sha256="0lcgapspl7ndrf3gxkrsv1172f2sv2587zaa1q6b950zympcvcj3"; depends=[data_table glasso igraph]; };
-  Rnightlights = derive2 { name="Rnightlights"; version="0.2.1"; sha256="07fd49i0cybnr5d14qf7d9p95frw8qjslrx9y2bwdrx89fvp0gk8"; depends=[cleangeo data_table doSNOW dplyr ff ffbase foreach gdalUtils lubridate R_utils raster readr reshape2 rgdal rgeos rvest rworldmap settings snow sp stringr xml2]; };
+  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]; };
+  Rnightlights = derive2 { name="Rnightlights"; version="0.2.3"; sha256="014bw1xln699y0zjaf5xifc2f3yl9zgb0acv7v1qw0q478ka9aak"; depends=[cleangeo data_table doSNOW dplyr ff ffbase foreach lubridate R_utils raster readr reshape2 rgdal rgeos rvest rworldmap settings snow sp stringr xml2]; };
+  Rnmr1D = derive2 { name="Rnmr1D"; version="1.2.1"; sha256="1lwkswg2jr5qwxzcx8g91m63caij85p7yx3kk8w75i8v0j8iac10"; depends=[base64enc doParallel foreach igraph impute MASS MassSpecWavelet Matrix ptw Rcpp signal speaq XML]; };
   Rnumerai = derive2 { name="Rnumerai"; version="0.3"; sha256="0zvfp9zp73gm6pflf9bx1xk1s45xwwvcd56cbris08d2zfj3b3nl"; depends=[httr lubridate]; };
-  RobAStBase = derive2 { name="RobAStBase"; version="1.0.2"; sha256="10bbv9jjh6zznkzrlkx7dahahicab8ld11ah1mar2kz09bdz3kih"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; };
-  RobAStRDA = derive2 { name="RobAStRDA"; version="1.0.2"; sha256="1lyp2y38jnwv8ggrv9pdzprpf2gs62w1mpzwcqcbrmy7fzjsym0b"; depends=[]; };
-  RobLox = derive2 { name="RobLox"; version="1.0"; sha256="0y193xai0mfwpm6zhxgy21h4yrlqrpvwx84bj4xnr8ql87wznh7q"; depends=[Biobase distr distrMod lattice RandVar RColorBrewer RobAStBase]; };
-  RobLoxBioC = derive2 { name="RobLoxBioC"; version="0.9"; sha256="0ia7vn8x8whyp8kl7mpwd6fd0yv0y3pb1mppnh2329x7xdvcs5j4"; depends=[affy beadarray Biobase BiocGenerics distr lattice RColorBrewer RobLox]; };
+  RobAStBase = derive2 { name="RobAStBase"; version="1.1.0"; sha256="1szxlqgm913fsgi4i7ccnv2rcj81bssl62ahh0g0818dx7zzblxb"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; };
+  RobAStRDA = derive2 { name="RobAStRDA"; version="1.1.0"; sha256="0hna14757g372ysyyb47529j1q0796k6nzf3lw4ba7ryjcydzw2v"; depends=[]; };
+  RobExtremes = derive2 { name="RobExtremes"; version="1.1.0"; sha256="10b8jbsdnw0zyvx8yjx775mcy64bfqqafy2sw4lfcji1sz3xqjxl"; depends=[actuar distr distrEx distrMod evd RandVar RobAStBase RobAStRDA robustbase ROptEst startupmsg]; };
+  RobLox = derive2 { name="RobLox"; version="1.1.0"; sha256="14k8xkxrw1ji1sbw49mxh6n0rpgqzn68srh5ch6k1i4nc5c6zmr5"; depends=[Biobase distr distrMod lattice RandVar RColorBrewer RobAStBase]; };
+  RobLoxBioC = derive2 { name="RobLoxBioC"; version="1.1.0"; sha256="17yp0jwibf839nwyfaxiz46ckgljssl9gzhhz89a7d12fyfhbb3p"; depends=[affy AnnotationDbi beadarray Biobase BiocGenerics distr distrMod lattice RColorBrewer RobLox]; };
   RobPer = derive2 { name="RobPer"; version="1.2.2"; sha256="0631qfpz61606r50vzn7b3h7arfwxcs8j13q1hg779qx60kwrliy"; depends=[BB quantreg rgenoud robustbase]; };
   RobRSVD = derive2 { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; };
-  RobRex = derive2 { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; };
+  RobRex = derive2 { name="RobRex"; version="1.1.0"; sha256="0nszr0dnk8v7raa8sk9zcs4a5xwjv7qzhzsryach777nr9vcdafh"; depends=[distr RandVar RobAStBase ROptRegTS]; };
   Robocoap = derive2 { name="Robocoap"; version="0.1-1"; sha256="0aj6iv85a1zfaknjhrzf6lnf0qn726dvnj4dywg9nii1kkqrkq2w"; depends=[data_table igraph markovchain tm]; };
   RobustAFT = derive2 { name="RobustAFT"; version="1.4-3"; sha256="0x7sn2y9s6nwzlj8476irv893crwag6v4k7w3w589k33kkz5n2hp"; depends=[robustbase survival]; };
   RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.1"; sha256="0wsnvryvrl37acljrda2dm1d8aynqiy66yd2i857m035whixfpqa"; depends=[Rcpp RcppEigen RobustGaSP]; };
-  RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.5"; sha256="0asxhzybpfmz3zzhr32hvcxrdmdsjlqjvxiihrxc8f4w3qwnzb82"; depends=[Rcpp RcppEigen]; };
+  RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.6"; sha256="0lrdsxg1b8pb1blf0pmla18jykjlzflrmgi7g8kccrgv725clifd"; depends=[Rcpp RcppEigen]; };
   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.3"; sha256="0cfqrvvwkz4marmkxxl2ihi5gdbmr51q2r0sk1lkppa5drdh8cb5"; depends=[RCurl]; };
-  RonFHIR = derive2 { name="RonFHIR"; version="0.2.0"; sha256="1kcbv8ibqh7jb3dpj4p73vd168c6vlwi08s9cshl4w6hqbz1pklg"; depends=[httr jsonlite R6]; };
+  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]; };
   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]; };
@@ -3311,20 +3445,23 @@ in with self; {
   RpeakChrom = derive2 { name="RpeakChrom"; version="1.1.0"; sha256="1r8f6knpz83arz2kabizx5yyh1myg0h310qlwh8rmy88cdxi1ps9"; depends=[ggplot2 minpack_lm pracma ptw]; };
   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]; };
-  Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.2.5"; sha256="1q24vpbzig7pr7l3nk24vs8qb476l6mcb02v6sjk7md1hrysk34y"; depends=[futile_logger R6 rgl stringr testthat XML]; };
+  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]; };
   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]; };
   Rramas = derive2 { name="Rramas"; version="0.1-5"; sha256="0wy0flzp68mikq4v9k5pv6hbzx0w9mpa74dwx79i3iiddn0ylby6"; depends=[diagram]; };
-  Rraven = derive2 { name="Rraven"; version="1.0.3"; sha256="076c7qki4whl6hb5918mdyn3iljgvd31c4c4lydbpwx0x0x1lxqn"; depends=[dplyr kableExtra pbapply vegan warbleR]; };
+  Rraven = derive2 { name="Rraven"; version="1.0.4"; sha256="1hdq0yqjc4s0bga73px8ybghxyn0xpgvjxmyzkx0js430hyyx84r"; depends=[dplyr kableExtra pbapply warbleR]; };
   Rrdrand = derive2 { name="Rrdrand"; version="0.1-16"; sha256="0j9yyvq8r1cgwj3kw1ak6hyazr67f2q0c1m651wdm0wcvm1ajx7f"; depends=[]; };
   Rsampletrees = derive2 { name="Rsampletrees"; version="1.0.2"; sha256="1wz3dp1myjkxzf9l5mfli3dfbkc2fwg70xx7m9cxa06vq0a4w5pv"; depends=[ape haplo_stats Rcpp]; };
   Rsampling = derive2 { name="Rsampling"; version="0.1.1"; sha256="14rp3j7iaii4rc3jkbijmbgvlagxxqjkz3vvfwwpxix43rsi8zsk"; depends=[]; };
   Rserve = derive2 { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; };
   RsimMosaic = derive2 { name="RsimMosaic"; version="1.0.3"; sha256="0jlzrs9xxlpazvq3iw8znk0bd00bzlry7bgxsxq7xl23akizj0ji"; depends=[fields jpeg RANN]; };
-  Rsmlx = derive2 { name="Rsmlx"; version="1.0.1"; sha256="1vzdzidi0i4gcpdmxcsfi6qh66wk20r9cw5s3y8fqd0nkdjlsagx"; depends=[ggplot2 gridExtra MASS RJSONIO]; };
+  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]; };
+  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]; };
   Rsurrogate = derive2 { name="Rsurrogate"; version="2.0"; sha256="1pjyhlxqi8mcbywa7qa1vxgxr5jca0nc9vm1bx53vr231wgnb7gf"; depends=[survival]; };
   Rsymphony = derive2 { name="Rsymphony"; version="0.1-28"; sha256="02x54ygbcd2600prcww1l9pb02skn96rj0jdljpky1228jbib4nx"; depends=[]; };
@@ -3334,30 +3471,32 @@ in with self; {
   Rtsne = derive2 { name="Rtsne"; version="0.13"; sha256="17crbdi80q4g2pwp9v7j3bdaznk96qlrqx01zvj3wwqippizyfqw"; 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.1"; sha256="132vyqkzjzwms9sbw6dmkqqk45si89r0xvy477xl98k14a2q4jlw"; depends=[colourpicker devtools dplyr DT FSelector ggplot2 ggthemes plotly ReporteRs rlang rmarkdown shiny shinyBS shinydashboard shinyjs tidyr]; };
+  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]; };
   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]; };
-  Rvcg = derive2 { name="Rvcg"; version="0.17"; sha256="0ssmi8mqmq82qrw0hzrmfqpwnkxwdlfa6j049r4l3gn28cfqhg1j"; depends=[Rcpp RcppArmadillo RcppEigen]; };
+  Rvcg = derive2 { name="Rvcg"; version="0.18"; sha256="0a9022ps8cddmblgyzzvfyb77n206dvbv0b7fpnfplis4s68zjkf"; depends=[Rcpp RcppArmadillo RcppEigen]; };
   Rvmmin = derive2 { name="Rvmmin"; version="2018-4.17"; sha256="0mhzzwk311wa157l3n4x5x038asvjd81l45g1jclfsjr0smsffym"; depends=[optextras]; };
   Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; };
   Rwave = derive2 { name="Rwave"; version="2.4-8"; sha256="1rmqwyj2r84sii0vfqhyhpi3n1n1zia2ca627fq9ksvwn110nrvh"; depends=[]; };
+  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.7.2-5"; sha256="04irzzv7n7jax1ricdwsmbw0gjn2x4d7cz7hg6y81qhjw4p8qgdi"; depends=[brew cli crayon digest dparser inline magrittr Matrix memoise mvnfast PreciseSums R_utils Rcpp RcppArmadillo rex]; };
+  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]; };
   RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; };
-  Ryacas = derive2 { name="Ryacas"; version="0.3-1"; sha256="13qvd5gpdrjgzf6isk3529khd02852y3ajmpp5vl8vn9k1jxp86v"; depends=[Rcpp XML]; };
+  Ryacas = derive2 { name="Ryacas"; version="0.3-4"; sha256="05y7q6d69nmkgwy1ycw0kqv7hmif5yqsrly3p3psrfsbfvvjl3fj"; depends=[Rcpp xml2]; };
   S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; };
   SACCR = derive2 { name="SACCR"; version="2.1"; sha256="184mw9q25b06zar4ii3na7c4x28ly922d5csfqkw9b07mdp81k3h"; depends=[data_tree jsonlite Trading]; };
   SACOBRA = derive2 { name="SACOBRA"; version="0.7"; sha256="12aj4ghs3i3ks749z0l95ipv8gi33xgggkyjf21zvnzmb1dgphys"; depends=[testit]; };
   SADEG = derive2 { name="SADEG"; version="1.0.0"; sha256="02ilykbdanx1isbd80c43hqpzkckq6dg40y0rklcnck6v96qky3n"; depends=[]; };
   SADISA = derive2 { name="SADISA"; version="1.0"; sha256="0v68k6pwcr2hfsffkcrvpgfwciwir2jsg3q1kvr0ka5iiizpliz3"; depends=[DDD pracma subplex]; };
-  SAFD = derive2 { name="SAFD"; version="1.0-1"; sha256="1h9hw66irq2c1ciz502r5h8h9hx32jwhrp9dwl91qlknlj6s1bxr"; depends=[]; };
+  SAFD = derive2 { name="SAFD"; version="2.0"; sha256="1ing0zkhl7f9pdcddivp3ii2siaxrrh0al7cdh1r92r4b93kfr70"; depends=[]; };
   SALES = derive2 { name="SALES"; version="1.0.0"; sha256="1kjmlwa4v2i7hzm947xby9jr0irsf4c851f7jyqyhqna9c65rx0g"; depends=[Matrix]; };
   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]; };
   SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; };
   SAMURAI = derive2 { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; };
@@ -3370,6 +3509,7 @@ in with self; {
   SASmixed = derive2 { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; };
   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]; };
   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=[]; };
@@ -3378,15 +3518,18 @@ in with self; {
   SCCS = derive2 { name="SCCS"; version="1.0"; sha256="0v1ycyx45jlv4y82q0kpcmmfcaaspmkk9nd89k6cfh24n6zf9j6w"; depends=[corpcor dummies fda gnm R_methodsS3 survival]; };
   SCEPtER = derive2 { name="SCEPtER"; version="0.2-1"; sha256="19sphwcsj2z05dvpmz7vgxykzyghkfn79jwqvk6d66daman679mv"; depends=[MASS]; };
   SCEPtERbinary = derive2 { name="SCEPtERbinary"; version="0.1-1"; sha256="0rab0widfndx94dn1nchhs06q0d57vq2n3xy79p130l9rgp9v489"; depends=[MASS SCEPtER]; };
-  SCGLR = derive2 { name="SCGLR"; version="2.0.3"; sha256="03v76nh6ng41hh4lm27r8ipf382sj98dyl9lh4fzl4y6ff1vwzzj"; depends=[expm Formula ggplot2 Matrix pROC scales]; };
+  SCGLR = derive2 { name="SCGLR"; version="3.0"; sha256="10hsvcjgsycap6wkp06snp2zab1ppsp78kyncpbjnm3vp84qm0nz"; depends=[ade4 expm Formula ggplot2 Matrix pROC]; };
   SCI = derive2 { name="SCI"; version="1.0-2"; sha256="1jvzkdv15ifgf6a3zjfzzcgw2y2vg0wp7yhiamiaqp8xkm142w49"; depends=[fitdistrplus lmomco]; };
+  SCINA = derive2 { name="SCINA"; version="1.0.1"; sha256="05sdg2l2jvwl95c0r11l22wjzqjygc4g1y6awmcx7jz0zv8gmnhx"; depends=[gplots MASS]; };
   SCMA = derive2 { name="SCMA"; version="1.2.1"; sha256="17hn3axhmd6wchh1zmgrj026y5yhg6w68d1mif38rrf5cb2wwjnq"; depends=[]; };
   SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; };
   SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.2"; sha256="01rg3c5i5wbdbkssmzr9x8chd9qm3ijdgvdh1cba6ry9y88f6ry5"; depends=[dplyr dynutils ggplot2 magrittr MASS mclust pbapply pheatmap princurve purrr ranger RColorBrewer reshape2 tidyr TSP]; };
+  SCPME = derive2 { name="SCPME"; version="1.0"; sha256="0yhsaaa349wbrswcvp7w8c52wzp7rs3528rs4wqa8b3r3fh983mh"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; };
   SCRSELECT = derive2 { name="SCRSELECT"; version="1.3-3"; sha256="118vwnd5gggvdhq7fbs0553l84vh5mhiag41q4svprd7p0pqd9hd"; depends=[mvtnorm]; };
   SCRT = derive2 { name="SCRT"; version="1.2.2"; sha256="1x6bzcgb5blavj4zdw4jam5r8yad3plyfzk31vz9pjv39784k229"; depends=[]; };
   SCVA = derive2 { name="SCVA"; version="1.2.1"; sha256="1ixy4ybw3c9w6q8csjv27r5f9x6988zrbr2a3yybhyw8xmkszc4v"; depends=[]; };
   SCperf = derive2 { name="SCperf"; version="1.1.1"; sha256="1kqi3sv9ds58l20pdcnjrrbf7fin82j73yqj5rbx4kjdw560ylb2"; depends=[]; };
+  SDALGCP = derive2 { name="SDALGCP"; version="0.1.0"; sha256="1ll39ws3hlz07v180g8k55z7ziyrqghndpvd0wp0pc85mw5i6f8s"; depends=[maptools Matrix pbapply pdist plyr PrevMap progress raster sp spatstat splancs]; };
   SDD = derive2 { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; };
   SDDE = derive2 { name="SDDE"; version="1.0.1"; sha256="14vql1bypn409w9xcx1jdzff6apiagcz2wng3y24h3mk7yjv9bzy"; depends=[doParallel foreach igraph iterators]; };
   SDEFSR = derive2 { name="SDEFSR"; version="0.7.1.0"; sha256="1pknkda7iaq5247557b93kc3cf2ih7b3wpqpkqyfgfay3ci9kg16"; depends=[]; };
@@ -3413,17 +3556,18 @@ in with self; {
   SGL = derive2 { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; };
   SGP = derive2 { name="SGP"; version="1.8-0.0"; sha256="02yh6kvc34gn33cbnhc5b86pmir1zbl6s875hangwb3qx7r13dx0"; depends=[Cairo colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats plotly quantreg randomNames RSQLite sn toOrdinal]; };
   SGPdata = derive2 { name="SGPdata"; version="20.0-0.0"; sha256="0fxv7nnxiaq6z9wii9x5qiy0vd2z8jw3gcwl5fj9m29ja7j3900g"; depends=[crayon data_table]; };
-  SHELF = derive2 { name="SHELF"; version="1.3.0"; sha256="0qhkp1ypbimiq9r8yv95bipbmhm7b38ibbk9nmhdckrr6ymd2w35"; depends=[ggExtra ggplot2 MASS shiny tidyr]; };
+  SHELF = derive2 { name="SHELF"; version="1.4.0"; sha256="1lc8f19dvnpv1mg32q3vrg96pwcsapkb30fqis6q58v434v42x89"; depends=[ggExtra ggplot2 gridExtra MASS rmarkdown scales shiny tidyr]; };
   SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; };
-  SI = derive2 { name="SI"; version="0.1.0"; sha256="11ywmyz4mamk30p4m9qvgmba237s1xvabablh91rwq13089x8nxm"; depends=[]; };
+  SI = derive2 { name="SI"; version="0.2.0"; sha256="0i6kpaw5yk39skm77nf56ai25clkparz3l8qx0223jrmdqbf97b7"; depends=[]; };
   SIBER = derive2 { name="SIBER"; version="2.1.3"; sha256="14ab9zid0i400kj924m2y5qgp2iibnpllhqw11rlmdf8j9cr7858"; depends=[dplyr ggplot2 hdrcde magrittr mnormt rjags spatstat_utils tidyr viridis]; };
   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.11"; sha256="1gmhfj44qdklsdklmg8p35lmvlgla8i881i3iaziblslyscbyw9f"; depends=[doParallel foreach MASS memoise multicool nnet survival]; };
+  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=[]; };
   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=[]; };
+  SIRE = derive2 { name="SIRE"; version="1.0.2"; sha256="1y313wmbpp7yiqg6sc280s97z1xp5zlpiddx42zwzwanikxscikx"; depends=[igraph MASS Matrix matrixcalc numDeriv psych stringr systemfit]; };
   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]; };
@@ -3445,6 +3589,7 @@ in with self; {
   SMNCensReg = derive2 { name="SMNCensReg"; version="3.0"; sha256="06542jacy74mw6ic0i1ml09pn45sll96bya7dqja6bg9yp0m6bvr"; depends=[Matrix PerformanceAnalytics]; };
   SMPracticals = derive2 { name="SMPracticals"; version="1.4-2"; sha256="0apmkmsv2fqmxpgq08n9k9dvcknj74s4cpp0myjcd6kibb7g9slq"; depends=[ellipse MASS nlme survival]; };
   SMR = derive2 { name="SMR"; version="2.0.1"; sha256="0qy56fmismcjklpf29ic2gi1g8ajdjpxsl0akb9cqzyisyf641ia"; depends=[]; };
+  SMUT = derive2 { name="SMUT"; version="1.0"; sha256="1dsmj0h969q9q6qjamr73yfjxbq7hfjmcawra3lynangnc78y1l7"; depends=[MASS Rcpp RcppEigen SKAT]; };
   SMVar = derive2 { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; };
   SNFtool = derive2 { name="SNFtool"; version="2.3.0"; sha256="1yplcwmy7jhsvz19r82ivpxfqav7q88jcf8d0r2k8ll9iqmi1dbc"; depends=[alluvial ExPosition heatmap_plus]; };
   SNPMClust = derive2 { name="SNPMClust"; version="1.3"; sha256="1gad1jfla4qpczh8vpwyss5cckzgpffsyj0d71r8drbspr4i3r90"; depends=[MASS mclust]; };
@@ -3454,7 +3599,6 @@ in with self; {
   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=[]; };
-  SOD = derive2 { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dvc5apdzs5hpf6xrlfg863pk"; depends=[Rcpp]; };
   SODC = derive2 { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic MASS ppls psych]; };
   SOFIA = derive2 { name="SOFIA"; version="1.0"; sha256="1jlaggxa2nz2r5yb2xmf0dh5wmxfdk6xwn0l3nwsqh82vyxhp7l9"; depends=[png]; };
   SOIL = derive2 { name="SOIL"; version="1.1"; sha256="0dvfh84xjzald51kmdb546par2rbjdn3nys9y9w7cvafv2lc5yj9"; depends=[brglm2 glmnet MASS ncvreg]; };
@@ -3470,7 +3614,7 @@ in with self; {
   SPAr = derive2 { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; };
   SPAtest = derive2 { name="SPAtest"; version="3.0.0"; sha256="0pq8mbj05x4l3lvdgayxigviirhx6ghf4w5bkpvg9hggkb79ib9y"; depends=[]; };
   SPCALDA = derive2 { name="SPCALDA"; version="1.0"; sha256="1bmp2zz0favmpyp0ap8a2r1mg1nlan7zg5cj75drdnfpqlsn5vgl"; depends=[MASS]; };
-  SPCAvRP = derive2 { name="SPCAvRP"; version="0.2"; sha256="1kqx2mf75h491aj6rm923frpj1yl9c1p666cq3f1d7aa1k9byrzi"; 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=[]; };
   SPEI = derive2 { name="SPEI"; version="1.7"; sha256="0lj7d3bbik7q4di5nqc3a1rn94z2y2v9x45r1jjkvgf03frj96qd"; depends=[ggplot2 lmomco]; };
@@ -3484,22 +3628,22 @@ in with self; {
   SPREDA = derive2 { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; 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.0.2"; sha256="0hf6g3s17ri1qzl1180s4akyhp98lj6zx5ix1z6rh53gk6dvxb5l"; depends=[autothresholdr ggplot2 imager infotheo reshape SDMTools spatstat viridis viridisLite]; };
+  SPUTNIK = derive2 { name="SPUTNIK"; version="1.1.1"; sha256="1spzl3dhxf0715xibl9ny2v4xgikd8chwdzb3ari1sj82jx1544p"; depends=[e1071 ggplot2 imager infotheo reshape SDMTools spatstat viridis]; };
   SPYvsSPY = derive2 { name="SPYvsSPY"; version="0.1.1"; sha256="1hxc73wwrzqh1r1xr9yd4hy4ma24virg4iv978lfyc9f9n56znp5"; depends=[]; };
   SPmlficmcm = derive2 { name="SPmlficmcm"; version="1.4"; sha256="1acs3560a7h6xx286m40abr9b7i5qihn6wni8flj0biahmsszzx6"; depends=[nleqslv]; };
   SPreFuGED = derive2 { name="SPreFuGED"; version="1.0"; sha256="1cdamkrr0xpc0l2dypd9lgjidrmalfxs0ms7z3wfmf22a8b3y0d2"; depends=[Biobase boot CMA lattice limma lme4 mvtnorm]; };
-  SQB = derive2 { name="SQB"; version="0.2"; sha256="11ccgf6bsnzfmqs92jl1ds09h2352qhjmwb88dvd7qww9admd0ig"; depends=[caret nnet pls rpart]; };
+  SQB = derive2 { name="SQB"; version="0.4"; sha256="12ii8xlwd2r77bj76j7l43898ras25z3plhhv106jaklhpcnk23m"; depends=[caret nnet pls rpart]; };
   SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; };
   SQN = derive2 { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; };
-  SQRL = derive2 { name="SQRL"; version="0.4.0"; sha256="0wl4drma9nznqdbgb95wq2g12iy87g4s3h67n8dpxp7alx5lxy7q"; depends=[RODBC]; };
+  SQRL = derive2 { name="SQRL"; version="0.5.0"; sha256="19mfr45csr23nw7w3li1iyb6hyf94a7w3xlm1rp8dx2ad0vdhzy2"; depends=[RODBC]; };
   SQUAREM = derive2 { name="SQUAREM"; version="2017.10-1"; sha256="10xj26x7qjyvzndnbjl5krr9wabnb9cbrnp3m7xg673g8ddr12cv"; depends=[]; };
   SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; };
   SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; };
-  SSBtools = derive2 { name="SSBtools"; version="0.2.1"; sha256="1cqdmvh9gxyx2yciy0j54v84hl8cayifv368ip5y3k6g1cff6488"; depends=[]; };
+  SSBtools = derive2 { name="SSBtools"; version="0.3.0"; sha256="14vs51cq34n2i7gwzs4yr53azhl8c1my293q6x7brvy6pflyj9w6"; depends=[Matrix stringr]; };
   SSDM = derive2 { name="SSDM"; version="0.2.4"; sha256="1zn0iaav58pjzd6ckm28w16pblkjxacj2s1daj0sk0423dhjkf76"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard shinyFiles sp spThin]; };
-  SSDforR = derive2 { name="SSDforR"; version="1.4.18"; sha256="0ffy6gk94q4wlil4jhvc0y2pxim81vza517scly71zwp004381q3"; depends=[MASS psych TSA TTR]; };
+  SSDforR = derive2 { name="SSDforR"; version="1.4.21"; sha256="1k73wy1krs4ngh639ajshi1pap13gl7xcwwi2fa0zzng1kyfwp1v"; depends=[MAd MASS metafor psych TSA TTR]; };
   SSL = derive2 { name="SSL"; version="0.1"; sha256="0fy6svf8xfni72bpsg8a5wr8ly46srhfixk8866lrcsp8pb6mqcd"; depends=[caret e1071 klaR NetPreProc proxy Rcpp xgboost]; };
-  SSLASSO = derive2 { name="SSLASSO"; version="1.1"; sha256="0zkzsdk568y9n9yj160i2vxgl570zvrfagwyafapypq5bz1cyjpi"; depends=[]; };
+  SSLASSO = derive2 { name="SSLASSO"; version="1.2-1"; sha256="0x9nbq9lsnq9g47y50z2ymfbj09l2d1lbii2cfjm76nzk3k5lb39"; depends=[]; };
   SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; };
   SSN = derive2 { name="SSN"; version="1.1.13"; sha256="0hk138p1jnlda7d2wxlrf2ipkgliqlip1i5xp67aym979g0b3aaj"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; };
   SSRA = derive2 { name="SSRA"; version="0.1-0"; sha256="1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37"; depends=[shape stringr]; };
@@ -3514,11 +3658,12 @@ in with self; {
   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]; };
-  STPGA = derive2 { name="STPGA"; version="4.0"; sha256="198h2wzhv5lnyqypn7s5lilywby2pq3zdx8vk4qd72bybfwwli2c"; depends=[]; };
+  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]; };
   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=[]; };
-  SUMMER = derive2 { name="SUMMER"; version="0.2.0"; sha256="019yfw76jihk886990pivq1mzbbjbwpn7b4bvmacgbb9v6qrsl3b"; depends=[classInt ggplot2 maptools Matrix pixmap RColorBrewer reshape2 rgeos sp spdep survey survival]; };
+  SUMMER = derive2 { name="SUMMER"; version="0.2.1"; sha256="11qm0spisx8f733d7gjyq8r82zvpv7mjpzxz5xfigyhyzrds18d2"; depends=[ggplot2 maptools Matrix reshape2 spdep survey survival]; };
   SVMMaj = derive2 { name="SVMMaj"; version="0.2-8"; sha256="13d9v1l85md1v6qyfrdc3l36yanw5canskngjr1sh0hmyla182bz"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; };
   SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; };
   SWATmodel = derive2 { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; };
@@ -3531,8 +3676,9 @@ in with self; {
   SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.1.0"; sha256="0wx1rfyf753wppjwwb3l1zpmg4b2mwnwjcw45yzav54yxaszy2v3"; depends=[]; };
   SampleSizeMeans = derive2 { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; };
   SampleSizeProportions = derive2 { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; };
-  SamplerCompare = derive2 { name="SamplerCompare"; version="1.2.9"; sha256="1fl9wgbfnkn2ai4swspl88crqpgd9b43hj8rkqkky4b49b8f6bj8"; depends=[mvtnorm]; };
-  SamplingStrata = derive2 { name="SamplingStrata"; version="1.2"; sha256="1qz0pcmp8a9wbq8qx1j2bv1j4makx97v9n4aiklagnmszg2gvggy"; depends=[memoise]; };
+  SamplerCompare = derive2 { name="SamplerCompare"; version="1.3.0"; sha256="1lqnkgbg1naa3crk3rakrf37vvxj6mbilbpxrv0k5iifdmh0b7k1"; depends=[mvtnorm]; };
+  SamplingBigData = derive2 { name="SamplingBigData"; version="1.0.0"; sha256="0khrh7vfqqzpfp16x0ic5ml854wr2fj28cx95s6c0pz91hzlxkns"; depends=[]; };
+  SamplingStrata = derive2 { name="SamplingStrata"; version="1.3"; sha256="0x4qppi3pbxmlcpcp62yxjia3nk3iy2f1rl6wqm0jsjp4rbn2mn9"; depends=[doParallel memoise pbapply]; };
   SanFranBeachWater = derive2 { name="SanFranBeachWater"; version="0.1.0"; sha256="18w2q3hzcrbmagnjyrn1ikwiyjh723mjb2vy0d8p1a6za0460p9w"; depends=[dplyr lubridate magrittr readr rvest tibble xml2]; };
   SanzCircos = derive2 { name="SanzCircos"; version="0.1.0"; sha256="0vw41qldp1gsj4mx2hdd5jfhx9r8pv62i8gvs86p6bvfzy2l1lq4"; depends=[dplyr pbapply purrr randomcoloR readr tibble tidyr]; };
   Scale = derive2 { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[Hmisc MASS psych]; };
@@ -3558,39 +3704,37 @@ in with self; {
   SeleMix = derive2 { name="SeleMix"; version="1.0.1"; sha256="1qzy59wbjh8llm66l70xi0p3lv94iawh2h5vwa9sqy2ra5vmpaxk"; depends=[mvtnorm]; };
   Select = derive2 { name="Select"; version="1.4"; sha256="1qx4wwxxwjq31vf645xvwb0y2z5h4v6ca8fcrfpaj5kc33f333v2"; depends=[ade4 FD lattice latticeExtra Rsolnp]; };
   SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; };
-  SemNetCleaner = derive2 { name="SemNetCleaner"; version="0.1.1"; sha256="0ry6lv33iynh1dy31zag5z36wr1limi8d7bbcjykcbgsbwcbazfj"; depends=[doParallel dplyr foreach ggplot2 magrittr NetworkToolbox plyr purrr qdap RColorBrewer tm]; };
+  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]; };
   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=[]; };
-  SensMap = derive2 { name="SensMap"; version="0.6"; sha256="0j52aplvdlwwfswyrij0vv7zsdr015cn5931c6631rlps94gka0w"; depends=[doBy factoextra FactoMineR fields ggdendro ggplot2 glmulti lattice MCMCpack mgcv plotly shiny]; };
   SensMixed = derive2 { name="SensMixed"; version="2.1-0"; sha256="0ykg94amnm9clf8d3naap8fmv9qqc6j1q52wnb83zk7ry44dp7dh"; depends=[doBy ggplot2 Hmisc lme4 MASS plyr reshape2 shiny shinyBS xtable]; };
   SensitivityCaseControl = derive2 { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; };
   SensoMineR = derive2 { name="SensoMineR"; version="1.23"; sha256="0a1s2wrb86a0y2faxj5ax8fa6vfcclgg7bcff4j7jb40ilxnxhn4"; depends=[AlgDesign cluster FactoMineR ggplot2 gtools KernSmooth reshape2]; };
-  SensusR = derive2 { name="SensusR"; version="2.2.0"; sha256="0ahgy6mvlxfdavdarmfmb1ld1pykhbrjgg8mdh5q71b3a75vbp47"; depends=[ggmap ggplot2 jsonlite lubridate openssl plyr R_utils]; };
+  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]; };
   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]; };
-  SequenceAnalysis = derive2 { name="SequenceAnalysis"; version="1.3"; sha256="0jrpq5ryw7rwkv99w0a5p3r0vj8nbzj6adlcsr84d9ffgxafmhif"; depends=[XML]; };
   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]; };
   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.3"; sha256="0hfv4balzjjir8gdhrzb92ap36k6imq3igvb1nn0rhb0fq7959cr"; depends=[ape cluster cowplot diffusionMap doSNOW dplyr dtw fitdistrplus foreach fpc ggplot2 ggridges gplots hdf5r Hmisc ica igraph irlba lars lmtest MASS Matrix metap mixtools pbapply plotly png RANN RColorBrewer Rcpp RcppEigen RcppProgress reshape2 reticulate ROCR Rtsne SDMTools tidyr tsne]; };
+  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]; };
   ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; };
   ShapePattern = derive2 { name="ShapePattern"; version="1.0.1"; sha256="18jzs0sq21qhldm86mgx7yb9kl473vv1aljl9hm4560xy5pd5fnb"; depends=[rgdal rgeos sp]; };
   ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.3"; sha256="1vvfl1ldrn0l9w38hx0hhszvj5a2dpmfl6ljzw7f0ji181lrx96m"; depends=[coneproj raster rgdal]; };
-  SharpeR = derive2 { name="SharpeR"; version="1.1.0"; sha256="0qhvpwv81jznqfzm7xysm051ckv8ilq7zhsysxc7wripnlj01c4m"; depends=[matrixcalc sadists]; };
+  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.7"; sha256="0l350q6sy63m09fiamphhkc3hhlncqjn5r2w59gv2hwqnjhwhp2c"; depends=[corrplot CTT data_table deltaPlotR difNLR difR DT ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyBS shinyjs stringr WrightMap xtable]; };
+  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]; };
   ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; };
-  ShortForm = derive2 { name="ShortForm"; version="0.4.1"; sha256="0c2q3lhcyfn3w4iqknid9gav11nlycy9lma5m49vixksv7rf5kyw"; depends=[ggplot2 lavaan stringr tidyr]; };
+  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=[]; };
   SiER = derive2 { name="SiER"; version="0.1.0"; sha256="1ng6vnh30z6z1nvclsdzc9gdbrsrb2kqdqvs6fwm0j1zqlk12x0y"; depends=[]; };
   SiMRiv = derive2 { name="SiMRiv"; version="1.0.3"; sha256="1kzvbzmqcxs0sh23nmjd39zkg68kbnc5djpbjhqhn55qjdfx5776"; depends=[mco raster rgdal sp]; };
@@ -3599,20 +3743,20 @@ 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.0"; sha256="04p6q3g0afyky2ljxf471axik6vwj9l4dv4r487jrykrlhnjrm4z"; depends=[Deriv MASS rgl scatterplot3d]; };
+  Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.2"; sha256="0166m9z2iir7qmfmjd3q7sbkdp0znlynqd2d3smb3yykcf312jbs"; 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]; };
-  SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.5.0"; sha256="10afb3k4rvsmgfx6m1csb0pvnjba1d896llfh3ksmjzxglmvslgw"; depends=[evd]; };
+  SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.6.0"; sha256="0x0wcc3nqw57xs7jiwc8bzmcwnb69dvpfp7anhx6bx607rcbxfpi"; depends=[evd]; };
   SimCorrMix = derive2 { name="SimCorrMix"; version="0.1.1"; sha256="1mx8xkg1nbh4x4xr6m672zyg00s3lky2sy5mz7dfkw40vz2bwi53"; depends=[BB ggplot2 MASS Matrix mvtnorm nleqslv SimMultiCorrData triangle VGAM]; };
-  SimDesign = derive2 { name="SimDesign"; version="1.10.1"; sha256="1g7nvzvmhkisl5bibigrsiv9s9xpigyib01vf05dhyc97f1vsg18"; depends=[foreach pbapply plyr]; };
+  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.0.0"; sha256="1bbmyqh367g4c6a2mnd78y08svaqyr96sj61wg1zn3n06892ilpg"; depends=[Matrix]; };
+  SimInf = derive2 { name="SimInf"; version="6.1.0"; sha256="1y9vk71k7rw7vk91nb25rf1vgnf6cqxw7b9lklrs41x6lk9ar0ps"; 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.1.1"; sha256="00qqqsf7na5c9nslnfpbyr2ysf7d7bi6vnpfiy761nhg8vgf2vjv"; depends=[]; };
+  SimPhe = derive2 { name="SimPhe"; version="0.2.0"; sha256="01kzypahw41jk8s2c92h0k9w32yaicis07wb6k8qlqcmv0zj8xry"; depends=[]; };
   SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; };
-  SimRVPedigree = derive2 { name="SimRVPedigree"; version="0.1.0"; sha256="1krdz4gxnqxj3wabc5hn7ayfqdfmpgg66zj09b3jnngcdaxkjlwb"; depends=[dplyr kinship2]; };
+  SimRVPedigree = derive2 { name="SimRVPedigree"; version="0.3.0"; sha256="1ppms2cirdhm8lsfl74mfc1f9zwc7lin6r5xs649czqlj63yzk4i"; depends=[dplyr kinship2]; };
   SimReg = derive2 { name="SimReg"; version="3.0"; sha256="188q399xcrvjw7y7lf3hfbb7x0m0hc4zaf9i1w2c4xzswmvljd8r"; depends=[ontologyIndex ontologyPlot ontologySimilarity Rcpp]; };
   SimRepeat = derive2 { name="SimRepeat"; version="0.1.0"; sha256="1vq82wlnas0jkl8hlj7dnnbn4y1a56lmszs4w7wya7acri92gkqm"; depends=[BB ggplot2 MASS Matrix nleqslv SimCorrMix SimMultiCorrData triangle VGAM]; };
   SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; };
@@ -3627,6 +3771,8 @@ in with self; {
   Simpsons = derive2 { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; };
   SimuChemPC = derive2 { name="SimuChemPC"; version="1.3"; sha256="06sxknaykikcgbw7qbbw1risg0sbaisb68vhfd7cl6sg0327dznk"; depends=[rcdk]; };
   SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; };
+  SingleCaseES = derive2 { name="SingleCaseES"; version="0.4.0"; sha256="0n2wybp06jx36095aw6073rdr2x1ahrnar28sqla2l2jd28ml72x"; depends=[dplyr magrittr purrr rlang tidyr tidyselect]; };
+  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]; };
@@ -3635,15 +3781,16 @@ in with self; {
   SkyWatchr = derive2 { name="SkyWatchr"; version="0.8-2"; sha256="0if44d79j2hlxdccn3jd7lrfbhrr09rfhfgds132syxprwkcb2mr"; depends=[htmlTable httr sp]; };
   Sleuth2 = derive2 { name="Sleuth2"; version="2.0-4"; sha256="18mh1svmb96hw3rjmgxlwzs7kdcvjkxf4zm8k4w0sxz94ks062i7"; depends=[]; };
   Sleuth3 = derive2 { name="Sleuth3"; version="1.0-2"; sha256="0b4g7j8a204wyvh0q9n1l4zrl9rk7ibyfijd49mjjdyg9zz4kbna"; depends=[]; };
-  SmartEDA = derive2 { name="SmartEDA"; version="0.2.0"; sha256="0k89nvq074c2skjysw0n2cr410ki8f2p2fvzmwy779sgkbabc497"; depends=[data_table ggplot2 gridExtra ISLR rmarkdown scales stringi]; };
+  SmallCountRounding = derive2 { name="SmallCountRounding"; version="0.2"; sha256="1xfx0cqrl7yz0a1alxk00ii2q63dawnlkg1s734sji6l6c0dvchy"; depends=[Matrix SSBtools]; };
+  SmartEDA = derive2 { name="SmartEDA"; version="0.3.0"; sha256="0adx637nmajmjl9j1rbdmx3gl5v6mgd2m3jdxx3wa4z12pjbrdac"; depends=[data_table GGally ggplot2 gridExtra ISLR rmarkdown sampling scales stringi]; };
   SmartSVA = derive2 { name="SmartSVA"; version="0.1.3"; sha256="10a8s2znsg8ywqkq9fsxiyqfsprrx33pqissazp2vmabs11mg4np"; depends=[isva Rcpp RcppEigen RSpectra sva]; };
   SmartSifter = derive2 { name="SmartSifter"; version="0.1.0"; sha256="16rzma87k27qg6qy39mzywdj8pzkp7r9q7bpqyikazp3fk2nmfri"; depends=[mvtnorm rootSolve]; };
   SmarterPoland = derive2 { name="SmarterPoland"; version="1.7"; sha256="03vs6hcd96va9kfhl2yq77alnm33j1dxy79kgrx17hlijsy65qqv"; depends=[ggplot2 htmltools httr jsonlite rjson]; };
   Smisc = derive2 { name="Smisc"; version="0.3.9"; sha256="12chfjjg588a55q3yg0i507vl68hhk7zzprj849smq9azaxidn4k"; depends=[doParallel plyr]; };
   SmithWilsonYieldCurve = derive2 { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; };
   SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.1"; sha256="147wjxgxnijpmixrfyl8kd4scz2w1xb8dcwvpr60zg32nv22g17r"; depends=[lava mvtnorm prodlim]; };
-  SmoothWin = derive2 { name="SmoothWin"; version="1.0.0"; sha256="19yd3gnanv8q8ab0x8ds61rznm5w71dri0liknylikiqgbqwxrcn"; depends=[msgps]; };
-  SnakeCharmR = derive2 { name="SnakeCharmR"; version="1.0.7"; sha256="1i8g0p51mp0j46434zzhmijwwk1v6my7rdw8j41ac3b4as3g0c73"; depends=[jsonlite Rcpp stringr]; };
+  SmoothWin = derive2 { name="SmoothWin"; version="2.0.0"; sha256="1mkmrh9f08sgvx4zvca2q09lrwvy24bcgi72bhy1dzdc4fbpg2s5"; depends=[nlme]; };
+  SnakeCharmR = derive2 { name="SnakeCharmR"; version="1.0.7.1"; sha256="12kzjrxjrgph95m949z6ri97nn97gh6avzqibw1jn76rsnjrhi6r"; depends=[jsonlite Rcpp stringr]; };
   SnakesAndLaddersAnalysis = derive2 { name="SnakesAndLaddersAnalysis"; version="2.1.0"; sha256="0h3664h6d32q201qfyv9y2gg4fhg3azdpwpmx4qfbc10hsc1ghl9"; depends=[]; };
   SnowballC = derive2 { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; };
   SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; };
@@ -3655,25 +3802,27 @@ in with self; {
   SoftClustering = derive2 { name="SoftClustering"; version="1.1502"; sha256="1pgg9mjpfw55m3ny726vx5wl8gwsdkrxv8xzgmy3aqdlwzhh4bwz"; depends=[]; };
   SoilHyP = derive2 { name="SoilHyP"; version="0.1.1"; sha256="10lwfmhiavfyzypdb2rpc0rjsphy84vzg8mrdkncircss45cbvyp"; depends=[]; };
   SoilR = derive2 { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; };
-  SolveLS = derive2 { name="SolveLS"; version="1.0"; sha256="0yb2sx3wjhccmkq8p3jj5pp8dgsdfvv4hr88km5yajl950wkbizp"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; };
   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.4"; sha256="0b48nm3xgvzws9222fmq07chqx4yllz4qjgzxg156s0waxfrjjfi"; depends=[lme4 NAM reshape2]; };
+  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]; };
+  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.1.1"; sha256="12w2yr4q440n68p4gcj82h7gzjd240khfxjwxpngfbhbgp7rmv4b"; depends=[crayon data_table DEoptim DiagrammeR digest dplyr fastdigest fpCompare httr igraph lubridate quickPlot R_utils raster RCurl reproducible sp stringi]; };
-  SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.2.0"; sha256="1xqydiswjg8dn57d0lmfll1ix6ca7w969swpyhwrqkh7x17q9bvg"; depends=[bit checkmate CircStats data_table fastmatch ff ffbase fpCompare magrittr quickPlot RandomFields raster Rcpp reproducible sp velox]; };
+  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_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=[]; };
   SparseDC = derive2 { name="SparseDC"; version="0.1.17"; sha256="0gsfj8631s67a0r9qjjll4rbb57nzk5fwm5bbggvf0027b9hk0pp"; depends=[]; };
   SparseFactorAnalysis = derive2 { name="SparseFactorAnalysis"; version="1.0"; sha256="0lgfvydxb86r5hks1mf0p0yhgpx8s8fbkc3q6dimc728rw26qcv5"; depends=[directlabels ggplot2 MASS proto Rcpp RcppArmadillo truncnorm VGAM]; };
   SparseGrid = derive2 { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; };
-  SparseLearner = derive2 { name="SparseLearner"; version="1.0-2"; sha256="1qxycxpch2m2yyk97210gdzsizhlinc0hkhk5ak00rdgkrsxxc0k"; depends=[glmnet lqa mlbench qgraph RankAggreg SIS SiZer]; };
+  SparseLPM = derive2 { name="SparseLPM"; version="1.0"; sha256="1mpjf7yk2haa8hch315davb6nrhxhy0w2vgw2x4111rn4bskhd8m"; depends=[gtools Rcpp RcppArmadillo vegan]; };
   SparseM = derive2 { name="SparseM"; version="1.77"; sha256="0p6ljma2h12cq1xmy0cxb48ih8dhxxbnwkqzvx3cckxf2kprycm9"; depends=[]; };
+  SparseMDC = derive2 { name="SparseMDC"; version="0.99.5"; sha256="0d3ashk3l9fjdbiyjhaxc05ayyscissrg7lwhnh46hv3fydbixlj"; depends=[doParallel doRNG foreach]; };
   SparseTSCGM = derive2 { name="SparseTSCGM"; version="2.5"; sha256="004hbk5fdd5b5hdvg25wl1908pfya26brm2pz00zypfvis99lps3"; depends=[abind flare glasso longitudinal MASS mvtnorm network QUIC]; };
   SpatEntropy = derive2 { name="SpatEntropy"; version="0.1.0"; sha256="0nk399anjhsdki9cra650ynk6sa0366495470sawxcfs3vxmlzrl"; depends=[spatstat]; };
   SpatMCA = derive2 { name="SpatMCA"; version="1.0.1.0"; sha256="1sjrm1md4lmhyq1yw3np4llkgdskw3mk667jr0k3isjmr6z88gxa"; depends=[fields MASS Rcpp RcppArmadillo RcppParallel]; };
@@ -3688,17 +3837,20 @@ in with self; {
   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]; };
   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]; };
+  SpecDetec = derive2 { name="SpecDetec"; version="1.0.0"; sha256="1940pl4vm1kzszq0hwhqkwbk1xmrimjdf03acpdndy089mdg9avc"; depends=[abind]; };
   SpecHelpers = derive2 { name="SpecHelpers"; version="0.2.7"; sha256="1v3v717ah2fkx9225860dwppdf5m6nnnaaa4iwmj30rn17nqr4jh"; depends=[gsubfn splancs]; };
   SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.4"; sha256="0d6hfmzxqcvg4fcvpsfxx36k95fwkws4rlylrixikndj2fncgwb5"; depends=[MASS numDeriv]; };
   SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-2"; sha256="0dnya9mzkf48clp51jrnkz6lc4fps38nn3lap7n2wcp3dvbvdycg"; depends=[Rcpp RcppArmadillo]; };
   SpectralMap = derive2 { name="SpectralMap"; version="1.0"; sha256="15689023k9jzg3s7bx5m97dmn00z876amqhxsxksy8n8wf09wr57"; depends=[fields scatterplot3d]; };
   SphericalCubature = derive2 { name="SphericalCubature"; version="1.4"; sha256="14xrxhmhavz82rcixnyharnbrvdzs6rh7gbxihaxh431d90w2q3k"; depends=[abind cubature mvmesh SimplicialCubature]; };
   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.0"; sha256="0g9x7dkks9jcgfqz1zzkvgzgjlj2bvlbnpk1k6zc2lplxp7hgzf7"; depends=[rJava]; };
+  SqlRender = derive2 { name="SqlRender"; version="1.5.2"; sha256="07x9jrrr7j6vi8blnl0byry0yh11fnf0zy9137zc4nmnp240fawv"; 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]; };
@@ -3708,7 +3860,7 @@ in with self; {
   Stack = derive2 { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[bit ff ffbase plyr stringr]; };
   StagedChoiceSplineMix = derive2 { name="StagedChoiceSplineMix"; version="1.0.0"; sha256="1008gm6zv5k8lpv0qg42qjriajmx0n4kshjh76mvx91dpi788ivh"; depends=[plyr]; };
   StakeholderAnalysis = derive2 { name="StakeholderAnalysis"; version="1.2"; sha256="164mah8h8izxaqp8hc43l6mlnf95pydkcx2laqrlqr9b0bybadxb"; depends=[]; };
-  StanHeaders = derive2 { name="StanHeaders"; version="2.17.2"; sha256="11fcc59z63rkgk6pp5vhb5avjlbhbjs2v5mn496ai9jms4223ivc"; depends=[]; };
+  StanHeaders = derive2 { name="StanHeaders"; version="2.18.0"; sha256="1h2g4j3ja71szvmwxp5c38s64zf1iamxpjlhkbc40jvw9fhbfc15"; depends=[]; };
   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]; };
@@ -3719,12 +3871,12 @@ in with self; {
   StatPerMeCo = derive2 { name="StatPerMeCo"; version="0.1.0"; sha256="1nm6brlj6h7jx8nqagrfk294ay3pfmkiizabwlb87qfnsfwchpk3"; depends=[]; };
   StatRank = derive2 { name="StatRank"; version="0.0.6"; sha256="14d8v3bp8vgksi6q0mxajwd9s8zi6lns3qwi1vcr5xp9rjp4n6iy"; depends=[ggplot2 plyr truncdist]; };
   SteinIV = derive2 { name="SteinIV"; version="0.1-1"; sha256="1bm4lc7g9h9jkb1dpzb84289bwxcywp0a8vylv6ipvhiqbqk5d95"; depends=[]; };
-  SteinerNet = derive2 { name="SteinerNet"; version="3.0.0"; sha256="1inm36mrxsiczh9i69gbx4d0y39ccgzrjkgdp3p2a1mv0dgzvwbi"; depends=[igraph]; };
+  SteinerNet = derive2 { name="SteinerNet"; version="3.0.1"; sha256="1jkvv0hsj85i1zfr1bmdsrbwgl11mxpfci3z7997m5vvb5fb5cxn"; depends=[igraph]; };
   Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; };
   StepReg = derive2 { name="StepReg"; version="1.0.0"; sha256="1ifdns1fpsjcbwcy19h5hxnd3an53qwba2a7gpn2571zb1phraz8"; depends=[Rcpp RcppEigen]; };
   StepSignalMargiLike = derive2 { name="StepSignalMargiLike"; version="2.6.0"; sha256="0j85lvs2bljfhf482r31sq3xgk8l73hcw22wgxxp8z8nla38cwf9"; depends=[Rcpp]; };
   StepwiseTest = derive2 { name="StepwiseTest"; version="1.0"; sha256="1fdm4s9l6grgd45r98ybbsh40rnmnn16c0id6lv28cpmssi0iphi"; depends=[Rcpp RcppArmadillo]; };
-  StereoMorph = derive2 { name="StereoMorph"; version="1.6.1"; sha256="1q0fif4azv8nd37smhmr61mr4fls1jpm1ky40aqlv6kjm336pn1c"; depends=[bezier jpeg png Rcpp rjson shiny svgViewR tiff]; };
+  StereoMorph = derive2 { name="StereoMorph"; version="1.6.2"; sha256="1jjvkwln9kkjgyg1vn9ma6ffi32cxbkfh6zn69vilbdkmjcsycl2"; depends=[bezier jpeg MASS png Rcpp rjson shiny svgViewR tiff]; };
   StockChina = derive2 { name="StockChina"; version="0.3.1"; sha256="1myxyfchnkskyqb5yciw1wfk3006f51y89ipzfjzdlfyzwy1lsp1"; depends=[]; };
   Storm = derive2 { name="Storm"; version="1.2"; sha256="1fg8y9my9yp6px1gh43mr3m2s2z262mzq03pj52mqg3n186vk8z3"; depends=[permute rjson]; };
   StrainRanking = derive2 { name="StrainRanking"; version="1.2"; sha256="1r8avm9xajqmsy4x7pgh1yaffq7wl5i5kg75kdilydwmii6n19i0"; depends=[]; };
@@ -3741,31 +3893,32 @@ in with self; {
   SubLasso = derive2 { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet gplots psych]; };
   SubTite = derive2 { name="SubTite"; version="2.0.3"; sha256="1i95f3x1nkhx9kqzxwvi15x6yq7mcdihzjxh60la6jvq5nscfi3l"; depends=[Rcpp RcppArmadillo]; };
   SubVis = derive2 { name="SubVis"; version="2.0.2"; sha256="1nb3zgm6i5lwfwdrn8mk3wkg8a4ldfvs27ai8v46l4316qc1fa9p"; depends=[Biostrings shiny]; };
+  SubgrPlots = derive2 { name="SubgrPlots"; version="0.1.0"; sha256="0bhrb82yck4q72r268wqcnz2cm0sss92zff580s5jjijc2cwh3cp"; depends=[alluvial circlize colorspace diagram dplyr geoR ggplot2 gridBase gridExtra plyr polyclip scales shape sp survival survRM2 UpSetR VennDiagram]; };
   SubgrpID = derive2 { name="SubgrpID"; version="0.11"; sha256="1by23gdkbls7l5xa9nl055nbm0d3138pmfmasqmcy42h62wf7dw6"; depends=[AIM ggplot2 glmnet Matrix rpart survival]; };
   SubpathwayGMir = derive2 { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; };
   SubpathwayLNCE = derive2 { name="SubpathwayLNCE"; version="1.0"; sha256="051csjavr9549y54yirfdn266i7swsvpbcakhziyz4sl4afwx5kl"; depends=[BiasedUrn graph igraph RBGL]; };
   Sunclarco = derive2 { name="Sunclarco"; version="1.0.0"; sha256="0jv92a4ciwkm0wa4irgb6ql3vf6v6p24fmbnk24pqp5p8drp8g5v"; depends=[survival]; };
   Sunder = derive2 { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; };
   SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; };
-  SuperExactTest = derive2 { name="SuperExactTest"; version="1.0.0"; sha256="184s0pnwv9irqjlv24svfz3ami559ln03wjknyj67pwi4pfbzz87"; depends=[]; };
+  SuperExactTest = derive2 { name="SuperExactTest"; version="1.0.4"; sha256="01839mp8g0hyrhsd2n37km0dlmq53f2x6mqnghjgycg6w3dd7jjm"; depends=[]; };
   SuperGauss = derive2 { name="SuperGauss"; version="1.0"; sha256="1yqskaz4zsx87mcb9p7081h2lilaiwa3213yxlkyihyans7gnmp8"; depends=[fftw Rcpp RcppEigen]; };
-  SuperLearner = derive2 { name="SuperLearner"; version="2.0-23"; sha256="04bsgxdczw5gr8mkyxgzrsawv2zfcab5jd85azac3m2n08402v44"; depends=[cvAUC nnls]; };
-  SuperRanker = derive2 { name="SuperRanker"; version="1.1.0"; sha256="19cfz89557ygf5dvvqykmxcr72sfa0s2d37pplp6iwbhkl4wfw04"; depends=[prodlim Rcpp]; };
+  SuperLearner = derive2 { name="SuperLearner"; version="2.0-24"; sha256="0hzgqhkj638dcrd4rwi1m37i0rjap2llz6zvf32jbcc5r2i5ixmd"; depends=[cvAUC nnls]; };
+  SuperPCA = derive2 { name="SuperPCA"; version="0.1.0"; sha256="02kn3gvmlnn89pk054pmyxgkh5h1qf78fym0j3xagl3cq97h1js8"; depends=[fBasics glmnet MASS matlab matlabr Matrix matrixStats pracma psych R_matlab RSpectra spls timeSeries]; };
+  SuperRanker = derive2 { name="SuperRanker"; version="1.1.1"; sha256="1yiklw9zk7yw0xz5g3lmyl5lv325fnysimdwbxa37nyj6qdfv0ls"; depends=[prodlim Rcpp]; };
   SuppDists = derive2 { name="SuppDists"; version="1.1-9.4"; sha256="1ffx8wigqqvz2pnh06jjc0fnf4vq9z2rhwk2y3f9aszn18ap3dgw"; depends=[]; };
   SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="0.1.0"; sha256="0cw2nsqc9dx36svb49pqkmrxwk5hhbih206mwwkzfyavswxd2lpv"; depends=[gstat gtools raster rgdal rgeos sp]; };
-  Surrogate = derive2 { name="Surrogate"; version="0.9"; sha256="10prqish36nvkipmagqqr5whq2qhy26nlm636i4kyj2iw3139xzg"; depends=[lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms survival]; };
+  Surrogate = derive2 { name="Surrogate"; version="1.1"; sha256="1wmvr0wmhb0pfgn5rjq7v0zvkcy0bn01bqylbimkfrp5qlc2nf65"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms rootSolve survival]; };
   SurrogateTest = derive2 { name="SurrogateTest"; version="1.0"; sha256="0dw8ic2rskwhj9f013q0j5my7qfsqihfis93frrlz4qag68jddqn"; depends=[survival]; };
   SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; };
   SurvDisc = derive2 { name="SurvDisc"; version="0.1.1"; sha256="0ajvnm0a4krbm0m584bg58hd7dzl0f2rz5as1zsajx8agywb5qmv"; depends=[cubature MASS mvtnorm nlme simex survival]; };
   SurvGSD = derive2 { name="SurvGSD"; version="1.0.0"; sha256="0aa5zaf9akkqkxs8iqwnm93sfwakhhhs3qfafbk0vrwmb5yvzzm1"; depends=[flexsurv ldbounds mnormt]; };
   SurvLong = derive2 { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; };
-  SurvRank = derive2 { name="SurvRank"; version="0.1"; sha256="1i08yjprzd9irs46rifa5fsmmhwbsf4py0m8qp5rprznyr8504y3"; depends=[doParallel foreach ggplot2 glmnet gplots ipred mboost randomForestSRC reshape rpart sampling survAUC survival]; };
   SurvRegCensCov = derive2 { name="SurvRegCensCov"; version="1.4"; sha256="0ipr7lajnrklk963lrlgx946l6r191q3bfif4njkdmw0x797nzm2"; depends=[numDeriv survival]; };
+  SurvTrunc = derive2 { name="SurvTrunc"; version="0.1.0"; sha256="0b6s7llljp75agd57lmc1yq5acnfwy113khrfjcbm1l5ply6pz7f"; depends=[survival]; };
   Survgini = derive2 { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; };
   SvyNom = derive2 { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; };
   SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-4"; sha256="1b0h1jfywsrfdj8dkbnlzvh7654rycagxij9jbzb65g6swss6ajx"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; };
-  SweaveListingUtils = derive2 { name="SweaveListingUtils"; version="0.7.7"; sha256="04yxhphf069y29b40i34kr4hvlcv8kgr6kqc2vdz2a40564fdsjb"; depends=[startupmsg]; };
-  SwissAir = derive2 { name="SwissAir"; version="1.1.4"; sha256="1avc32q7nbwjkcbml7z05car6khv1ghcz3miw0krm8i53w032c6f"; depends=[]; };
+  SwissAir = derive2 { name="SwissAir"; version="1.1.5"; sha256="0lh69924vhyilgn562jqn8m7z4dq3xmdj09501sbs7hbxfaiiyly"; depends=[]; };
   SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; };
   SymTS = derive2 { name="SymTS"; version="1.0"; sha256="17vhm00zd9yxl6li36bsfkm4rsizjsm93ibrzgqnkl72sqmmlwfi"; depends=[]; };
   SympluR = derive2 { name="SympluR"; version="0.3.0"; sha256="0a3irbk5bh3af8rv4l4sh3ymj3icyqjv5akzmx6rrp6pr3mgq6c6"; depends=[httr jsonlite plyr readr]; };
@@ -3774,25 +3927,26 @@ 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.12-18"; sha256="1mbhf5ni2a1mlyh8qa7id3p0h1baqigmh5ch2yf18h8mn52ig47i"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; };
+  TAM = derive2 { name="TAM"; version="2.13-15"; sha256="0c13327dp2whnmns0k53f5rc2cz60kjhdh6nq4q021yhm2j4xd81"; 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]; };
   TBEST = derive2 { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; };
-  TBFmultinomial = derive2 { name="TBFmultinomial"; version="0.1.1"; sha256="0cwga4pkfz4azm62v54jql07ymkhm97wyccz4gg6mhwy4qzigyjq"; depends=[nnet plotrix stringr VGAM]; };
+  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]; };
   TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; };
   TCGAretriever = derive2 { name="TCGAretriever"; version="1.3"; sha256="0mi8j7k2b1sx75ka8ympydqpk8jqp8wz8dyf4vk4776fra7bq24p"; depends=[httr]; };
   TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.2"; sha256="1fgjmz297jckdb0xsly1scq5n8y8awfgdkr4yfml4lim2mkdsigx"; depends=[httr jsonlite]; };
-  TDA = derive2 { name="TDA"; version="1.6.2"; sha256="1vkb4d3ayw8y4iskd6y1y9hnp0baidaxiqjqydxv2jwkdx0x9c3z"; depends=[BH FNN igraph Rcpp RcppEigen scales]; };
+  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]; };
   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]; };
   TDPanalysis = derive2 { name="TDPanalysis"; version="0.99"; sha256="1kyhs4rpkm3gr55l6hrz4xcb9igk95si1m1sp175580k16n885z0"; depends=[plyr]; };
   TDboost = derive2 { name="TDboost"; version="1.2"; sha256="0sc9vby4892gm5b5h8gbdl4misqvgbkfp8fms53dk83malxkw1zx"; depends=[lattice]; };
-  TE = derive2 { name="TE"; version="0.2-2"; sha256="1yy6ky11ijnnkz2a4g6lww870pb4himn9nx230jnxpr0q8nsfqpb"; depends=[MASS rainbow]; };
+  TE = derive2 { name="TE"; version="0.3-0"; sha256="15530a5qjlh74c1qji76j25mm4c59gifp34y066f8j21f70rahfs"; depends=[MASS rainbow]; };
   TED = derive2 { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vhkr1f3vlym2hqs0pq0lnsl4g0"; depends=[animation fields foreach geoR RcppArmadillo zoo]; };
   TEEReg = derive2 { name="TEEReg"; version="1.1"; sha256="0v5qz3vvmcm3fh16kjb05j1r0yj23r7hrxf2www20ng3dmga5q0f"; depends=[]; };
   TELP = derive2 { name="TELP"; version="1.0"; sha256="0wzm3dz0489ha7dd6lkashvvjydck9jw2pavlx9plpksvzr4q9ph"; depends=[arules arulesViz ggplot2 gridExtra RColorBrewer tcltk2 tm wordcloud]; };
@@ -3800,26 +3954,26 @@ in with self; {
   TERAplusB = derive2 { name="TERAplusB"; version="1.0"; sha256="0mshx615awcf2arm39mgw2gzgpyn7a3f767484g7z4nqqlikwpgc"; depends=[]; };
   TESS = derive2 { name="TESS"; version="2.1.0"; sha256="05xsz2v847pwj4ja7hmg3zfbfqrwwzpf0ri0gjzb8snm2a7xm23y"; depends=[ape coda deSolve Rcpp]; };
   TExPosition = derive2 { name="TExPosition"; version="2.6.10"; sha256="12rgijlclaipwjjiyng7nwilzixdy6lsvncigcg0vjydhgk97jn1"; depends=[ExPosition prettyGraphs]; };
-  TFDEA = derive2 { name="TFDEA"; version="0.9.8.3"; sha256="0qg4nhlqqj7hc8lg732zz8klbbp3yksnq8q8n4ml3jz8gadrpyj7"; depends=[lpSolveAPI]; };
   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]; };
-  TH_data = derive2 { name="TH.data"; version="1.0-8"; sha256="17csnwyk2f3d47nghkfy9wly5kff8zhdcfwfml7509hjrjgi13s7"; depends=[MASS survival]; };
+  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=[]; };
   TInPosition = derive2 { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[ExPosition InPosition prettyGraphs TExPosition]; };
   TKF = derive2 { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[ape expm numDeriv phangorn phytools]; };
   TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; };
-  TLMoments = derive2 { name="TLMoments"; version="0.7.2.1"; sha256="1xgkbdnh79dj54jg5kf0c5kwykcvjaf4y16yyqf0vcc7aand6a3y"; depends=[hypergeo Rcpp]; };
+  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]; };
   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]; };
-  TOSTER = derive2 { name="TOSTER"; version="0.3.3"; sha256="1b1zmg0klf26hajlf420vpf8yf47np2l6ccl6062jmakg37ngh00"; depends=[ggplot2 jmvcore R6]; };
+  TOSTER = derive2 { name="TOSTER"; version="0.3.4"; sha256="1pxcvlw2nhh1sv0d662xc61rykf7kz7f4xjq3yrqf119gjcmps5s"; depends=[ggplot2 jmvcore R6]; };
   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]; };
   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]; };
   TRADER = derive2 { name="TRADER"; version="1.2-3"; sha256="1w9m2b866dyj82s118m64q8j9a1chpq2km2pnn9mfwwj8sivgdgn"; depends=[dplR]; };
@@ -3829,6 +3983,7 @@ in with self; {
   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]; };
+  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]; };
@@ -3856,10 +4011,10 @@ in with self; {
   TSrepr = derive2 { name="TSrepr"; version="1.0.1"; sha256="07gxsp4cfzpjmm6l9wpcdxar3sngm0ih0gp4c8gb6kyzm7pb780n"; 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.1"; sha256="1myvih5kd9pliczddjscqlq811dswqh9d8an8p5bi12h31w9pp30"; depends=[forecast lubridate magrittr plotly reshape2 xts 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]; };
   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-3"; sha256="07r62ngyzjl4aszdxnr3n6bnbcgcap32yhd430jsilicg8n06di1"; depends=[curl xts zoo]; };
+  TTR = derive2 { name="TTR"; version="0.23-4"; sha256="18mzyv6cmxmqyqsfwlx2b2k055887mfgc2jgj8xkn8c6m56n05zb"; depends=[curl xts zoo]; };
   TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; };
   TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; };
   TUWmodel = derive2 { name="TUWmodel"; version="1.0-1"; sha256="1q150r0m93cjj0q1qvn4drhgvhvvgb63d8iii5crhzjpqbdhyka7"; depends=[]; };
@@ -3869,20 +4024,23 @@ in with self; {
   TableToLongForm = derive2 { name="TableToLongForm"; version="1.3.1"; sha256="135q0bgsm2yndrg3vpwmihbqlyf3qkm97i0jvcw6bf06p6b2fk41"; depends=[]; };
   TailRank = derive2 { name="TailRank"; version="3.2.1"; sha256="142m0cq9j8y5g9wh4plxya1jqi0dv6p6praxx3jb84kwqspi91xr"; depends=[Biobase oompaBase oompaData]; };
   TanB = derive2 { name="TanB"; version="0.1"; sha256="05y9j1a5nzqfpsw48gix5c4ds1cm80liad9wnwmddhbx4fda6p32"; depends=[fdrtool pracma]; };
+  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.3"; sha256="1z1yzy4f9k0zxa6zx1vp5axgjszics5wa8niy6087jz3r7y2bwph"; depends=[]; };
-  TauP_R = derive2 { name="TauP.R"; version="1.1"; sha256="10sjvcv70fjrsl5nnk9gm4sy7nhwm6aaq57gr37cb10v079ykmk1"; depends=[]; };
+  Tariff = derive2 { name="Tariff"; version="1.0.4"; sha256="1sf7qzv6cdx1k0h5cc2w1jbcpg07j02r5h31xcbsnsgd7wj3h3q1"; 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=[]; };
   Taxonstand = derive2 { name="Taxonstand"; version="2.1"; sha256="0dvhiqggbv1by284fg38rcvvrxr9q3zp5gh51p1dh0129h73qj7i"; depends=[pbapply]; };
   TcGSA = derive2 { name="TcGSA"; version="0.11.1"; sha256="072i04cp91v2ygarpqg8dlqqf8hia0ryambcv83fcchz9hzs2yx6"; depends=[cluster cowplot ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; };
   Tcomp = derive2 { name="Tcomp"; version="1.0.1"; sha256="1k0gsf3yr5n9zc2yi6szxm6s7bf61lz4fx8m3v48jlp5w900prwb"; depends=[forecast Mcomp]; };
-  TeXCheckR = derive2 { name="TeXCheckR"; version="0.5.1"; sha256="18p3hyrrglgn2fdn5q9p1ayb58nznpdr5sy9mniybzsxrmfhghax"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr rstudioapi zoo]; };
+  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=[]; };
   TeachingDemos = derive2 { name="TeachingDemos"; version="2.10"; sha256="016pivvy8gzz8f3clnr5dg488rb1lf0l5s00c3v34gm1dgiw5x1f"; depends=[]; };
-  TeachingSampling = derive2 { name="TeachingSampling"; version="3.2.2"; sha256="07c1wx7hl246kvj9ah55kdjpag8a9zbzh3jy0680w5nnv8vzsxxs"; depends=[]; };
-  TempleMetrics = derive2 { name="TempleMetrics"; version="1.1.0"; sha256="02cs2dgcmxgz1y98x4rpq4l4khqvbnr0248s6rgrgq5l3z2s4qr0"; depends=[BMisc pbapply]; };
+  TeachingSampling = derive2 { name="TeachingSampling"; version="3.4.2"; sha256="1r06if6ljlr9i3y5ri7akris97dsjy3n3n6sgz2dvy9szm4zsadp"; depends=[]; };
+  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=[]; };
   TestDataImputation = derive2 { name="TestDataImputation"; version="1.0"; sha256="07k4sgjda1gwdlx5rap5fhs5rww2ahzyf0fq98dsm99gvjajnmwn"; depends=[Amelia mice]; };
   TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; };
@@ -3891,21 +4049,20 @@ 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.0"; sha256="1gbbmmgmp6a8swl6kdfzf4kj9dpm17m809r2xrc58wg8gslx8m1c"; depends=[png tiff]; };
+  Thermimage = derive2 { name="Thermimage"; version="3.1.1"; sha256="10jffqhqvy2is41cgzmkzrncqd65yjsyag8qli114s799qd9g3bm"; depends=[png roxygen2 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=[]; };
   ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; };
-  Thresher = derive2 { name="Thresher"; version="0.12.3"; sha256="1lrydxrv67ga73bzxyvnibmggr9kixq2jb6as4cv35rm93vs5mrg"; depends=[ade4 ClassDiscovery colorspace MASS movMF oompaBase PCDimension]; };
+  Thresher = derive2 { name="Thresher"; version="1.0.2"; sha256="06qc2dzapp78d27x855fc03k7p878bkv6b1ry4a9m23kmlvsyfi4"; depends=[ade4 ClassDiscovery colorspace MASS movMF oompaBase PCDimension]; };
   ThresholdROC = derive2 { name="ThresholdROC"; version="2.6"; sha256="0ah102z6v9k5pxp3kbj5ffa9vhb7vi7axjkrg5qy5b4spnb71qsg"; depends=[MASS numDeriv pROC]; };
   TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; };
   TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; };
   TideCurves = derive2 { name="TideCurves"; version="0.0.3"; sha256="0wll0zbkfas6hs4h8ma5km68nv2brw1k75ngw5lrnxilya22lrgp"; depends=[chron data_table fields]; };
   TideHarmonics = derive2 { name="TideHarmonics"; version="0.1-1"; sha256="1g1v99gh6mns4l8ipmw7kpalbk07m92ybcqjq7b0wsjmdvs1y67s"; depends=[]; };
   TideTables = derive2 { name="TideTables"; version="0.0.2"; sha256="1grm9s9np7xs2d8gql4sgg72rxpxiidw6g1ni8q97qgqr7r3105l"; depends=[chron data_table]; };
-  Tides = derive2 { name="Tides"; version="2.0"; sha256="0s7ja0vs8ag7myjq4kmza4ja9p76sdbbkaaamxbsgp9yaf02c6nf"; depends=[]; };
-  TileManager = derive2 { name="TileManager"; version="0.2.0"; sha256="1zk5q1m3imlr9ms81jyb9kibm0m5zmiidsv86qgnqj8r4b8hpqyh"; depends=[APfun raster rgeos sp]; };
-  TimeMachine = derive2 { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; };
+  Tides = derive2 { name="Tides"; version="2.1"; sha256="0da3z010ali83qf8mf1znicqv8vvsa5r93mc40ax60ln2w33nlrm"; depends=[]; };
+  TileManager = derive2 { name="TileManager"; version="0.3.0"; sha256="1my9ljgr7j9qvgc2f2qj7d8m0yp0jq8xhq31jc6mnzbsppmr1q6n"; depends=[APfun raster rgeos sp]; };
   TimeProjection = derive2 { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; };
   TimeSeries_OBeu = derive2 { name="TimeSeries.OBeu"; version="1.2.2"; sha256="1a44fb29yacwgdiwaf5fpxzc5222cpi5mkv7l0dh43b6lh8f0j5k"; depends=[forecast jsonlite locfit trend tseries]; };
   TimeVTree = derive2 { name="TimeVTree"; version="0.3.1"; sha256="124kg9zcq4b2j4qvg9f6gykbmzf69qjnnw54nv213ip2h4rdkv32"; depends=[survival]; };
@@ -3919,8 +4076,8 @@ 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-8"; sha256="0x4ppghg7rbsj7q4q274vcs6kcwajjbi0s181r5qmzbxf20l8k9r"; depends=[boot cluster Hmisc RColorBrewer]; };
-  TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.2"; sha256="1k2s3syx27vma5k0qcfx2579jyaxmx7crizkvz3wplhzdwag7wbk"; depends=[cluster RColorBrewer survival TraMineR]; };
+  TraMineR = derive2 { name="TraMineR"; version="2.0-9"; sha256="01sbf5dmy1bp0kqhn9xmf6kwjk3h6cgys28hzr61q4qxq5x0373f"; 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=[]; };
   TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.0"; sha256="1lnh9lbjxaradivnd1dkd2szggjh2r4v7klpyxb862dxsmdxxrqw"; depends=[caret data_table dplyr lubridate neuralnet RCurl zoo]; };
@@ -3928,12 +4085,11 @@ in with self; {
   TrajDataMining = derive2 { name="TrajDataMining"; version="0.1.6"; sha256="1n5qcyc1kb8rdrqaji7pp63l2gyr6jim8spm8ydb4lnqfcnrin9g"; depends=[geosphere rgdal RPostgreSQL sp spacetime trajectories xts]; };
   TransModel = derive2 { name="TransModel"; version="2.1"; sha256="0brlr4w5k8xsgbrizm7ha0cmq0kqzd2fcjpszq7gym844jj93csi"; depends=[MASS survival]; };
   TransP = derive2 { name="TransP"; version="0.1"; sha256="0p6pfcp8qjdah0lfhx0a396nxjzp3ckpda9hl3snpppx79iyww55"; depends=[]; };
-  TransferEntropy = derive2 { name="TransferEntropy"; version="1.4"; sha256="0620axdj6qyskf7xszrs8j5d2l73ns4bgbdg03fvr8i7jmq70zb8"; depends=[BH Rcpp]; };
   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.1"; sha256="0229ip18vbz36ks28p6pja30fb72qcdp7vwi2x0aiymhiigsmirs"; depends=[ggplot2 lubridate]; };
+  TreeDep = derive2 { name="TreeDep"; version="0.1.2"; sha256="1li5h44crg7gb8589w6g2c1ms7jpk3x3nq378f66ihwhfdak3zn9"; depends=[ggplot2 lubridate]; };
   TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; };
-  TreeSearch = derive2 { name="TreeSearch"; version="0.1.2"; sha256="0q25zw53whp1v57pkc50h2j7jb64jpip00s0qnmvdgncbrs4zhx5"; depends=[ape memoise phangorn R_cache Rdpack]; };
+  TreeSearch = derive2 { name="TreeSearch"; version="0.2.0"; sha256="1zn2ig3iq5mfqs5gd31g1smm9vv1q68j1w9wpx4x4yxrwib35ghh"; depends=[ape colorspace gmp memoise phangorn R_cache 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]; };
@@ -3949,6 +4105,7 @@ 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]; };
   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]; };
@@ -3956,9 +4113,12 @@ in with self; {
   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]; };
+  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]; };
   UPMASK = derive2 { name="UPMASK"; version="1.1"; sha256="1qxajvld8g2mii12agypcm50fps9bai6d2wx6l0bv3srk80in7ai"; depends=[DBI MASS RSQLite]; };
+  UPSvarApprox = derive2 { name="UPSvarApprox"; version="0.1.1"; sha256="1lm3xzj70s070ag2sk24nq5ayckk3mnqfmwppbhq5i4y13fw6vip"; depends=[]; };
   USAboundaries = derive2 { name="USAboundaries"; version="0.3.1"; sha256="1mqbxkv347307mbvn70929bi3l8wmiwrp86rxdgy45g2ddjdcb6s"; depends=[]; };
   USCF = derive2 { name="USCF"; version="0.1.3"; sha256="00ynxfd4lg8g4mspz5izxvgkj27l2i1cnp0z0dnkhsbxsg0161mj"; depends=[]; };
   USGSstates2k = derive2 { name="USGSstates2k"; version="1.0.1"; sha256="11yk0pkss23j6fmmxnjkjm9p24ln343y4hijigbrbvcnb21wj2py"; depends=[sp]; };
@@ -3977,30 +4137,35 @@ in with self; {
   UniDOE = derive2 { name="UniDOE"; version="1.0.2"; sha256="14jz4acrvbv59sbr7gya8g0z749vv0i04gl5wl0y4218byjvw6bs"; depends=[Rcpp]; };
   UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; };
   Unicode = derive2 { name="Unicode"; version="11.0.0-1"; sha256="1rjyz1d7xw9i1pzx0g653ymkr5hjcmri3dl8v0skzq13qc3fag3d"; depends=[]; };
+  UnitCircle = derive2 { name="UnitCircle"; version="0.1.3"; sha256="0z5ssps8l5ka4aw4984qml15scw4pfssara5dls82afhfhpkszsr"; depends=[]; };
   UnivRNG = derive2 { name="UnivRNG"; version="1.1"; sha256="0vjsqc1y24z7zlclglh55kkxjhy0dc5gjsy427zdv95j58jbxa66"; depends=[]; };
   UpSetR = derive2 { name="UpSetR"; version="1.3.3"; sha256="08vj7l92b8fpqyqwxshll2mhk3yhgyr74axvr2lf29z78bapymhz"; depends=[ggplot2 gridExtra plyr scales]; };
   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.7"; sha256="1vf0gqf81lbksp9m6yj28wsk5s29fqcfvlymy91hni814dkb1mxw"; depends=[]; };
+  VARSEDIG = derive2 { name="VARSEDIG"; version="1.8"; sha256="10qkhi749z2hsywzdri6ari02x3ninprg1hj41fslvr7bjq2hn4z"; 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]; };
-  VBLPCM = derive2 { name="VBLPCM"; version="2.4.4"; sha256="09b80313w2dljl009xzcfhdcl6flc8nqzw9pzgfbciwi61666ppb"; depends=[ergm mclust network sna]; };
-  VCA = derive2 { name="VCA"; version="1.3.3"; sha256="03ibvn3a6bbgq36a1ibhi4givdnba6d0qcfbpbdxkz5masn1r23q"; depends=[lme4 Matrix numDeriv]; };
+  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]; };
   VDA = derive2 { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; };
   VDAP = derive2 { name="VDAP"; version="2.0.0"; sha256="134x4aisaim72xkyzb1vb8vhl2m4i12yzh6cj858a1ag7b0ing3n"; depends=[drc ggplot2 reshape2 stringr]; };
   VDSPCalibration = derive2 { name="VDSPCalibration"; version="1.0"; sha256="1hrmmhvk3mhd3bdl0msnm5shcj4cjgd3pn1rkfkv8fh4llqvz7w8"; depends=[]; };
-  VGAM = derive2 { name="VGAM"; version="1.0-5"; sha256="0ik3wyv6jj54bg34z0fzzk4xg0h6x98jqx4q2r7g1f0in0qgbb01"; depends=[]; };
+  VFP = derive2 { name="VFP"; version="1.0"; sha256="1gkpqxmxyv1hdaxk5yi3cd1k9q246q5gj9xhfnc87dp60rfg8p8f"; depends=[gnm MASS]; };
+  VFS = derive2 { name="VFS"; version="1.0.2"; sha256="1b8sl8id2gj4iqkpjzd3giybbix2jvskwsbw1kqj3zqr77hygxwg"; depends=[e1071 nleqslv]; };
+  VGAM = derive2 { name="VGAM"; version="1.0-6"; sha256="1fg31xz86jblqraifiy3q36d0hjqnll01jxx85xq87j1cyhj060j"; depends=[]; };
   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]; };
   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=[]; };
   VIM = derive2 { name="VIM"; version="4.7.0"; sha256="1vjcs5wvjv94ln01d94h9rs4j50d3ky4n26mm3prgh13raylrmnd"; depends=[car colorspace data_table e1071 laeken MASS nnet Rcpp robustbase sp vcd]; };
   VIMGUI = derive2 { name="VIMGUI"; version="0.10.0"; sha256="14na9ss0vkcys979kdcciynwssqsvy2w566nydgzd3n7gcmx2agm"; depends=[Cairo foreign gWidgets gWidgetsRGtk2 Hmisc RGtk2 survey tkrplot VIM]; };
   VLF = derive2 { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; };
-  VLMC = derive2 { name="VLMC"; version="1.4-1"; sha256="0y91cl9pv1d5s8956grdx3y4xa5l1fabrh1wl5hn11fjgyz1dcij"; depends=[MASS]; };
+  VLMC = derive2 { name="VLMC"; version="1.4-2"; sha256="1jlyi0zl6d3zk8mp3rzcsq850ivqcg8296jndrdzmlsrp8mnldrq"; depends=[MASS]; };
   VNM = derive2 { name="VNM"; version="7.1"; sha256="19qglcibb7r6jjz0n0piklwfv3hi4jphd6vmyfbm0ccjjkmn5nin"; depends=[Rcpp]; };
   VRPM = derive2 { name="VRPM"; version="1.2"; sha256="1cai5a71vzkx0d7cwzsxbcz7r9cdkqjk4l4bp2ffj5pp7nrlh15r"; depends=[fields ggplot2 Hmisc kernlab R2HTML ROCR shiny survival viridis]; };
   VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; };
@@ -4008,12 +4173,13 @@ in with self; {
   VTrack = derive2 { name="VTrack"; version="1.21"; sha256="1acf2b8zy72shc4768rhikfa3590h3l3nwk32jk7pwsms0nb87rf"; depends=[checkmate doParallel foreach gdistance gstat Hmisc intervals lubridate plotKML plyr raster sp spacetime XML]; };
   VWPre = derive2 { name="VWPre"; version="1.1.0"; sha256="1ccrim9nx5fmmadg687gz9qrfkyxp48rskg1n2pxfwd3h10c9js1"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; };
   VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; };
+  VarBundle = derive2 { name="VarBundle"; version="0.3.0"; sha256="0jfx9gkb3f29lgc0nrz3xc7m2ham0scx9lay7x5a6ira7crga6cr"; depends=[crayon dplyr glue magrittr R6 stringr tibble]; };
   VarED = derive2 { name="VarED"; version="1.0.0"; sha256="16j9p2a143y4hqclsv1mig0fccrzjx2r0lll0wz8isjp9x1wzjv8"; depends=[]; };
   VarReg = derive2 { name="VarReg"; version="1.0.2"; sha256="04235hr0r6sp7r3ccvcfb8l6p8yapcdrn6zl7mmvbyc4qb70gawh"; depends=[sn survival]; };
-  VarSelLCM = derive2 { name="VarSelLCM"; version="2.1.2"; sha256="0ilkn40b7845y3nlli160i6fmfaw2p1hvd97q2hnpvscrgmdqvz3"; depends=[ggplot2 mgcv Rcpp RcppArmadillo shiny]; };
+  VarSelLCM = derive2 { name="VarSelLCM"; version="2.1.3"; sha256="07ss4wxw1q1mvf6y860zcl5ja65f5yaqpgqj1k1yi5smqj50y0jk"; depends=[ggplot2 mgcv Rcpp RcppArmadillo shiny]; };
   VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
-  VarfromPDB = derive2 { name="VarfromPDB"; version="2.2.7"; sha256="1sb31338r2p0jsa3k72q9lc5f57cybywmda7q2j8byngh1fjvgyz"; depends=[curl RISmed stringi stringr XML XML2R]; };
-  VariableScreening = derive2 { name="VariableScreening"; version="0.1.1"; sha256="03l929qhgr1bd721488xx0il1hlswv3zdad518ki94ghq9c4nmg3"; depends=[expm gee MASS]; };
+  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]; };
   VdgRsm = derive2 { name="VdgRsm"; version="1.5"; sha256="13mbv3ih6p2915wdzq4zjx7m4k37w1xddkxx6dzk1jiak2br9slj"; depends=[AlgDesign permute]; };
   Vdgraph = derive2 { name="Vdgraph"; version="2.2-2"; sha256="1q8l711zbrrj4h1wmpv93nbvlg8xi6kjv22zpidkck8ncpyyla80"; depends=[]; };
@@ -4024,7 +4190,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]; };
-  VineCopula = derive2 { name="VineCopula"; version="2.1.6"; sha256="0gppfjffz5vc35rfjjplwjfp2vpw8hmfc0257k33qki46g5haw5j"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; };
+  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]; };
   Voss = derive2 { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
@@ -4033,22 +4199,22 @@ in with self; {
   W3CMarkupValidator = derive2 { name="W3CMarkupValidator"; version="0.1-6"; sha256="0nfay5nqss3zlw4nikj8h3zzlnjfxjch4pm3qky15qrcigrybrbl"; depends=[curl xml2]; };
   WACS = derive2 { name="WACS"; version="1.0"; sha256="1x6vn7xhrnaggrxkvap6si8gz7b6z2zpjpbb9zgag4vyq3s7nxgy"; depends=[mclust mnormt mvtnorm tmvtnorm]; };
   WARN = derive2 { name="WARN"; version="1.2-3"; sha256="0vkp70cc3slz9y8qfybrqyjyglsxz9fnqrid735h2a113h4xvr3v"; depends=[MASS]; };
-  WCE = derive2 { name="WCE"; version="1.0.1"; sha256="0zp9xcq40vy2pv06rqn4d24bracm2vd3yyq4h56qppx47419fmm4"; depends=[plyr survival]; };
+  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]; };
   WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; };
-  WGCNA = derive2 { name="WGCNA"; version="1.63"; sha256="1225dqm68bynkmklnsxdqdd3zqrpzbvqwyly8ibxmk75z33xz309"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp robust survival]; };
+  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]; };
   WLreg = derive2 { name="WLreg"; version="1.0.0"; sha256="0paghjcshhrr6y1gm98d6gr78zvgzhl678g9f96hppfa4q3lfpr7"; depends=[inline survival]; };
   WMCapacity = derive2 { name="WMCapacity"; version="0.9.6.7"; sha256="167wx759xi7rv74n6sdsdkjnfpxdsiybk4ik70psdgfwdqqcga1y"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; };
   WMDB = derive2 { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; };
-  WMWssp = derive2 { name="WMWssp"; version="0.3.2"; sha256="019fcmf5zmbm20zyvx96nwp66lqm2xw7hbpacfwn8cvw3dq85chr"; depends=[rankFD]; };
+  WMWssp = derive2 { name="WMWssp"; version="0.3.4"; sha256="00kjddiy9sjfhnixj9p8v8sd389c1cm5j4rz4gar84mgmbc520gg"; depends=[rankFD]; };
   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]; };
-  WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.0"; sha256="0yyhls0qzwwj4sz5d1nvzfiacx28dmf2hgjc7xgfi2qjkckg40hs"; depends=[caret dplyr EnvStats fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; };
-  WVPlots = derive2 { name="WVPlots"; version="1.0.0"; sha256="16wazxf4c1awxfix4dmp1zcwrfwbkddck71gxgimf471gx60hl8p"; depends=[cdata ggplot2 gridExtra mgcv sigr wrapr]; };
+  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]; };
   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]; };
@@ -4058,14 +4224,15 @@ in with self; {
   WaveletArima = derive2 { name="WaveletArima"; version="0.1.1"; sha256="19hz2q280m41qh3m9lx3i9p6p5fl6pw8r9b06xk6sn04hxbim8xx"; depends=[forecast fracdiff wavelets]; };
   WaveletComp = derive2 { name="WaveletComp"; version="1.1"; sha256="07w2aa0jiflvxyqhgh48705hg8hjspd103jd00i2pcw2v42hwmf8"; depends=[]; };
   WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; };
-  WeMix = derive2 { name="WeMix"; version="1.0.2"; sha256="1wj1jxw65i94xf5zk9phgkwybvl2h05ynq0zhdc7q3j6b90mv9hn"; depends=[lme4 MASS minqa NPflow numDeriv Rcpp RcppArmadillo Rmpfr statmod]; };
+  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]; };
-  WeibullR = derive2 { name="WeibullR"; version="1.0.9"; sha256="13qkfnfp2pbvb78mj7fg8cgjnbrxv6dbms70wvn9f3mc70djmrb3"; depends=[Rcpp RcppArmadillo]; };
+  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]; };
   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=[]; };
+  WeightedROC = derive2 { name="WeightedROC"; version="2018.10.1"; sha256="1hdksd47pkky83g6hn6123f243yw3bzrlaibdgr2kd5kxn9rma3y"; depends=[]; };
   WhatIf = derive2 { name="WhatIf"; version="1.5-9"; sha256="0ihpp3wbhpsg00g0s31l0ca4q0a2sch2a2j8cgz14g8na43x8831"; depends=[lpSolve pbmcapply Zelig]; };
   WhiteStripe = derive2 { name="WhiteStripe"; version="2.3.1"; sha256="1qyv06ai83b1idfg4bgr97askyzlwi2dv8d5wkivb5czp7crdri1"; depends=[mgcv oro_nifti]; };
   WhopGenome = derive2 { name="WhopGenome"; version="0.9.7"; sha256="1xa7d9x5ny8g79scfkv7v5ix9m3mfzg0fks2bsan9zqyhcd01fsq"; depends=[]; };
@@ -4078,18 +4245,18 @@ in with self; {
   WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; };
   WindCurves = derive2 { name="WindCurves"; version="0.1.3"; sha256="0bvbnrkdk0g0radgcw4zbhq6czpvq3f7f34x83qk09i8ngmwd28c"; depends=[drc imputeTestbench readbitmap]; };
   WordPools = derive2 { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
-  WordR = derive2 { name="WordR"; version="0.3.0"; sha256="0wfgr5jg0vn58cn2dra3s46c5x5msqw3p666lbhhs48m75j12daq"; depends=[dplyr flextable officer]; };
+  WordR = derive2 { name="WordR"; version="0.3.1"; sha256="17g8v3xhdy57y0b95zrakhi0zamqi35v0zcmjpy47xyqyk4b2grs"; depends=[dplyr flextable officer]; };
   Wrapped = derive2 { name="Wrapped"; version="2.0"; sha256="1z5kypsd39z9arsw57axckvl8b4jnr5wv60s9z58f5s89gn5vxxg"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm metRology NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; };
   WrightMap = derive2 { name="WrightMap"; version="1.2.1"; sha256="16zp7h28fap5hq5xzvkb4lc217yhfmwzfbvw2lsni0gf9qxqkgqd"; depends=[]; };
   WriteXLS = derive2 { name="WriteXLS"; version="4.0.0"; sha256="0nwxi36w3rkzw9j0qil64gakhb101rxg1wydjkwlpg0nbsj1sm50"; depends=[]; };
   WufooR = derive2 { name="WufooR"; version="0.8"; sha256="0nwf66y1jb7dw4yhkdl9g4brh59ky4q4x6j9zbqdn70pcj9hq9jx"; depends=[dplyr httr jsonlite]; };
   XBRL = derive2 { name="XBRL"; version="0.99.18"; sha256="1bwvxqbxdf1ynz2bv27l86h05h8y19q2li2y79xk819p5nkxq341"; depends=[Rcpp]; };
-  XGR = derive2 { name="XGR"; version="1.1.3"; sha256="01czagfjx5w212l5h29klrrsg0qiprlsiwpz7pfqh44haifnq4pz"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges Matrix plot3D RCircos rtracklayer S4Vectors supraHex tidyr XML]; };
+  XGR = derive2 { name="XGR"; version="1.1.4"; sha256="0npyfq587wg2qz2n0f8gmnq396h3xil20navbgfy7dbkvfncv3f0"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges Matrix plot3D RCircos rtracklayer S4Vectors supraHex tidyr XML]; };
   XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; };
   XKCDdata = derive2 { name="XKCDdata"; version="0.1.0"; sha256="1lx9frlbc549qrh4d3m79r3l9icfzqkgfgp8raa8x46a2havi0a5"; depends=[assertthat dplyr glue htmltools httr jsonlite magrittr tibble]; };
   XLConnect = derive2 { name="XLConnect"; version="0.2-15"; sha256="1cvq677m09gwpwhj3fy15mbfn0s0b1y35w95pjnijiwpcpdxiq96"; depends=[rJava XLConnectJars]; };
   XLConnectJars = derive2 { name="XLConnectJars"; version="0.2-15"; sha256="1ipqyjgsh5a1ygsbhyqxyj9wfjv1f73cyfrpx6jvf0is5jklhvxx"; depends=[rJava]; };
-  XML = derive2 { name="XML"; version="3.98-1.11"; sha256="18izvlg2x9mzr6yb3yf02ghwbyn00frki3av4lpc44r22m4djnsh"; depends=[]; };
+  XML = derive2 { name="XML"; version="3.98-1.16"; sha256="0nl1kk354r8snhj6p9mc74m7awvqc6akmd4y3a46y78yv3g15njp"; depends=[]; };
   XML2R = derive2 { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[plyr RCurl XML]; };
   XMRF = derive2 { name="XMRF"; version="1.0"; sha256="0jnyy9pcksfadznidqsbwh8nlqv3k0yppj76q8a2g0aidbdmg2cc"; depends=[glmnet igraph MASS Matrix snowfall]; };
   XNomial = derive2 { name="XNomial"; version="1.0.4"; sha256="1mwx302576rmsjllbq2clfxilm3hkyp5bw0wmwqbn0kgv5wpy8z6"; depends=[]; };
@@ -4107,7 +4274,7 @@ in with self; {
   YuGene = derive2 { name="YuGene"; version="1.1.6"; sha256="1kv9n82wrms0c4y5fz9ckzhm1a609mnqp0pwvd0fpyscp8krmlpp"; depends=[mixOmics]; };
   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.0.3"; sha256="1497ki0pr0x21fz5wa2z6zgb2br99z56gvfxyn9cglqq45if6cjh"; depends=[MASS]; };
+  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]; };
@@ -4115,6 +4282,7 @@ in with self; {
   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]; };
   ZillowR = derive2 { name="ZillowR"; version="0.1.0"; sha256="1wrr58p76ps29fqzzwgfvfibxrvc72p2yzs5kc2rv1yxzzcpyxvb"; depends=[RCurl XML]; };
+  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]; };
   aLFQ = derive2 { name="aLFQ"; version="1.3.4"; sha256="1q2l5cwkcsng22nxckgc7aalvy3qhvgga5nkchfpy53sxg68awqv"; depends=[bio3d caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; };
@@ -4130,23 +4298,23 @@ in with self; {
   abc_data = derive2 { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; };
   abcdeFBA = derive2 { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; };
   abcrf = derive2 { name="abcrf"; version="1.7.1"; sha256="06vy3inikrr9hv36q4djhrgzi9zizdfnhz17wpra8kadmr7qj441"; depends=[MASS matrixStats ranger Rcpp RcppArmadillo readr stringr]; };
-  abctools = derive2 { name="abctools"; version="1.1.1"; sha256="0x6pjdvn5z510j42byddzdvg2mgv81yy72snia5k8h7bs9k5glfg"; depends=[abc abind Hmisc plyr]; };
+  abctools = derive2 { name="abctools"; version="1.1.3"; sha256="07s9dg10i8lsxl73b4n2hynca2fjgb0ykb0dz8c3zv6cgw3cyx97"; depends=[abc abind Hmisc plyr]; };
   abd = derive2 { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; };
   abe = derive2 { name="abe"; version="3.0.1"; sha256="1f19h3xzzmjhvwc1rrb8z0rai3ip03y4gdi2gg9bfr5sg2nfklk6"; depends=[]; };
   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.0.2"; sha256="0jxpw5mplnpc57jjg9w3zrik40g7va6s8m9zbfsyf0vqn645wfwq"; depends=[Cairo]; };
+  abn = derive2 { name="abn"; version="1.2"; sha256="00k0razgdb5y5f62622fm7rxkcxrxg470nyyb02dvpfp60254kvs"; 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]; };
   acc = derive2 { name="acc"; version="1.3.3"; sha256="1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m"; depends=[circlize DBI ggplot2 iterators mhsmm nleqslv PhysicalActivity plyr R_utils Rcpp RcppArmadillo RSQLite zoo]; };
   accSDA = derive2 { name="accSDA"; version="1.0.0"; sha256="0sgxy5y8kkc1n35657kifwfjsba7y5m1vbr7rkk5lmbpkzahqm61"; depends=[ggplot2 ggthemes gridExtra MASS rARPACK sparseLDA]; };
-  accelerometry = derive2 { name="accelerometry"; version="2.2.5"; sha256="00mn09j7y39sc7h5srnnfk2l73vhh6zq7rzc0vckfvs72lncmwv5"; depends=[Rcpp]; };
+  accelerometry = derive2 { name="accelerometry"; version="3.1.2"; sha256="13xzrwhr4i1nj9c8vrmfdg2rmrc8n446iihcyxmy99sm99hpzyip"; depends=[dvmisc Rcpp]; };
   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"; sha256="0533f9c44lq57cyar05z3ikg091h1pyrq84h2zghjyp66drnw6pa"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; };
+  acebayes = derive2 { name="acebayes"; version="1.5.1"; sha256="1rhc8vib7y1nf4m5i21bsvfqmccfqv2ghlfa8vhx8dik6m733zn9"; 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]; };
@@ -4167,39 +4335,41 @@ in with self; {
   adagio = derive2 { name="adagio"; version="0.7.1"; sha256="1h9l0ddrxq8y35iy9hdkxdvdwsqpnpkzzbkbwwhm4380lq1m7a3k"; depends=[]; };
   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=[]; };
   adaptTest = derive2 { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; };
   adaptalint = derive2 { name="adaptalint"; version="0.2.3"; sha256="0n047zibp3jsw8d3c971xnqgl8nsqxzcayic0xkz917pwlfrdnd7"; depends=[dplyr lintr purrr]; };
   adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1.2"; sha256="0bb6hw77dfa66b12xyazlp992gwjb1plylixlmq4cv4yjhnl9n5z"; depends=[ape ggplot2 phyloseq shiny]; };
   adaptivetau = derive2 { name="adaptivetau"; version="2.2-1"; sha256="1hd2l1jv4i5mg0k0g8bbrvv43nk1zxbwh21594zayrzjyikb2593"; depends=[]; };
   adaptsmoFMRI = derive2 { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[coda Matrix MCMCpack mvtnorm spatstat]; };
-  addhaz = derive2 { name="addhaz"; version="0.4"; sha256="0i3czmv538m8s3pnxrhh2a1mrdv9m3hgzjkb25p7hygwnzz54drg"; depends=[boot MASS Matrix]; };
+  addhaz = derive2 { name="addhaz"; version="0.5"; sha256="1709jq9rp5lhqk0qpk8zkdwzhcv1bcach8mm7yiz7hzcc1mgxb12"; depends=[boot MASS Matrix]; };
   addhazard = derive2 { name="addhazard"; version="1.1.0"; sha256="0hk7br52wjmq605xgslv8lspr35aqpdgkiz2yljz31khy3y3vi8c"; depends=[ahaz rootSolve survival]; };
   addinslist = derive2 { name="addinslist"; version="0.2"; sha256="04jqhdy0axs1a9c0cfi3pqy9hd67jqxz79a2lj209gd27qv1q22c"; depends=[curl devtools DT miniUI rappdirs rmarkdown rvest shiny shinyjs xml2]; };
   additiveDEA = derive2 { name="additiveDEA"; version="1.1"; sha256="15nxpdybsda6yhjk23bpafr8v1zdx8332pcxf26k795q3ypjpiy2"; depends=[Benchmarking lpSolveAPI]; };
   additivityTests = derive2 { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; };
   addreg = derive2 { name="addreg"; version="3.0"; sha256="13bwmgxylwi02g60j1rr51cr5jvvkl2nvf2lnnhnq46fhvs2ma7s"; depends=[combinat glm2 turboEM]; };
-  ade4 = derive2 { name="ade4"; version="1.7-11"; sha256="0wm54wcpn87rdh6vyw04cr8vgba899y6jsl61f22bmlvx6d7kkac"; depends=[MASS]; };
+  ade4 = derive2 { name="ade4"; version="1.7-13"; sha256="16z9jk4qj35ghsk4lwmq241dgc770y8a70dlmp9q4gz6d8ssgl7m"; depends=[MASS]; };
   ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.2-9"; sha256="0kfnikkzhyfxskrphr65b8amjhdfq35x6dda4kivdhn7ak07s3ll"; depends=[ade4 adegraphics lattice tkrplot]; };
   adeba = derive2 { name="adeba"; version="1.1.2"; sha256="1z1law3qh6l902g62y8yapk4nypdmb20jmpwhxp9jbglalw9lm73"; depends=[mixtools pdist Rcpp]; };
   adegenet = derive2 { name="adegenet"; version="2.1.1"; sha256="0ynfblp0hbd3dp3k86fn1wyhqr28lk6hs2bg4q7gyf0sfdfzwhrh"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; };
-  adegraphics = derive2 { name="adegraphics"; version="1.0-10"; sha256="0vig5c8hmsa6xapqzb8l4sm05qw7zc5s6b796bspffxj0crg3l3v"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; };
+  adegraphics = derive2 { name="adegraphics"; version="1.0-12"; sha256="0rq1v9fp6nh181y8v8nxch2f8507hz5z2kaxy95ybp4bhp0jj37r"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; };
   adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.15"; sha256="1bwx2mfkzfknr6fjjkbx2xnm4gksd78i8fz0bcizqyi1zhg5hd0c"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; };
   adehabitatHS = derive2 { name="adehabitatHS"; version="0.3.13"; sha256="158a6qzks0hml6hk4f1vr66gvwdn09792i2ca3k23061i3j3xp75"; depends=[ade4 adehabitatHR adehabitatMA sp]; };
   adehabitatLT = derive2 { name="adehabitatLT"; version="0.3.23"; sha256="0hf6wpwhsvfp906xk5sadfnvz524zmm05d0h2zxpx6089c6hnw3j"; depends=[ade4 adehabitatMA CircStats sp]; };
   adehabitatMA = derive2 { name="adehabitatMA"; version="0.3.12"; sha256="13mhj36nfs36988g53yrmhyd8yq2zzxl8ppzql63964n04fybbpb"; depends=[filehash sp]; };
   adephylo = derive2 { name="adephylo"; version="1.1-11"; sha256="06pnrycc7562h17gxbli935289a48na3p4vpb2w96i5cbrjg4jqm"; depends=[ade4 adegenet ape phylobase]; };
   adepro = derive2 { name="adepro"; version="2.0.0"; sha256="0q9h7wmkgdnbhg2ygw32jl0bm2vrl32ig2nci9pphgwpsfzb34jq"; depends=[audio Cairo MASS shape shiny shinyBS]; };
-  adespatial = derive2 { name="adespatial"; version="0.2-0"; sha256="1yqpfkz7i8jkqkbpafm09s1g6mjigpca73b4959zw7gqp9aariz6"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep vegan]; };
+  adespatial = derive2 { name="adespatial"; version="0.3-2"; sha256="1368r72d7yjv6w4nl621bjphzqngvnjj5v9ibzsvs801qg71dx7l"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep vegan]; };
   adfExplorer = derive2 { name="adfExplorer"; version="0.1.4"; sha256="11z6jm20giqmmz4dwcpa9fshvrmlmv8m0y1vg053nch05884niz2"; depends=[]; };
   adhoc = derive2 { name="adhoc"; version="1.1"; sha256="0a59fv9glcqh4zzd0887ndrhlcaylja6vay2ifajp8an29gjk1vv"; depends=[ape pegas polynom]; };
   adimpro = derive2 { name="adimpro"; version="0.8.2"; sha256="0nfzk9pp4p16c1nvpidngag96r845376h8ljh7m6p6rhk9fs4jdw"; depends=[awsMethods]; };
-  adiv = derive2 { name="adiv"; version="1.1"; sha256="12m8p1agahzck1nm8j765wacc6vrl0pa31wld4rqxl7c2pvhs7f4"; depends=[ade4 adegraphics adephylo ape cluster phylobase]; };
-  adjclust = derive2 { name="adjclust"; version="0.5.6"; sha256="0hff2fjp6dyrsc6crcipq72x7bs3jblv42z7v2c63clrrs7byc0h"; depends=[Matrix matrixStats]; };
+  adiv = derive2 { name="adiv"; version="1.2"; sha256="1lmq499ipv2a4f3270hdp54x8n7gij4ssgagxc9i35qwqwdbr8gy"; depends=[ade4 adegraphics adephylo ape cluster phylobase rgl]; };
+  adjclust = derive2 { name="adjclust"; version="0.5.7"; sha256="059gzbnwkmy1l8yqbl8ksz80nm6pf917sxplp048jzx57sxpry2k"; depends=[capushe Matrix matrixStats]; };
   adjustedcranlogs = derive2 { name="adjustedcranlogs"; version="0.1.0"; sha256="08apfvpqvnnalx230p4qf5ckrwm1sgzras4zfrysgym5d4map9ci"; depends=[cranlogs dplyr lubridate rvest xml2]; };
   adklakedata = derive2 { name="adklakedata"; version="0.6.1"; sha256="1lzj3ib4bgfkq5lq12n47pwc52h7k35xbbwj6brwsgx1gd4fx3x6"; depends=[httr rappdirs]; };
-  adlift = derive2 { name="adlift"; version="1.3-3"; sha256="0q4ipk9yax4wqp3jckpx6ihriqaaaz0knxd19cm20qzdx37vz4id"; depends=[EbayesThresh]; };
+  adlift = derive2 { name="adlift"; version="1.4-1"; sha256="14q7fnhlqvxdhnfjhdhfmadz241srplbm069a7ybbsql21cphpf3"; depends=[EbayesThresh]; };
   admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; };
   adnuts = derive2 { name="adnuts"; version="1.0.0"; sha256="0jy9wq269r7s70bwld6ngxc6vmaj9vplq4wn97x4f3c6lqy42swc"; depends=[ellipse rstan]; };
+  adpss = derive2 { name="adpss"; version="0.1.1"; sha256="0p2gyfc4rxmms8zdsq4hjsh1njfl2s736arq8aq1am2wh1w9k5ch"; depends=[Rcpp]; };
   ads = derive2 { name="ads"; version="1.5-3"; sha256="1k1japzcf0mafxkv9dlzaqz9n4c749lsx0lja4wj327ninpdcfy4"; depends=[ade4 spatstat]; };
   advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; };
   adwave = derive2 { name="adwave"; version="1.3"; sha256="11iy50ng0zxvwsvdsvx262j8zgqaai308lp5is47az7xzvk57mx7"; depends=[waveslim]; };
@@ -4207,35 +4377,37 @@ in with self; {
   aemo = derive2 { name="aemo"; version="0.2.0"; sha256="11msifszq7pzmcmwibf2dk2j5dqjc74hrxdxshlprkp6p8sfhijh"; depends=[assertthat dplyr lubridate stringr]; };
   afCEC = derive2 { name="afCEC"; version="1.0.2"; sha256="0jdppp93z5nb8m5qbry6cvd472mwiq1yrmm11906c3z2bfz7791f"; depends=[Rcpp RcppArmadillo rgl]; };
   afc = derive2 { name="afc"; version="1.4.0"; sha256="1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl"; depends=[]; };
-  afex = derive2 { name="afex"; version="0.21-2"; sha256="0wf6fvfwk1v2bswp1j8ab2r157vr1i9r1wr1fqhrcaxa2c4fikmz"; depends=[car emmeans lme4 lmerTest pbkrtest reshape2]; };
+  afex = derive2 { name="afex"; version="0.22-1"; sha256="065wbxljl77zqvc2c4gpfpfyc6mbnnrf24q399q9bxmrz3sapj8n"; depends=[car lme4 lmerTest pbkrtest reshape2]; };
   affluenceIndex = derive2 { name="affluenceIndex"; version="1.0"; sha256="1nb2dlsnvjsvkyrfdaskmpr3kv3qgdfb60xgmzvscfli0yf4dzr1"; depends=[]; };
   afmToolkit = derive2 { name="afmToolkit"; version="0.0.1"; sha256="1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl"; depends=[assertthat DBI dplyr ggplot2 gridExtra minpack_lm scales tibble]; };
   afpt = derive2 { name="afpt"; version="1.0.0"; sha256="0kshyzvw8sp7p686xi98g758zld3n7kq44lnvly8d0y8fg6ahcl2"; depends=[]; };
-  aftgee = derive2 { name="aftgee"; version="1.1-2"; sha256="0g4skg333vdj0cxwkcn7sh1km9rbwjjz40qz211rlzr7x76477rx"; depends=[BB geepack MASS survival]; };
-  agRee = derive2 { name="agRee"; version="0.5-1"; sha256="1hmqvpcz4vnpcl9f92q5fy1ca89l9sq25fnsw2mxfsa0yqbyxpw6"; depends=[coda lme4 miscF R2jags]; };
+  aftgee = derive2 { name="aftgee"; version="1.1.3"; sha256="1zkb99938q8pp318a0c0bpgzcqxc8ijygfz904lz6n40c5i2i9lz"; depends=[BB geepack MASS survival]; };
+  agRee = derive2 { name="agRee"; version="0.5-2"; sha256="1fhpkhnq8gbdy8k2w5wwn7h7gj0mmvk052fqxfazksxrlqicbbhb"; depends=[coda lme4 miscF R2jags]; };
   aggregation = derive2 { name="aggregation"; version="1.0.1"; sha256="0j9g604m2ccc7hcy02539yja9cf3xcbl25gvp838bp4x8w18my46"; depends=[]; };
   agop = derive2 { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; };
-  agriTutorial = derive2 { name="agriTutorial"; version="0.1.3"; sha256="1ihz92f10p7nq0rw01hka5wg2svf2hgx9f39604ab0j99z0f99hz"; depends=[emmeans ggplot2 lattice lmerTest nlme pbkrtest]; };
+  agriTutorial = derive2 { name="agriTutorial"; version="0.1.4"; sha256="1abi6cdgh9k6x9vapca3gcf3hn1z9dsmw24as9i5i2c57q06b6qx"; depends=[emmeans ggplot2 lattice lmerTest nlme pbkrtest]; };
   agricolae = derive2 { name="agricolae"; version="1.2-8"; sha256="1c6n52jralp33hl3nmpv9fc9vsvs6lcz9j75f2zbz0r4sqd2mw89"; depends=[AlgDesign cluster klaR MASS nlme spdep]; };
-  agridat = derive2 { name="agridat"; version="1.15"; sha256="08wlh75jv856linkspx5w9irjlbjkhqy9wwaciks79s00ii5vbzj"; depends=[]; };
+  agridat = derive2 { name="agridat"; version="1.16"; sha256="1kgmjrj207md86qivadkmv3s2gh3hi9zv63bsj8b9vlcd9f58pfk"; depends=[]; };
   agrmt = derive2 { name="agrmt"; version="1.40.4"; sha256="1y2gnq6b4zkxknygg73r8qrd435y7c69iqn8i56kwk1ccc1rwddx"; depends=[]; };
   agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; };
   ahaz = derive2 { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; };
   ahnr = derive2 { name="ahnr"; version="0.3.1"; sha256="1g8m3q108ricfyn4fjjaihpr93xz7fm2sfzg3i0fz1n1i703jwm8"; depends=[ggplot2 magrittr matrixcalc pdist pracma purrr visNetwork]; };
   ahp = derive2 { name="ahp"; version="0.2.12"; sha256="0zjhgl0smzx4bkhmdm4rmpyrq4hmxy1nkxvwqjr40pz7vm69icqx"; depends=[data_tree DiagrammeR formattable yaml]; };
-  aiRthermo = derive2 { name="aiRthermo"; version="1.2"; sha256="0j7nldmf63rap18dfa5rcwyy61fcn592fb3h1hp08b00qw39asx3"; depends=[]; };
+  ahpsurvey = derive2 { name="ahpsurvey"; version="0.2.2"; sha256="0y1afsxakfx6zfv4vjl54zgp5yqfl2haga08qbz9shjwsm28jw0p"; depends=[dplyr knitr magrittr Rdpack tidyr]; };
+  aiRthermo = derive2 { name="aiRthermo"; version="1.2.1"; sha256="058082qdfi1pbdgf26vbfahri1kbc8b2l816q4dq89j5aj5is0a2"; depends=[]; };
   aidar = derive2 { name="aidar"; version="1.0.5"; sha256="1q2iz2qzh2yl0v0sc537xq4vbx2nblym3kv419vr7jvrghdpx3vj"; depends=[XML]; };
   aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; };
-  airGR = derive2 { name="airGR"; version="1.0.10.11"; sha256="0m64ww5f4ilrkkpnkv9k1qxsxh519is6y8wciq472jjfwcnsscb1"; depends=[]; };
-  airGRteaching = derive2 { name="airGRteaching"; version="0.2.2.2"; sha256="13alnmazf8n7sgfzh0hfq6i4cd2pl414vwrakgp36q365fkgzpnc"; depends=[airGR dygraphs htmlwidgets markdown plotrix shiny shinyjs xts]; };
+  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]; };
-  airr = derive2 { name="airr"; version="1.1.0"; sha256="0fyyd6sw3fk7gwdxhxxrvsckyxj9qlqqsa20rhqdg3xslkwzzpjh"; depends=[readr stringi yaml]; };
+  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]; };
   akima = derive2 { name="akima"; version="0.6-2"; sha256="1klprj4a2pgy5pwdwnrn3siisi2lh8hr4z6vz38sdvjkcmakxnk1"; depends=[sp]; };
   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.10"; sha256="0bfqc7rbchmj0dby8c8xlxff9gk18kq1v8zqfj3s7h3yddrr7znr"; depends=[dplyr ggplot2 igraph lazyeval progress Rcpp readr scales seqinr stringi]; };
-  albopictus = derive2 { name="albopictus"; version="0.3"; sha256="03vk2df17rkcg29il3jj5jlnjs4kkfnj1cfrxdgj3hgm7rbs38si"; depends=[]; };
+  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=[]; };
   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]; };
@@ -4248,6 +4420,7 @@ in with self; {
   allelematch = derive2 { name="allelematch"; version="2.5"; sha256="1kws6y3igq6l85cfjrck2dzcfpgr56ridbc6w071h8kjw19mlzas"; depends=[dynamicTreeCut]; };
   allelic = derive2 { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; };
   alluvial = derive2 { name="alluvial"; version="0.1-2"; sha256="039frwrsxq1lb97s7vf2vbyyadimkigs628ymym06fxka53drdkp"; depends=[]; };
+  alpaca = derive2 { name="alpaca"; version="0.2"; sha256="0hjy7irxa31kv92xvnj58zasmy4drbmaq6g1js4d5ns6d6fqx845"; depends=[data_table Formula MASS Rcpp RcppArmadillo]; };
   alphaOutlier = derive2 { name="alphaOutlier"; version="1.2.0"; sha256="09yrbv7jsiymw5gzp8p92ki70v1fys2k75x4sb9s7wy3c58wn1cd"; depends=[nleqslv quantreg Rsolnp]; };
   alphabetr = derive2 { name="alphabetr"; version="0.2.2"; sha256="1pmp6zwhgycb38y5jbvrbv2nza7gyjh508vy09ml483c2cysvc1r"; depends=[clue dplyr multicool Rcpp]; };
   alphahull = derive2 { name="alphahull"; version="2.1"; sha256="129b2j9j60p2wvbb8703x18pydv1g715vmjcb1a80v70i93w4f49"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; };
@@ -4260,18 +4433,20 @@ in with self; {
   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]; };
+  ambient = derive2 { name="ambient"; version="0.1.0"; sha256="142q30rhi0wz0gp1v0swm83gbli8j6plpzzpqjwnjc693wd3a1ih"; depends=[Rcpp]; };
   ameco = derive2 { name="ameco"; version="0.2.9"; sha256="0vzwsy7gp17ghl1hgcsbfs9rarzl8dl36x6lplnzrisqv3dqmk25"; depends=[]; };
   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]; };
   ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; };
-  amt = derive2 { name="amt"; version="0.0.4.0"; sha256="1qdkvkxkxk7l2bjr11h0k9vhh5vapvm12f20lmj7rhamipc43ybv"; depends=[broom circular dplyr fitdistrplus FNN geosphere KernSmooth lazyeval leaflet lubridate magrittr maptools purrr raster Rcpp rgeos rlang sp survival tibble tidyr]; };
-  anMC = derive2 { name="anMC"; version="0.2.0"; sha256="1j6dah49sgfsb7bj4xys5rcaqw12rrkqhqryqz2xhdkazjmz3gpq"; depends=[mvtnorm Rcpp RcppArmadillo]; };
+  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]; };
   anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; };
   analogsea = derive2 { name="analogsea"; version="0.6.0"; sha256="1fcvf3yci3szm155pnk89q36dgc55wdlffvll642zn26zc5d1y5n"; depends=[aws_s3 httr jsonlite magrittr yaml]; };
-  analogue = derive2 { name="analogue"; version="0.17-0"; sha256="00wk4jnzif28ibx9s3m68qdx64ycdgg5yr6ybb0srlydikvf1sy8"; depends=[brglm lattice MASS mgcv princurve vegan]; };
+  analogue = derive2 { name="analogue"; version="0.17-1"; sha256="09xv6dxdlc5kwsbh9vzp2mnxgbccimiadjpj12iiw6hcplw6v4ma"; depends=[brglm lattice MASS mgcv princurve vegan]; };
   analogueExtra = derive2 { name="analogueExtra"; version="0.1-1"; sha256="1s3qs10hf6hkna0bicid1mc8x8r449bl93xpgyw6lnsjgh2yx62c"; depends=[analogue rgl vegan3d]; };
-  analytics = derive2 { name="analytics"; version="2.0"; sha256="1jkdjqc3fnvvsgi6x9ncf36rxzq0a55cmgkcv92mfmpcramg2lk6"; depends=[car cluster fractal lmtest MASS np powerplus robust trend TSA urca]; };
+  analytics = derive2 { name="analytics"; version="3.0"; sha256="0js3c8lwj3knccb55nq03cbjlf4w390p9aid2mi5x80l3ayd9in1"; depends=[car cluster fractal lmtest MASS np powerplus robust trend TSA urca VIM]; };
   analyz = derive2 { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; };
   anchoredDistr = derive2 { name="anchoredDistr"; version="1.0.3"; sha256="07q4np0zryb49cpi7w5iz0qna63cyp9nz13d8ws6x9ccg417r99a"; depends=[DBI dplyr ggplot2 np plyr reshape2 Rmisc RSQLite]; };
   anchors = derive2 { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[MASS rgenoud]; };
@@ -4284,44 +4459,45 @@ in with self; {
   animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; };
   animation = derive2 { name="animation"; version="2.5"; sha256="0pxmihfr3q1hh4cdnzf7wbzqak5spa3kv4p1wl89giqqngqzwcmj"; depends=[]; };
   anipaths = derive2 { name="anipaths"; version="0.9.6"; sha256="0wqpnn85gqsy0m40allx0mngnq5lqz5qhl9g8v0kh0073xq4mvvc"; depends=[animation knitr mgcv RColorBrewer rgdal scales sp]; };
-  annovarR = derive2 { name="annovarR"; version="1.0.0"; sha256="0l2csp06m5f3i1b4h0pvl8mmzx25c0b411c5sdc3qszirbplh038"; depends=[AnnotationDbi BioInstaller configr data_table DBI futile_logger glue ngstk RMySQL RSQLite stringi stringr vcfR]; };
   anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; };
   anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; };
   anomalize = derive2 { name="anomalize"; version="0.1.1"; sha256="1szxjc8bh616z2xc50hcggh4ky1b7343i3xmg81rbssvkl2gghlh"; depends=[dplyr ggplot2 glue purrr rlang sweep tibble tibbletime tidyr timetk]; };
-  anomaly = derive2 { name="anomaly"; version="1.0.0"; sha256="1l86y3hzqi06s1v3l5vkvk679cy630i2pj0yzxyznm5fjq43l47r"; depends=[dplyr Rdpack rlang]; };
+  anomaly = derive2 { name="anomaly"; version="1.1.0"; sha256="0v1pgyckqkimyh1hh68clyqnm9hkzmz3dal676l9qaiwbgqmkxi4"; depends=[dplyr ggplot2 Rdpack rlang]; };
   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.15.3"; sha256="0asr43lf8vajf72sgpixy5w7r7v7b83a0877q6dadcxxr4mifr8f"; depends=[antaresRead data_table]; };
-  antaresRead = derive2 { name="antaresRead"; version="2.1.2"; sha256="1vw2q2affpi4icqbsh89qkhdf6xxfjnwn6939ibgw5vv8df1b11s"; depends=[data_table lubridate plyr shiny stringr]; };
-  antaresViz = derive2 { name="antaresViz"; version="0.14.0"; sha256="0xli4bvk5nds357wq3r1dp155xrcxcjscndbysfdv52827i80nxs"; depends=[antaresProcessing antaresRead assertthat data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate manipulateWidget plotly rAmCharts raster rgeos shiny sp spMaps webshot]; };
+  antaresProcessing = derive2 { name="antaresProcessing"; version="0.16.0"; sha256="1wbrp07j8518p53yismij5mylxz34r3n8k4f7k8aj43armavkmxk"; depends=[antaresRead data_table]; };
+  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.1"; sha256="0nbx2l0d2y4qvcw4dw3m26zfkgdmav4cq0l00gib7l3y9pqxzjh5"; depends=[sys]; };
+  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]; };
+  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]; };
   aod = derive2 { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; };
-  aods3 = derive2 { name="aods3"; version="0.4-1"; sha256="074c16wmgd1vc2yvwx1y84bg55hvmm5yi8zgpwh51jcsbqlhbpgn"; depends=[boot lme4]; };
+  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]; };
   aop = derive2 { name="aop"; version="1.0.0"; sha256="1i3mixiwcvqygbcvj6f9vm223plmydzmixpy6nhis2zv9d90vakd"; depends=[ggplot2 graph igraph plyr Rgraphviz rjson]; };
   aoristic = derive2 { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[classInt ggplot2 GISTools lubridate maptools MASS plotKML RColorBrewer reshape2 rgdal sp spatstat]; };
   apTreeshape = derive2 { name="apTreeshape"; version="1.5-0"; sha256="0mnydk157557pnkjvcadlghn5d8w9kxas4kwz4y4w21xg7z1jrig"; depends=[ape coda cubature pbapply quantreg]; };
-  apa = derive2 { name="apa"; version="0.2.0"; sha256="1f9c8m5z8j7mbmbh61vcs680ya1zq5spwqs90zhajaw5fhvlg8km"; depends=[dplyr magrittr purrr rmarkdown stringr]; };
-  apaTables = derive2 { name="apaTables"; version="2.0.4"; sha256="1msb8aygzbcggdcifmcjpgcpnscvr6fq2ib5afff1vzbas9hjrs3"; depends=[boot broom car dplyr tibble]; };
+  apa = derive2 { name="apa"; version="0.3.0"; sha256="0bpg2nf6838mb2apj2wqi1gbn3zbm7lsixykgkzr539rcdjfdggd"; depends=[dplyr magrittr purrr rmarkdown stringr]; };
+  apaTables = derive2 { name="apaTables"; version="2.0.5"; sha256="0h986jqdl65fd33gfa433ik77r6lm9zrq75qfk5r8xsdgzb4wgva"; depends=[boot broom car dplyr tibble]; };
   apaText = derive2 { name="apaText"; version="0.1.1"; sha256="1r217k60w027i63nbj24b1rm37m4qf7a6iirc941s945babkxcmb"; depends=[dplyr]; };
   apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; };
   apcluster = derive2 { name="apcluster"; version="1.4.7"; sha256="188hdfmwjjx3aic599nwmkzjqm9j9jighi5bly6qd43c1vj6ih2s"; depends=[Matrix Rcpp]; };
   apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; };
-  ape = derive2 { name="ape"; version="5.1"; sha256="0vm2065993wf4hdqarxqykhfz9aaj0rrb98alhkq4qw1d2kdrmdp"; depends=[lattice nlme Rcpp]; };
+  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.1.0"; sha256="0mf2v7b915hpasic2yqxi0g5fcrwac4d1ycikwzcd9hb9qngcb0n"; depends=[kmer openssl Rcpp]; };
+  aphid = derive2 { name="aphid"; version="1.3.0"; sha256="13h5vwxrw74drw8ai8y0i3c20kdhbybaa3zyplrnlsa2yzzdhqa2"; 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=[Biobase DESeq edgeR genefilter gtools multtest seqinr]; };
+  apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; };
   apng = derive2 { name="apng"; version="1.0"; sha256="13hvr1w566anrhdicaqwqjgfq2lk3zkn5gcfgy8zazjnad4vy07y"; depends=[bitops]; };
   appell = derive2 { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; };
   apple = derive2 { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; };
   appnn = derive2 { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; };
-  approximator = derive2 { name="approximator"; version="1.2-6"; sha256="165qvx5946wkv1qsgbmjhmwvik7m23r1vbpnp7claylflgj1ycnm"; depends=[emulator]; };
+  approximator = derive2 { name="approximator"; version="1.2-7"; sha256="0smqjdla9mvzy164nsb0pw0sgal3w2wnyhqidp74h0smyczrr1zw"; depends=[emulator mvtnorm]; };
   approxmatch = derive2 { name="approxmatch"; version="1.0"; sha256="1z1lrbfvm380p2az88hrxr3f2cgbv2h70wzm99vi9a2dmh0pl7qy"; depends=[]; };
   aprean3 = derive2 { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; };
   apricom = derive2 { name="apricom"; version="1.0.0"; sha256="1gyd1yln14cn0iswj7sjs4hav6j6d4f3ncps4gqbci5fwha5blcr"; depends=[logistf penalized rms shrink]; };
@@ -4331,7 +4507,7 @@ in with self; {
   apt = derive2 { name="apt"; version="2.5"; sha256="1y18bqnnxy5p0xx9gbfrnrzq3nlhw3psl5zlibrw6lfhb8lxd4mk"; depends=[car copula erer gWidgets urca]; };
   aptg = derive2 { name="aptg"; version="0.1.0"; sha256="06z8041h1k9v0ymd7azn11xzhqxb8lda4r7nyg51h8z3i8mpq1ba"; depends=[ape brranching phytools taxize xml2]; };
   aqfig = derive2 { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; };
-  aqp = derive2 { name="aqp"; version="1.16"; sha256="11ksjvvwazan2xk535ygrk8qs66ny6fywfgw2mpy8kv2637l9pay"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
+  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]; };
   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]; };
@@ -4339,16 +4515,18 @@ in with self; {
   archetypes = derive2 { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
   archiDART = derive2 { name="archiDART"; version="3.2"; sha256="08jam0nbqvrgrxjqj24k7f0dybyi935w977yi1qk34q1p48462ph"; depends=[rgl sp XML]; };
   archivist = derive2 { name="archivist"; version="2.3.1"; sha256="04f1f9fczibda2a4wivmgwzh5p9xblm9hk8wkgd6xqrvxgv5z8mn"; depends=[DBI digest flock httr lubridate magrittr RCurl RSQLite]; };
-  archivist_github = derive2 { name="archivist.github"; version="0.2.2"; sha256="04xb2i47y12ic87gb2l30bldil0505h7s9601hq0afjg3npx6jq7"; depends=[archivist digest git2r httr jsonlite]; };
+  archivist_github = derive2 { name="archivist.github"; version="0.2.6"; sha256="092fzi505vx9xbk41m86d0isxna42iflp7q2kjiqa6z1ccvim2yx"; depends=[archivist digest git2r httr jsonlite]; };
   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-7"; sha256="0wajd15lbzbc62v8kclnp0fbppnm7vy2zxrsd5njx5sswvkfx5v3"; depends=[ltsa]; };
+  arfima = derive2 { name="arfima"; version="1.6-8"; sha256="0ym86wzwdlxrx987ibaspqmjq6i3j5cx3w04dlia5js1siyq9clp"; depends=[ltsa]; };
   argon2 = derive2 { name="argon2"; version="0.2-0"; sha256="0kqn06rpb39jlzizjlnc5c44mfic8llrshxn7ljgmyj35lbqwxqh"; depends=[]; };
   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]; };
   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]; };
   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]; };
@@ -4356,19 +4534,19 @@ 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.0.2"; sha256="0vqxx0pzvvqnbklpxrcq7d5ppicwbwk3gb2846in0gqjhn4ya4g1"; depends=[gmp R6]; };
+  arrangements = derive2 { name="arrangements"; version="1.1.4"; sha256="04l63br7a93qgiaglzmxpjw03y5p05jihlbbshy9cb7lg3rdld6m"; depends=[gmp R6]; };
   arrayhelpers = derive2 { name="arrayhelpers"; version="1.0-20160527"; sha256="1ib91hpg6xgy0jr4sb8ib19x0v4f5n96lak0qm0z5vksawgcnp1l"; depends=[svUnit]; };
-  ars = derive2 { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; };
-  arsenal = derive2 { name="arsenal"; version="1.2.0"; sha256="1glh8vyms5hcplzzn5n6fynr8jyryy65xb2y9lf6nv7kziwqr5fk"; depends=[testthat]; };
+  ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; };
+  arsenal = derive2 { name="arsenal"; version="1.4.0"; sha256="1hd1nx5nzpswi5903vkkhf4ap4pk5gjxj45xc8z0wngp4xrjv4a4"; 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]; };
   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-19"; sha256="1cncvrf7za38b3vdwbzy4yrbakj7jbpxrl1jg6bvjnlkymiajavx"; depends=[arules]; };
+  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]; };
   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"; sha256="0p54a9x54jg81hd86br6b3dg3sr9kzl9rmnrh7x3m6bkinzc780c"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; };
+  asbio = derive2 { name="asbio"; version="1.5-3"; sha256="0k4cyivh08p9psp0z07nqa04i7xcqf4gh7x0vfk17rvycywksbhy"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; };
   ascii = derive2 { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; };
   asciiSetupReader = derive2 { name="asciiSetupReader"; version="1.4.0"; sha256="0pq23ncwlndhzw4qfvzcv9nh74fq6hh9k6w96xhxx69ajy9zd2ys"; depends=[data_table haven readr stringr zoo]; };
   asciiruler = derive2 { name="asciiruler"; version="0.2"; sha256="0xhkbsy9dypk09avazgxczyfkh3rhdxhwci688dw1lxnhxv1hj24"; depends=[stringr]; };
@@ -4376,9 +4554,9 @@ in with self; {
   asdreader = derive2 { name="asdreader"; version="0.1-3"; sha256="15a922aw0v5w4hrha03xifx8cpifcc773gambgwqq6i5nz08ya26"; depends=[]; };
   ash = derive2 { name="ash"; version="1.0-15"; sha256="1ay2a2agdmiz7zzvn26mli0x0iwk09g5pp4yy1r23knhkp1pn2lb"; depends=[]; };
   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.3"; sha256="075gzxly8sqkbwnznxcr4z3zs1qvlyl8c4ishgxk035ik1w6p16n"; depends=[bpcp coin exact2x2 exactci perm ssanv]; };
+  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.9"; sha256="0r6hajdvasvik2ij58xm5kvlcz2gqzgqbvw0ypghrp0qkfqxkrla"; depends=[MASS Matrix]; };
+  asnipe = derive2 { name="asnipe"; version="1.1.10"; sha256="1n53aqajra3rp202jz1xciw7nppicxkpiq4ybay768n3mxlvlhjr"; 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=[]; };
@@ -4386,14 +4564,14 @@ in with self; {
   assertable = derive2 { name="assertable"; version="0.2.4"; sha256="1d1mc5k9jwn2h5bny3bpkwy10kfz5qlp03z12z9401v47q12d61i"; depends=[data_table]; };
   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-1"; sha256="0drdrc9ljznkz52lvpwx0mvrghl0wf6dffzc3msz8lnvraxmanyw"; depends=[assertive_base assertive_properties assertive_types]; };
+  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_uk = derive2 { name="assertive.data.uk"; version="0.0-1"; sha256="0z2hpvfl34zzy9sncmihcj1ir5nnm9d05j7ip7j83by2pfwsjdhf"; depends=[assertive_base assertive_strings]; };
-  assertive_data_us = derive2 { name="assertive.data.us"; version="0.0-1"; sha256="0nfwfkaczbmxaj4bpyibcvsypigkn5j2syn2wb4d2grm7virk9bk"; 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_models = derive2 { name="assertive.models"; version="0.0-1"; sha256="1pkyssavld57njmv545bfa3a7dmyrgpsvr9vdhqmrmcpc55w89cj"; 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]; };
   assertive_reflection = derive2 { name="assertive.reflection"; version="0.0-4"; sha256="19zmsbn00crfqm0kwd9ys5gv87xs3gi6wmlikrz9xiwzm7hp4dhj"; depends=[assertive_base]; };
@@ -4406,7 +4584,7 @@ in with self; {
   assist = derive2 { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[lattice nlme]; };
   assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; };
   assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; };
-  aster = derive2 { name="aster"; version="0.9.1.1"; sha256="12zn3wcx0n37fbnwwcz517libsgkbfphwbr4m68zba4craqhh5mi"; depends=[trust]; };
+  aster = derive2 { name="aster"; version="1.0-2"; sha256="1yxa8b19g1acvn7mcj6l53x0cvb66dmjwrpmxb2y6k8da95hc9lp"; depends=[trust]; };
   aster2 = derive2 { name="aster2"; version="0.3"; sha256="17d200sg0vn1fj6lb480dhszm70q6ipjldilb3x0jp72hiczakk9"; depends=[Matrix]; };
   astro = derive2 { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; };
   astroFns = derive2 { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; };
@@ -4416,53 +4594,60 @@ in with self; {
   astsa = derive2 { name="astsa"; version="1.8"; sha256="023nk6chyy79scjzhv42px5cpym7rnm1c55ylcslyjdmlr5i6afk"; depends=[]; };
   asus = derive2 { name="asus"; version="1.0.0"; sha256="16hp8xajb631a5amm1cvhzq8z4cwh1vjiavv3n11fzpxyskhmfrb"; depends=[rwt wavethresh]; };
   asymLD = derive2 { name="asymLD"; version="0.1"; sha256="1q05pxwn6arpalspgf2m0cym4ivnwyv94i58k9kaihd37kvm5lgc"; depends=[]; };
-  asymmetry = derive2 { name="asymmetry"; version="1.2.5"; sha256="0wsmarmij4crhv5wr4mqibsf787cy7fmmp4xrclsb3gm3g1xwvzz"; depends=[gplots rJava smacof]; };
+  asymmetry = derive2 { name="asymmetry"; version="2.0"; sha256="02l9sg4f7i0mxzh4p7r930fswy4b04dv0icm7f2h1rldsnswh2sk"; depends=[gplots smacof]; };
   asympTest = derive2 { name="asympTest"; version="0.1.4"; sha256="02l07psiy1888zx86j2r1l5lznz47wdmzbh39pd2nbj8r9i80szr"; depends=[]; };
   asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; };
+  atable = derive2 { name="atable"; version="0.1.0"; sha256="0q3vy42a09sayb69f5fihfrkrsp3cz4380hb9f35ggkyi9v2d7nk"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; };
   atlantistools = derive2 { name="atlantistools"; version="0.4.3"; sha256="06rb0c4ralx55mdlqwpjzim0inxif4cdi9732v4h1ll8jhlm5v7d"; depends=[circlize dplyr ggplot2 gridExtra lazyeval magrittr proj4 purrr RColorBrewer RNetCDF rvest scales stringr tibble tidyr xml2]; };
-  atlas = derive2 { name="atlas"; version="0.6.0"; sha256="0phpninwqqibafq88s3kwlv84506l2jxaz0hvcwd5hknvydcf6ib"; depends=[httr testthat]; };
+  atlas = derive2 { name="atlas"; version="1.0.0"; sha256="02wm22j40llmdi6z3rzgbc5fpkzmjfq0xar33bypvj1dx1zxygnd"; depends=[httr testthat]; };
   atmcmc = derive2 { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; };
+  atmopt = derive2 { name="atmopt"; version="0.1.0"; sha256="1h79ngq1236gz4w29fs3nj46a3m1x8a28z3xnhc6wn3a46cf8zzi"; depends=[DoE_base gtools hierNet]; };
   atsd = derive2 { name="atsd"; version="1.2.0"; sha256="0jan8r5f2r3l2xpdf9rrv4smkr2l645rfdgdfjb1xa54jd3pqvqs"; depends=[httr RCurl]; };
   attempt = derive2 { name="attempt"; version="0.2.1"; sha256="0366sq1mf3d0amf6yfa42gw1gwwr9rbbqnqvr8hai1bfl672zkcp"; depends=[rlang]; };
   attrCUSUM = derive2 { name="attrCUSUM"; version="0.1.0"; sha256="113y40v9hyvnvvzvyqg81n0n1h84pj4zph5q8p0vc0384hw00544"; depends=[Rcpp RcppArmadillo]; };
   attribrisk = derive2 { name="attribrisk"; version="0.1"; sha256="1zqx53mxz2hh9jyanf3jkadgpj44jbqrk4p13fas91zvhpw9pn5s"; depends=[boot survival]; };
-  atus = derive2 { name="atus"; version="0.1"; sha256="15arijdfyci43k0a32zc8qmm73fmzrr3ghhxw0kgipdr3w5xcmz3"; depends=[]; };
+  atus = derive2 { name="atus"; version="0.2"; sha256="1i67rx8p5v4shgbfcym4lbnlw55xx7w2fdzhgsgjjyfpwbpm7h4h"; depends=[]; };
   auRoc = derive2 { name="auRoc"; version="0.1-0"; sha256="1ijk127p6g5mzc7b4b9lnjnfzvklz3g8w6bckrdahlw7djd9mgz1"; depends=[coda MBESS ProbYX rjags]; };
   aucm = derive2 { name="aucm"; version="2018.1-24"; sha256="0x10dawlwxqywjl7mxc2gpp2r4wnd7pb6n80xlrb9yywm7zbb6x2"; depends=[kyotil]; };
   auctestr = derive2 { name="auctestr"; version="1.0.0"; sha256="15b1x0c9yhl91gir7jmivp8vxzc8q7wvb0mgam9454avc6l29x4y"; depends=[dplyr tidyr]; };
   audio = derive2 { name="audio"; version="0.1-5.1"; sha256="1imh2l43n1cvwzzby598qn59rsm5262snril6b98hyih7mw7fyad"; depends=[]; };
   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.2.1"; sha256="0kpadjzfnahrbryn2zh0zxb93wivlbnznrgad3025mf1qabm3xnr"; depends=[car factoextra fdrtool GGally ggplot2 ggrepel hnp plotROC ROCR tseries]; };
-  augSIMEX = derive2 { name="augSIMEX"; version="2.0"; sha256="0j0izfk1hdzzn1s7gd64q56x8ws8nvpzh7a8d13gzwxi9dhvkzvf"; depends=[MASS Rcpp rootSolve]; };
-  auk = derive2 { name="auk"; version="0.2.1"; sha256="18vqvjksnllbkwfskiv8cv0dbw92nzkxwb0rj14sxxw8y55hybyy"; depends=[assertthat countrycode dplyr rlang stringi stringr tidyr]; };
+  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]; };
+  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]; };
   aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; };
   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]; };
+  autocogs = derive2 { name="autocogs"; version="0.1.1"; sha256="0p5z4gnairar1g7fpf3cm7iy5kgx66k8zhkqxx1hjdhjqjqp4w0g"; depends=[broom checkmate diptest dplyr ggplot2 hexbin MASS mclust moments progress tibble]; };
   autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; };
   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]; };
   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.0"; sha256="09wpyirsqw0s4b5221ksr0v0srrq24c6ca8kr5m4hr4ps728np0p"; depends=[checkmate filesstrings ijtiff magrittr Rcpp]; };
+  autothresholdr = derive2 { name="autothresholdr"; version="1.2.1"; sha256="0jbqadhpmd3fq8i7ncwv98s12wcsrvvgk0dw2qgpg9f2d2k2gnb1"; depends=[checkmate filesstrings ijtiff lattice magrittr Rcpp]; };
   autovarCore = derive2 { name="autovarCore"; version="1.0-4"; sha256="0i5fvx0z2kri0c855q40hd596kfjhmwpp2zw7d7k0xvk2xbcgbiv"; depends=[Amelia jsonlite Rcpp urca vars]; };
-  available = derive2 { name="available"; version="1.0.0"; sha256="0w4i0ajw0p71k717v8hg9d8az08m8yl97w5lly87kli36p7mv30h"; depends=[cli clisymbols crayon desc glue jsonlite memoise purrr SnowballC stringdist tibble tidytext udapi yesno]; };
+  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]; };
   averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; };
-  aws = derive2 { name="aws"; version="1.9-6"; sha256="0mfq44pji0p6d7s1wbwi0f97lsh3f33wnj8fiyimpg9fv8lr4inz"; depends=[awsMethods gsl]; };
+  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]; };
   aws_cloudtrail = derive2 { name="aws.cloudtrail"; version="0.1.5"; sha256="0p7qj9ivs14ska11a9qni4n0f8d05c1p126zvlxj9038c9p0y1wx"; depends=[aws_s3 aws_signature httr jsonlite]; };
   aws_comprehend = derive2 { name="aws.comprehend"; version="0.1.2"; sha256="0480ggfdmcv2pkjzmwh40h4nd87qswrpwr6h3j959f9y8zmzfd7n"; depends=[aws_signature httr jsonlite]; };
-  aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.1.4"; sha256="08l1gnqn2l6f6rkh21v1my2jp5bbzwnq38swymwl94jbnvnlrasw"; depends=[curl jsonlite]; };
+  aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.1.5"; sha256="077vp2djy2y37vkhvadbbaizfkx4qm86fm336idvrv36q8lcrl1v"; depends=[curl jsonlite]; };
   aws_iam = derive2 { name="aws.iam"; version="0.1.7"; sha256="0hag8j5g8rqg39x4f6d8vwwzhz98cx7549xixfl9cxiff7x9sz2c"; depends=[aws_signature httr jsonlite xml2]; };
+  aws_kms = derive2 { name="aws.kms"; version="0.1.2"; sha256="1bg1csdlwgaw928jschq1pxhg1ibrzy2q85vvc2zhlfd6c6xif3d"; depends=[aws_signature base64enc httr jsonlite]; };
   aws_lambda = derive2 { name="aws.lambda"; version="0.1.6"; sha256="16vis596clxn6h9j1k66224ikacsg0f9xrzqi5987nqlzrwskjgk"; depends=[aws_signature base64enc httr jsonlite]; };
   aws_polly = derive2 { name="aws.polly"; version="0.1.2"; sha256="0ij0rbng8q7xfa08p4x1l1lcmskmz3fy2pvln28zxqbs6jbc22rm"; depends=[aws_signature httr jsonlite tuneR]; };
   aws_s3 = derive2 { name="aws.s3"; version="0.3.12"; sha256="1yfi9ihrd0hmzxklc86mf5hcwgzsb5c4p1i402vgpg5mfvcvp3rl"; depends=[aws_signature base64enc digest httr xml2]; };
   aws_ses = derive2 { name="aws.ses"; version="0.1.4"; sha256="13hf4iqhnpkm9rnr7nzwky663vplnkjrgk90zix91cn2fvaspjgp"; depends=[aws_signature httr jsonlite]; };
-  aws_signature = derive2 { name="aws.signature"; version="0.4.1"; sha256="094d0jwg6433bdfkvs3r9mjvg61k78ff4ck0zhgyaz4aivlchm9j"; depends=[base64enc digest]; };
+  aws_signature = derive2 { name="aws.signature"; version="0.4.4"; sha256="18w4m7ald8ira59mrvhppzs0vfafi8xwqn7xrwl3hhsj855nzmyc"; depends=[base64enc digest]; };
   aws_sns = derive2 { name="aws.sns"; version="0.1.7"; sha256="0i8nn5jnykhsjwn4nsqdqbagankjc09zs8and54rkirdigzdny8v"; depends=[aws_signature httr jsonlite xml2]; };
   aws_sqs = derive2 { name="aws.sqs"; version="0.1.10"; sha256="09sh3injb4kfrq5al7hmbnqdn5v5hnjkqqsz86vpi4154435ymdg"; depends=[aws_signature httr jsonlite xml2]; };
   aws_transcribe = derive2 { name="aws.transcribe"; version="0.1.2"; sha256="12qz7j535aqxcvcawj4iqycbcmlba32sdl8qj2cw6rq5rgm55xaz"; depends=[aws_signature httr jsonlite]; };
@@ -4473,10 +4658,12 @@ in with self; {
   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=[]; };
-  bWGR = derive2 { name="bWGR"; version="1.5.3"; sha256="0kgl29kmpdbzjhbwv8kdy2lygza06fb90hqr7vwbgyl4fw049k9p"; depends=[Rcpp]; };
+  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]; };
   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]; };
+  bacistool = derive2 { name="bacistool"; version="0.9.8"; sha256="1yq7d2657l6iyy5v094c9rwphbpyhnijhwvacwhb07k6c6h069wh"; depends=[rjags]; };
   backShift = derive2 { name="backShift"; version="0.1.4.2"; sha256="1nj7mcdpzfzq68qg86rrys752gzw69n99yyb0jzg6r8qrgpcxj49"; depends=[clue ggplot2 igraph MASS matrixcalc mvnmle reshape2]; };
   backblazer = derive2 { name="backblazer"; version="0.1.0"; sha256="020kdydksm0brnxsa00blf5sylxd4hz49wmngk1x1fx43kdlyc41"; depends=[httr jsonlite openssl]; };
   backpipe = derive2 { name="backpipe"; version="0.2.3"; sha256="12k2cv9x8h0b002m9c8g4vj5a7chp4b8jqz377ia0diqw89dydpm"; depends=[]; };
@@ -4488,17 +4675,20 @@ 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]; };
-  ballr = derive2 { name="ballr"; version="0.2.0"; sha256="1f5fclmgp0pznahr3ix7xiixqah01jmh2g6fvrqyi6xcin8ynwqc"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; };
-  bamboo = derive2 { name="bamboo"; version="0.9.22"; sha256="1fajc4880wkpxjdgh41r2fq95dllpk1irbrkvrrwvb0pf3zbmjsl"; depends=[rscala]; };
-  bamdit = derive2 { name="bamdit"; version="3.1.0"; sha256="148ikj7mly8m6kxs2n4gidi7kb70i3x2vbf9xsllrf0cgvrjccps"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; };
-  bamlss = derive2 { name="bamlss"; version="1.0-0"; sha256="0wa54f5zyjyplys29cqhrasc6qa8p5znfal2ihp0qhhs46wzsk4y"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; };
+  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]; };
+  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]; };
   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]; };
   bannerCommenter = derive2 { name="bannerCommenter"; version="0.1.0"; sha256="0ycx771g9a73w0sx8zzix8kswwbjagzhbyvaq7l5r8a9ayfli8ic"; depends=[]; };
+  banter = derive2 { name="banter"; version="0.9.3"; sha256="1ziys0zy66477ynr8rp2kv7w82n6226whn47aa06kkb4nhcqfk2c"; depends=[dplyr ggplot2 gridExtra magrittr plyr randomForest ranger rfPermute rlang tibble tidyr]; };
   banxicoR = derive2 { name="banxicoR"; version="0.9.0"; sha256="0vchm2hnqm45fhn8k38rcam4vkazmifcl40390s2r04bgvqr0pnl"; depends=[rvest stringr xml2]; };
   bapred = derive2 { name="bapred"; version="1.0"; sha256="08kvc4cc984jv08ikwbja8zxidrcdiwi5w88hlqakbm8yc6hzssa"; depends=[affy affyPLM Biobase FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; };
   barcode = derive2 { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; };
+  barsurf = derive2 { name="barsurf"; version="0.1.0"; sha256="0lz87lzs4fs9rbc0p8a92li5cj1cd8va5rgp9s0n96rwmzmdkz63"; depends=[]; };
   bartMachine = derive2 { name="bartMachine"; version="1.2.4.2"; sha256="100zcpbndbps01qnybrgmsfnh37j93661l4v7zcin0i56cvgg998"; depends=[bartMachineJARs car missForest randomForest rJava]; };
   bartMachineJARs = derive2 { name="bartMachineJARs"; version="1.1"; sha256="1wpfzrb6mrx3xmxy4rgnwygmpqq2l4ki2xqr4m51g1bl9nwirhzj"; depends=[rJava]; };
   basad = derive2 { name="basad"; version="0.2.0"; sha256="1qc2amkrjrgdqys275p82lmbpjszm5rzjdpri7hqc9d8b8q1vc9q"; depends=[Rcpp RcppEigen rmutil]; };
@@ -4507,75 +4697,82 @@ in with self; {
   base64enc = derive2 { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; };
   base64url = derive2 { name="base64url"; version="1.4"; sha256="0n1c2b68vza1dh7sk38v6biiwm72c4jpl79kpdg1bsb0hq9qy18x"; depends=[backports]; };
   baseballDBR = derive2 { name="baseballDBR"; version="0.1.2"; sha256="0w54g1avcqamc12lmvjchlqbqck9jfjccm441k03nsql460mpydq"; depends=[dplyr magrittr rvest xml2]; };
-  basefun = derive2 { name="basefun"; version="1.0-1"; sha256="0qiszm71alh7p3inhiv9prdl4f5l45ny8plz2fm7l5h51z5xj54r"; depends=[Matrix orthopolynom polynom variables]; };
+  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]; };
-  basicTrendline = derive2 { name="basicTrendline"; version="1.0.1"; sha256="0rsmlp70ylpkqv437jcy3skwbfkj4xwkpjb2q79b9n8kw2ir0716"; depends=[]; };
+  basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.1.0"; sha256="033m0z7xj5lvzfw7g54ls99ii2wj5hwk5lhids124ax8ckqzspii"; 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]; };
   bastah = derive2 { name="bastah"; version="1.0.7"; sha256="08xdba16wj0inp0kq2sbcrdr6wj8bwlq7rqnfrzjrz03wxhc5bk0"; depends=[BigQuic foreach glmnet lars MASS Matrix scalreg]; };
   batade = derive2 { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; };
   batch = derive2 { name="batch"; version="1.1-5"; sha256="0wdgfvk2i542cqg34ikvzwlix09f2jyjb32a0f4zh9vg9nrywswq"; depends=[]; };
   batchmeans = derive2 { name="batchmeans"; version="1.0-3"; sha256="1qkdljngvlahk0pbrkarkjh2g4sxxwiva9f3m5y8gz8pjw9fpy9n"; depends=[]; };
-  batchtools = derive2 { name="batchtools"; version="0.9.10"; sha256="0qgjag82z7s6s35lccpidkq5rivkz03gnmcggrgaa9vskv0w6q62"; depends=[backports base64url brew checkmate data_table digest fs progress R6 rappdirs stringi withr]; };
+  batchtools = derive2 { name="batchtools"; version="0.9.11"; sha256="02mj21ypcjv5fs7ajf63p6bq0cyvihdl55hlpqx6kmsfjin1cr0v"; depends=[backports base64url brew checkmate data_table digest fs progress R6 rappdirs stringi withr]; };
   batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; };
   batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; };
-  bayesAB = derive2 { name="bayesAB"; version="1.1.0"; sha256="0g74n6jvpmb2sbmywcagb10rk8sd3pxzkw9s8s6qpg34q58v01a6"; depends=[ggplot2 Rcpp]; };
+  bayesAB = derive2 { name="bayesAB"; version="1.1.1"; sha256="0kxrhxg43hzkcziyqpwy29iqs7i0qi3pn3jz0z1s8paf8drbgdf4"; depends=[ggplot2 Rcpp]; };
   bayesCL = derive2 { name="bayesCL"; version="0.0.1"; sha256="1l278lxidn16nma2ny14wjajcqyzbr6j5xl2lj08cic26c7hvjbm"; depends=[]; };
-  bayesDP = derive2 { name="bayesDP"; version="1.3.1"; sha256="175g75cpynccyzcbzca4h6xa2708985h8dhq34kvkpfhv35pc64d"; depends=[ggplot2 Rcpp RcppArmadillo survival]; };
+  bayesDP = derive2 { name="bayesDP"; version="1.3.2"; sha256="1xv133v01mbfsy0w5acc9819m92dcxfdjg4a8p7kdfkycz4ilwnl"; depends=[ggplot2 Rcpp RcppArmadillo survival]; };
   bayesDccGarch = derive2 { name="bayesDccGarch"; version="2.0"; sha256="1s2b8f43wi9ja966n2p2r4l4s79vk6xb8mqaxsagnw90g969p681"; depends=[coda numDeriv]; };
   bayesDem = derive2 { name="bayesDem"; version="2.5-1"; sha256="1cxrqil1p692mbzkcj1fvsx335qyy6c1y43mq48s4shs1hhc69bn"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; };
   bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.3"; sha256="1480mmzfshchfbfh3x420cq5qblfh59jkl21hkq2jvnwppksdn9w"; depends=[coda mvtnorm]; };
   bayesGDS = derive2 { name="bayesGDS"; version="0.6.2"; sha256="0ash16hmassn76x3f59dfvp4plqp8vb17qzcwmag7vi3mi3y2ap6"; depends=[Matrix]; };
-  bayesImageS = derive2 { name="bayesImageS"; version="0.5-2"; sha256="01gnjxrp68jxrygijk6v42dsiyfkxawvj4ilh0sajm05iknkn419"; depends=[Rcpp RcppArmadillo]; };
+  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="6.2-4"; sha256="1z8s5lbvz642hxl10b4cv361izw82akq40dav3mknqqcgv1vlrk6"; depends=[abind bayesLife bayesTFR fields googleVis plyr reshape2 rworldmap wpp2012 wpp2017]; };
+  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]; };
-  bayesTFR = derive2 { name="bayesTFR"; version="6.1-2"; sha256="092sl8xk82kybpp0v06j0dxh4zal0d6j2na42ghl2ri36iy6wqvx"; depends=[coda MASS mvtnorm wpp2017]; };
+  bayesTFR = derive2 { name="bayesTFR"; version="6.2-0"; sha256="0qgab56dk8pf2r6rl3h18lfh6xkdw9jn5va55iw20lc4a52miz64"; depends=[coda MASS mvtnorm wpp2017]; };
   bayesammi = derive2 { name="bayesammi"; version="0.1.0"; sha256="1vfcmk47x71c5akj3ppxzb74293pikspknkkv08f8p15v0chk7fs"; depends=[dplyr ggplot2 lme4 magrittr MASS mvtnorm rlang rstiefel scales tibble tidyr tmvtnorm]; };
   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]; };
   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]; };
   bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; };
   bayesm = derive2 { name="bayesm"; version="3.1-0.1"; sha256="04b4s8clxrmdyhnhd2arnsdi992422yam3z91w6dzrmngwxq4yaq"; depends=[Rcpp RcppArmadillo]; };
-  bayesmeta = derive2 { name="bayesmeta"; version="2.2"; sha256="15pqa1plcnl8pbzs38cw22y3qq1v7f9vla4zy0154crvbrbp8kwf"; depends=[forestplot metafor]; };
+  bayesmeta = derive2 { name="bayesmeta"; version="2.3"; sha256="12rljnlr7wv0q95ild7vrsbgkpg7zw1lmh6gx4kpip1ckax04360"; depends=[forestplot metafor]; };
   bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; };
-  bayesplot = derive2 { name="bayesplot"; version="1.5.0"; sha256="1f0kgrgr87fp9576ssrygkp5n4186zq1rw5iwzhqr8s81is352li"; depends=[dplyr ggplot2 ggridges reshape2 rlang]; };
+  bayesplot = derive2 { name="bayesplot"; version="1.6.0"; sha256="0in9cq2ybpa7njrwqx4l6nc8i01cjswsvzwlyiw465pi74aapr57"; depends=[dplyr ggplot2 ggridges reshape2 rlang]; };
   bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; };
   bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; };
-  bayou = derive2 { name="bayou"; version="2.1"; sha256="0biziarmamdpapv2p2ylvxqa4mcdvdwbay545w51yb73538bgkb8"; depends=[ape assertthat coda denstrip fitdistrplus foreach geiger MASS Matrix mnormt phytools Rcpp RcppArmadillo]; };
+  bayou = derive2 { name="bayou"; version="2.1.1"; sha256="17gvb2dmviwibnlqn6p3p9pcc3705xh9r8lrm90p0yg7nhm0cn02"; depends=[ape assertthat coda denstrip fitdistrplus foreach geiger MASS Matrix mnormt phytools Rcpp RcppArmadillo]; };
   baystability = derive2 { name="baystability"; version="0.1.0"; sha256="1zv4bf5a4p21w2qpr6lcsgsxb0xv15v8p33031rsypmnbs9i80dp"; depends=[dplyr ggfortify ggplot2 lme4 magrittr MASS matrixStats reshape2 rlang rstiefel scales tibble tidyr tidyverse]; };
-  bazar = derive2 { name="bazar"; version="1.0.6"; sha256="12b1x218x1yh9iadv8ciyncr841s0arvj4pbn74bryhcgbvmbwqm"; depends=[kimisc]; };
+  baytrends = derive2 { name="baytrends"; version="1.0.7"; sha256="1l59w79n2l04n0i12ka1cvnnqsx9412b2fgsgp4pz5hsi5nswlp8"; depends=[dataRetrieval digest gdata lubridate memoise mgcv plyr survival XML zCompositions]; };
+  bazar = derive2 { name="bazar"; version="1.0.10"; sha256="1in3096bxw7v80wxkjp6i9akyv18ihzc0kldl952i9s772dcgbfs"; depends=[kimisc]; };
   bbefkr = derive2 { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; };
   bbemkr = derive2 { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; };
   bbmle = derive2 { name="bbmle"; version="1.0.20"; sha256="1xzij7swrrzl5ly8l3lw6awh486zcm00251dwqws1y23fbgyh3vc"; depends=[lattice MASS numDeriv]; };
   bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; };
   bbw = derive2 { name="bbw"; version="0.1.3"; sha256="1z3an561qh0rfi3jhh1ghsdbg8aimqmf4hpqri2jz39in3p0gwg4"; depends=[car]; };
   bc3net = derive2 { name="bc3net"; version="1.0.4"; sha256="15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h"; depends=[c3net igraph infotheo lattice Matrix]; };
-  bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-2"; sha256="0v1zjbgpalr5ag97s9rxcd2z0r7qpw8yhc4lw4p4i3xkw2paf5zh"; depends=[boot nnet Rcpp RcppArmadillo rgl]; };
+  bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-3"; sha256="1g9l4abnpp1iq5wy3rl2jv47ql9zh6s2qrhyj06x22358lpinjnl"; depends=[boot nnet Rcpp RcppArmadillo rgl]; };
   bcRep = derive2 { name="bcRep"; version="1.3.6"; sha256="1fibx11ykkkjv4sgg6zc2a0g270384z2cf68hwghnld0wi002b5z"; depends=[ape doParallel foreach gplots ineq plotrix proxy stringdist vegan]; };
+  bcaboot = derive2 { name="bcaboot"; version="0.2-1"; sha256="0wf1igkb0lidz4pvh3kfccs9858m1g9650wprrvrpwsdfrcd7rc9"; depends=[]; };
+  bcf = derive2 { name="bcf"; version="1.2.1"; sha256="03l4wlqz69sqkffjrlznlam2sql9zfpa6x84y7x1z66zfy6f7n79"; depends=[Rcpp RcppArmadillo]; };
   bcgam = derive2 { name="bcgam"; version="1.0"; sha256="1dg2fcjw8xal77irviiz260qpar2iqkjvi2k4qfm71jyq0ir0axk"; depends=[coda igraph nimble]; };
   bclust = derive2 { name="bclust"; version="1.5"; sha256="01kx02azj26b6swly53zhf3sny6c6jglkxnzylsc0pvri89x7yj2"; depends=[]; };
   bcmaps = derive2 { name="bcmaps"; version="0.17.1"; sha256="12hca67n7fqplis8g954hj588zl9kj8gmph86mxhcy151qpyh927"; depends=[httr rappdirs sf]; };
-  bcp = derive2 { name="bcp"; version="4.0.2"; sha256="0ixpjhyyqaz7gc2ixpask062sxhsfg8d146mm244jkqgiagydg5l"; depends=[Rcpp RcppArmadillo]; };
+  bcp = derive2 { name="bcp"; version="4.0.3"; sha256="0vhs89lb2wpanqsljclpvwbjmgdsc3jicws8bzqiqh8mbs3nzpxy"; depends=[Rcpp RcppArmadillo]; };
   bcpa = derive2 { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; };
   bcpmeta = derive2 { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
   bcrm = derive2 { name="bcrm"; version="0.4.7"; sha256="0s0xmmphrrsqnrsnnsqh9ska6afl4jyk0s0290w6askrlqdzjgil"; depends=[ggplot2 mvtnorm]; };
   bcrypt = derive2 { name="bcrypt"; version="1.1"; sha256="1wwdin8x09y8n8zrwj1ylh5ikcz0v0la4wmrsvbdr61cg336wzx4"; depends=[openssl]; };
   bcv = derive2 { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; };
+  bdDwC = derive2 { name="bdDwC"; version="0.1.15"; sha256="0yraq8a0wgz12rzi2dx0gdcz5rx99qd2pzw972wjqyq3rs41pwx0"; depends=[shiny shinyBS shinydashboard shinyFiles shinyjs]; };
   bda = derive2 { name="bda"; version="10.1.9"; sha256="06ycxqjpnsywakjkjxf1czhxsbdzbpwa11m69gad5538z066d24x"; depends=[]; };
   bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; };
   bdlp = derive2 { name="bdlp"; version="0.9-1"; sha256="1ydb5hsaj1bfdz7hcdkc74qlk608kf0xrbpw247klkxrhsh9ba2p"; depends=[DBI GenOrd MASS MultiOrd rgl RSQLite stringdist]; };
   bdots = derive2 { name="bdots"; version="0.1.19"; sha256="1cj6ly62d50z6713119hadl90cxf5x30wpnpx6mssmd49zds6nxb"; depends=[doParallel doRNG foreach Matrix mvtnorm nlme]; };
   bdpopt = derive2 { name="bdpopt"; version="1.0-1"; sha256="1z7mdqklw3frsdzyhvx8s8wvblwm28fr1gca2yrivqjng0r47lx4"; depends=[coda rjags]; };
   bdpv = derive2 { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; };
+  bdribs = derive2 { name="bdribs"; version="1.0.4"; sha256="19qakmdw3l8vfxkr4p1ydkyfs4cmq37lqzw7l5zx5rdn6zlhqwh4"; depends=[rjags]; };
   bdscale = derive2 { name="bdscale"; version="2.0.0"; sha256="1hkkfd69g2bg2y4hicjs6bnw9f0zw74jy0dpadchnzw17lffpms3"; depends=[ggplot2 scales]; };
   bdsmatrix = derive2 { name="bdsmatrix"; version="1.3-3"; sha256="17ddvz4gnih7rx0lr1gzk280xyh6x796cf2x794dvplpiiq83skh"; depends=[]; };
-  bdvis = derive2 { name="bdvis"; version="0.2.20"; sha256="1iif70s17d9nh6bylm9s0ky70qx441n56h953gz4hxp7rb5dly31"; depends=[chron ggplot2 lattice leafletR maps plotrix plyr sqldf taxize treemap]; };
+  bdvis = derive2 { name="bdvis"; version="0.2.22"; sha256="1kfkn3ak1aqqj61ryfxmq8vvmi4z4znha03ga1ncsrnpb6g1kfvk"; depends=[chron ggplot2 lattice leafletR maps plotrix plyr rgdal sqldf taxize treemap]; };
   bdynsys = derive2 { name="bdynsys"; version="1.3"; sha256="07gfyp0qwq9y1cnh7lhcz7q0b1s51cjwlbpll50l2cza2dszmf29"; depends=[caTools deSolve Formula Hmisc MASS matrixStats plm pracma]; };
   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]; };
@@ -4588,48 +4785,49 @@ in with self; {
   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]; };
   beeswarm = derive2 { name="beeswarm"; version="0.2.3"; sha256="0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581"; depends=[]; };
+  beezdemand = derive2 { name="beezdemand"; version="0.1.0"; sha256="1i6p36cfvz87k6llpibklmdbjb7vp1v38ijxaqkmv1jzc28sj3cl"; depends=[ggplot2 nlmrt nls2 nlstools reshape2]; };
   beginr = derive2 { name="beginr"; version="0.1.3"; sha256="1wrxcgapan19p2zwvmrz9fg9hwkxfm0x2qcqkanmn0mmsaixhs3h"; depends=[cranlogs]; };
+  behaviorchange = derive2 { name="behaviorchange"; version="0.0.2"; sha256="1g5r4mnqpls16836pi2dr7lm308c677m5j8xha6c12pnr39rnc4a"; depends=[data_tree DiagrammeR ggplot2 googlesheets gridExtra gtable magrittr ufs userfriendlyscience viridis]; };
   behavr = derive2 { name="behavr"; version="0.3.1"; sha256="18rpln7db8cnaj6f47vjgh7q2xbcjmd0vhfbmvm82fr7qhdnnyc0"; depends=[data_table]; };
   belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; };
   belg = derive2 { name="belg"; version="0.2.3"; sha256="1ss40fxfmzld4fqpbkc3knsxdqc4nmllgvl2v4nyqzcalcknzvvf"; depends=[Rcpp RcppArmadillo]; };
   bench = derive2 { name="bench"; version="1.0.1"; sha256="0hiwm3jbwr9wjdfx0nk3djskiw1q900h4acaqjgy97p8gl0ig3g8"; depends=[glue pillar profmem rlang tibble]; };
   benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
-  benchmark = derive2 { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[ggplot2 plyr proto psychotools relations reshape scales]; };
   benchmarkme = derive2 { name="benchmarkme"; version="0.6.0"; sha256="0w98q4b814bz3q0vqdfnwqrgfrky3ggsyyzmdiz17kv6xk17qds8"; depends=[benchmarkmeData doParallel foreach httr Matrix]; };
   benchmarkmeData = derive2 { name="benchmarkmeData"; version="0.5.1"; sha256="0vv5d90qv81lwrgi5d3zbwlwxwjqlx70xi4ljhcc0ljv50x2rvv4"; depends=[]; };
-  benchr = derive2 { name="benchr"; version="0.2.0"; sha256="042ijh6726s116z7w2cky5l105p3dj7xsfmlwkigsbrmya8x5d37"; depends=[Rcpp RcppProgress]; };
+  benchr = derive2 { name="benchr"; version="0.2.2"; sha256="1ls75pmhvj6d4wc9knifv6d1dfr0avfhry370m636mhfpw4z2ybf"; depends=[Rcpp RcppProgress]; };
   benford_analysis = derive2 { name="benford.analysis"; version="0.1.4.1"; sha256="0acbjjavbvsaigy78b5k9qhj8011751116lqln8j0v8w1k3vqwqm"; depends=[data_table]; };
   bentcableAR = derive2 { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; };
   benthos = derive2 { name="benthos"; version="1.3-5"; sha256="1mzhqqy4dblwv70v1ky5gzrr3jyky9k4wibbp589jjjrga2vhq2a"; depends=[dplyr lazyeval readr]; };
   ber = derive2 { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; };
   berryFunctions = derive2 { name="berryFunctions"; version="1.17.0"; sha256="13wslhr3xm9davx3s69as41r53m3x0gm3mrnwrbsqcbmf9n0zbv3"; depends=[abind]; };
-  bestNormalize = derive2 { name="bestNormalize"; version="1.2.0"; sha256="0ixv5w4x4413131fxl47c3ma0h9ac1khakp89psnci4qjxbcx5xc"; depends=[LambertW nortest]; };
+  bestNormalize = derive2 { name="bestNormalize"; version="1.3.0"; sha256="0wipxc4dqhpmxqb8nkfp2pgxp7854r1rgrmppvlja7v5hwz4mgw7"; depends=[doParallel doRNG dplyr foreach LambertW nortest]; };
   bestglm = derive2 { name="bestglm"; version="0.37"; sha256="0ghhi4g75mgq2pnkrvw188s65132i1d7v3hahnjrsnx4vrr8a9lz"; depends=[glmnet grpreg lattice leaps pls]; };
-  betaboost = derive2 { name="betaboost"; version="1.0.0"; sha256="11r6vywkb8182r1797aijm3czrxxghv5hjbadw61ick0masvcpml"; depends=[gamboostLSS mboost]; };
+  betaboost = derive2 { name="betaboost"; version="1.0.1"; sha256="1zdyzxl2kp2i5lkiz280wz4av9wqklbn25zmq6n4yb6a579yjfn8"; depends=[gamboostLSS mboost]; };
   betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; };
   betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
   betalink = derive2 { name="betalink"; version="2.2.1"; sha256="1wskr8nh1jzcrnc8fn58lscphsvj5z9p1i1pnpfdjn60mdb09rkp"; depends=[igraph plyr stringr]; };
-  betapart = derive2 { name="betapart"; version="1.5.0"; sha256="0hk016hpdb927d142rfa13kjwhgzki1fy4xqbwdphzwv37nyxag7"; depends=[ape geometry picante rcdd]; };
+  betapart = derive2 { name="betapart"; version="1.5.1"; sha256="0j72rfvnn0ag6vxp8nw5v68n3qblyp5gd0y8z1kchs4dbq1v288g"; depends=[ape fastmatch geometry picante rcdd]; };
   betaper = derive2 { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[ellipse vegan]; };
-  betareg = derive2 { name="betareg"; version="3.1-0"; sha256="05s5lszj22186xhvk0dxgz4vqfvmss40pbh147mwqkz1h48z5pf7"; depends=[flexmix Formula lmtest modeltools sandwich]; };
+  betareg = derive2 { name="betareg"; version="3.1-1"; sha256="07cblxprybqkv55805za6qg47vw95azxn4446frxwkramza4ygv2"; depends=[flexmix Formula lmtest modeltools sandwich]; };
   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="0.18.1"; sha256="0aph1sshnxk7aajnm871zw9fadxbhv8l93kbydzh69b8kiz6wi6x"; depends=[ltsa Rcpp]; };
+  beyondWhittle = derive2 { name="beyondWhittle"; version="1.0"; sha256="15q3dp5aw7csr3sp12vxhjvhazryk9b67x1spp0kv7qxy1v2jl95"; depends=[ltsa MASS Rcpp]; };
   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.1.0"; sha256="13hbg2kr56yfg2r58cw3l631rq1kv8bk9gcdqbgspsjn04g1iq2f"; depends=[coda MASS rJava runjags]; };
+  bfw = derive2 { name="bfw"; version="0.2.0"; sha256="05h4i3mpwgdn3w1163qhzzhzrcxzsw3y35pjzj0w4kjc28nkp354"; 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.1"; sha256="09h118msqf9yl2z7d6dsvgn4vrvy43ynznajj58k7gkxdlm1nimg"; depends=[coda EDISON Matrix mnormt mvtnorm sparseMVN statmod]; };
+  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.0"; sha256="0rqn9wkd25d7l295n55idsf1zch1niz5f05qnsbd1gqrq7nw42xn"; depends=[AER Cairo MASS MCMCpack msm mvtnorm survival]; };
+  bhrcr = derive2 { name="bhrcr"; version="1.0.1"; sha256="1frkzngrxy65nzdz3aylpj4kfikd1giwpwsy0bbhr5a9zbpr405v"; 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="1.9.4"; sha256="0l2lqz9qx8f86dz2asvv11iv366hvjn2fjamgm98winrvyrzqnsw"; depends=[factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix RColorBrewer RISmed rscopus SnowballC stringdist 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]; };
   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]; };
@@ -4641,33 +4839,37 @@ 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.0.0"; sha256="14hjrma9qjyi9nypbvrqrzf6d1fxh4rrc48yq95vsrg7vr4han5x"; depends=[ff ffbase]; };
-  bigdatadist = derive2 { name="bigdatadist"; version="1.0"; sha256="1xmralvhdczd270c2ym47ywc7gkqs247vpjr1vpmqsgiqvr7n1ql"; depends=[FNN MASS pdist rrcov]; };
+  bigchess = derive2 { name="bigchess"; version="1.1.0"; sha256="0w6zhlljnza16xb1zsw4lan9al4pynbvk4d830yvqpd3bnb6aidk"; 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]; };
-  bigmatch = derive2 { name="bigmatch"; version="0.2.1"; sha256="0c2rg6fiphb01xz6lm34766gwz7m054bgismwbx6wscmw51nj7rw"; depends=[liqueueR mvnfast plyr rcbalance]; };
+  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]; };
   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]; };
+  bigreadr = derive2 { name="bigreadr"; version="0.1.3"; sha256="1cdr7i8y7bvhfajs3bmxlljbda2922dgbiwkkyxn2k5cn384plak"; depends=[data_table fpeek Rcpp]; };
   bigrquery = derive2 { name="bigrquery"; version="1.0.0"; sha256="0z7wsqxla1pg2454l35kkfaz2s9hppwvpz1pds286ddldbbmyzis"; depends=[assertthat curl DBI glue httr jsonlite prettyunits progress rapidjsonr Rcpp tibble]; };
   bigsplines = derive2 { name="bigsplines"; version="1.1-1"; sha256="1kf04p2lglzdi1fdryk27nmj2a2jca2ii7ki8vak93sq21isb179"; depends=[quadprog]; };
-  bigstep = derive2 { name="bigstep"; version="0.7.4"; sha256="0g45fgnamdv1v3b8xvpsj4rzhisyvbbddwyzvzvmmi4a8w20pzn5"; depends=[bigmemory matrixStats R_utils RcppEigen speedglm]; };
+  bigstatsr = derive2 { name="bigstatsr"; version="0.6.2"; sha256="1dv6615yn26lpqj4nswji74zp4zjp6j5m1n0h1h3jffdh7xai46d"; depends=[BH bigreadr cowplot doParallel foreach ggplot2 Rcpp RcppArmadillo RSpectra]; };
+  bigstep = derive2 { name="bigstep"; version="1.0.0"; sha256="1bkh7a4qzvh567qglkyidlfam5qj33aih9k8ndxj2ng6dcq38lbd"; depends=[bigmemory magrittr matrixStats R_utils RcppEigen speedglm]; };
   bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; };
   bigtcr = derive2 { name="bigtcr"; version="1.1"; sha256="1l03yc28afdm7glbw4ay0zsywjgqg5l90qz1hfhslsy8gg7d5wq5"; depends=[]; };
   bigtime = derive2 { name="bigtime"; version="0.1.0"; sha256="136gy2i4qwa2drklllyzp3z0dbijlavgf3sxy73bf84df2yq1c9i"; depends=[corrplot lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; };
-  bikedata = derive2 { name="bikedata"; version="0.2.0"; sha256="1iihf1nf3ybvkhq4j3c5p1271c56vpsmsrjf3q2r9n98g3apa6k2"; depends=[BH DBI dodgr httr lubridate magrittr Rcpp readxl reshape2 RSQLite tibble xml2]; };
+  bikedata = derive2 { name="bikedata"; version="0.2.2"; sha256="02qwi0rdrg6pmimfqc9y2nkb9l9aks8zxgqz9paqyr2b2psib7ym"; depends=[BH DBI dodgr httr lubridate magrittr Rcpp readxl reshape2 RSQLite tibble xml2]; };
   bikeshare14 = derive2 { name="bikeshare14"; version="0.1.0"; sha256="12399c01s8p9rmpi3fpy4rm7xxnsf627slz3h234frbahhs882c4"; depends=[]; };
   bild = derive2 { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; };
   billboard = derive2 { name="billboard"; version="0.1.0"; sha256="1z3y8dijhc1381y91n5zq305xzm1gpvs0g4mdpfr7zrblpa8ws39"; depends=[tibble]; };
-  billboarder = derive2 { name="billboarder"; version="0.2.2"; sha256="14jq3k2d0bsc2l8hsc2shps3hw6fq0k0w5m0yj9k4hbidgpg9z7n"; depends=[ggplot2 htmlwidgets jsonlite magrittr scales]; };
+  billboarder = derive2 { name="billboarder"; version="0.2.4"; sha256="0y4rcrcdi8jfp5dha4vzvr5d0rq73wlbvszb517bdwgg4cgh2hgq"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr scales]; };
   bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; };
   bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; };
-  binGroup = derive2 { name="binGroup"; version="2.1-1"; sha256="1rwmsrm4ghpvb1vldph2frwglfvajwyj7bzi1f6mhnm9mrg80blj"; depends=[partitions]; };
+  binGroup = derive2 { name="binGroup"; version="2.2-1"; sha256="0cb7j6b0s3y56mv1967awwri0kv0rf3sr3vwf9gc2zbjggxi9ffp"; depends=[partitions Rdpack]; };
   binMto = derive2 { name="binMto"; version="0.0-7"; sha256="0rg9rsdy14jx7zjv60krcz1vh0sxqimsai0wynhx2sx0kydw4ngy"; depends=[mvtnorm]; };
   binaryGP = derive2 { name="binaryGP"; version="0.2"; sha256="0i4xi0gxk0lamjdygyx0azdp3kfqmva1g20nl3p65w4yx77m88d6"; depends=[GPfit lhs logitnorm nloptr Rcpp RcppArmadillo]; };
   binaryLogic = derive2 { name="binaryLogic"; version="0.3.9"; sha256="19ig9qgjjnivfihjy41pc13qlrb95679mmk4zks5lbbri8qi4qxj"; depends=[]; };
+  binb = derive2 { name="binb"; version="0.0.3"; sha256="14fzsaxlh0kl85gapw9xizgd201zbbcqh2hngiqap6fzha73gvc8"; depends=[knitr rmarkdown]; };
   binda = derive2 { name="binda"; version="1.0.3"; sha256="15rhxnlif7agblzd09gyllkqkf5d8cc75b4vmp7grx8a6y7w47g0"; depends=[entropy]; };
   bindata = derive2 { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; };
   bindr = derive2 { name="bindr"; version="0.1.1"; sha256="1l05fpk2yql3jka321c0bdgx6mqq9pvfrg2844lbjfpbgjkmqy3w"; depends=[]; };
@@ -4675,9 +4877,10 @@ in with self; {
   binequality = derive2 { name="binequality"; version="1.0.3"; sha256="0hhcmw1mq785zylcxghfnazi3xvnl7sqpqll8fqdk064a4drqkw1"; 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-2"; sha256="040ss4jwqar4b5wb96gpi41xhmlqcbvs4vphxmfj8xs12hd7r6wl"; depends=[adlift EbayesThresh wavethresh]; };
+  binhf = derive2 { name="binhf"; version="1.0-3"; sha256="1vdw2s8zddp7gad8l3c4jpmnjcc0f5wpqbrp6gp9lgp1c3qa505y"; depends=[adlift EbayesThresh wavethresh]; };
+  binman = derive2 { name="binman"; version="0.1.1"; sha256="0hm0h285p4v9lhrqjy8s22f1s1vmfpfla5iaycpj8vw3qb3632az"; depends=[assertthat httr jsonlite rappdirs semver xml2 yaml]; };
   binneR = derive2 { name="binneR"; version="1.1.1"; sha256="07cfcp9jj5bks8kmxvir9y9z7fj44hvy1wyrg4jy029dvkz8g2ki"; depends=[dplyr magrittr mzR plyr tidyr]; };
-  binnednp = derive2 { name="binnednp"; version="0.1.0"; sha256="0cfgz6828b2525dmph5n4zxdgkbx0nsrm4k2azhw1xfi3pz4z6ga"; depends=[fitdistrplus kedd mclust nor1mix Rcpp Rdpack]; };
+  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]; };
@@ -4691,7 +4894,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.2"; sha256="0xhlmcfb7ll4w655dsq6vdjn6yl2imrw6da2xg5csk2s9yg059wq"; depends=[htmltools moments Rcpp stringr tuneR]; };
+  bioacoustics = derive2 { name="bioacoustics"; version="0.1.5"; sha256="159dyqj5r5s4673nkcvv432gcc17f0qygnyjjd6mq6l7a38zb017"; 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]; };
@@ -4708,7 +4911,7 @@ in with self; {
   biosignalEMG = derive2 { name="biosignalEMG"; version="2.1.0"; sha256="0bbkrfqkmks4z8c7rh0k43lvm71vn3fzrw3kpj012ym77whwkvay"; depends=[signal]; };
   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.08"; sha256="16j70ikzprjsm81w9bqbp26xxf14ckw654dy7c5hkz24x62qsx2i"; depends=[fields igraph MASS permute sna vegan]; };
+  bipartite = derive2 { name="bipartite"; version="2.11"; sha256="1ahn696g881dc9mnf67pglf0kskfk2zqkj2afvinqxmwal827f72"; depends=[fields igraph MASS permute sna vegan]; };
   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]; };
@@ -4722,6 +4925,8 @@ in with self; {
   bitops = derive2 { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; };
   bitrugs = derive2 { name="bitrugs"; version="0.1"; sha256="0sqgp05b902mdldr4ckz4knmkbsqvgl1vx0l792cn2r437yqlgp3"; depends=[]; };
   bivarRIpower = derive2 { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; };
+  bivariate = derive2 { name="bivariate"; version="0.2.2"; sha256="1kf34gdhi0cnngwp3xgk3qmiqxav8qldign93mxygxx8as2za00x"; depends=[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]; };
   biwt = derive2 { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; };
@@ -4730,55 +4935,57 @@ in with self; {
   bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; };
   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.0"; sha256="11vaqsfm0kszx3iq38c8vbqnwkfk77lv5021l2zq9iaxz9d83s7k"; depends=[commonmark downloader dplyr ggplot2 glue htmltools httr knitr magrittr purrr rlang stringr tibble tidyr]; };
+  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]; };
   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]; };
   blink = derive2 { name="blink"; version="0.1.0"; sha256="0gi5dk2js3mssg2blji7yddrbmsynp9nr3qhzlpkpy15i81mg2xy"; depends=[plyr RecordLinkage stringdist]; };
   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]; };
-  blkergm = derive2 { name="blkergm"; version="1.1"; sha256="0giknhcl14b4djn5k5v5n33b7bc3f8x6lx2h4jr25kpd89aynhq5"; depends=[ergm network statnet_common]; };
   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]; };
   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.2.6"; sha256="0dskcwdh89a24j1lr829p9rrs88l13738b1gvsmsqrcrg9z955xc"; depends=[Rcpp rtkore]; };
+  blockcluster = derive2 { name="blockcluster"; version="4.3.2"; sha256="15xp4navipxcr2pqxnxc47b0ifdazcsdkn5kmay883vzqj8c1nrb"; depends=[Rcpp rtkore]; };
+  blockingChallenge = derive2 { name="blockingChallenge"; version="1.0"; sha256="0zj649gj4djdl0wly3gh99ayk1i1rk5dawcrrlzxxh56xqf4l19i"; depends=[]; };
   blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
   blockmodeling = derive2 { name="blockmodeling"; version="0.3.1"; sha256="0cbx44mg5b9w1sz32wsgjprbss4mfx79sn6m42lvminf0023ds1r"; depends=[doParallel doRNG foreach Matrix]; };
   blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; };
   blockrand = derive2 { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; };
-  blocksdesign = derive2 { name="blocksdesign"; version="3.0"; sha256="17flj5glim3fa53k16p5pfl7dj12f76pgf4j6c1395xhn0qpww8i"; depends=[crossdes lme4]; };
+  blocksdesign = derive2 { name="blocksdesign"; version="3.1"; sha256="1ykh0clj5fwli40cj4jvdkmvn4i4n4iba5sbasbaqdk45dlka5sf"; depends=[crossdes lme4]; };
   blockseg = derive2 { name="blockseg"; version="0.5.0"; sha256="1zc6mvkdwjz7n0yj46c610gz2d3rwsjchbzdcg7k56j06vc9w4lp"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 shiny]; };
-  blogdown = derive2 { name="blogdown"; version="0.6"; sha256="02ahyzcapsjaanjiz1j9jx2wh8w2fa7dwbraj5w7bl7bln87cs16"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; };
+  blogdown = derive2 { name="blogdown"; version="0.9"; sha256="1ps07zrr0zzp763hrfhqrmc927cl97v7l1r617s1lqhxwcji1fkx"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; };
   blorr = derive2 { name="blorr"; version="0.1.0"; sha256="148x2ns7l9s7pb4ksg7h8ayn2lkr18gpfskvjasycccw1q44l8bk"; depends=[car caret checkmate cli clisymbols crayon descriptr dplyr e1071 ggplot2 glue gridExtra magrittr purrr Rcpp rlang scales shiny tibble]; };
-  blsAPI = derive2 { name="blsAPI"; version="0.1.9"; sha256="1p7s799kix396fbx8ap9vy9akwpaps37awr18qbj53n9qcm74wkp"; depends=[RCurl rjson]; };
+  blsAPI = derive2 { name="blsAPI"; version="0.2.1"; sha256="0p45g4qqaialh5m9bxgrvnc7nqmm0429syw0bml8h4h8vy4014a7"; depends=[httr rjson]; };
   bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; };
   bmem = derive2 { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia lavaan MASS sem snowfall]; };
   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.6"; sha256="0fjxz5p698izhfg14kizm04s1wslnkr8l2l19x3pz6qx8a2dcsgq"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; };
+  bmlm = derive2 { name="bmlm"; version="1.3.8"; sha256="05h69pp9m0lsm3047y1l6r2h9v55kfb4flc60l7y6hh9ahh65h52"; 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=[]; };
   bmrm = derive2 { name="bmrm"; version="3.7"; sha256="1lv4bcjri95nh4yqcp9hd3ad90lcp2drh1dwfn99i3344yw196x2"; depends=[LowRankQP lpSolve matrixStats]; };
-  bnclassify = derive2 { name="bnclassify"; version="0.4.0"; sha256="02xs0qn2bmkjw48w1m4d424x8wncgvh8kk1d1jx5r2mv04h32rs7"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; };
-  bnlearn = derive2 { name="bnlearn"; version="4.3"; sha256="11zp8vf79h5a6dyijazld199pzp1lsgk3x049ykgy0bqjx2ivfvq"; depends=[]; };
+  bnclassify = derive2 { name="bnclassify"; version="0.4.1"; sha256="1mz0waxgppq0mw83ylpy028shmcbxlgli7q22i6rdwpacll2jqsy"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; };
+  bnlearn = derive2 { name="bnlearn"; version="4.4"; sha256="0nyp8qprp40hn6hbjx869603hdl0lpsdikrdb3jscy9pb49fz5di"; depends=[]; };
   bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; };
   bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
   bnpmr = derive2 { name="bnpmr"; version="1.2"; sha256="0vpqhs1h2mphn9w5yngb7lxvmzrhn7mkj7ca6hykhhg48s2ra98g"; depends=[]; };
   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.2"; sha256="0n4gn1vhka694wdzignawyaca0rx2l0wjgw09fw42bkrswfjvxy1"; depends=[bitops igraph Matrix]; };
+  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]; };
   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.5.0"; sha256="0gdmb3zsspcp594d32yzqhdpw4dwg7a3pfm7kgbghz368yw662gl"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; };
-  bomrang = derive2 { name="bomrang"; version="0.2.1"; sha256="1xivym3imf9gyp88yangyh0023sycy4n8iy578msikjk487iq0w9"; depends=[curl data_table dplyr foreign hoardr httr janitor jsonlite magrittr raster readr rgdal rvest tidyr xml2]; };
+  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]; };
-  bookdownplus = derive2 { name="bookdownplus"; version="1.3.2"; sha256="0vkivgjfmqy2xfs75w8ylkpgcvca294q61jrhbpg24vnll3c281n"; depends=[bookdown knitr 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.2.1"; sha256="0k79zfkck1plcd51sk6i8n5qh7hpnhchkqqhjn460hf0rl2mcjab"; depends=[nlme randomForestSRC]; };
+  boostmtree = derive2 { name="boostmtree"; version="1.3.0"; sha256="0q1lgjvbc15m2gygnmh63m0wy2c6x25iwrh9cbn0baq598hnr7j9"; depends=[nlme randomForestSRC]; };
   boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
   boot = derive2 { name="boot"; version="1.3-20"; sha256="0ai1qpm0p4z07xr0dvag8sdn9jrxcwanrsk9khzmww094jvr1jxd"; depends=[]; };
   bootES = derive2 { name="bootES"; version="1.2"; sha256="0hcaw1v80zspdsy4wr464lmgq33807i2f6n2dc3r7qqwa80g4zz0"; depends=[boot]; };
@@ -4787,16 +4994,17 @@ in with self; {
   bootSVD = derive2 { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; };
   bootStepAIC = derive2 { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
   bootcluster = derive2 { name="bootcluster"; version="0.1.0"; sha256="1mx08p0csz06mq55bdg4vgnqa9khdgqrz4jnm48c24pg8rpaj98b"; depends=[cluster flexclust fpc mclust plyr sets]; };
-  bootnet = derive2 { name="bootnet"; version="1.0.1"; sha256="1r5kbcycdlb8g4zs5vsrmcxl20a6x2kj47ybz6h1s83rqiylxg1b"; depends=[abind corpcor dplyr ggplot2 gtools huge igraph IsingFit IsingSampler Matrix mgm mvtnorm parcor qgraph relaimpo tidyr]; };
+  bootnet = derive2 { name="bootnet"; version="1.1.0"; sha256="12r9xbsixj8bxjgn1cn0y2zvxmcllmz15cyflf7vnhn8lrphx309"; depends=[abind BDgraph corpcor dplyr ggplot2 graphicalVAR gtools huge igraph IsingFit IsingSampler Matrix mgm mvtnorm NetworkToolbox parcor pbapply psych qgraph relaimpo tidyr]; };
   bootruin = derive2 { name="bootruin"; version="1.2-4"; sha256="1gbvh99snchipf13kjhymcx60s2kni23y7lv8lhzd3d402grp68h"; depends=[]; };
   bootsPLS = derive2 { name="bootsPLS"; version="1.1.2"; sha256="19ikz3l0qds25hgcxvhsvqy6jyshcdvnxw6774ifl9ylngxvlfh0"; depends=[mixOmics]; };
   bootspecdens = derive2 { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; };
   bootstrap = derive2 { name="bootstrap"; version="2017.2"; sha256="08lmsy7k8wsgv89yc904c6fidcymr1ma2ry4fl0p69p21v4iiwa4"; depends=[]; };
   boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; };
-  boral = derive2 { name="boral"; version="1.6.1"; sha256="1336nfgr5ni42pkikknlrhiqfi6avyl54ik2173vaxkgxcrlypzz"; depends=[abind coda fishMod MASS mvtnorm R2jags]; };
+  bor = derive2 { name="bor"; version="0.1.0"; sha256="1r5jacmin0cq9zipxa9nmp3jnh6wsddd4wnzw2n5sggnf24ryp8g"; depends=[]; };
+  boral = derive2 { name="boral"; version="1.7"; sha256="0li7jdzgq2ffhrf0nly96syp72vv3c6rbcni19kk2wgyv16mjwcm"; depends=[abind coda fishMod MASS mvtnorm R2jags]; };
   bossMaps = derive2 { name="bossMaps"; version="0.1.0"; sha256="0w4ks1xicvfm8ari4fr18wjm0qj2nxdsapl6lpfjz8l1id0y78cg"; depends=[doParallel foreach ggplot2 raster rgdal rgeos scales sp tidyr]; };
   boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
-  boxcoxmix = derive2 { name="boxcoxmix"; version="0.20"; sha256="1s6mkybr88dkn9mandmfrd0j7r3zrfjqgrdfywv54lasl1gcijzk"; depends=[npmlreg qicharts statmod]; };
+  boxcoxmix = derive2 { name="boxcoxmix"; version="0.21"; sha256="0pav4nksh1zbic11l38jyyq8i58hfvwzkp88ra6nny3jn2axzipl"; depends=[npmlreg qicharts statmod]; };
   boxoffice = derive2 { name="boxoffice"; version="1.1.0"; sha256="08b897dp5cfv6f30k2pdvh8y5n1981msnjr6lfs4dzfc1i6y2zfy"; depends=[httr rvest]; };
   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]; };
@@ -4814,6 +5022,7 @@ in with self; {
   brainKCCA = derive2 { name="brainKCCA"; version="0.1.0"; sha256="1ag3qahlba4h4126873hg2bbi6sr729mhiw22gjgr4g4jg6lhh09"; depends=[brainR CCA elasticnet kernlab knitr misc3d oro_nifti rgl]; };
   brainR = derive2 { name="brainR"; version="1.5.1"; sha256="0ih4vwy445ciyyvf8snm42vg7rzzf6vn9qkbhj0yyd8sy88mgyss"; depends=[misc3d oro_nifti rgl]; };
   brainwaver = derive2 { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; };
+  brandwatchR = derive2 { name="brandwatchR"; version="0.3.0"; sha256="10bccsaswsq06wdrxqg71amzx5rabmgfi4n074y651r2c1pyy98w"; depends=[data_table httr jsonlite]; };
   brant = derive2 { name="brant"; version="0.2-0"; sha256="1hdwdrdl6ad112zd7q248am3qk19alnj647nrk9xxxgd7s6a9pnb"; depends=[MASS Matrix]; };
   brazilmaps = derive2 { name="brazilmaps"; version="0.1.0"; sha256="1nvd8x4m4m3966qph6390kqwpsrv7vy4yf6pam98xxkjbl9a41nf"; depends=[dplyr ggplot2 magrittr sf sp]; };
   brea = derive2 { name="brea"; version="0.2.0"; sha256="0mb043fdhxrg9gyf4g55ydjx37j20394nvd4d0fmiym98lccyi04"; depends=[]; };
@@ -4822,41 +5031,41 @@ in with self; {
   breakaway = derive2 { name="breakaway"; version="3.0"; sha256="0y3h7gifv279z3x77jmr97c0i3vy58m5wsr8pa2vyn26m02rbkpc"; depends=[]; };
   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.1"; sha256="1wd5csdkq9i78l2d9rgp2fp2sw81n0bgi0ssfd447rw6c67x4539"; depends=[assertthat broom dplyr ggfittext ggplot2 MASS multcomp nlme purrr readr readxl signal stringr tibble tidyr xml2]; };
-  breathteststan = derive2 { name="breathteststan"; version="0.4.1"; sha256="0jmc3984827v656h5zk1rkpbyk56cziandsdz689brw85m01kn1l"; depends=[BH dplyr purrr Rcpp RcppEigen rstan StanHeaders stringr tibble tidyr]; };
+  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]; };
   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]; };
   bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; };
   bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; };
-  bridgesampling = derive2 { name="bridgesampling"; version="0.4-0"; sha256="1gv2h2wgj1ym7qpmxmj5s3q2xsz217ijwdx70qnh4ijvacsvaxwm"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; };
+  bridgesampling = derive2 { name="bridgesampling"; version="0.6-0"; sha256="1526lsqhgjh0v8jb2sb7rw9jxj2kkbidsqapqp309a2f05bsfb8p"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; };
   briskaR = derive2 { name="briskaR"; version="0.1.2"; sha256="1y9sabj7pfgyvv6s3bbvrb0xhjhwc4pcfsfx847kqdajid92qx8w"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; };
   brlrmr = derive2 { name="brlrmr"; version="0.1.5"; sha256="14dnmh062fw11bm236ilaqs6ss4ywajvsk3sxj0zwqk2bjf7y7vh"; depends=[boot brglm MASS profileModel Rcpp]; };
   brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; };
-  brms = derive2 { name="brms"; version="2.3.1"; sha256="134qixmk9r5bq6zmbyrhzyrrd60ihn5m7nkvblj7im9n8gh415wl"; depends=[abind backports bayesplot bridgesampling coda ggplot2 loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; };
-  brnn = derive2 { name="brnn"; version="0.6"; sha256="0q3f3cbl89hgpav7bn54s13cysgz8fi0zm8byc9rgz0sqkjrxval"; depends=[Formula]; };
-  broman = derive2 { name="broman"; version="0.67-4"; sha256="1jv1543zq74zjdrmhkcrjwxhn9bmsmmwadd9rjnn18svnrbnlq0g"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
-  broom = derive2 { name="broom"; version="0.4.5"; sha256="1mrrqqw1bmjf2v88ziqwb5y86g29h0a3rsx2jpw0hrzrzb8i5kcb"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; };
+  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_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]; };
   brt = derive2 { name="brt"; version="1.3.0"; sha256="13fn2mv66fys7w0xchh69sb6jggg5c2imk1psi3mlr1902m6ss5m"; depends=[ggplot2]; };
-  bs4Dash = derive2 { name="bs4Dash"; version="0.1.0"; sha256="0gqh51rpmqg359pv3lqg221rw9xixvgksv1yldp6sdvy0zxpp8dx"; depends=[shiny]; };
+  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]; };
   bsamGP = derive2 { name="bsamGP"; version="1.2.1"; sha256="0b4a6ll11cykqq05ys1b0y9gdhbw6y60hjclz678vy5w8jia7a1m"; depends=[ggplot2 gridExtra MASS]; };
   bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; };
   bshazard = derive2 { name="bshazard"; version="1.1"; sha256="1kidypyqlilf794mksjvhja8bmnd9hdhz91ywy0mcddgc6wbar4h"; depends=[Epi survival]; };
   bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; };
-  bsplinePsd = derive2 { name="bsplinePsd"; version="0.5.0"; sha256="1ddvkn182r48fbjqkiskb94afy942bnl953n0cghza4wkbkdfprd"; depends=[Rcpp]; };
+  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]; };
   bssn = derive2 { name="bssn"; version="0.7"; sha256="1g2xhb7bqapwd5zbc4bl4h1fskd7k6gd0rz74hnydiiwxrwiihf6"; depends=[sn]; };
-  bst = derive2 { name="bst"; version="0.3-14"; sha256="02rnnv3f89329kw81a1v88wjzrfjshqjijw5hp3zyydcsfa3j088"; depends=[doParallel foreach gbm rpart]; };
+  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.1"; sha256="1bvq6v35fpfd4vhbq1c5jb4gg3iyfflbv0n89gv4hzm80xx50rs9"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet statnet_common texreg xergm_common]; };
-  btf = derive2 { name="btf"; version="1.2"; sha256="110p7rk43g48yrnr6c9xkyzsh3kqdywsvi23dav89hl7sxahrf75"; depends=[coda Matrix Rcpp RcppEigen]; };
+  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]; };
   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]; };
@@ -4866,26 +5075,26 @@ in with self; {
   bupaR = derive2 { name="bupaR"; version="0.4.1"; sha256="0gf9qzk826zq15w8fl9skg1kpmz0s87k5l1rs45ggdwg49q5pq48"; depends=[data_table dplyr eventdataR forcats glue magrittr miniUI purrr rlang shiny tidyr]; };
   burnr = derive2 { name="burnr"; version="0.2.2"; sha256="1b5ys0jm2dmiz1jd5f3907dhv44wh60kmfdfhj3fzx8rk7zllm06"; depends=[ggplot2 MASS plyr reshape2]; };
   bursts = derive2 { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; };
-  bustt = derive2 { name="bustt"; version="0.1.0"; sha256="16y1si8bk7ar6h82bb8l3xq8k2azlxdz4aa56kh33nrajvbfc1fg"; depends=[dplyr lubridate rlang tibble tidyr]; };
   bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; };
   bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; };
   bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; };
   bvpSolve = derive2 { name="bvpSolve"; version="1.3.3"; sha256="1q5sh3kj1c07zq7mx8sh4ggp1fvwh86394qrc3ildj4wrbakmzib"; depends=[deSolve rootSolve]; };
-  bw = derive2 { name="bw"; version="1.0.0"; sha256="169mqd0vj0ia0zrfnv3g5gm9vzpj5mrxrwhfv5kh5a720inlcwj1"; depends=[ggplot2 gridExtra Rcpp reshape2 survey]; };
   bytescircle = derive2 { name="bytescircle"; version="1.1"; sha256="0c83d37kijcvr00pc4qqdci14cpbg6988izyjfjk1yliavyc6mwf"; depends=[]; };
   c060 = derive2 { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; };
-  c212 = derive2 { name="c212"; version="0.93"; sha256="10gwkr2w05bi27zwvspm3g31a1dpqbh1i52vyrfaamqkxypa11nh"; depends=[coda]; };
+  c14bazAAR = derive2 { name="c14bazAAR"; version="1.0.2"; sha256="03siiadhj8wp80jhm99lw7xb1p24yk9ycx2kp085a7xj82hl22jj"; depends=[crayon data_table dplyr magrittr pbapply RCurl rlang tibble tidyr]; };
+  c212 = derive2 { name="c212"; version="0.94"; sha256="04vd0yzilzq078s8498085bryhhi0h19v0xykd1pzn680flm5lx8"; depends=[coda]; };
   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.4"; sha256="1lv2nawrjmb89nvp308irmbnagzjxp78l6csmql6nkwcbyhwf9rh"; depends=[lme4 Matrix]; };
+  cAIC4 = derive2 { name="cAIC4"; version="0.5"; sha256="1xbij45ds0f64nj8y50dpsxvngxm004bcbs31zwicqlhf3mabf8y"; depends=[lme4 Matrix]; };
   cIRT = derive2 { name="cIRT"; version="1.2.1"; sha256="1i43pqlyzykyd1a6abg1yi7ai9ay7d2jkvnw1sa4c6q07jk56d89"; depends=[Rcpp RcppArmadillo]; };
-  cOde = derive2 { name="cOde"; version="0.3"; sha256="1r49q7qansn86wrxbhxqnn1dccd9av4lh4h5pn9kk42pls9q60nf"; depends=[Rcpp RcppArmadillo]; };
-  cRegulome = derive2 { name="cRegulome"; version="0.1.1"; sha256="0rhi4f1wkl03vh9m6hsba08cfvqjfn99xyxsykv625bgxra817bd"; depends=[AnnotationDbi clusterProfiler DBI dplyr ggplot2 ggridges httr magrittr org_Hs_eg_db purrr R_utils reshape2 RSQLite tidyr UpSetR VennDiagram]; };
-  ca = derive2 { name="ca"; version="0.70"; sha256="0730c7nk49hz0k1i5nnhq2j3wbhrlhr1qvb50mk8vmqkbhb1pz1l"; depends=[]; };
+  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=[]; };
+  caMST = derive2 { name="caMST"; version="0.1.0"; sha256="1xb8ka2r729sqwxhxh5qj4girh0va0faqjv1jsyn3hlbijcz78jj"; depends=[catR mstR]; };
   caRamel = derive2 { name="caRamel"; version="1.0"; sha256="0al4yk77a4bh8rjdpl841bnnjvs0sjyxqswqwik1n6y0bfr8f7pl"; depends=[geometry]; };
   caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; };
-  caTools = derive2 { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; };
+  caTools = derive2 { name="caTools"; version="1.17.1.1"; sha256="01hccp05gz25vhz9nnxv1c91lrxlr7drcw9xf124gggifxf2qgnm"; depends=[bitops]; };
   cabootcrs = derive2 { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; };
   cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; };
   caesar = derive2 { name="caesar"; version="0.1.0"; sha256="1l0z64fsifx37j2h61kzygbwr3z3cncn48znrpb5cq10ma42igqf"; depends=[binhf]; };
@@ -4894,28 +5103,32 @@ in with self; {
   calACS = derive2 { name="calACS"; version="2.2.2"; sha256="0a53k2rzyjksb0ypr5zrask4a6mgiyrqx0l2z3lm218y8pk2jf1w"; depends=[]; };
   calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; };
   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="2.0.4"; sha256="1053qqq632z94pqq2v5dynjpgyv1b1c8zvidmcllw7zn8zha8gqf"; depends=[processx R6]; };
+  callr = derive2 { name="callr"; version="3.0.0"; sha256="1rxbxy6kn7dj90z9hpppr9cnpvnxzknba2dwrdp0lrk5dh462qz3"; depends=[base64enc 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="0.99.9"; sha256="1kzy90mwmpn2yb47xp5b8s3lj8lbkg8hfw44pwfb54gqf7wi2lkm"; depends=[overlap rgdal ritis secr sp taxize]; };
+  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]; };
   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.19.0"; sha256="1cxfadvrm3gkrdfibwi1b7kqlc3hczyc0g72v5gkgc9hssb8j46i"; depends=[htmlwidgets]; };
+  canvasXpress = derive2 { name="canvasXpress"; version="1.20.5"; sha256="00hf905ypaclxhf11fkg5kdfllq9ljdziw8xbyj9lw7kq3xn5h22"; depends=[htmlwidgets]; };
+  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.11.0"; sha256="1yw7h1r5m4md8yv0fn1j4wxvhwybifqyvrn8ip3fl32kxbwsmnvz"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; };
+  capm = derive2 { name="capm"; version="0.13.5"; sha256="01jl1xqlycy726jbkkq39n3j8yia7i5x2lmkg285c4zlp350vnbg"; 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]; };
   capushe = derive2 { name="capushe"; version="1.1.1"; sha256="1aa76ir1kp67hiz7dr60azyc71yzslshyc640fjh0fpw0sp5kwbc"; depends=[MASS]; };
   capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; };
-  car = derive2 { name="car"; version="3.0-0"; sha256="1ks2jaav8lbxhzw56vpbnysjk3pvpmqh6avd574k0bha1226k81h"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg rio]; };
-  carData = derive2 { name="carData"; version="3.0-1"; sha256="193pdwgw6gk19v7swk1kwphg3vqdmpsgi555g9nyz93sa39j7r8j"; depends=[]; };
+  car = derive2 { name="car"; version="3.0-2"; sha256="0l3wyc9ia0ypcbap2p39slazfpbl84mjzydqvpsywrzdiyxajnfz"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg rio]; };
+  carData = derive2 { name="carData"; version="3.0-2"; sha256="152lfgaspgx6x2wzdb5p3zv6r87a0d2pg10h6fjmdr613kzlwp1v"; depends=[]; };
   carSurv = derive2 { name="carSurv"; version="1.0.0"; sha256="0wv7lp10i4sdfqyizg77ghblp3pcp7wzhs946sm0wl6w00krav9j"; depends=[corpcor fdrtool mboost Rcpp survival]; };
+  carbonate = derive2 { name="carbonate"; version="0.1.0"; sha256="0p1l84vmcn1jiwnw6s9ysbbag2zxb2qiwx2kb4ghkxrhycid1p9n"; depends=[clipr httr magick R6 RSelenium rtweet wdman yaml]; };
   carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; };
   cardidates = derive2 { name="cardidates"; version="0.4.8"; sha256="1mfd5sgzswhs9rln2bgxx8c54z69xp8l5dfmx7jfh8jl43qkzpjf"; depends=[boot lattice pastecs]; };
   cardioModel = derive2 { name="cardioModel"; version="1.4"; sha256="1a2nvn4a4zc89pb01m20pxqgbj0ypzzvx9w2vfzwly1kzkhvc9hr"; depends=[lubridate nlme]; };
@@ -4927,16 +5140,18 @@ in with self; {
   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]; };
-  cartography = derive2 { name="cartography"; version="2.1.1"; sha256="0dd1qps1iw9cbipy1wamyb1f2ia9bcwdb1v7jaa58ac2x1y4m9gr"; depends=[classInt raster Rcpp rgeos rosm 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]; };
   caschrono = derive2 { name="caschrono"; version="2.0"; sha256="091zqin2cr9p50zmifrb52dxy10zflm7f0lr9nissy589qjdd0gk"; depends=[Hmisc zoo]; };
   caseMatch = derive2 { name="caseMatch"; version="1.0.7"; sha256="1xd7mlnknjrilxcp0w0b36aaiql6jdqgyin1823r2x8vl9r4aqns"; depends=[]; };
   casebase = derive2 { name="casebase"; version="0.1.0"; sha256="0216qzyxv44cl9f806lal9lx4n0zzr9csx8ggyjva04h5iiqrq6w"; depends=[data_table ggplot2 survival VGAM]; };
-  castor = derive2 { name="castor"; version="1.3.3"; sha256="0n7d4225g28c3i4w4n9bdd8zz91kr80vvnajpn5433db71bqrrv8"; depends=[naturalsort Rcpp]; };
+  castor = derive2 { name="castor"; version="1.3.4"; sha256="0ghbxh9n8189wzif5v941iax775yq0n7rkhw98wx3wklwn75ijv4"; depends=[naturalsort Rcpp]; };
   cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; };
   catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; };
-  catR = derive2 { name="catR"; version="3.15"; sha256="1c258x8s1j4z0p1kdg7kr4ligir8q2xdcxmk2cqshxfi0p0irajz"; depends=[]; };
+  catR = derive2 { name="catR"; version="3.16"; sha256="1w39dxfzqk065v64qzmfamx8p1njsv13a461s6clagbqmhysmzbx"; depends=[]; };
   catSurv = derive2 { name="catSurv"; version="1.0.3"; sha256="1qjmjdmc81inim5kpwh4k2r3cffmkyp2wpcqqzv731hciqrad8a8"; depends=[BH ltm Rcpp RcppArmadillo RcppGSL RcppParallel]; };
   catch = derive2 { name="catch"; version="1.0"; sha256="16gdjrmlsnpyc38fihggj6c7wpgpmf4phcwrimnncdhwlk038yn8"; depends=[MASS Matrix tensr]; };
   catcont = derive2 { name="catcont"; version="0.5.0"; sha256="0ix6ipm3nn9aq5vxirjga2kwwfnxn4v8ggfjlg5v9027v2r8rb96"; depends=[dplyr]; };
@@ -4945,7 +5160,7 @@ in with self; {
   cate = derive2 { name="cate"; version="1.0.4"; sha256="0qck6675xm5xbw440m1b6n38wjwk7izx3s0zpxbmhc9wh12c5prk"; depends=[corpcor esaBcv leapp MASS ruv sva]; };
   catenary = derive2 { name="catenary"; version="1.1.2"; sha256="1n64kq3lkaf00a2mghs67hnxvi4dp6g12pwifyx0bd418wkw9wf3"; depends=[boot broom dplyr ggplot2 tidyverse]; };
   cati = derive2 { name="cati"; version="0.99.2"; sha256="1h8x73sfjdz45zpcrv80nq8l9i1gldw0vmdgn2lhqrjaxz4zn01l"; depends=[ade4 ape e1071 FD geometry hypervolume nlme rasterVis vegan]; };
-  catlearn = derive2 { name="catlearn"; version="0.5"; sha256="12sl1jlnn8669via3fbslbqs3f34andwsizkllpiw0b6k9z2yid6"; depends=[doParallel foreach Rcpp]; };
+  catlearn = derive2 { name="catlearn"; version="0.6"; sha256="1dh6svlnvxq1a8sv72wdwsgzd72kgaqgjbbbm3nw5qpycy5lqr8x"; depends=[doParallel dplyr foreach Rcpp tidyr]; };
   catmap = derive2 { name="catmap"; version="1.6.4"; sha256="18449qh10jxfi8p49gmbnib5y013nfdgdblbs4n0mfs0nnzb10sx"; depends=[forestplot metafor]; };
   catnet = derive2 { name="catnet"; version="1.15.3"; sha256="1dgqrn1lz57pwb5pca0mlvcmw9piy9xgf6fs0y2lsy4qxa9k0plk"; depends=[]; };
   catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
@@ -4954,7 +5169,7 @@ in with self; {
   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]; };
   causalsens = derive2 { name="causalsens"; version="0.1.2"; sha256="1xy8nybflbw6hymc15mmz27ic6hcq89wryb8q6d4zi216lwv2nww"; depends=[]; };
-  causalweight = derive2 { name="causalweight"; version="0.1.0"; sha256="1hig92w18vsyfpv1kvgymk37ik7rw7ql80p886b3s6vwdz8z0r3j"; depends=[mvtnorm np]; };
+  causalweight = derive2 { name="causalweight"; version="0.1.1"; sha256="0np9dzl5nq4rkxy8br1pvgkl5sxmihwgjxn0b1gn5cisiv6q2106"; 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]; };
@@ -4970,13 +5185,13 @@ in with self; {
   cccrm = derive2 { name="cccrm"; version="1.2.1"; sha256="180hzxm4z91hh008lysq1f0zky7qngg5z1laa1c119g4rqqcdskl"; depends=[gdata nlme]; };
   ccda = derive2 { name="ccda"; version="1.1"; sha256="0ya9x1b41l0pjyyfdswjyip0c2v8z7gncbj7cdz0486ad75229x7"; depends=[MASS]; };
   ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.5"; sha256="171k70p4qyasr385ma3cvcga2b4nbz2dfry78wqx5yb1aa6wwcyc"; depends=[Rcpp sparsebnUtils]; };
-  ccfa = derive2 { name="ccfa"; version="1.0.0"; sha256="0hhrcckiig1qfj7qb04jdmm7bwk9a17y6fn7ldxbmmw8546ad7md"; depends=[BMisc formula_tools ggplot2 pbapply quantreg TempleMetrics tidyr]; };
+  ccfa = derive2 { name="ccfa"; version="1.1.0"; sha256="1paxk1jkkl8yy71h8zqw7kmhy5yz93sp7z9mpnckwyxmsbs58ps8"; depends=[BMisc doParallel foreach formula_tools ggplot2 pbapply quantreg TempleMetrics tidyr]; };
   ccgarch = derive2 { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; };
   cchs = derive2 { name="cchs"; version="0.4.0"; sha256="1dahiyn3rj65w56hmhqdxvxh7vkjy5rxlkp1l59aq5iba21ldsyj"; depends=[survival]; };
   cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; };
   ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; };
   cctools = derive2 { name="cctools"; version="0.1.1"; sha256="1baqijxg75wr90y38d5g1gg8jmpz8ji7zv51wp9n1knif27rg348"; depends=[qrng Rcpp RcppArmadillo]; };
-  cdata = derive2 { name="cdata"; version="0.7.1"; sha256="0hijmhpcz5r4sg8r4fn5h5lzklfwyzjh3dr25bwjc82jdcysjplg"; depends=[wrapr]; };
+  cdata = derive2 { name="cdata"; version="1.0.3"; sha256="0vakyz0asb0fw86lfd1vcc5px45s1xa9f10san0kvlv1qs7agmdz"; depends=[rquery wrapr]; };
   cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
   cdcfluview = derive2 { name="cdcfluview"; version="0.7.0"; sha256="00yc3q28y20l2ppqxy6h53p9fvwhvpkc8m7csmp2lizqh787i2cc"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf units xml2]; };
   cdcsis = derive2 { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; };
@@ -5000,7 +5215,7 @@ in with self; {
   censorcopula = derive2 { name="censorcopula"; version="2.0"; sha256="16pk4xlpliif02qznrhvl8qmrr6k4kknygqxcm83nsjxy6dcyga8"; depends=[copula]; };
   census = derive2 { name="census"; version="0.2.0"; sha256="02qlmifppnfxw7bzh0zngih8z8qz0sxpsi38h7bv324vxx94gvz2"; depends=[ggmap RCurl]; };
   censusGeography = derive2 { name="censusGeography"; version="0.1.0"; sha256="1ncgd05ml571g3vy1g4p5xxg2bm08hbb6d5r3hpz7frn7w3l8l1d"; depends=[qdapTools]; };
-  censusapi = derive2 { name="censusapi"; version="0.3.0"; sha256="1i3z54ikg6nlxdq3hrb0a58v92lri096jxmkqqdg70rv089wspmf"; depends=[httr jsonlite]; };
+  censusapi = derive2 { name="censusapi"; version="0.4.1"; sha256="0lyy5n1zv22l0lwbkllvx0g6i2vzm7srgynmxhyis4d62cygfbdq"; depends=[httr jsonlite]; };
   censusr = derive2 { name="censusr"; version="0.0.4"; sha256="1n9571fyr46wj1dcxc2xgns9865655yzlq7yfz8im014wh0ycwqc"; depends=[dplyr httr stringr]; };
   censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; };
   centiserve = derive2 { name="centiserve"; version="1.0.0"; sha256="1m6gqz2rk7023340laa5pc0ncbfka2qi9ajvh65fwijd7xvv3n5c"; depends=[igraph Matrix]; };
@@ -5010,10 +5225,10 @@ in with self; {
   cepp = derive2 { name="cepp"; version="1.7"; sha256="01hvm6586xnb1crvk7brqh3dm2j44ia5lrl5swnf6pb682yskbq0"; depends=[randtoolbox trust]; };
   cepreader = derive2 { name="cepreader"; version="1.1-2"; sha256="0pyycacsnbqz7hyrvrwwmmphrhny0byyxv66fwrvcsk3s88a7crf"; depends=[]; };
   cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; };
-  cetcolor = derive2 { name="cetcolor"; version="0.1.0"; sha256="013ghlfs27a585851cir5fxgxhi41h48irq90932y55npa8gwdak"; depends=[]; };
-  ceterisParibus = derive2 { name="ceterisParibus"; version="0.2.1"; sha256="0qjdp4mi1s5j6rzp1z858qv8pxsbh9imykpnh6lmg7diawqpll8h"; depends=[DALEX ggplot2 gower knitr]; };
+  cetcolor = derive2 { name="cetcolor"; version="0.2.0"; sha256="0kygdcr9ldanr0z4qpygwh0padki7s2ad0j6myky601g4228z79q"; depends=[]; };
+  ceterisParibus = derive2 { name="ceterisParibus"; version="0.3.0"; sha256="1ajc5irn9b0ww58vp09pi5bkgx5qdfs5nih9zyayb3nka3jnrkpz"; depends=[DALEX ggplot2 gower knitr]; };
   cfa = derive2 { name="cfa"; version="0.10-0"; sha256="12z58y4ls9m58wpj1xa4ir2p2apzxaskps05sxy2946m24i71zfk"; depends=[]; };
-  cffdrs = derive2 { name="cffdrs"; version="1.7.6"; sha256="00n3h2vf855anxh0xgsps7sv0kj819864wjdmkiak1lsacysav8s"; depends=[data_table doParallel foreach raster rgdal spatial_tools]; };
+  cffdrs = derive2 { name="cffdrs"; version="1.8.1"; sha256="1l3iihqp5yqr7215ahpb80mdd0qr68xfbhskh7ypl9aq6aw4flzd"; depends=[data_table doParallel foreach geosphere raster rgdal spatial_tools]; };
   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]; };
@@ -5021,66 +5236,72 @@ in with self; {
   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]; };
-  cgmanalysis = derive2 { name="cgmanalysis"; version="1.3"; sha256="0fb93czybl9rpndvz3lykfiwksa154vdrmils8c8l688c62gyq55"; depends=[gdata pracma zoo]; };
-  chandwich = derive2 { name="chandwich"; version="1.0.0"; sha256="05x9mg33yl4d9kh5sc4lqi00hwnxdhfg2m0dkm5q0jynkhap7bmz"; depends=[numDeriv]; };
+  cglasso = derive2 { name="cglasso"; version="1.1.0"; sha256="0qr6y06aablncj4ja4xjp4dhykqy15qmbigi4px9snpwssrqhwl2"; depends=[igraph MASS]; };
+  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]; };
   changepoint = derive2 { name="changepoint"; version="2.2.2"; sha256="1jbki95pck10phpxna0b4i79hhl912zqi5ii9mjqb673y64dszkj"; depends=[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]; };
-  charlatan = derive2 { name="charlatan"; version="0.2.0"; sha256="1j8lrkh2s7d3jpc07k3rranf8l5rsp1sp9y42fi1rhfkakwssfqd"; depends=[R6 tibble whisker]; };
+  changer = derive2 { name="changer"; version="0.0.3"; sha256="1pmnspadkshz7z9f275vks1xjh6a9k37h7j51dqdjrqilzq7y6sf"; depends=[available devtools git2r]; };
+  charlatan = derive2 { name="charlatan"; version="0.3.0"; sha256="1i8n6kmdv8f2mnd626qja979qx35fdl1a8r9akgqznh5bhjqiq42"; depends=[R6 tibble whisker]; };
   cheb = derive2 { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
-  chebpol = derive2 { name="chebpol"; version="1.5"; sha256="1fsxvay91yqbhxcxchd6pf9x8jpjm9qp2rvc79wq5l5g4ng617pj"; depends=[]; };
+  chebpol = derive2 { name="chebpol"; version="2.0"; sha256="0iz7iz7b1mc67gkgklh8zmnhacgq1cgdfy0w2wd54g0jz934d77p"; depends=[geometry]; };
+  checkLuhn = derive2 { name="checkLuhn"; version="1.1.0"; sha256="1s1ix5n98bcbzcvrz5h19sk9pchdvrhpy3ppmw96ys8vylzm58mv"; depends=[dplyr stringr]; };
   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.3"; sha256="0r7v7ijyq92yd95ssxxbdlp5dv1sd09yvxr8c0yihf48kzw65s63"; depends=[]; };
+  checkpoint = derive2 { name="checkpoint"; version="0.4.5"; sha256="0ml6lr8vmnrj2d073mr6dxsy0sqf50vyc956j9pnmzan2k7qv2wc"; depends=[]; };
   checkr = derive2 { name="checkr"; version="0.3.0"; sha256="168grrzl17k43fdrh9ps4hvhiyinldlmdq8bwdpj5b5cvvhh22lp"; depends=[]; };
   cheddar = derive2 { name="cheddar"; version="0.1-633"; sha256="09mw8rr5xb06gw3hbk7zv2nnx6mwhs6i19ffbp9pv3yv2945cjlf"; depends=[]; };
-  chemCal = derive2 { name="chemCal"; version="0.1-37"; sha256="1sbmr8arczc65nzbgr5rfk2mbbnk6h60ni9cd9jngbhgdf0g1scw"; 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]; };
   chemometrics = derive2 { name="chemometrics"; version="1.4.2"; sha256="0shqns0n964pfwnd0q5sadglrlpgs4g5fbv45fsj9p37l4pq61dp"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; };
   cherry = derive2 { name="cherry"; version="0.6-12"; sha256="1b74wlvjqxa532gxs400m1k4qs7xwpdap9ms60nlcwr7x1857mk6"; depends=[bitops lpSolve Matrix]; };
   chi = derive2 { name="chi"; version="0.1"; sha256="1y91mwahj4j2wz0y5k5vdpq7ygq834h8jkn37n74lqnwvv1968rr"; depends=[]; };
   chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; };
+  chicane = derive2 { name="chicane"; version="0.1.0"; sha256="1f7sxqwg9s8l3lz538kyq8x5csqyq8g67vpm4zh9c962kg5m3f55"; depends=[data_table doParallel foreach gamlss gamlss_tr MASS]; };
   childesr = derive2 { name="childesr"; version="0.1.0"; sha256="14jca7lxyn0fip794l70mznhz4ld6iix995wrmiqynxdms6j80np"; depends=[DBI dbplyr dplyr jsonlite magrittr purrr RMySQL]; };
   childhoodmortality = derive2 { name="childhoodmortality"; version="0.3.0"; sha256="1ixd10jyzgr1ssnjas35kngpsqyjzl73wwpvcspv06cn12sv2b8d"; depends=[dplyr matrixStats plyr]; };
   childsds = derive2 { name="childsds"; version="0.6.7"; sha256="1m5w0wbdk032b6d6h1704wji84yckyl427bja0mb4vqp28m99z48"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr reshape2 tibble tidyr]; };
   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.6-2"; sha256="043aw52kimif7wbz87hf7bg0vmd9n73pj87lvqp0ms99jmp7q2w0"; depends=[boot kyotil MASS survival]; };
+  chngpt = derive2 { name="chngpt"; version="2018.7-25"; sha256="0c9vxlhrcyrbrp8cj0xvm2z4hy1m2rs538i4kzhrw8xlfiwb8ydd"; depends=[boot kyotil MASS survival]; };
   choiceDes = derive2 { name="choiceDes"; version="0.9-3"; sha256="1nsc8p4svfc6z7ckffl24c0acnaxi6cnpz7jq03vzn6spxvpjcmw"; depends=[AlgDesign]; };
-  cholera = derive2 { name="cholera"; version="0.4.0"; sha256="0pm5kbaqkxkwzyda4ms90yivx0iv7hcn2z65xfqcqlsxsjbvlmhs"; depends=[deldir HistData igraph KernSmooth pracma RColorBrewer scales sp]; };
+  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=[]; };
   chopthin = derive2 { name="chopthin"; version="0.2.2"; sha256="1ixmgq6igd2ji88qba7scny1j8rrizcf76dk4ymk3hah5dln97fz"; depends=[Rcpp]; };
   chords = derive2 { name="chords"; version="0.95.4"; sha256="1v6zvl1mv9fyf6hx1fpbj3i7s893n4y1w4j9rw1arps006qz2jqn"; depends=[MASS Matrix]; };
-  choroplethr = derive2 { name="choroplethr"; version="3.6.2"; sha256="0am163df7ggvvk8bk9hjq6f2jc55zzq24skpsgrx1qdlpgv7mls5"; depends=[acs dplyr ggmap ggplot2 gridExtra Hmisc R6 RgoogleMaps scales stringr tigris WDI]; };
+  choroplethr = derive2 { name="choroplethr"; version="3.6.3"; sha256="0m6kyrgnv5s1q2ncc63rfxcwqdqx5adqk14q57ss4r84i14dm5yb"; depends=[acs dplyr ggmap ggplot2 gridExtra Hmisc R6 RgoogleMaps stringr tigris WDI]; };
   choroplethrAdmin1 = derive2 { name="choroplethrAdmin1"; version="1.1.1"; sha256="13ljs21hdhiv6n4napmk1gjnjhpll6j5wyijzv4xnnbi1y3ns7a9"; depends=[ggplot2]; };
   choroplethrMaps = derive2 { name="choroplethrMaps"; version="1.0.1"; sha256="0ghqb2d1h0qkbcsll6ck2qk5sfvdwsrlh3phlbsjbak30832j7fr"; depends=[]; };
-  chorrrds = derive2 { name="chorrrds"; version="0.1.4"; sha256="1mfvzj3bwipdhcdhsp66ihchnnvdbcb9zww2a19ldwr6bwx7nfic"; depends=[dplyr httr jsonlite magrittr plyr stringr XML]; };
+  chorrrds = derive2 { name="chorrrds"; version="0.1.7"; sha256="0dxy57w91cjfya5v4sgmih0snzqbbqh9ljyk9gb59z83dm6cj9fg"; depends=[dplyr magrittr plyr purrr stringr XML]; };
   chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; };
   chromoMap = derive2 { name="chromoMap"; version="0.1"; sha256="10cj9liggnbnr4isqmm8jp700z3qj4zq0dm7f7jyj7f0lg8my80y"; depends=[htmltools htmlwidgets]; };
   chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; };
-  chron = derive2 { name="chron"; version="2.3-52"; sha256="185lfp75cv3l4cavg64sccj8lgc5sivch13n6gkannv3pd5cyzy4"; depends=[]; };
+  chron = derive2 { name="chron"; version="2.3-53"; sha256="02bkywwsxwrxc035hv51dxgdm1fjxdm7dn19ivifln59dfs1862j"; depends=[]; };
   chunkR = derive2 { name="chunkR"; version="1.1.1"; sha256="1kw3hsx5k4cdicx0hc1v0mf2nzvqg95shx2xv05vb2pass48qw48"; depends=[Rcpp]; };
   chunked = derive2 { name="chunked"; version="0.4"; sha256="0pqk6nnxxnlsw9zal62ajjalrlmvkdrzyz2l8r10jd7s61vhra40"; depends=[DBI dplyr LaF lazyeval]; };
-  ciTools = derive2 { name="ciTools"; version="0.3.0"; sha256="0mqrnln7iz6jm30nh1qb2457icaz3hcqmgqbj8m61z0sf6jj9pd7"; depends=[arm boot dplyr lme4 magrittr MASS tibble]; };
+  ciTools = derive2 { name="ciTools"; version="0.5.0"; sha256="0gzzzy2siwlhvwfv2hrasz4m9p8qir8w11bhc3hwkcidb4z8ydqs"; depends=[arm boot dplyr lme4 magrittr MASS survival tibble]; };
   cifti = derive2 { name="cifti"; version="0.4.5"; sha256="092334lcpkzv52bg53hzx64dnrwq67f3p9fzwchmafx1l46xrqx9"; depends=[gifti oro_nifti R_utils xml2]; };
   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]; };
   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]; };
   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=[]; };
   citr = derive2 { name="citr"; version="0.2.0"; sha256="1nzn0yw74k6zkwzb6spfzqkj3cbx6ry6ypbsnhy6w2flabnnvy4v"; depends=[assertthat curl miniUI RefManageR rstudioapi shiny yaml]; };
   ciuupi = derive2 { name="ciuupi"; version="1.0.0"; sha256="1c72crf0his7vzmh86isvcvi0ahxnqdq4i6ms84hk20jmlz2hxin"; depends=[functional nloptr pracma statmod]; };
-  civis = derive2 { name="civis"; version="1.5.0"; sha256="1cxafcnmbr97i1ygfrwn0d91hyr8irxp1g9zc9zmmaqb3kw5s0sx"; depends=[DBI dbplyr devtools dplyr feather future ggplot2 httr jsonlite lubridate memoise purrr roxygen2 stringr testthat]; };
-  cjoint = derive2 { name="cjoint"; version="2.0.6"; sha256="1bhzw751ll43qbyif589yxmi3m1pbm206lqnsc5zcxsnxjf4li5n"; depends=[ggplot2 lmtest Matrix sandwich survey]; };
+  civis = derive2 { name="civis"; version="1.5.1"; sha256="13zc0p63i2iqnc27xcnkvhfz0bxyv4grqg4qi8ah7a1n7d2jq2ks"; depends=[DBI dbplyr devtools dplyr feather future ggplot2 httr jsonlite lubridate memoise purrr roxygen2 stringr testthat]; };
+  cjoint = derive2 { name="cjoint"; version="2.1.0"; sha256="1bs380ji9vsc1d77wqhl0ij9xblww3g9x3hiwpcpz26wihqcx7ac"; depends=[DT ggplot2 lmtest Matrix sandwich shiny shinyBS shinyjs survey]; };
   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.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp RcppArmadillo]; };
+  cladoRcpp = derive2 { name="cladoRcpp"; version="0.15"; sha256="0glx3gn2pvisrhplwd89j6l0qs3cfy4qigmncl4n631ic93y3dz4"; 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]; };
@@ -5092,23 +5313,25 @@ 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]; };
   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=[]; };
   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]; };
   clespr = derive2 { name="clespr"; version="1.1.2"; sha256="1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g"; depends=[AER clordr doParallel foreach magic MASS pbivnorm survival]; };
-  clhs = derive2 { name="clhs"; version="0.6-0"; sha256="1vw8z4kmmpd8sbx7n8fzdd7lhg10qpnnx31nnjhv4dbd6v2nqii9"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; };
-  cli = derive2 { name="cli"; version="1.0.0"; sha256="07as3dr7vwx02p3qgzlmxz1dlrd3x3lysrzp222ip9jcjpydp8wg"; depends=[assertthat crayon]; };
-  clickR = derive2 { name="clickR"; version="0.4.05"; sha256="0vi8bgvnlq09wxzc51kllngcw9dw3j2m2rh6dwa017xml2cl37j8"; depends=[beeswarm boot flextable lme4 lmerTest officer xtable]; };
+  clhs = derive2 { name="clhs"; version="0.7-0"; sha256="0wliffs16misvlsxcng89a6yasq9blrlic88n59334vj60p42l3m"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; };
+  cli = derive2 { name="cli"; version="1.0.1"; sha256="1r2yih4c0bdmbx0qrarlf0m1p5z30sri755zmdazsq2pw76zp07g"; depends=[assertthat crayon]; };
+  clickR = derive2 { name="clickR"; version="0.4.20"; sha256="140ncl7iv48yxnwf55rf8cwcyznzw7kslkjzymslyqmhvvw43q6p"; depends=[beeswarm boot flextable lme4 lmerTest officer xtable]; };
   clickstream = derive2 { name="clickstream"; version="1.3.0"; sha256="01bii527xy7hdph1pm6f1g4qnwa5yf3mwz01rjg1h2gc12s5vzgg"; depends=[arules ClickClust data_table ggplot2 igraph linprog MASS plyr reshape2 Rsolnp]; };
-  clifro = derive2 { name="clifro"; version="3.1-5"; sha256="1fbl5zljy60xp3klrsgs84rqw9484xmyq84n3wkrqc6pyvhskp4c"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; };
+  clifro = derive2 { name="clifro"; version="3.2-0"; sha256="1pq66wg19dvmacqj5pdh8ngxq1irihg76g0hnfy16gxsz7snvnkh"; depends=[ggplot2 lubridate magrittr RColorBrewer RCurl reshape2 scales xml2]; };
   clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; };
   climatol = derive2 { name="climatol"; version="3.1.1"; sha256="012spjgw20bg4rlxgwh05rhaswa4afbd35sq1isidm6i73ma0yjq"; depends=[mapdata maps]; };
   climbeR = derive2 { name="climbeR"; version="0.0.1"; sha256="10i74bph7dhv2xj01qdhymlmfwj32lzxivanif11zmzmq9p5bqsw"; depends=[ggplot2]; };
-  climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-6"; sha256="0dyhqxrma8g4ny4afv6drr885m88q2b8g1n19yy3yjbrbddyz8yl"; depends=[caTools PCICt Rcpp]; };
+  climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-9"; sha256="0bnxdfqc207fjjb8qas9wvmw1kpi69csadx5ylsbxwb53cy1g93i"; depends=[PCICt Rcpp]; };
   clime = derive2 { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
   climextRemes = derive2 { name="climextRemes"; version="0.2.0"; sha256="0cjvmd48iaid0f95354zpxlgwy79jga9lz0p82yiv0fb2mvjpbqn"; depends=[boot extRemes]; };
   climwin = derive2 { name="climwin"; version="1.2.0"; sha256="0xqgf9hmpidxq85rfm0vndh3waw0qf2yhrzmp04sqbbqhzkf9v7n"; depends=[evd ggplot2 gridExtra lme4 lubridate Matrix MuMIn nlme numDeriv plyr RcppRoll reshape]; };
@@ -5124,37 +5347,38 @@ in with self; {
   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]; };
   cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; };
-  cloudml = derive2 { name="cloudml"; version="0.5.1"; sha256="1h276vxb1cfqlcbj9fciysdj4wr9zvwglxfq2sh6hh08lm1w3c0z"; depends=[jsonlite packrat processx rprojroot rstudioapi tfruns withr yaml]; };
-  clpAPI = derive2 { name="clpAPI"; version="1.2.7"; sha256="19bn5d7qjj7g0x17jnh2snymcn2r2skzj35hkhsgcj5r43834f3r"; 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=[]; };
   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-55"; sha256="0hprhzd9i5ifrmfcgddgacg404f6y1zpcpqbyqza4c5lw44am4nc"; depends=[cluster]; };
+  clue = derive2 { name="clue"; version="0.3-56"; sha256="1gc7galavhivs2102vvc8c51555hghkawiv8vzciwwpscr19zxg9"; depends=[cluster]; };
   clues = derive2 { name="clues"; version="0.5.9"; sha256="0znlsbfmnz5wkp2cswrkjbgchdmmf7h78mv2zwx382m9n9n9hshy"; depends=[]; };
-  clusrank = derive2 { name="clusrank"; version="0.5-3"; sha256="0am8q6xc9x9g42gmn0khdizlwrz3ssrripqrw0a36apzk61i6qpp"; depends=[MASS Rcpp]; };
+  clusrank = derive2 { name="clusrank"; version="0.6-2"; sha256="1hjxks8cb1mp1d93rcpwqjrxqavspmzjrxvflhv6nqx41ar9dpxv"; depends=[MASS Rcpp]; };
   clust_bin_pair = derive2 { name="clust.bin.pair"; version="0.1.2"; sha256="11lqd3vmx4kg08n6iv9na8rra49dkldx4f8jyf43hppbjrbvfinm"; depends=[]; };
   clustEff = derive2 { name="clustEff"; version="0.1.2"; sha256="1hy7jc8yfg554l439lfrppdsizrdmvxrqf9dwbkjckbvggg54f0k"; depends=[cluster fda qrcm]; };
   clustMD = derive2 { name="clustMD"; version="1.2.1"; sha256="0w4s9dab2mm5x0xibyl6s101c64if945a2cmwin9psd95p76mcny"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; };
-  clustMixType = derive2 { name="clustMixType"; version="0.1-29"; sha256="01rc84ppy5mw3cdcx15xs6061lg1mwh6kxa80rnj3ax3g10x37sh"; depends=[RColorBrewer]; };
+  clustMixType = derive2 { name="clustMixType"; version="0.1-36"; sha256="111pnhj92hly3a1km41wdq3w80s6lld8j31rygbczb5dig5cmlb9"; depends=[RColorBrewer]; };
   clustRcompaR = derive2 { name="clustRcompaR"; version="0.2.0"; sha256="151xq8qf1mrl35kyhdliwl2jpdkpkbl3gdnrvrybanihry2p0kqg"; depends=[dplyr ggplot2 ppls quanteda]; };
   cluster = derive2 { name="cluster"; version="2.0.7-1"; sha256="1grxbifbc4nwig25dmjgkympnbzb4al0w6k1c0ibdhpk1h4l20di"; depends=[]; };
   cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
-  clusterCrit = derive2 { name="clusterCrit"; version="1.2.7"; sha256="13smdm8dmp4795qqn8an3k22l7xs4i4kgazyjzxdbzkg742akk7q"; depends=[]; };
+  clusterCrit = derive2 { name="clusterCrit"; version="1.2.8"; sha256="10pz1bikdbkm2ky3xnagp0qv60whalavp6j39b4p7d75jj5xcxgk"; depends=[]; };
   clusterGeneration = derive2 { name="clusterGeneration"; version="1.3.4"; sha256="1ak8p2sxz3y9scyva7niywyadmppg3yhvn6mwjq7z7cabbcilnbw"; depends=[MASS]; };
   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.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; };
+  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-1"; sha256="0k9cn0ycz7l9g4lb434cqp9yx2ilmp25xa5hlhma9jmxlbdsbji2"; depends=[ade4 cluster e1071 MASS modeest R2HTML rgl]; };
+  clusterSim = derive2 { name="clusterSim"; version="0.47-2"; sha256="151cg89ac8b66bgcgpl3w9wvbvxs9g3v9vh8f3z6vg6fklrf5x2d"; 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=[]; };
   clustering_sc_dp = derive2 { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; };
-  clusterlab = derive2 { name="clusterlab"; version="0.0.2.2"; sha256="0pls0yk5x1a48kg1vwzm60yvpmy85gflg9kf0znvkv4k4xrz5smc"; depends=[ggplot2 reshape]; };
-  clustermq = derive2 { name="clustermq"; version="0.8.4.1"; sha256="0j8xaj2spqsvr1dmzz2xi8qwwwyvhw8nmrg3jy52zk20pcqw3c03"; depends=[infuser narray progress purrr R6 rzmq]; };
+  clusterlab = derive2 { name="clusterlab"; version="0.0.2.5"; sha256="0v9nk92sbca66w416jhvrq3ldgsc76mlir89yi2r4k2i8ymw1xr6"; depends=[ggplot2 reshape]; };
+  clustermq = derive2 { name="clustermq"; version="0.8.5"; sha256="0asa48gx9wycp87qgk7f6h27kp4kr5bpxs1lx1j2jm7b1ssqjsm4"; depends=[infuser narray progress purrr R6 rzmq]; };
   clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; };
   clustertend = derive2 { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; };
   clusteval = derive2 { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; };
   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]; };
   clv = derive2 { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; };
@@ -5166,32 +5390,34 @@ in with self; {
   cmpprocess = derive2 { name="cmpprocess"; version="1.0"; sha256="0gqfmbm86bfi2l81pf2dn70rxg58h1y8hiyrp8sv9v84cx20422v"; depends=[compoisson numDeriv]; };
   cmprsk = derive2 { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; };
   cmprskQR = derive2 { name="cmprskQR"; version="0.9.1"; sha256="002s6ls670sdzrxgqv9gbl646b675q1gn6dzkngnf6rgcdqwid7n"; depends=[quantreg survival]; };
-  cmrutils = derive2 { name="cmrutils"; version="1.3"; sha256="0zjc0bwp2p03hmnj3zjw7800pcdw8b8161y68npyp3hya0s4i9x0"; depends=[chron]; };
-  cmsaf = derive2 { name="cmsaf"; version="1.9.1"; sha256="02l1g5l42lxg3wlpjg5qm6h8mfr1bdcpi052z8masxf6xf4l0abr"; depends=[fields ncdf4 raster sp]; };
-  cmvnorm = derive2 { name="cmvnorm"; version="1.0-3"; sha256="0810kzg78yaxzniq59a4swvdk9qxp37ja52f5n1zssgn0cwz1vk9"; depends=[elliptic emulator]; };
+  cmrutils = derive2 { name="cmrutils"; version="1.3.1"; sha256="0nrq84bkd23lvvg8ls2smkjcnfnydhbcni3n6s8w0579i9xga8dv"; depends=[chron]; };
+  cmsaf = derive2 { name="cmsaf"; version="1.9.4"; sha256="01z6i3vjilr8nhjkdjifhg3vbfpkk7rii4hlv6rhy9cvpqs6f1d6"; depends=[fields ncdf4 raster sp]; };
+  cmvnorm = derive2 { name="cmvnorm"; version="1.0-5"; sha256="1cyiw12fmm83xjlsj8wszyr9sym1b4y3cns6naagvv8037wnh0wb"; depends=[elliptic emulator]; };
   cna = derive2 { name="cna"; version="2.1.1"; sha256="1m4920ya3nm5x5yyzpd4g0vgnk4f0lc62c2favymk03ldg6kd6c4"; depends=[matrixStats Rcpp]; };
   cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; };
   cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; };
   cnmlcd = derive2 { name="cnmlcd"; version="1.2-0"; sha256="1vpn926wf8vkifscnb35y4c74721iar2wykrl50fcv0fg16yggnd"; depends=[lsei]; };
-  coRanking = derive2 { name="coRanking"; version="0.1.3"; sha256="1ss00l0c99fi9p6gcimb31nrl5iflps6lvplnjjqwcqjkb2pjh9p"; depends=[Rtsne scatterplot3d]; };
+  coRanking = derive2 { name="coRanking"; version="0.1.4"; sha256="03wvy19jrb3q31yfpmakji25zwc6zx26irj4rwkad81iwdqihq3s"; depends=[]; };
   coala = derive2 { name="coala"; version="0.5.2"; sha256="1rj9my20ba79alkhszh5lfvb9gjr6vcgiwqk2szawkpd1np3lpsr"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; };
   coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; };
-  coalitions = derive2 { name="coalitions"; version="0.6.2"; sha256="0plzrjjsbbr5mw6wqirxp1wgpl2bw2kh0gdalr8c8v2z7hc1d9r6"; depends=[checkmate dplyr forcats gtools jsonlite lubridate magrittr purrr RCurl reshape2 rlang rvest stringr tidyr xml2]; };
+  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.3.0"; sha256="12pdcdjca9lncvjpdmpss74sz4jlk33p1l6nmyk2qvwzpf2s8f1d"; depends=[crayon ggplot2 ggstance]; };
+  cobalt = derive2 { name="cobalt"; version="3.5.0"; sha256="0vczislwy92a7p91ip0mwhh6v5n4wgk7fy9dqc1r746ivx8h13yv"; 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.1.0"; sha256="0gc75qy0k01z0r5hl07gyc3gi98fcmapwq523vldp04arn3glnb4"; depends=[dplyr DT forcats ggplot2 ggtern magrittr shiny shinythemes tibble tidyr]; };
+  cocktailApp = derive2 { name="cocktailApp"; version="0.2.0"; sha256="05jw72v7gayyfflyy5g249d4sl689a55bf7ycijiks2s5gbj68b6"; depends=[dplyr DT forcats ggplot2 magrittr shiny shinythemes Ternary tibble tidyr]; };
   cocor = derive2 { name="cocor"; version="1.1-3"; sha256="106zyrrypil8jyg0pva5zj4hgb53z81nca3d0mh2q3j55zq3wl12"; depends=[]; };
   cocoreg = derive2 { name="cocoreg"; version="0.1.1"; sha256="0jrrkak964pl1vih592jgqgl6bw08j0fa1rh3j85x64bqq4m7278"; depends=[abind CCAGFA combinat e1071 ggplot2 glmnet gridExtra MASS multiway pls reshape RGCCA]; };
   cocorresp = derive2 { name="cocorresp"; version="0.3-0"; sha256="1r1ssz0cip1gk52nkbr1kpz8gwrg6lwri8ymk41xj2adlsp576v2"; depends=[vegan]; };
   cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; };
-  coda = derive2 { name="coda"; version="0.19-1"; sha256="14a4a8df4ygj05h37chmdn8kzcqs07fpbflxfrq530563mrza7yl"; depends=[lattice]; };
-  coda_base = derive2 { name="coda.base"; version="0.1.9"; sha256="0m4a77l34bk0bwcsvc8654hf5pinf2p7k2223vxkrq5ldylpwqax"; depends=[MASS Rcpp RcppArmadillo]; };
+  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.5.9"; sha256="12hycq576klq12lqqkwjvxi2k2axl34zs78hfy78mlwlbcgm51gk"; depends=[dplyr DT future ggplot2 haven htmltools knitr labeling likert mice pander psych purrr readr rio rlang rmarkdown skimr stringr tibble tidyr]; };
+  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]; };
   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=[]; };
+  codified = derive2 { name="codified"; version="0.2.0"; sha256="1hmw7yrw4qx8v9rkqqvqf4013s9whq5qlgwz7v882j4slpvm6gb1"; depends=[checkmate dplyr kableExtra knitr magrittr readr rlang tibble tidyr]; };
   codingMatrices = derive2 { name="codingMatrices"; version="0.3.2"; sha256="0kldx2h3mksw4644d0ask6ij7i63rrwk0njlsvkbdjz3bf7pdv1b"; depends=[fractional Matrix]; };
   codyn = derive2 { name="codyn"; version="2.0.0"; sha256="1h58w4hb5m8qy7i5h1r7306c5aac1j887aig0imgsjhinj48pi5l"; depends=[assertthat permute vegan]; };
   coefficientalpha = derive2 { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[lavaan rsem]; };
@@ -5208,8 +5434,9 @@ in with self; {
   cointmonitoR = derive2 { name="cointmonitoR"; version="0.1.0"; sha256="0rsacvib9prgb199m5ndi0zlgfsvf1giqc5s41wp0yvxdxjdq5lw"; depends=[cointReg matrixStats]; };
   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.6"; sha256="1l02rk1lmm2ac9rr5p1633y1chc203cr9mhlc9s95bv12791i5zb"; depends=[data_tree htmlwidgets]; };
+  collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.7"; sha256="0b65pbp1wnpsrayqi630ds4r98jvcvynnlp6wxdqrnnr9nzw5343"; depends=[data_tree htmlwidgets]; };
   collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; };
+  collections = derive2 { name="collections"; version="0.1.2"; sha256="10crxbbxihcln58j6rlw1kh9qf1njpi0njb7sary80rcfhxwc4w4"; 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]; };
@@ -5219,18 +5446,19 @@ in with self; {
   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]; };
+  colorfindr = derive2 { name="colorfindr"; version="0.1.3"; sha256="0h74075km6hxf9j35iwsd3af0igfpplgjnh3lzgkdqw0shp86iy8"; depends=[bmp dplyr jpeg magrittr pixmap plotly plotwidgets png purrr rsvg stringr tibble tiff treemap]; };
   colorfulVennPlot = derive2 { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; };
   colorhcplot = derive2 { name="colorhcplot"; version="1.3.1"; sha256="009pyyb30kwshldd7v7zfy5rxys6i0dhlc5w8ail61acbg4rlrmz"; depends=[]; };
   colormap = derive2 { name="colormap"; version="0.1.4"; sha256="0032ji9n8pivl70jppq989fgg781wil8zag7pfl1hs9xrpin8asy"; depends=[ggplot2 stringr V8]; };
   colorpatch = derive2 { name="colorpatch"; version="0.1.2"; sha256="18p9hgccp37pbdf437xffkv6z500896v08fsw2jm8zcl9ladygaf"; depends=[colorspace ggplot2 gridExtra TSP]; };
-  colorplaner = derive2 { name="colorplaner"; version="0.1.3"; sha256="0mqqk59yjklbc7a0n7jgyhj458622dfdsa1101a5w6kwppbjvnfg"; depends=[digest ggplot2 gtable scales]; };
   colorr = derive2 { name="colorr"; version="1.0.0"; sha256="1wwrgb9fc9gzxxwxrdrkwwrmhqqllv29wr4q8y1shj9d3nzcpwmh"; depends=[]; };
-  colorscience = derive2 { name="colorscience"; version="1.0.4"; sha256="19943gnzszh13mg74clbkhbc6xg4259ilqk19mrv8d6ml6f6wspl"; depends=[Hmisc munsellinterpol pracma sp]; };
+  colorscience = derive2 { name="colorscience"; version="1.0.5"; sha256="0pr28fhv7alvki9f6wncys8lxihsl6q6lr8xffw4fkkgyapnhqxg"; depends=[Hmisc pracma sp]; };
   colorspace = derive2 { name="colorspace"; version="1.3-2"; sha256="0d1ya7hx4y58n5ivwmdmq2zgh0g2sbv7ykh13n85c1355csd57yx"; depends=[]; };
   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]; };
-  colourvision = derive2 { name="colourvision"; version="2.0.1"; sha256="009nssi996dakjggk64zzmfx9mjdfj04kfy7ds3c9fsb39ynz1ag"; depends=[Matrix rgl]; };
+  colourvalues = derive2 { name="colourvalues"; version="0.1.1"; sha256="1ip1linid749h5lv0x1jlndwx57n8qidglcghspdpnvsccl8cm03"; 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]; };
   comato = derive2 { name="comato"; version="1.1"; sha256="0lidwr5vw10655p7q0iqzq3phq5y1i86w3bjdv87cwx3m6333bz6"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; };
@@ -5241,31 +5469,34 @@ 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.5"; sha256="1jwx5rgm0ypd9a3v4jd9za4a644rdzhk1n4dvmgkj9hdpwsida3z"; depends=[]; };
-  commonsMath = derive2 { name="commonsMath"; version="1.1"; sha256="0v9jlk75ihh8yjhq5ybighvndp0hn1d6rqh78jkh4g6ylhbpvcw0"; depends=[]; };
-  comorbidity = derive2 { name="comorbidity"; version="0.1.1"; sha256="0xb3k2ql3ikdbyx8l73wsrwi62ayapszbrygk8arw1g2n0yqz2f4"; depends=[checkmate]; };
+  commonmark = derive2 { name="commonmark"; version="1.6"; sha256="1xymqncf8byqxzpx64zlp6vbx7gry572jkr2ax0zlavr8bli861x"; 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=[]; };
   compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
   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.5.0"; sha256="0nn8yimmi1yqb5qf4brx7i8zps1mfh6w3gfx3xpsaigk1miik1hb"; depends=[dplyr htmlTable stringr tidyr]; };
+  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]; };
   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]; };
+  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]; };
   comperank = derive2 { name="comperank"; version="0.1.0"; sha256="0fxg32kp4v42455fia48rnbd3v84g4vsh4r4qc29d0gg93ymz9hp"; depends=[comperes dplyr Rcpp rlang tibble]; };
-  comperes = derive2 { name="comperes"; version="0.2.0"; sha256="0h531xbaidh0ld16q1q4jlx4yshyiczx464x0kkyrrr7ysg527pp"; depends=[dplyr magrittr rlang tibble tidyr]; };
+  comperes = derive2 { name="comperes"; version="0.2.1"; sha256="1mi7x7634lxzzpp1z6xq0pbmfq3p63mqy3kvk19xjfbiz3drakw3"; depends=[dplyr magrittr rlang tibble tidyr]; };
   compete = derive2 { name="compete"; version="0.1"; sha256="1b1320jw8pcnjkzb0lr8j6d3z7yhlq31gszd79wdcmwnpzap9k0z"; depends=[igraph sna]; };
   complexity = derive2 { name="complexity"; version="1.1.1"; sha256="1lpsvry88jpqfw0wkdlwjzkqjl17f4adjcqvq0dwk483mi54xnfk"; depends=[combinat shiny]; };
   complexplus = derive2 { name="complexplus"; version="2.1"; sha256="16w9v7d1ckavqmr86l34frr37pkvdn0iqnb17ssb8xaggns5lgqx"; depends=[expm Matrix]; };
   complmrob = derive2 { name="complmrob"; version="0.6.1"; sha256="1dr80r1p05h3mlnjbgh6kfw86np8y2bhy9yi5qydv85w52k133n1"; depends=[boot ggplot2 robustbase scales]; };
   compoisson = derive2 { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; };
   compositions = derive2 { name="compositions"; version="1.40-2"; sha256="12mp05yi7jkdqg9iwh6bc9sx6sdxagcnrirznxy9hq8502p7238i"; depends=[bayesm energy robustbase tensorA]; };
-  compound_Cox = derive2 { name="compound.Cox"; version="3.12"; sha256="143a0vgv86n1pz6442r7nk7hh04brz1x3na8msnm9njxf0qqjwpm"; depends=[numDeriv survival]; };
+  compound_Cox = derive2 { name="compound.Cox"; version="3.14"; sha256="118s0j8xkv0fk8hvzfyw2dwkh76ky5k98dnh92vh6akcz1wm0iam"; depends=[numDeriv survival]; };
   compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; };
-  comtradr = derive2 { name="comtradr"; version="0.2.1"; sha256="0l14qwvnzll98jp235ip6skmr3fdr1y5niqjwhz9nyk8spfbyvp1"; depends=[httr jsonlite magrittr purrr]; };
+  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]; };
   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=[]; };
@@ -5281,22 +5512,22 @@ in with self; {
   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.4-2"; sha256="0l515wpsmh7g4q4w29gb1gv5kafwzfhb8as0ml8vbbrh6xcgmz9q"; depends=[MASS]; };
+  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.2"; sha256="1xk3b94k73msj2mykxr0b9q472biz40qnckkym82b4vqmga1c0rs"; depends=[SDMTools STAR statmod]; };
+  conf = derive2 { name="conf"; version="1.3.3"; sha256="0hankl9grc149r82v93iwrk6hf19n5ipay80cc9zv034wv2249w1"; depends=[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]; };
   confinterpret = derive2 { name="confinterpret"; version="1.0.0"; sha256="0qldaqpx7kpk71zfwv465jrscwzc9w3xfv52i4h01k9aw3q6m8ja"; depends=[]; };
-  conflicted = derive2 { name="conflicted"; version="0.1.0"; sha256="0dai0dvb3sbnjspg5wdwm4j5d11xkmrvpjjxpzb7s70d8wp4c72h"; depends=[rlang]; };
+  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.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; };
+  conjoint = derive2 { name="conjoint"; version="1.41"; sha256="1iq3226a6fn1gddmh2nxlzvjcvbj7502r9520g9d4xdmk8smfx33"; depends=[AlgDesign broom cluster fpc ggfortify ggplot2]; };
   conover_test = derive2 { name="conover.test"; version="1.1.5"; sha256="0f1p10klidk1xic1wd48j9rjh2fb3z6pfjx4y021lglx1w3av68k"; depends=[]; };
   constants = derive2 { name="constants"; version="0.0.2"; sha256="1j9d52riwx7v1ppfdw0x517j7xh92qgskd4mj5yk9qa233brcwyy"; depends=[]; };
   constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; };
@@ -5310,14 +5541,14 @@ 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.1"; sha256="1d9h2vjzfmnbm4aprbvhndgjh85zp3j1hssm9082nw7zb9ycxs1s"; depends=[ape cluster geiger MASS phytools]; };
+  convevol = derive2 { name="convevol"; version="1.2"; sha256="106x3qj5m8flcq4ixrvh0fv0kkcc7595ym4bg9dxjhdx4v0zhnbg"; 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]; };
   cooccur = derive2 { name="cooccur"; version="1.3"; sha256="1wlaghhi4f3v8kzwhcgq3c6as7v3zlpkzhb232qz1amr7f0058kv"; depends=[ggplot2 gmp reshape2]; };
   cooccurNet = derive2 { name="cooccurNet"; version="0.1.6"; sha256="1vqfmvjrxxn977jrry47wn4lag4yi4bkyxwlis3n1ly39kkmyh2j"; depends=[bigmemory doParallel foreach igraph knitr Matrix pryr seqinr]; };
   coop = derive2 { name="coop"; version="0.6-1"; sha256="1hr78w7qlslpwnrz9mk6w4p5qa8sxhkzans5givy5hf9qkykn0dp"; depends=[]; };
-  coopProductGame = derive2 { name="coopProductGame"; version="1.0"; sha256="0vzx9f6za2zms9sda8p19gcmp4g6y87p91ydybjv8lz9na8hl3ix"; depends=[dplyr GameTheory ggplot2 gtools kappalab lpSolveAPI]; };
+  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]; };
   copCAR = derive2 { name="copCAR"; version="2.0-2"; sha256="032gphv64v2mmy63q86qgpa31i36ix6fkjsdxmzgqyxcyzgb0jcy"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; };
@@ -5326,7 +5557,7 @@ in with self; {
   coprimary = derive2 { name="coprimary"; version="1.0"; sha256="0pjln9p5lzv6wl5xrz0kb90hnjlnp7ch2kvh054nxdbmlxv5akc3"; depends=[digest gsDesign plyr proto]; };
   copula = derive2 { name="copula"; version="0.999-18"; sha256="1xdjnp8zgla2hixyp524nvgbji0jcrmqc4j99hr8xp9365xb6z86"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; };
   copulaData = derive2 { name="copulaData"; version="0.0-1"; sha256="1s917g8wasxndg1xq4b4fjaq29nyzzigpflgqcy4rxdb7r54dl0z"; depends=[]; };
-  copulaedas = derive2 { name="copulaedas"; version="1.4.2"; sha256="09w6b1m1lnlnsx0qp2mzlp0z9rxzz90qs9jqzwwjl56lzdad3vpr"; depends=[copula mvtnorm truncnorm vines]; };
+  copulaedas = derive2 { name="copulaedas"; version="1.4.3"; sha256="01wp8jnz7kndknj7lh9ia7mm41k1vbaksalyy9v19bb77yhgzmba"; depends=[copula mvtnorm truncnorm vines]; };
   corHMM = derive2 { name="corHMM"; version="1.22"; sha256="03di9250hjn5fiwn47f0pr4zprmsza4if3xpmy3j1czahc8zlqnj"; depends=[ape corpcor expm GenSA nloptr nnet numDeriv phangorn Rmpfr]; };
   corTest = derive2 { name="corTest"; version="0.9.6"; sha256="1ccb38jyl2nyff2m71pba7vs13nl59zzpdnc7k68333dd8p7zswa"; depends=[MASS]; };
   corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; };
@@ -5341,7 +5572,7 @@ in with self; {
   corkscrew = derive2 { name="corkscrew"; version="1.1"; sha256="1nb81r4lsrajcj3xz3f7p6xznnb38yg3rnnh44rd3kabca4d8r1s"; depends=[ggplot2 gplots igraph RColorBrewer]; };
   corlink = derive2 { name="corlink"; version="1.0.0"; sha256="06n9pcvbn8y9gy0mn9c0sw05424ss8smpaw3ly6a785cmj3d9b6m"; depends=[]; };
   corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; };
-  corpora = derive2 { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; };
+  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]; };
@@ -5349,20 +5580,21 @@ in with self; {
   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]; };
   correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; };
-  corrgram = derive2 { name="corrgram"; version="1.12"; sha256="1z0h2mkf4805w3wnhy31cf1gm9miliapxchgc4ksg3kx2799gv91"; depends=[seriation]; };
+  corrgram = derive2 { name="corrgram"; version="1.13"; sha256="1g5159vihsz5a2cfmg4g4i1lildn2x2wzck5sd0vml5810rxjpma"; depends=[seriation]; };
   corrplot = derive2 { name="corrplot"; version="0.84"; sha256="1k03qd8db7pwg1v318xapx5mpiypiz2n07qr19c4b45diri5xkhd"; depends=[]; };
-  corrr = derive2 { name="corrr"; version="0.2.1"; sha256="1d04nk92fjmk4kc5zipjqjhhmb1w97kid7l2jz5a8pkwiccn5byc"; depends=[dplyr ggplot2 ggrepel lazyeval magrittr purrr seriation tibble tidyr]; };
+  corrr = derive2 { name="corrr"; version="0.3.0"; sha256="1l5157m4k5zvxnkgndvkxc0ghcsgxvm5jr6hpbpdc6s1nnz7s027"; depends=[dplyr ggplot2 ggrepel lazyeval magrittr purrr rlang seriation tibble tidyr]; };
   corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; };
   corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; };
   cosa = derive2 { name="cosa"; version="1.2.0"; sha256="1g2n9l79bi6pr5m9f4c0byw2ls9nhykkaaivssxbx4m6qpqlqg54"; depends=[nloptr]; };
   cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; };
-  cosinor2 = derive2 { name="cosinor2"; version="0.1.0"; sha256="0pxkkp8dxhzqp2v3pfzigh1ka7ardf168k5p41z289xgar9p33g0"; depends=[cosinor ggplot2 Hmisc matrixStats]; };
+  cosinor2 = derive2 { name="cosinor2"; version="0.2.1"; sha256="1pp0z86fflqkkllfrzx3vj98kzxjwnawr4a2d8z5q6zhq6v5qrvf"; depends=[cosinor cowplot ggplot2 Hmisc magrittr matrixStats purrr scales stringr]; };
   cosmoFns = derive2 { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; };
   cosso = derive2 { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[glmnet quadprog Rglpk]; };
   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]; };
-  countrycode = derive2 { name="countrycode"; version="1.00.0"; sha256="1b2ijbf74bxvi01f53lbb2b9jya2rlyazvzacxpj79y1dbs600s6"; depends=[]; };
+  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]; };
   countytimezones = derive2 { name="countytimezones"; version="1.0.0"; sha256="0sk22fmz9d3wvlfvjl1xdavvl04q1ywy8ww2gi5am3yiizkf0v9w"; depends=[dplyr lubridate]; };
   countyweather = derive2 { name="countyweather"; version="0.1.0"; sha256="0q56bnh9x6jyj1sdd1q4yv2n774mbv268pgp285bjybgqm2pyisz"; depends=[dplyr geosphere ggmap ggplot2 lubridate purrr raster rnoaa sp stringi tibble tidyr tigris]; };
@@ -5370,18 +5602,18 @@ in with self; {
   covLCA = derive2 { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhxkb11jmgpmddg98nfrzmjpczn2iw3"; depends=[Matrix mlogit poLCA]; };
   covRobust = derive2 { name="covRobust"; version="1.1-3"; sha256="0zcfala4l0j4w0sx5hlw40vxiypans3d7pgkxy25nj0d2m1jkvba"; depends=[]; };
   covTest = derive2 { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[glmnet glmpath lars MASS]; };
-  covTestR = derive2 { name="covTestR"; version="0.1.3"; sha256="13sjnc3yrh2hzdcnnh6sfzl8gqilarg79n0sjr8vqyvclmz686k0"; depends=[dplyr lazyeval Rcpp RcppArmadillo]; };
-  covafillr = derive2 { name="covafillr"; version="0.4.2"; sha256="00790rgpdxxwc48cw0w5savvmvi8ljmyrh6w3f8qzx6pq1s982gm"; depends=[ggplot2 RcppEigen]; };
-  covatest = derive2 { name="covatest"; version="1.0.0"; sha256="0g4wfwxngvcssi2bmmb2q5fv909z9qm4wfc8gcldz7fckbsc0k10"; depends=[gstat matrixcalc sp spacetime]; };
+  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]; };
   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.1.0"; sha256="0ml7hpnwn0b4rgk0qx0pchz1m5b57issbvhl708lnb0bplvf00f7"; depends=[crayon digest httr jsonlite rex withr]; };
+  covr = derive2 { name="covr"; version="3.2.1"; sha256="187hvqp7mvxy3hl00fgw56sm93yrz81fwixf652arr0ih2jdm47a"; depends=[crayon digest httr jsonlite rex withr]; };
   covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; };
   covsep = derive2 { name="covsep"; version="1.1.0"; sha256="19dvwhl85yx9ddwxvnq5sdd534s6llcw61gckrav48hq49x1bqld"; depends=[mvtnorm]; };
   cowbell = derive2 { name="cowbell"; version="0.1.0"; sha256="1zz0g30zvqfk5lh09y90iq3s7x2wwbs852i3d56mfp926gxdxc2y"; depends=[ggplot2 misc3d rgl]; };
-  cowplot = derive2 { name="cowplot"; version="0.9.2"; sha256="13yjw7yv7imyqiawqqp304hkp6x36iv6rf6gn03dwzwkj9zwx4lb"; depends=[ggplot2 gtable plyr scales]; };
-  cowsay = derive2 { name="cowsay"; version="0.6.0"; sha256="15kiiqbh8bqdifbjh6ab9r595j2a4zyk4mgmy1w39sja1g95nlvi"; depends=[fortunes rmsfact]; };
-  coxed = derive2 { name="coxed"; version="0.1.1"; sha256="1fk9vcrad8p2xdm1q7wcrd2fk9b59cfs3lvfxi8arkmmbz7pxrmq"; depends=[dplyr ggplot2 gridExtra mgcv PermAlgo rms survival tidyr]; };
+  cowplot = derive2 { name="cowplot"; version="0.9.3"; sha256="1jrx1h0blkk577y4cvnjk7xccn7qmjiv2bnpgqlsjvjhsxglf41y"; depends=[ggplot2 gtable plyr scales]; };
+  cowsay = derive2 { name="cowsay"; version="0.7.0"; sha256="1f5hc1sj79yd3l2c6vrcj6xx2hdfxb16c3d2sgr7yps8j5fyrb9h"; depends=[crayon fortunes rmsfact]; };
+  coxed = derive2 { name="coxed"; version="0.2.0"; sha256="0idr6ic8nsw6f210swvpfzbaf05blg4x6kh6mb7q773qirmwi0rs"; depends=[dplyr ggplot2 gridExtra mgcv PermAlgo rms survival tidyr]; };
   coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; };
   coxme = derive2 { name="coxme"; version="2.2-10"; sha256="12p41qc3ryxdcw2zljgvw2gk1wl1pj7h61naqbyc1h0l3dqy8dg2"; depends=[bdsmatrix Matrix nlme survival]; };
   coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; };
@@ -5389,6 +5621,7 @@ in with self; {
   coxphf = derive2 { name="coxphf"; version="1.13"; sha256="16bman8xv5xx7gg8s54sj3hc4isqxk4h3q93h4q3h3j0bdvww2yy"; depends=[survival]; };
   coxphw = derive2 { name="coxphw"; version="4.0.1"; sha256="116dp6zispa8k7y6jrn4v9ipf0jqdhj68w9qqc2qwcapawvrd0nh"; depends=[survival]; };
   coxrobust = derive2 { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; };
+  coxrt = derive2 { name="coxrt"; version="1.0.0"; sha256="1nyc4qpgxyji314w372rg7dhiq6bmzfjbgi035m350s81fp6y8br"; depends=[BB ggplot2 gss inline Rcpp RcppArmadillo survival]; };
   coxsei = derive2 { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; };
   cp4p = derive2 { name="cp4p"; version="0.3.5"; sha256="16pkl0brm415v153ln41nyy13fsp4i0jy8349lsffkv5mvp7vklc"; depends=[limma MESS multtest qvalue]; };
   cpa = derive2 { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; };
@@ -5412,35 +5645,40 @@ in with self; {
   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=[]; };
-  crawl = derive2 { name="crawl"; version="2.1.1"; sha256="0dr9z8y8rvc3wn1gjb6mh5wmszng9j1r2a9ks6p5am8ghf754sps"; depends=[dplyr gdistance mvtnorm raster Rcpp RcppArmadillo shiny sp]; };
+  crawl = derive2 { name="crawl"; version="2.2.1"; sha256="18mr7vp72jj5msj9mbq45jy3f6qhn45azsmkq07i2d30gwdj0c3a"; depends=[dplyr gdistance lubridate magrittr mvtnorm purrr raster Rcpp RcppArmadillo rmapshaper sf shiny sp tibble]; };
   crayon = derive2 { name="crayon"; version="1.3.4"; sha256="0s7s6vc3ww8pzanpjisym4jjvwcc5pi2qg8srx7jqlz9j3wrnvpw"; depends=[]; };
   crblocks = derive2 { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; };
   crch = derive2 { name="crch"; version="1.0-1"; sha256="0h97vr9sy7hncjxv5v3y79pw2qqzpx6z6nqgx6k2ics1lf9misyb"; depends=[Formula ordinal sandwich scoringRules]; };
   creditr = derive2 { name="creditr"; version="0.6.1"; sha256="1dhjl99gjc97bdsdg29mq6xifivjn9kr0y7m2jzvrzb26x856z97"; depends=[devtools quantmod Rcpp RCurl XML xts zoo]; };
   credsubs = derive2 { name="credsubs"; version="1.0"; sha256="12bs1whk23y41hxa976j30d31x81rmxapz9ll5y2hi5c1h4fypn4"; depends=[]; };
   credule = derive2 { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; };
+  cregg = derive2 { name="cregg"; version="0.3.0"; sha256="08dhn4i5i27zw3ayqp7lkw5z8dzckv8fhflpvz0mphax34pm3z72"; depends=[ggplot2 ggstance lmtest sandwich scales survey]; };
+  crfsuite = derive2 { name="crfsuite"; version="0.2"; sha256="10d7gahqqc6g6l99n6g5r49hlngdl3k9jz9j2c4x9hx1r8f8gql6"; depends=[data_table Rcpp]; };
   cricketr = derive2 { name="cricketr"; version="0.0.15"; sha256="0jf9a8kfhzydmspmgh2mxb18q4adbjm3jiz3brxpl42d64agq7qj"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; };
   crimCV = derive2 { name="crimCV"; version="0.9.6"; sha256="14ckk88i7jk8a7kl51d7qfdis44jng6zz9zd72cdp80a57dvrvzq"; depends=[]; };
+  crimedata = derive2 { name="crimedata"; version="0.1.0"; sha256="006wz4nvfq10dppkg8kqp2bmllcc7zpwdqkp3nqwm4qgw7pllyvz"; depends=[digest dplyr httr magrittr purrr readr stringr tibble]; };
   crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; };
   crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; };
   crmPack = derive2 { name="crmPack"; version="0.2.7"; sha256="1d0ydllcbykwip9dw3arvn6lv4h88n5nkm3ms122gfrf44f6h2c0"; depends=[GenSA ggplot2 gridExtra MASS mvtnorm rjags]; };
-  crminer = derive2 { name="crminer"; version="0.1.4"; sha256="1vnl01q5sw13g6qhvn61w9i40zpg9cszisgi0h8d6q6rr23iws9w"; depends=[crul hoardr jsonlite pdftools xml2]; };
+  crminer = derive2 { name="crminer"; version="0.2.0"; sha256="1rlh7bxk8bry2v9fnqzy0ph62dda1pzifksr7v4pmdyhji9mjw33"; depends=[crul hoardr jsonlite pdftools xml2]; };
   crmn = derive2 { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; };
   crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; };
-  crochet = derive2 { name="crochet"; version="2.0.1"; sha256="1il29hnnx3kwjvsnirvm5vxdd04x94qn4526411cw0syyqqlbnp8"; depends=[]; };
+  crochet = derive2 { name="crochet"; version="2.1.0"; sha256="0bfhgkbyrm836wjshlv1gxkc7m84sij6i3zrg95q4fmqzspwqnq0"; depends=[]; };
+  cromwellDashboard = derive2 { name="cromwellDashboard"; version="0.5.1"; sha256="0d57c1wdd1ds9fr7p256la63qbv8mirljgrvl1k8fp5gcnkps5wb"; depends=[dplyr DT httr shiny shinydashboard stringr]; };
   cronR = derive2 { name="cronR"; version="0.4.0"; sha256="0ydlwhlzb57vbr8ya6hdsw2mhsjkb01jspn0jw081anrxfy5m2jw"; depends=[digest]; };
   crop = derive2 { name="crop"; version="0.0-2"; sha256="1yjpk7584wrz9hjqs21irjnrlnahjg8lajra9yfdp6r927iimg1l"; depends=[]; };
   cropdatape = derive2 { name="cropdatape"; version="1.0.0"; sha256="19bn0apx4p8hnz388zg7sq59qv89vv8k5php317kcv7ai2k2gh34"; depends=[]; };
   crossReg = derive2 { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; };
   crossdes = derive2 { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; };
   crossmatch = derive2 { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; };
+  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]; };
   crossword_r = derive2 { name="crossword.r"; version="0.3.5"; sha256="1h6r5rrmla3jsdfnkxsv4drvp3nrkqkygqv9ak0pn37zlbms99z9"; depends=[dplyr jsonlite magrittr R6 r6extended stringr]; };
   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.7"; sha256="008dmrgsajm73r3fl3lqsd4pgkdacpx6m48xg61yc02xciv7ad2b"; depends=[fields Matrix plot3D pracma tseriesChaos]; };
+  crqa = derive2 { name="crqa"; version="1.0.9"; sha256="1k6jgkmgbjab78dynng1hlxdbnqrpwmiiw54rgyfhx6v3lcir75d"; depends=[fields Matrix plot3D pracma tseriesChaos]; };
   crqanlp = derive2 { name="crqanlp"; version="0.3"; sha256="1ndd5k44w232x6k564r84lyahljgcnldfwgih3iiar3il94drbdg"; depends=[corpus crqa gutenbergr RCurl tm]; };
   crrSC = derive2 { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
   crrp = derive2 { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; };
@@ -5450,11 +5688,11 @@ in with self; {
   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]; };
   crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; };
-  crul = derive2 { name="crul"; version="0.5.2"; sha256="0sfjv8jrb5x85b4dicp7789xxa0g6y89sfd96war84yidmh2a6z0"; depends=[curl httpcode mime R6 urltools]; };
-  crunch = derive2 { name="crunch"; version="1.23.0"; sha256="0mcq4qnhn3gadq2ssglvh5wid0a0clkxza3zikxrxwa69vjp7x3q"; depends=[crayon curl httpcache httr jsonlite]; };
+  crul = derive2 { name="crul"; version="0.6.0"; sha256="1vnir41mqah8ib9p2p4ij54bpv54baa1q9ad5j2a7hn59vwpjhh0"; depends=[curl httpcode mime R6 urltools]; };
+  crunch = derive2 { name="crunch"; version="1.24.0"; sha256="0jydmicc4c4vkf6r3krybbrdf96059nx6q611lyd2qj32irlr49j"; depends=[crayon curl httpcache httr jsonlite]; };
   crunchy = derive2 { name="crunchy"; version="0.2.0"; sha256="1q9mqpkg5ljb798922fmvjjp36kyjr1rrm6jf3s2fwjrhq186y3z"; depends=[crunch shiny]; };
-  cruts = derive2 { name="cruts"; version="0.4"; sha256="0flhlv9pabmj667azc7vjacmk4d512s34xlrip176s8cmswprzg1"; depends=[lubridate ncdf4 raster sp stringr]; };
-  crypto = derive2 { name="crypto"; version="1.0.2"; sha256="16k08kbn8lr3ycf61imc3fd0vdm2w1rzzn11c6vv7s8kfwvdcfdl"; depends=[curl doSNOW dplyr foreach jsonlite lubridate magrittr rvest tidyr xml2 xts yaml]; };
+  cruts = derive2 { name="cruts"; version="0.5"; sha256="08mklbmwgaq6cf3hd40mingplwjss5im30l5j6nmy7lijp15nq7k"; depends=[lubridate ncdf4 raster sp stringr]; };
+  crypto = derive2 { name="crypto"; version="1.0.3"; sha256="19d245sq8xhxmq252cjcymc86n6q6yq2b1liy2mm62agkyjxznrd"; depends=[curl doSNOW dplyr foreach jsonlite lubridate magrittr rvest tibble tidyr xml2 xts yaml]; };
   cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; };
   csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
   csabounds = derive2 { name="csabounds"; version="1.0.0"; sha256="15l7i15w5jk4h3148dlk8v2i4awns5vxvv6m59qcv0hzns6jhx9j"; depends=[BMisc ggplot2 pbapply progress qte]; };
@@ -5468,18 +5706,19 @@ in with self; {
   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=[]; };
-  csvy = derive2 { name="csvy"; version="0.1.3"; sha256="0vszbxqa88sdsi73wng4y8zxhrvcksqa6qs3rbh50c2nll8r8kb3"; depends=[yaml]; };
+  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-0"; sha256="12hrrql9wz43s1d3sfyzlqzx7ajrl3hvf96776ik6icbm8by8h6j"; depends=[MASS qtl]; };
-  ctmcd = derive2 { name="ctmcd"; version="1.3.5"; sha256="0nsazcfa8bg5r2ki5wf4v6q2ws47wk97zr4a5h9jj0mp1900rz2l"; depends=[coda expm numDeriv Rcpp RcppArmadillo]; };
+  ctl = derive2 { name="ctl"; version="1.0.0-2"; sha256="1gpb43zn411l476dby2g38qkcvh2fsdcvbkr9jb274l1154km1xm"; depends=[MASS qtl]; };
+  ctmcd = derive2 { name="ctmcd"; version="1.4.0"; sha256="1b4bf2j3gdzm417pimn9m365y7x11ddinq9mb5mixwsbf77dqagm"; depends=[coda expm numDeriv Rcpp RcppArmadillo]; };
   ctmcmove = derive2 { name="ctmcmove"; version="1.2.9"; sha256="1pxyxbbhfa8arqfb7qw10ya1b8hy9ylqbqqzys6d9dsixvdk98h0"; depends=[fda gdistance Matrix raster sp]; };
   ctmle = derive2 { name="ctmle"; version="0.1.1"; sha256="1k9nr2xbaqrbpp31vdcnmpwyazcw79k0r3gbcbinva4pgv2psp29"; depends=[glmnet SuperLearner tmle]; };
-  ctmm = derive2 { name="ctmm"; version="0.5.0"; sha256="1lz07gsly4acdwmv62l01g3rmmjwkiww8hsxlbx0cp0jmk63znn1"; depends=[data_table expm fasttime Gmedian manipulate MASS Matrix numDeriv pbivnorm pracma raster rgdal scales shape]; };
+  ctmm = derive2 { name="ctmm"; version="0.5.2"; sha256="1x8nzmhdby0nwm18l6b3y4x4b7pihfkpnhakykh23rfnr7d6ajj3"; depends=[data_table expm fasttime Gmedian manipulate MASS numDeriv pbivnorm pracma raster rgdal scales shape]; };
   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]; };
   ctv = derive2 { name="ctv"; version="0.8-5"; sha256="0kl6z8dbbjgm29q0c5xy6lihjgf5cdihrllm27x0zbcvy8lyl51p"; depends=[]; };
-  cubature = derive2 { name="cubature"; version="1.4"; sha256="1hd23b8v2kpqp5gr0va8p2q7j8w9rik6ks7zrr4b8mb2mwrakk74"; depends=[Rcpp]; };
+  cubature = derive2 { name="cubature"; version="1.4-1"; sha256="10jl5l3xnigiq95829ssq69xbim97k851187dghc30awszcx4clh"; 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]; };
@@ -5495,45 +5734,49 @@ 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]; };
   customizedTraining = derive2 { name="customizedTraining"; version="1.1"; sha256="0rlfsnhmmcwx7iyjavj03v4kdfzxcqjggi8qpgmi6lkli3n0s6pg"; depends=[FNN glmnet]; };
   cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; };
-  cutpointr = derive2 { name="cutpointr"; version="0.7.3"; sha256="09pcja8kp3sdsz2vp32s5vl7m5cz14rlbp9aa00y4qd21nyckyj9"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr]; };
+  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=[]; };
   cvAUC = derive2 { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[data_table ROCR]; };
   cvTools = derive2 { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; };
-  cvar = derive2 { name="cvar"; version="0.1-1"; sha256="0aqv42wbhdql1v0mxspr5ms2mwkk6yw0snzzjg5qg682m5f13ghn"; depends=[gbutils Rdpack]; };
+  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=[]; };
   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]; };
-  cwhmisc = derive2 { name="cwhmisc"; version="6.5"; sha256="1nakiyamg05r7xysac5b1y0ddq6s25v6ygsrb487b5jcv0d95g2n"; depends=[lattice]; };
+  cwhmisc = derive2 { name="cwhmisc"; version="6.6"; sha256="1pf365g4f51cfrhlff9mqw2ddvkps0abax17zcn3vw1ba2djalnp"; depends=[lattice]; };
   cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; };
+  cxhull = derive2 { name="cxhull"; version="0.1.1"; sha256="0ihvgliwssf5jprb7f842vsck1d5x657c43pb6wi03y4wdz2r0s5"; depends=[]; };
   cxxfunplus = derive2 { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; };
   cycleRtools = derive2 { name="cycleRtools"; version="1.1.1"; sha256="1l7w2lm4s149ndd85v41pkdrdig6l3nmhl14bdx56aw8q57fxmb0"; depends=[Rcpp xml2]; };
   cyclestreets = derive2 { name="cyclestreets"; version="0.1.5"; sha256="1wvg43wrnh0lz2pkkrbidzdsrkypdl2r4ccs9jhdsj8ixm158dvf"; depends=[httr jsonlite magrittr sf stringr]; };
   cyclocomp = derive2 { name="cyclocomp"; version="1.1.0"; sha256="0gky3svk02wiajw7nfjh30684h3qxili4bvsab0m7b6cggw6bgyd"; depends=[callr crayon desc remotes withr]; };
   cycloids = derive2 { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; };
-  cymruservices = derive2 { name="cymruservices"; version="0.2.0"; sha256="1pgk9llaz0glhgf3n60nq3xb8kp4jkk8paz4scxff3whyksxv4yn"; depends=[purrr stringr]; };
+  cymruservices = derive2 { name="cymruservices"; version="0.5.0"; sha256="1xhdvijybdy7312qdbp50881yix587pmym0hchnwb3h0vhjv553v"; depends=[memoise pingr stringi]; };
   cyphid = derive2 { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
   cystiSim = derive2 { name="cystiSim"; version="0.1.0"; sha256="0pz8jxi4lgcwzrb4dh8xn63xhpaga5rzg5hwqicwv8isc16iqizd"; depends=[ggplot2 knitr magrittr]; };
   cytoDiv = derive2 { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; };
-  cytometree = derive2 { name="cytometree"; version="1.1.1"; sha256="1v90dp2bk06iv7im6r3rgj442ajxyy0h05h1higrjyw6k2v78dmd"; depends=[ggplot2 igraph mclust Rcpp RcppArmadillo]; };
+  cytofan = derive2 { name="cytofan"; version="0.1.0"; sha256="0gqs98mnwiawnyfb9hs5nlin8d1fj64bszn4b40gs8ajyh36r9pp"; depends=[ggplot2 RColorBrewer]; };
+  cytometree = derive2 { name="cytometree"; version="1.2.0"; sha256="1919f9d7phgnf1z5srgjj4h4pgl9hrv9rx75rifj819zv2s9hfig"; depends=[cowplot ggplot2 igraph mclust RColorBrewer Rcpp RcppArmadillo robustbase]; };
   cytominer = derive2 { name="cytominer"; version="0.1.0"; sha256="1p988aw689kgpbglmzrnl30krnbynwk3dgjv7w3x2719hi481z2j"; depends=[caret doParallel dplyr foreach futile_logger magrittr purrr rlang tibble tidyr]; };
   d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; };
   d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; };
   d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.2"; sha256="1ici8j0wzzklhmw94qlxm292qs562vc32wq8mnjsas2n1p35vkmk"; depends=[base64enc dendextend htmlwidgets png scales]; };
   d3plus = derive2 { name="d3plus"; version="0.1.0"; sha256="0kadz83pals03n0v3zqhmhf6visigk52yn58xckhb57fid4xzj5w"; depends=[htmlwidgets magrittr]; };
-  d3r = derive2 { name="d3r"; version="0.8.2"; sha256="1i8y2pr79v2mfwgi6sgibsgwp0l717yf86dn07l39nfgyrxgx9f4"; depends=[dplyr htmltools tidyr]; };
+  d3r = derive2 { name="d3r"; version="0.8.4"; sha256="01z70nc48z7l3lr5p3nndiv8hxqlbinn7yr8pd15yk35f46hcsbk"; depends=[dplyr htmltools tidyr]; };
   dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; };
   dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; };
   dGAselID = derive2 { name="dGAselID"; version="1.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; };
   dHSIC = derive2 { name="dHSIC"; version="2.0"; sha256="1acbzln2rlyranccsjndpw6pj4a2lyb24jb52r2wms8lsg4fn2m9"; depends=[Rcpp]; };
-  dLagM = derive2 { name="dLagM"; version="1.0.2"; sha256="0wl1sivphm6plmvjixxs90ki8a1pi4nb2vxqdm5xxbi0ljwpgl1x"; depends=[AER dynlm formula_tools Hmisc plyr wavethresh]; };
-  dMod = derive2 { name="dMod"; version="0.4"; sha256="12q80pk0j5081qz4rb19iib0n4h1yf1c42iq1z14yyrmki3266pm"; depends=[cOde deSolve ggplot2 plyr rootSolve stringr]; };
+  dLagM = derive2 { name="dLagM"; version="1.0.10"; sha256="0fbblcg2z10a2yijxl6sgbzb59y0mwwg6wg1p68madkr4r3w79mw"; depends=[AER dynlm formula_tools plyr wavethresh]; };
+  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=[]; };
   dad = derive2 { name="dad"; version="3.1.1"; sha256="120f7asg3hbr0c5n821jdr8c7cz67dbv1v646v6xgnyy4n6ym2qa"; depends=[e1071 lattice]; };
-  dae = derive2 { name="dae"; version="3.0-16"; sha256="0nryjijr6cq0pm02ik58lish57ld3nfd16c908jq40dhgws2q7x9"; depends=[ggplot2]; };
+  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]; };
   daff = derive2 { name="daff"; version="0.3.0"; sha256="1kl5pjwxds6bz58zd5xaa1hknd6f9i0512895fhljqi7kvsrldra"; depends=[jsonlite V8]; };
   dafs = derive2 { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; };
@@ -5548,22 +5791,22 @@ in with self; {
   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]; };
-  data_table = derive2 { name="data.table"; version="1.11.4"; sha256="1mc1drqj5i5ar2za3nkh5j70y37s7z7xwqri2r2b72zkqggg3k7x"; depends=[]; };
-  data_tree = derive2 { name="data.tree"; version="0.7.6"; sha256="0fq7wsql4rmbfjif3klccciq7iqhrwjirj21il6n9r5f1i6x5qxn"; depends=[DiagrammeR R6 stringr]; };
+  data_table = derive2 { name="data.table"; version="1.11.8"; sha256="1nb6wngrk1a30m984524gf26fa1nwgyf4y4an94dibcwb5jp8hnw"; depends=[]; };
+  data_tree = derive2 { name="data.tree"; version="0.7.8"; sha256="05svd1h70dn92imadw2djqqvchx30md74d4z6a00grkajj16cchb"; depends=[DiagrammeR R6 stringr]; };
   data_world = derive2 { name="data.world"; version="1.2.2"; sha256="1d9hh4965f2d0lwh2xxhnxzc948ailkjzdax3d3z9l8lakqfrx0h"; depends=[dwapi httr ini miniUI shiny stringi]; };
-  data360r = derive2 { name="data360r"; version="1.0.1"; sha256="1g245zg70ch81zjmd1ng16lks38qr0a6m63y582w558mza7v148g"; depends=[curl data_table jsonlite reshape2]; };
-  dataCompareR = derive2 { name="dataCompareR"; version="0.1.1"; sha256="06nba2yir2yz1189bsag9yavdf9hfmpswxdy92dlnbz9d27jjsic"; depends=[dplyr knitr markdown stringi]; };
-  dataMaid = derive2 { name="dataMaid"; version="1.1.2"; sha256="1phy03bya6zd3xpypic3ymjqgx8iv2y8661mfyvbz99a2bvspj5a"; depends=[ggplot2 gridExtra haven htmltools magrittr pander robustbase whoami]; };
+  data360r = derive2 { name="data360r"; version="1.0.2"; sha256="09s1p5yh756jl13jq6jx10r009lqvpry5y7y83xd4dqwa180s9gg"; depends=[curl data_table jsonlite reshape2]; };
+  dataCompareR = derive2 { name="dataCompareR"; version="0.1.2"; sha256="0n10dqnrlpwafxys68b3ly156235lhqby71qay0vb0r6bvl2g349"; depends=[dplyr knitr markdown stringi]; };
+  dataMaid = derive2 { name="dataMaid"; version="1.2.0"; sha256="0w2dslyzr35y6mjg46sq7cc3mar6v29md1i716hiix9kzy7b5782"; depends=[DT ggplot2 gridExtra haven htmltools magrittr pander robustbase stringi whoami]; };
   dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; };
-  dataPreparation = derive2 { name="dataPreparation"; version="0.3.6"; sha256="1nx9lbwrp55wyirqyfmwddilinhyd9428l9n4kb8bwms7hjcf18h"; depends=[data_table lubridate Matrix progress stringr]; };
+  dataPreparation = derive2 { name="dataPreparation"; version="0.3.8"; sha256="1k4lww4n57zqf5lk2gwrjjk9qfv3b4zvb18591mnq5bbvylkw2c4"; depends=[data_table lubridate Matrix progress stringr]; };
   dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
   dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.3"; sha256="0lrv6fyqi7k079wdpqilgjlb4j2qfs3r02d9ip8s9yznfwqsl826"; depends=[curl dplyr httr jsonlite lubridate readr reshape2 xml2]; };
   datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; };
-  datacheckr = derive2 { name="datacheckr"; version="0.2.0"; sha256="1kk38pb4dsy6ll6drz2gsngzsv81pwmjrbvh3izm22h849mvlypv"; depends=[]; };
+  datadigest = derive2 { name="datadigest"; version="1.0.2"; sha256="1v4nwflrgjhwkrdlrjnqyq1spv1jkgxn1kmapml0zrvnvwf0r1a1"; depends=[haven Hmisc htmltools htmlwidgets jsonlite miniUI shiny tibble]; };
   datadogr = derive2 { name="datadogr"; version="0.1.2"; sha256="10zbxb9gkymw78ras9y4wrifz7cxh3y630yzjcf9ds2p557vcjzp"; depends=[anytime dplyr glue httr lubridate purrr stringr tibble tidyr]; };
-  datadr = derive2 { name="datadr"; version="0.8.6"; sha256="0fmywnxcvw31vfb9iaxqiw19ycnd98v41pdsdknabysr7fpnygfq"; depends=[codetools data_table digest dplyr hexbin magrittr]; };
+  datadr = derive2 { name="datadr"; version="0.8.6.1"; sha256="1x8j34gj5c5arr1iqxfx8cs8hjapylvfjsnh4k6a34z65r83h93y"; depends=[codetools data_table digest dplyr hexbin magrittr]; };
   dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; };
-  datafsm = derive2 { name="datafsm"; version="0.2.1"; sha256="16l6ssprsvnpzxlfnqj7r061x700704s5gdci5x9ixdjmglakmdd"; depends=[caret GA Rcpp]; };
+  datafsm = derive2 { name="datafsm"; version="0.2.2"; sha256="1q4vfvpvlp127lh6y2ls59gg8dg20syv0sqrwa7sfnml6ysb21q2"; depends=[caret GA Rcpp]; };
   datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; };
   datamaps = derive2 { name="datamaps"; version="0.0.3"; sha256="00pvns98miq56z3prbb5qg608d5ns9wbp0711x3mmqg0bld1xwmp"; depends=[htmlwidgets magrittr]; };
   datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; };
@@ -5571,12 +5814,12 @@ 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.8.0"; sha256="06yqp1lvskvcyiz8a2jy7kzv721qrvf5ycw6g9jl2bj84raifmap"; depends=[curl httr jsonlite yaml]; };
-  datasauRus = derive2 { name="datasauRus"; version="0.1.2"; sha256="1ixfc1v0iv5jb4920957xhpq9kchdy482vdsm51wj1961ldrkhvh"; depends=[]; };
+  datarobot = derive2 { name="datarobot"; version="2.9.0"; sha256="0z49dyr0gpgasnf1igyjivpjr2116rvkdirxxvq2nlb6q7i5smjd"; 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.1.0"; sha256="029rxg0h17nszkxgq5kjd0njymb8pgdsabmz5slshzd2ijjh82jz"; depends=[DT miniUI shiny]; };
+  datasets_load = derive2 { name="datasets.load"; version="0.3.0"; sha256="13ywnqln831i5hlf1cpqcyc77blg99w8jvy8jic17z86fjxh4gim"; depends=[DT miniUI shiny]; };
   datastepr = derive2 { name="datastepr"; version="0.0.2"; sha256="039yggdj8jdici7hwmkjwgix45lvwjl7rw5h2rfzsm9xaq6vw1z2"; depends=[dplyr lazyeval magrittr R6 tibble]; };
-  datastructures = derive2 { name="datastructures"; version="0.2.6"; sha256="1sigcm4w9fj6i538vpf939x9blwx2cfa626lfc8ya8fr8wd5w7vg"; depends=[BH purrr Rcpp]; };
+  datastructures = derive2 { name="datastructures"; version="0.2.7"; sha256="0lvm2n056msbmx3aw3a2wkn8vcyjhb5m9iaqdirpcvbzdpigfj80"; depends=[BH purrr Rcpp]; };
   datasus = derive2 { name="datasus"; version="0.4.1"; sha256="175bzhjigri49p4v9v3kwdc233w0l3v35220m05qsbpn6in7gw67"; depends=[dplyr httr magrittr RCurl readr rvest stringi stringr xml2]; };
   datautils = derive2 { name="datautils"; version="0.1.5"; sha256="1yy25a84zmfh54jvxwa7mv4j296rmjgd40m4p81mrsswlqvncmfn"; depends=[deldir gplots gtools]; };
   dataverse = derive2 { name="dataverse"; version="0.2.0"; sha256="0lyga8rdsir2yr1n9nr10iiaf6a7dxp1nb04bx8mq8ljrvpkgr8n"; depends=[httr jsonlite xml2]; };
@@ -5592,41 +5835,44 @@ in with self; {
   dbConnect = derive2 { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; };
   dbEmpLikeGOF = derive2 { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; };
   dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
-  dbarts = derive2 { name="dbarts"; version="0.9-4"; sha256="1xglsx2x8jq71q5y377kcc92j8nymh3v11idjj44gixpm8lspljc"; depends=[]; };
+  dbarts = derive2 { name="dbarts"; version="0.9-5"; sha256="0pjw5fljn3fzsimsyfc21xq6klrxmav8snjjjp8myn19viikv1rg"; depends=[]; };
   dbfaker = derive2 { name="dbfaker"; version="0.1.0"; sha256="00n2z4q5drpg26pw826i16rg07m7w66a0r466q2lrl14hxs4rcaq"; depends=[assertive DBI dplyr foreach parsedate RPostgreSQL tidyr]; };
-  dbhydroR = derive2 { name="dbhydroR"; version="0.2-5"; sha256="1vldyc7ksi0pbdvnydbsjzap3ghh447x5c15n0s5isw82mqssnjz"; depends=[httr reshape2 XML]; };
+  dbhydroR = derive2 { name="dbhydroR"; version="0.2-6"; sha256="0pmd6bakifacmdk2zwlsg2zfdqc5jibc5jbd1mvnmllh5d0wwcqm"; depends=[httr reshape2 XML]; };
   dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
   dblr = derive2 { name="dblr"; version="0.1.0"; sha256="0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw"; depends=[CatEncoders data_table Metrics xgboost]; };
   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.1"; sha256="1nwrls9c3kc9q7405jp6b9sh23642sz13yw55iikgw134shffj5k"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; };
+  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]; };
   dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; depends=[cluster pls]; };
-  dbx = derive2 { name="dbx"; version="0.1.0"; sha256="026iqa2wnh0amkv0nnflg3wyqnfrh94imrw486k5i1561abdzndq"; depends=[DBI]; };
+  dbx = derive2 { name="dbx"; version="0.2.2"; sha256="1n6r2plq718xwxw2q2dxc3vql0brnin7dm3lsv1nh41rwk9ypsp8"; 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]; };
   dclone = derive2 { name="dclone"; version="2.2-0"; sha256="05myb01ypnhf9wdk3i8s9xldn8ihvw7gf4ajqld886nvc306rfkv"; depends=[coda Matrix rjags]; };
   dcminfo = derive2 { name="dcminfo"; version="0.1.7"; sha256="03r0ynzc5cck2rz20zbg5zx8v6s66ivizqav1pjkyvp6kxkmnf8q"; depends=[CDM]; };
   dcmle = derive2 { name="dcmle"; version="0.3-1"; sha256="1d6zk9413h30wcw8q1gnjzk67vshmjcpnh8zjxrsh1h69i1z6rpy"; depends=[coda dclone lattice]; };
-  dcmodify = derive2 { name="dcmodify"; version="0.1.1"; sha256="1a909v6jhihwwmq7lzv2xazrkfa1553kbrjsbjfsh1qrqdiam3sr"; depends=[settings validate yaml]; };
-  dcmr = derive2 { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; };
+  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]; };
   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]; };
   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]; };
   deSolve = derive2 { name="deSolve"; version="1.21"; sha256="0qqc4mknw1jblzcmph1dg3k1p6w42yal0k1xjh8pqk7yb3a75hs5"; depends=[]; };
   deTestSet = derive2 { name="deTestSet"; version="1.1.5"; sha256="07wbgniwkpp0yry6wvchvszr8isxs1i9k6km951r5c009w1iviwk"; depends=[deSolve]; };
   deadband = derive2 { name="deadband"; version="0.1.0"; sha256="02pq3d0l0wy8bdlyfir3zf46j1ascx4qajyq5cf28yl62q6ngq5d"; depends=[TTR]; };
+  deal = derive2 { name="deal"; version="1.2-39"; sha256="0sw0v1mm004ky1gjw3dmvf2vb7nf2j9s9386bhqxijw63j7xnjd3"; depends=[]; };
   deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; };
   debugme = derive2 { name="debugme"; version="1.1.0"; sha256="1c9sg55zvf10h8198jdnpamm6f66lzw3c3jnmdp9ls6na0j0xbjd"; depends=[crayon]; };
-  decido = derive2 { name="decido"; version="0.1.0"; sha256="1d53qcpy165f9izaj0x5x5d5h7jvihhk6mghs9g52dfxrvpndfgn"; depends=[oz Rcpp]; };
+  debugr = derive2 { name="debugr"; version="0.0.1"; sha256="0lfq0s0hibd00558vl3dmvrkzxjc7q62xr8sqzai0pv9a9lhixcn"; depends=[rprojroot rstudioapi]; };
+  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.7"; sha256="1nmrr0fic391sxxfnyp32yb889bwb3zkyb4b8g8sk2pgrsqrbybl"; depends=[chillR msm mvtnorm nleqslv rriskDistributions]; };
+  decisionSupport = derive2 { name="decisionSupport"; version="1.103.8"; sha256="1xp97v22ar4nsv2q4di6rqfin7pa7a6zqw5d1zmm5aqxfi07nc4x"; depends=[chillR msm mvtnorm nleqslv rriskDistributions]; };
   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]; };
@@ -5640,7 +5886,8 @@ in with self; {
   deeplr = derive2 { name="deeplr"; version="1.0.0"; sha256="0pg1vy4x53qns8qn5sv0nqplf23w8dwj0b0wbibpr52lgqjc34r7"; depends=[httr purrr rjson stringr tibble tokenizers utf8]; };
   deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
   default = derive2 { name="default"; version="1.0.0"; sha256="0hzxgp9la9kll5cw3m4gd02rii571xsn1v53kz407k7k6rfg5mda"; depends=[]; };
-  define = derive2 { name="define"; version="0.2.7"; sha256="0m5nk6shfak43zw68vzc9ncl0a3rrrkhc5ckhb5yhjllj6g5yigf"; depends=[encode Hmisc latexpdf SASxport spec]; };
+  define = derive2 { name="define"; version="0.2.8"; sha256="12xy1l1z1ilk85kbl7x4na99n6hc5axwrhpb6m6ipmbii4vv407v"; depends=[encode Hmisc latexpdf SASxport spec]; };
+  deflateBR = derive2 { name="deflateBR"; version="1.1.2"; sha256="17zsy10k12gmffbk7nagi60xj347q0bf7wr885fiylqz2xiy9fl9"; depends=[dplyr httr lubridate]; };
   deformula = derive2 { name="deformula"; version="0.1.1"; sha256="0h85yzl8kvjwrn1mkzyblvknf7gg8kx8y85qnvkwfbr9ik42ngn1"; depends=[]; };
   degenes = derive2 { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; };
   degreenet = derive2 { name="degreenet"; version="1.3-3"; sha256="07mkj2sdp09624mmb1x3djjypnrzn43qn2j4m93blli51j6zchm3"; depends=[igraph network]; };
@@ -5651,12 +5898,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.2"; sha256="0lhc9asly988j38d6pdz54b8yxzigrchnz57inj2my33cfbzp300"; depends=[boot]; };
+  deming = derive2 { name="deming"; version="1.3"; sha256="0r5wx0cj6ym97jplvfyz36iig7zczdd6fiqf8g3vc4f53mqlhx9b"; depends=[boot]; };
   demoKde = derive2 { name="demoKde"; version="0.9-4"; sha256="0p4v808m42wbv8ibdfqzm43cbbg0yl452wnm1mzqq2n37z6yljkr"; depends=[]; };
-  demogR = derive2 { name="demogR"; version="0.5.0"; sha256="1y7pkf1m8fqjsvs0szyaqga2y7p3dvj0r85nz8nzqbmy4zrrv4w8"; 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]; };
-  dendextend = derive2 { name="dendextend"; version="1.8.0"; sha256="1virn3c232xwcq3d0hhkgjh5gpzl01s39iwii5gxcm9mnsxjzdrh"; depends=[fpc ggplot2 magrittr viridis whisker]; };
-  dendroTools = derive2 { name="dendroTools"; version="0.0.9"; sha256="192bzpq7zxnknkn7g6w10lsqdj5qk0dq2z0dpdripi768y63cdim"; depends=[brnn dplyr ggplot2 gridExtra knitr magrittr MLmetrics oce plotly reshape reshape2 RWeka scales]; };
+  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]; };
   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=[]; };
@@ -5670,18 +5918,19 @@ in with self; {
   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]; };
-  depmixS4 = derive2 { name="depmixS4"; version="1.3-3"; sha256="0ls30v59hzyd684w4a3aygq1i5m8iq4gxsh8mmjxdq8qx0v84hk2"; depends=[MASS nnet Rsolnp]; };
+  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]; };
   depthTools = derive2 { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
   dequer = derive2 { name="dequer"; version="2.0-1"; sha256="04kzlff8xa733qkkx0gacgig7d4l7yvgqmzva0mj8di12byh214p"; depends=[]; };
   derivmkts = derive2 { name="derivmkts"; version="0.2.3"; sha256="0qw1xdn3mhz9kx4z352hdny2f46p3rx61hjk2ha5bibm8hnyzdpa"; depends=[mnormt testthat]; };
   desc = derive2 { name="desc"; version="1.2.0"; sha256="1s6s13fk6sxwcj8wzkwxl9vr33153xx11p5wi9avqx3rzkabavz6"; depends=[assertthat crayon R6 rprojroot]; };
-  descomponer = derive2 { name="descomponer"; version="1.4"; sha256="12zpkixclm6jmrgzvcy48c1mdqh9dgadzf9026wjyamphxkkjbip"; depends=[taRifx]; };
+  descomponer = derive2 { name="descomponer"; version="1.5"; sha256="1dxnvignd3hwagkghvdiqfrkxlhyvxndprcyh8n9pmq8zgask5qk"; depends=[]; };
   descr = derive2 { name="descr"; version="1.1.4"; sha256="05maviw8l8qhmy7p80gs3dlyy6pqk5k1686ny4xla4psj8mr7lbk"; depends=[xtable]; };
   describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; };
   descriptr = derive2 { name="descriptr"; version="0.4.1"; sha256="1jpcfpidi49lyn02sl0hwsixzln9frrz03vrap1aq0phjcln39hh"; depends=[dplyr forcats ggplot2 magrittr rlang scales shiny tibble tidyr]; };
-  desctable = derive2 { name="desctable"; version="0.1.2"; sha256="135v6gmrvmap71il13i5s0wsxddv8wyqb70ygl05jbmb3n4x61y7"; depends=[dplyr DT htmltools pander purrr]; };
+  descstatsr = derive2 { name="descstatsr"; version="0.1.0"; sha256="1pz5lww1dkkqvsq6h0vkch39bj76qffmmag3zlag5in75s4wj0wl"; depends=[moments zoo]; };
+  desctable = derive2 { name="desctable"; version="0.1.3"; sha256="1bc0xb7v1fnl91vbrh6xbqxnk1yq5ahxchlxb30dvpkjzycdnr4w"; depends=[dplyr DT htmltools pander purrr]; };
   deseasonalize = derive2 { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; };
   desiR = derive2 { name="desiR"; version="1.2.1"; sha256="0ghcv96bbwn74mka4dpf2lkpnlikjn3q6lx2sl8bbw77nriap0n6"; depends=[]; };
   designGG = derive2 { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; };
@@ -5690,7 +5939,7 @@ in with self; {
   desirability = derive2 { name="desirability"; version="2.1"; sha256="094gxvp6a60lfcc0a0gk9rv1p6ajnzq9m58sy8cvhcj5337g4fmk"; depends=[]; };
   desire = derive2 { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; };
   desplot = derive2 { name="desplot"; version="1.4"; sha256="0brmdp095zcwx7gncng1ls972kr67ldwiq081wyafn9jm9z461ix"; depends=[lattice reshape2]; };
-  detect = derive2 { name="detect"; version="0.4-1"; sha256="0hq3imp4w6bd8x4njcfrvcs5lf0vrfnags1zdph86d7hlrwfds62"; depends=[Formula Matrix pbapply]; };
+  detect = derive2 { name="detect"; version="0.4-2"; sha256="03xzv13y2l15afyp00lgvbh51vxg1jaakxjcbnsxzdgb11039x2g"; depends=[Formula Matrix pbapply]; };
   detectRUNS = derive2 { name="detectRUNS"; version="0.9.5"; sha256="0w4pz7waaabgsb47xcmgiz8bzlrs2a83y3v6j7bqb5125y1wn8hw"; depends=[data_table ggplot2 gridExtra iterators itertools plyr Rcpp reshape2]; };
   detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; };
   detpack = derive2 { name="detpack"; version="1.1.1"; sha256="0q7c01bjrvrlbrhb8vhkjw2f43jp46ny3jdyay0j760cfdaqb5zk"; depends=[]; };
@@ -5699,10 +5948,11 @@ in with self; {
   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.7"; sha256="1vmq467a60fz45fwdp0qs51fzdrdyj61vvdlk82046akzs8mvjvy"; depends=[]; };
-  devtools = derive2 { name="devtools"; version="1.13.6"; sha256="1d9n49djydywfyp9w3njgxs5lag4ac7719wmxy1lkgcmn3l9sx5r"; depends=[digest git2r httr jsonlite memoise rstudioapi whisker withr]; };
-  dexter = derive2 { name="dexter"; version="0.8.0"; sha256="1lnhgy3ji6qa9qw0hdv4r8m4igcsasg0fx1kkz8lr80hxdg98zc3"; depends=[colorspace DBI dbplyr dplyr DT fastmatch purrr RColorBrewer rlang rprintf RSQLite shiny shinyBS shinydashboard tibble tidyr]; };
-  dextergui = derive2 { name="dextergui"; version="0.1.3"; sha256="0k0dvsb5vvbhw2x57kgsifpiv9jrglapxzillj0nglg8i71wwypg"; 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]; };
+  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]; };
   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]; };
@@ -5713,27 +5963,30 @@ 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.4.1"; sha256="1nmn5ir20wx3qvcf9rvnwnni5kqbn8adhc2354fb5gcvbnxlc7mc"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; };
+  dfpk = derive2 { name="dfpk"; version="3.5.0"; sha256="1jl1ddi7kq1w95gvz3j4a4yxvnjk3ml7vqvb83lqzkb1ms8wlxw3"; 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.0.1"; sha256="18iypbvk805xh0ybwawwvswsp086q2kjj2cmk1yhlq810260j686"; depends=[Matrix]; };
+  dglars = derive2 { name="dglars"; version="2.1.0"; sha256="1miqrsb1k36mcfvwf4i94z7sn3qq6wkikwv3fiyzyd2q7ny9a068"; depends=[Matrix]; };
   dglm = derive2 { name="dglm"; version="1.8.3"; sha256="0vj4vddqcrjzgqsi6zsxm22gj5pa5dm50wcxip4vi8kbwxaahnaj"; depends=[statmod]; };
   dgmb = derive2 { name="dgmb"; version="1.2"; sha256="1r5md917wipx78n63x87fpvsc3h87c68cpacrrs9dhss199p1a5k"; depends=[abind MASS]; };
-  dgo = derive2 { name="dgo"; version="0.2.14"; sha256="0pizzyqgnng3g5g9q2qa5wcwfdl94rz69ah071qx01k03fzayg86"; depends=[assertthat data_table dgodata ggplot2 lubridate R6 rstan survey]; };
+  dgo = derive2 { name="dgo"; version="0.2.15"; sha256="16z3vag1fwsnmynqh0zpwq5qp5ac3xf4787lwqy7asx8qgcc3wmw"; depends=[assertthat data_table dgodata ggplot2 lubridate R6 rstan survey]; };
   dgodata = derive2 { name="dgodata"; version="0.0.2"; sha256="03cyiig8pn7fdkrkrd29cwy5g63bp57bpl9jmdxfi03smngzbz0m"; depends=[]; };
   dgof = derive2 { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; };
   dhga = derive2 { name="dhga"; version="0.1"; sha256="1n48irj53g3kn451ak5ly50wxdn7qmzi2kib8clsvcx2n7mvpgcm"; depends=[VennDiagram]; };
+  dhglm = derive2 { name="dhglm"; version="2.0"; sha256="1918wkylldcdxjggly3a4yh4cv2nkig5bjfx0j79av633hahlg92"; depends=[boot car MASS Matrix sandwich]; };
+  dhh = derive2 { name="dhh"; version="0.0.1"; sha256="00kg2x1was85aq2vr15bak8y5p4mymbs8pbriijlbw64401djmb0"; depends=[]; };
   di = derive2 { name="di"; version="1.1.4"; sha256="1w2gjhyi410z98d8wnhbd69jxm69nz4pmnr4fb09i70a90f53s25"; depends=[scales]; };
   diagis = derive2 { name="diagis"; version="0.1.3-1"; sha256="1cagcr5znhrg4fp96d79ly0z7bs3hhh3zfspclyfc88p2p3qsd96"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; };
   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]; };
   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]; };
   dichromat = derive2 { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; };
   dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; };
-  did = derive2 { name="did"; version="1.0.0"; sha256="0fgwassb8m92iij78f045fl8441f1x9dhf4hnc93wl16yv5hh7g7"; depends=[BMisc formula_tools ggplot2 gridExtra knitr MASS pbapply]; };
+  did = derive2 { name="did"; version="1.2.0"; sha256="18x8h50zph7xahqd2d9q1269ch8lgzcl5lflhl7860v3yk947zpa"; depends=[BMisc ggplot2 gridExtra knitr MASS pbapply]; };
   didrooRFM = derive2 { name="didrooRFM"; version="1.0.0"; sha256="12clfnbm56jwldw0afb0nb0argnd97mx7369jiywhxy0p4xqibqq"; depends=[dplyr]; };
   dief = derive2 { name="dief"; version="1.1"; sha256="0x3dwlfi130wmbsmm8vf66qxqn001b07yaiq6mp1s707dnl131mc"; depends=[flux fmsb ggplot2 plyr]; };
   dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; };
@@ -5746,20 +5999,20 @@ in with self; {
   diffMeanVar = derive2 { name="diffMeanVar"; version="0.0.6"; sha256="0zivbd22hp0biy4vnjh21f4djfg5bl9az0wlhn47rk7fw65rgipb"; depends=[Biobase lawstat MASS methylumi missMethyl]; };
   diffMeshGP = derive2 { name="diffMeshGP"; version="0.1.0"; sha256="1dc37hxh3fi27gw11kij57j78p87bza77s82niagdv6dqhldj5a4"; depends=[]; };
   diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; };
-  diffdf = derive2 { name="diffdf"; version="1.0.0"; sha256="1qb27pkjs9bapwgqlb1kablcz54hs4cg0mmf2sisl1b8q4j68q96"; depends=[tibble]; };
-  diffeR = derive2 { name="diffeR"; version="0.0-4"; sha256="08g21h3yq8rm2i6ah364nfadg7hnghc21jnpi5aqwzqyd2v93b67"; depends=[ggplot2 raster rgdal]; };
+  diffdf = derive2 { name="diffdf"; version="1.0.1"; sha256="05kl841h9lcirp874g7ny1xjijd1dpdqxwyzwwqwpcvibf69pprm"; depends=[tibble]; };
+  diffeR = derive2 { name="diffeR"; version="0.0-5"; sha256="1r1klvi83qp5xaxna3l2v48zjj5ngfcrq535m1crnmsjj4iwqilv"; depends=[ggplot2 raster reshape2 rgdal]; };
   diffee = derive2 { name="diffee"; version="1.1.0"; sha256="01lb1prz70mxgymhhsvx48kbfy69xyyaabsmfhf28af9wfb89662"; depends=[igraph pcaPP]; };
   diffeqr = derive2 { name="diffeqr"; version="0.1.1"; sha256="1zvjl2i38nyhk63bncqc5cva1m40sm692w7a36qc455s2jnskfh8"; depends=[JuliaCall stringr]; };
-  diffobj = derive2 { name="diffobj"; version="0.1.10"; sha256="1y3fijswy9fw7q9xdv8cz9vm279av2hlzwbq8fc8lffwrbfl1zs1"; depends=[crayon]; };
+  diffobj = derive2 { name="diffobj"; version="0.1.11"; sha256="1aqdb4q3zixf2xg9q0387vp2xrmfwl7h5j5wnlr0mxwbxv8423ly"; depends=[crayon]; };
   diffpriv = derive2 { name="diffpriv"; version="0.4.2"; sha256="12q2v93369bshid83rsy1csbr9ay6rfpd8zdxm12zi7py3f9sjs8"; depends=[gsl]; };
   diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; };
   diffractometry = derive2 { name="diffractometry"; version="0.1-10"; sha256="09mkqg6avky26c2dsnhpcmby76hfqg0pwmnjhkbp4px2k6c9inrc"; depends=[]; };
   diffrprojects = derive2 { name="diffrprojects"; version="0.1.14"; sha256="1mnqf5zs1w8dx9y5iwn4blyzb9j60ayzc04zxj5l8804nd527n25"; depends=[dplyr hellno magrittr R6 Rcpp RSQLite rtext stringb stringdist]; };
   diffrprojectswidget = derive2 { name="diffrprojectswidget"; version="0.1.5"; sha256="1h69mc1wayi80vz4b9cqydylf4kp9mxsigv05r0f903pqakdrzcw"; depends=[diffrprojects dplyr hellno htmlwidgets jsonlite magrittr tidyr]; };
   diffusion = derive2 { name="diffusion"; version="0.2.7"; sha256="1j9s9vw5sc4k956bk4yp3bf4fnp7lhhkwcvlzvsh1w4dyaj8l35h"; depends=[dfoptim nloptr systemfit]; };
-  diffusionMap = derive2 { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[igraph Matrix scatterplot3d]; };
+  diffusionMap = derive2 { name="diffusionMap"; version="1.1-0.1"; sha256="11l4kbciawvli5nlsi4qaf8afmgk5xgqiqpdyhvaqri5mx0zhk5j"; depends=[igraph Matrix scatterplot3d]; };
   diffusr = derive2 { name="diffusr"; version="0.1.4"; sha256="1f3h387kblw1xzdnxphwgfl1n7f6i07kk7kfslvbfxkalbish6ii"; depends=[igraph Rcpp RcppEigen]; };
-  digest = derive2 { name="digest"; version="0.6.15"; sha256="1ia4ak956gnn0f5aqhwgam6g9z6f1y57zz8jv45jc8h79yxp8bl8"; depends=[]; };
+  digest = derive2 { name="digest"; version="0.6.18"; sha256="0k3iv0r8wy8w7zchmgrnrqv3bc149075j4817kf0q521vi4f6vbj"; depends=[]; };
   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]; };
@@ -5767,13 +6020,15 @@ in with self; {
   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]; };
+  dint = derive2 { name="dint"; version="2.0.0"; sha256="1rrkf1j7vdnxskmjzh41shwxmcy624qrhipfpdvp76ijf1hf32vk"; depends=[]; };
   diptest = derive2 { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; };
   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]; };
   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.1"; sha256="0vq3g42xy97ksgsghhz232spkbkr2zs8i9nm7xwdabysi9fgqdsv"; depends=[functional mgcv mvtnorm]; };
+  discSurv = derive2 { name="discSurv"; version="1.3.4"; sha256="0xawvadgy5lkzhk60kb4ga1gh4niqpr9p6wxgrp88mbwp7q600kl"; depends=[functional mgcv mvtnorm]; };
   discgolf = derive2 { name="discgolf"; version="0.2.0"; sha256="07clh1awnibgrh7vl4a51r8dbya2rbmicm8v8x8mq8h8am2b3j0s"; depends=[crul jsonlite xml2]; };
   disclap = derive2 { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; };
   disclapmix = derive2 { name="disclapmix"; version="1.7"; sha256="11qkk5bl5x3axyfdzm1hw522g643mmvk5qg7g3sc3licfvsn32i1"; depends=[cluster disclap MASS Rcpp RcppProgress]; };
@@ -5784,10 +6039,10 @@ in with self; {
   discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.5"; sha256="1q4g455jjg293yxdwdppw04ah15idk5j233x2kbqv0jni4v0l2bf"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; };
   discretization = derive2 { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; };
   discrimARTs = derive2 { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; };
-  diseasemapping = derive2 { name="diseasemapping"; version="1.4.2"; sha256="065ndvpx3q9ycxfjl1f2iy3s23d7qf27s1qz31ppx0n929jynn6n"; depends=[sp]; };
+  diseasemapping = derive2 { name="diseasemapping"; version="1.4.6"; sha256="16y2w8qjq442qdbqlrg3s2mn53rlcipl22m3q168gda5klm4f7sl"; depends=[sp]; };
   diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; };
   dismo = derive2 { name="dismo"; version="1.1-4"; sha256="1j4pzbyvn8msi3k2y79nc6pqlrald46168ibznjwrr6rdiqhy4gj"; depends=[raster sp]; };
-  dispRity = derive2 { name="dispRity"; version="1.0.3"; sha256="1swix45fcr0hn21pvy2dwsnbr60bvsdjk8vwh432p0s69c372m3l"; depends=[ade4 ape geiger geometry geoscale paleotree phangorn phyclust vegan]; };
+  dispRity = derive2 { name="dispRity"; version="1.2"; sha256="1dihcb5smsjl57562vnm9w63izbzl22vr0ky5far66cxz0y6di2k"; depends=[ade4 ape geiger geometry geoscale mnormt paleotree phangorn phyclust vegan]; };
   disparityfilter = derive2 { name="disparityfilter"; version="2.2.3"; sha256="0dkk3qws631mf0g02di5rsrvh5954cykysyri0g8aqgik0j9dg06"; depends=[igraph]; };
   displayHTS = derive2 { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; };
   dispmod = derive2 { name="dispmod"; version="1.2"; sha256="16r6is0pchzc9mxpz0c44f72j76vsh3j9damalcxajrha06dkdq4"; depends=[]; };
@@ -5795,119 +6050,126 @@ in with self; {
   dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; };
   dissever = derive2 { name="dissever"; version="0.2-3"; sha256="1lgs5nmv3lpm4gsryxvcwiwibvvg9flv23q8maisp77x49c18qcp"; depends=[boot caret dplyr foreach magrittr plyr raster sp viridis]; };
   distance_sample_size = derive2 { name="distance.sample.size"; version="0.0"; sha256="0hlf3kp34rg1gnkxp4k3rnv0shv4fpgb0rhx3a6x5692lhyigbcs"; depends=[MASS]; };
-  distances = derive2 { name="distances"; version="0.1.2"; sha256="17872h4jw6cgdk40vczjlygnays2v0wdh64mz5isk7zkvqs0x1ld"; depends=[]; };
+  distances = derive2 { name="distances"; version="0.1.4"; sha256="0axh75s0l478nlgd2sd1nxbmpx0iw1wi5aaa6b24hy1v3bizazbn"; depends=[]; };
   distcomp = derive2 { name="distcomp"; version="1.0-1"; sha256="0f69bxw52ai39dmkmfvrs0lbibcgmv6n849xa9xgd2jm5mvbc58f"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
   distcrete = derive2 { name="distcrete"; version="1.0.3"; sha256="0sa6z2mpmk51ig1r7bmpbyv2jd8z6z7mixki2vlq1kybg8cx3wmi"; depends=[]; };
+  distdichoR = derive2 { name="distdichoR"; version="0.1-1"; sha256="0v19m3n1jgipg65yrv75rm4v27b5aq58cbsmbp7lxvfxmj5ra328"; depends=[boot emmeans nlme sn]; };
   distdrawr = derive2 { name="distdrawr"; version="0.1.3"; sha256="1c8wznfml8k5gwyanfg7rqr22a96xx8rgm7f4z3bv5gsgsbps49y"; depends=[]; };
   distfree_cr = derive2 { name="distfree.cr"; version="1.5.1"; sha256="0h7cywxnasxmqnl9f2f9wp4viwvv72hjx2drr78prqy3nn3lvqwx"; depends=[]; };
   distillery = derive2 { name="distillery"; version="1.0-4"; sha256="1m0pgmlvk7bsb6q3kxagnq422babk61sf73naavac68v8x2q8fix"; depends=[]; };
+  disto = derive2 { name="disto"; version="0.2.0"; sha256="09pafy8y1ifgglqmal32dy34acx06ypsq2bgwsn6fjiqr9kw401j"; depends=[assertthat broom dplyr factoextra fastcluster fastmatch ggplot2 pbapply proxy tidyr]; };
   distory = derive2 { name="distory"; version="1.4.3"; sha256="1mszk8fv1z46d7y1q37mhq9b5yk39w2i9rq6mgdf03afdslrmrip"; depends=[ape]; };
-  distr = derive2 { name="distr"; version="2.6.2"; sha256="1x118v7ycw33mkwy9frw38yn7a6ihghpssz6r2nj5766ab93i89s"; depends=[MASS sfsmisc startupmsg SweaveListingUtils]; };
-  distrDoc = derive2 { name="distrDoc"; version="2.6"; sha256="19yjns5cv2jp551kbld30xmdzljxr0lj5gps0lxfv8d7mrj09kf7"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg SweaveListingUtils]; };
-  distrEllipse = derive2 { name="distrEllipse"; version="2.6.2"; sha256="1rhpnwsml7vs2nkn4q4203fi0qwfc4pxgva0b4z30zzhywb0p3hg"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; };
-  distrEx = derive2 { name="distrEx"; version="2.6.1"; sha256="088a7pvkpndwdg22gmh6ypi5s2fw2gqc47njlvw5gyxfdm9gcdy5"; depends=[distr startupmsg]; };
-  distrMod = derive2 { name="distrMod"; version="2.6.1"; sha256="1i7b08i8zjv2k4p2j1nlqbyjrcapf52k2my83i75hcrjqdy8r3sv"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; };
-  distrRmetrics = derive2 { name="distrRmetrics"; version="2.6"; sha256="077ryxl6l6fql81nsl7dm16pawsqd0l6ljfpkrnzjab4mljqaxgp"; depends=[distr fBasics fGarch startupmsg]; };
-  distrSim = derive2 { name="distrSim"; version="2.6"; sha256="1kq85ivnw4mplpr2jmc2w19kvk0d1wffz6laypay2j5gyd8fm44x"; depends=[distr setRNG startupmsg]; };
-  distrTEst = derive2 { name="distrTEst"; version="2.6"; sha256="1c0xwpyr5gs89psiflcz5dplsb1g9r651jiqg8nxcqa05r9kyhkr"; depends=[distrSim setRNG startupmsg]; };
+  distr = derive2 { name="distr"; version="2.7.0"; sha256="0z822y1mj8h368k1iclnaviz6m6wgnl97jwgisb8qah98f4dbmwh"; depends=[MASS sfsmisc startupmsg]; };
+  distrDoc = derive2 { name="distrDoc"; version="2.7.1"; sha256="0zbj550lflq0i7i900cb3ybrcik40ahsjz24yf5jnxvx397glsfx"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg]; };
+  distrEllipse = derive2 { name="distrEllipse"; version="2.7.0"; sha256="0k6jicf8411jzyv9hi63qng9mq6bbil2qgwy7lijgvy2dr4d0niw"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; };
+  distrEx = derive2 { name="distrEx"; version="2.7.0"; sha256="0mhf79fxwvy8x261ckfz93z05f2dn8p70hpdzn47xyh7z8dg38gd"; depends=[distr startupmsg]; };
+  distrMod = derive2 { name="distrMod"; version="2.7.0"; sha256="14c2djk3faw4z1b4fgwpk35qfyvix7b5jcaglc9g6rx43f8h81hp"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; };
+  distrRmetrics = derive2 { name="distrRmetrics"; version="2.7.0"; sha256="01z3vm5qfnrp5qd518f7h7dynjjg3am0hrk7zqv8kjzxgsisgnq9"; depends=[distr fBasics fGarch startupmsg]; };
+  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]; };
   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]; };
   divagis = derive2 { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; };
   diveMove = derive2 { name="diveMove"; version="1.4.4"; sha256="0mq3nkcn1w8mry9lda6fkycb1a5qmkyzpckwxbrvsyc5kyyx755c"; depends=[caTools geosphere KernSmooth quantreg uniReg]; };
   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.6.0"; sha256="0j7glxg2sp1x11mlfrl0fciqp9w6jwf2j7s1sxchaw1b2rm0nklm"; depends=[Rcpp RNifti]; };
+  divest = derive2 { name="divest"; version="0.7.1"; sha256="0ih61l7lncs6lzszwshxnnn9wvpac5zfdaamax9hqkz171zq2gnw"; 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.1"; sha256="15vvfvhs715aczb0g1prgvynzx0xcmqvq7ancqcjw89al40zaiyc"; depends=[assertthat dplyr httr jsonlite purrr stringr tibble]; };
+  dkanr = derive2 { name="dkanr"; version="0.1.2"; sha256="1936jhj95cqsa6n8yw7zg8hh8m4ld5ajgwb94r5w5w8lfwdficli"; depends=[assertthat dplyr httr jsonlite purrr stringr tibble]; };
   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]; };
-  dlnm = derive2 { name="dlnm"; version="2.3.4"; sha256="08k9x29iakgnzf4zbj6bgv6i4812mhbgraxm468wvv8ia574dm1m"; depends=[mgcv nlme tsModel]; };
-  dlookr = derive2 { name="dlookr"; version="0.3.0"; sha256="00yxv2wfprqpsjd4c9q330agy1q3iqi4lnqk8xz62bnqizb0v3hm"; depends=[classInt corrplot DMwR dplyr ggplot2 gridExtra kableExtra knitr magrittr mice moments prettydoc purrr randomForest RcmdrMisc RColorBrewer rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; };
-  dlsem = derive2 { name="dlsem"; version="2.3"; sha256="1v7p6d2ylpvq69sbgicznmzsfsv08nivgj6dv6lyw7059anilgkn"; depends=[graph gRbase Rgraphviz]; };
+  dlnm = derive2 { name="dlnm"; version="2.3.6"; sha256="0yh964536zh57pcj6q2b172j57pdk4jzf78281jym81j6qxwf2fb"; depends=[mgcv nlme tsModel]; };
+  dlookr = derive2 { name="dlookr"; version="0.3.2"; sha256="0cm48nzj5zbs2db39w9f2gk9wh813ib48hnfhcbp8f833xd5x72n"; depends=[classInt corrplot dbplyr DMwR dplyr ggplot2 gridExtra kableExtra knitr magrittr mice moments prettydoc purrr randomForest RcmdrMisc RColorBrewer rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; };
+  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.3-1"; sha256="0azask61cmkklly32nbpw9rq03v0g976i7shhvawxj20dh4h1jz9"; depends=[MASS mnormt]; };
+  dma = derive2 { name="dma"; version="1.4-0"; sha256="003snr09hazszwqnvjrbv8vyz6ihgcfcfhrlshg451dddn920615"; depends=[MASS]; };
   dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; };
-  dmm = derive2 { name="dmm"; version="2.1-4"; sha256="0qwgsv128gqapnc2xi3yas51l9d1gylgs6ww0gc3d8mavlhkz4b1"; depends=[MASS Matrix nadiv pls robustbase]; };
+  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]; };
   dmutate = derive2 { name="dmutate"; version="0.1.2"; sha256="06gr49j5jz6ns1zydwsqysgkigi2sbm4hdd2jbb82f05rd9spyf3"; depends=[dplyr MASS]; };
   dna = derive2 { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
-  dnet = derive2 { name="dnet"; version="1.1.3"; sha256="1av4kbcbhpj1ivz6ln26p80z5fd170971mrcy59zm67h6kdi56az"; depends=[graph igraph Matrix Rgraphviz supraHex]; };
+  dnet = derive2 { name="dnet"; version="1.1.4"; sha256="0xccb50a85d9fcxfg0shxf430hzgjyh4qgb3js4sgzi02iagim58"; depends=[graph igraph Matrix Rgraphviz supraHex]; };
   dng = derive2 { name="dng"; version="0.2.1"; sha256="0yi1fs4yvlsy3j128l7s5kwq8mhdd5fr74y2bzj7cjrxi7wgz2hg"; depends=[Rcpp]; };
-  dnr = derive2 { name="dnr"; version="0.3.2"; sha256="0f5xahd86x196mg7c9zrhxj7c8cg7mrnd4nzyr02xcym6cff6vqm"; depends=[arm ergm glmnet igraph network sna]; };
-  doBy = derive2 { name="doBy"; version="4.6-1"; sha256="1y02awzid23bxz8hx6j8pxd6i7jaq8pdw3k60rag8y6m69incrw5"; depends=[dplyr magrittr MASS Matrix plyr]; };
+  dnr = derive2 { name="dnr"; version="0.3.4"; sha256="0hzaa308pppq2cqpb067f3y3nyv1p2xdmgy3dykf90psnn5v011p"; depends=[arm ergm glmnet igraph network sna]; };
+  doBy = derive2 { name="doBy"; version="4.6-2"; sha256="02vbv9nfgywg6lsiialkmfnax5z3rkyb9nr8j9l2cp8xi6ml95mb"; depends=[dplyr magrittr MASS Matrix plyr]; };
   doFuture = derive2 { name="doFuture"; version="0.6.0"; sha256="04pvs2h1ibdbl6cph30rvdn5vzj9afllvh8f0iy64pgy83vls790"; depends=[foreach future iterators]; };
   doMC = derive2 { name="doMC"; version="1.3.5"; sha256="1vfrykvfvsyq12mypd266867ml1dcwc3rj5k9c3wrn5bddcm88kr"; depends=[foreach iterators]; };
   doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; };
-  doParallel = derive2 { name="doParallel"; version="1.0.11"; sha256="0sppgxk3d8mfsrb3cjdyn0mv0s4i7pcy8g8c3cjzbr6k8vmx5jsc"; depends=[foreach iterators]; };
+  doParallel = derive2 { name="doParallel"; version="1.0.14"; sha256="01qjs4iw9f1kgymcypj0m2s4pvgqhxaycpli0fb8lq3dc0vpzfyb"; depends=[foreach iterators]; };
   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=[]; };
   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.4.5"; sha256="1pwng6018ls0hk785bs8yjwpzsqr2pcvzgpavqd9rw19n5lvzhxn"; depends=[stringr]; };
-  docopulae = derive2 { name="docopulae"; version="0.3.5"; sha256="0k69ca3bjjr9q9v43ds3malwxnldizx0lr62286n0h2idqn63kfa"; depends=[]; };
+  docopt = derive2 { name="docopt"; version="0.6.1"; sha256="06zknnd0c5s2y0hbddzdlr3m63ib783izpck6pgz7sjbab5pd068"; depends=[]; };
+  docopulae = derive2 { name="docopulae"; version="0.4.0"; sha256="186mfiy4ygx6spnv7yrm5h0k6nf2g1xhk1l05iij39j5al5d9j21"; depends=[]; };
   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.1"; sha256="1pmms1mrldjqsd2zrmpyxz86xykgq1ld4l4gv9gd1ycd7r8v0f8p"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; };
-  docxtools = derive2 { name="docxtools"; version="0.1.3"; sha256="0c8harmlil1cqg74a0n2b544gghdl71y0qrcx34yk6ky2f8bl4s3"; depends=[dplyr ggplot2 lubridate magrittr pander purrr rlang stringr tidyr]; };
-  docxtractr = derive2 { name="docxtractr"; version="0.2.0"; sha256="197j57ab8x960b1yfq6xp8fwmq51xs04nf0cb16r161h4bcmgs2j"; depends=[dplyr purrr tibble xml2]; };
-  dodgr = derive2 { name="dodgr"; version="0.0.3"; sha256="161qy9iyszpb44v26zn6w4d7c9bw8pg7vwgqcba0k0xc5dnr2wjc"; depends=[igraph magrittr osmdata rbenchmark Rcpp sp]; };
+  document = derive2 { name="document"; version="3.0.2"; sha256="0p5brpqbgcn1v1i51cvkqq3pg6v256d70zpsc48jj5x7f2mfz3jb"; 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]; };
   doex = derive2 { name="doex"; version="1.0.0"; sha256="1d70pb0wxc47z401ya2awjpx0rgipicxgbvkhwinx2mg0jpa8kki"; depends=[]; };
   domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; };
+  doremi = derive2 { name="doremi"; version="0.1.0"; sha256="0qqg0kl806gsidcigwggpx1g5p691b4300dfipiv4cfxp0pl5r1k"; depends=[data_table ggplot2 lme4 lmerTest zoo]; };
   dosresmeta = derive2 { name="dosresmeta"; version="2.0.1"; sha256="0qdalzdk7q4wx3vl5f3i64m8cb7vhi4pqzghar32j0a7l6gla04z"; depends=[mvmeta]; };
   dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; };
-  dotCall64 = derive2 { name="dotCall64"; version="0.9-5.2"; sha256="1jw0kyw95nivjimh25ri9sigqwlvk12kd45ydsh1yggigzc0k23k"; depends=[]; };
+  dotCall64 = derive2 { name="dotCall64"; version="1.0-0"; sha256="1b8p7m3w0m7bp977c6jz74xkd611cxg11j49yza59k5fp338scb9"; depends=[]; };
   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=[]; };
   downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; };
-  downscale = derive2 { name="downscale"; version="2.0-3"; sha256="0jvzvmwhpdr7ygcxky4yl1ldb843hrmnzhmnvl0694mmswwqsf8l"; depends=[cubature minpack_lm raster Rmpfr sp]; };
+  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]; };
-  dpcR = derive2 { name="dpcR"; version="0.4"; sha256="02j7fhhfq7p2wfcnr7rdy65v6dcvdym3nfyps7717p7b429chchc"; depends=[binom chipPCR dgof e1071 evd multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; };
   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]; };
   dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; };
-  dplyr = derive2 { name="dplyr"; version="0.7.6"; sha256="0c43h13s5mr0fklikbbm89gs6z5n66rkjzdv6w3w6kl5af5wr2fl"; depends=[assertthat BH bindrcpp glue magrittr pkgconfig plogr R6 Rcpp rlang tibble tidyselect]; };
+  dplyr = derive2 { name="dplyr"; version="0.7.7"; sha256="196lwck3i3m25jnn1f1nrda9svnjqqi89s0is79gbrphamddnlq5"; 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-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[cluster oro_nifti]; };
+  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]; };
   dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; };
-  dr4pl = derive2 { name="dr4pl"; version="1.1.1"; sha256="1wh7mdns9vxjkfphj2nqllh7q3k3lch5y0b4yzf3j4xrd0wyf2hm"; depends=[ggplot2 Matrix matrixcalc Rdpack tensor]; };
+  dr4pl = derive2 { name="dr4pl"; version="1.1.7.1"; sha256="17w3ls3g57zs0ibgwsh12f7l47yc4sh13b02n61wf7k5yjaql8yr"; 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="5.2.1"; sha256="004rxsxzxyc2738p92p4mk68p88pc5n0dynkffr2pmqk50n3wrq6"; depends=[bindr CodeDepends crayon digest dplyr evaluate formatR fs future future_apply igraph knitr lubridate magrittr pkgconfig purrr R_utils R6 rlang rprojroot storr stringi testthat tibble tidyselect txtq visNetwork withr]; };
+  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]; };
   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=[]; };
   drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; };
-  drfit = derive2 { name="drfit"; version="0.7.1"; sha256="1k2chmhdwd78a5d1pxi3iskzfb4h1fxp51ji72qs73m3i6s2mqpz"; depends=[drc MASS qcc reshape2 RODBC]; };
+  drfit = derive2 { name="drfit"; version="0.7.2"; sha256="03ahzmjzrkdrv36yj6vfg3g5bwn6lb7mlxmli68sixag5h83xq7f"; depends=[DBI drc MASS odbc qcc reshape2]; };
   drgee = derive2 { name="drgee"; version="1.1.6"; sha256="01404mqvkvndn5gybq8dgkfc1cy9wk94p7k7i64h47w3zbkcwsax"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; };
   driftR = derive2 { name="driftR"; version="1.1.0"; sha256="0mvrmwfqg234kk5klhmw7vmf8i0g485xkx5nk73iam16fbzl9y5g"; depends=[dplyr glue janitor lubridate magrittr readr readxl rlang stringr tibble]; };
   drmdel = derive2 { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; };
   dropR = derive2 { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; };
-  droptest = derive2 { name="droptest"; version="0.1.1"; sha256="065cf0rc2jw83nypjcq3nj37kmdwbaq9yglrvcffy9jcdm804kp9"; depends=[data_table]; };
+  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]; };
   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]; };
   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.3.3"; sha256="1bh6n0s171n6r68fsizz2jryjlj0990bn4rbinl2ln8j17r8lgpf"; depends=[ggplot2]; };
+  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]; };
   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=[]; };
   dtables = derive2 { name="dtables"; version="0.2.0"; sha256="0ikgip3p4b7q97b2dshlx0fq09xsk304gfk5prw4rk95w9wck3qs"; depends=[psych]; };
@@ -5919,30 +6181,31 @@ in with self; {
   dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; };
   dtw = derive2 { name="dtw"; version="1.20-1"; sha256="1w301xwizncy5r8v9rwwdxfshydgp3l1pnjla1fjn6n8lx3imjj3"; depends=[proxy]; };
   dtwSat = derive2 { name="dtwSat"; version="0.2.4"; sha256="1yvl64z3dp4qyii4p8phbk1g1l10q9fbickj0xzzvg2q1xmjps91"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer reshape2 rgdal scales snow sp xtable zoo]; };
-  dtwclust = derive2 { name="dtwclust"; version="5.4.1"; sha256="17q48hv2zix8jz7znb5pvwq4mrixdyh1rpzmyvj8g0sz62q0h2xc"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel reshape2 RSpectra shiny shinyjs]; };
-  dub = derive2 { name="dub"; version="0.1.0"; sha256="0sdk8sppjcfx2bsngpngm2446warsnipzzw4yz5z4jpickp52ay0"; depends=[]; };
+  dtwclust = derive2 { name="dtwclust"; version="5.5.1"; sha256="12wz5pzmafq3vzfr5bm6kkqfn2fg9qb7z0c5csn9r1w8ijidsyg4"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel reshape2 RSpectra shiny shinyjs]; };
+  duawranglr = derive2 { name="duawranglr"; version="0.6.3"; sha256="0swvrdwnbyigsvds3s32nw79b245q3cgv7xskjx7qjcpnvzr7x7q"; depends=[digest dplyr haven readr readxl]; };
+  dub = derive2 { name="dub"; version="0.2.0"; sha256="066lzyk44380mf17vx4db4a3a4rs7zl85mj5hjg172khjbqnbixw"; depends=[]; };
   duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; };
   dummies = derive2 { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; };
   dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; };
   dunn_test = derive2 { name="dunn.test"; version="1.3.5"; sha256="0lqwvyl3pyygfc73nf81gzw3zl3w43r7ki0yw2dgrzhkpb2iji4a"; depends=[]; };
   dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; };
   dvmisc = derive2 { name="dvmisc"; version="1.1.2"; sha256="1dy0yykskwhkql19bhzmbwsgv028afc8jh9yqwbczj6f3vpv31zh"; depends=[MASS rbenchmark Rcpp]; };
-  dwapi = derive2 { name="dwapi"; version="0.1.3"; sha256="149v1yjnrdbqjg7cpnanm1jv1dcpzqy264qk5dx8wvw9kdc5h3b8"; depends=[httr jsonlite readr rjson xml2]; };
+  dwapi = derive2 { name="dwapi"; version="0.1.3.1"; sha256="1sz4n8vn7cmlilxzhkm4rdfca0904cbh28n5383p9pr46bdi69q5"; depends=[httr jsonlite readr rjson xml2]; };
   dyads = derive2 { name="dyads"; version="1.1"; sha256="0jlyg4bz3zp4g5ig0swwi72bxaj85wll05h6vishnvmnprpdc96n"; depends=[MASS mvnfast]; };
-  dygraphs = derive2 { name="dygraphs"; version="1.1.1.5"; sha256="0bfpna7gijnfvf40fm4dhb63lf2x6n91d0ym3w936s6xiyc3ah17"; depends=[htmltools htmlwidgets magrittr xts zoo]; };
+  dygraphs = derive2 { name="dygraphs"; version="1.1.1.6"; sha256="022j007mzfa9k2n31yg4aizcsf571vv3jip092h23rqj03rk3ly3"; depends=[htmltools htmlwidgets magrittr xts zoo]; };
   dyn = derive2 { name="dyn"; version="0.2-9.6"; sha256="16fqv9k7yxdgybwzafjkyqm16qpgqz13lcjpi6a1nc8xbzlzh0gb"; depends=[zoo]; };
   dynBiplotGUI = derive2 { name="dynBiplotGUI"; version="1.1.5"; sha256="0fvyn33mzjcc3sis05phc6412y25m406il2wzdfw8caa8dafj0yw"; depends=[tcltk2 tkrplot]; };
   dynCorr = derive2 { name="dynCorr"; version="1.1.0"; sha256="0l5k764j1zhsqpgp0ndihah63hsk3zv9hviixfmh4h3i0sr0q52p"; depends=[lpridge]; };
   dynOmics = derive2 { name="dynOmics"; version="1.2"; sha256="0fsck5wx4rcfckjr6xg0s3a6cvh4881cqzy0af91icqg0p3zjj2l"; depends=[ggplot2 gplots]; };
-  dynRB = derive2 { name="dynRB"; version="0.11"; sha256="0xki395r1biasbpg0dp0daql44zszs2d3sb7q08ypcp529c9v40y"; depends=[caTools corrplot ggplot2 RColorBrewer reshape2 vegan]; };
+  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]; };
   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.5.3"; sha256="1ggz3i4l5p23gkk0mvfgkiv9q8gmnamjyss8kz5i870ymwnxya09"; depends=[boot Rcpp RcppArmadillo survival]; };
+  dynamichazard = derive2 { name="dynamichazard"; version="0.6.1"; sha256="0xwvfpw0djnzi4igim8g32s233f5xf53pskg5w4xwnqja7x6w8v2"; depends=[boot Rcpp RcppArmadillo survival]; };
   dynamo = derive2 { name="dynamo"; version="1.0"; sha256="0arsv686ix7xpca57ayqgifim1q35dl4w2mx7fw8bc0lidapilyp"; depends=[abind glamlasso MortalitySmooth Rcpp RcppArmadillo]; };
   dynatopmodel = derive2 { name="dynatopmodel"; version="1.2.1"; sha256="0lpfhj69bvagqzzg2kjqvn9xx8f93ii34flrrns20z3bxla6gds9"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; };
-  dyncomp = derive2 { name="dyncomp"; version="0.0.1-5"; sha256="1626z5523s4igw55fw97lplfgg9mzf4np8imrarkligslvc5q8ip"; depends=[zoo]; };
+  dyncomp = derive2 { name="dyncomp"; version="0.0.2-1"; sha256="13wp2k8nbgrbrqng2dmgy0ixgidk51wq9y7mv5pdbvdajxdsyh11"; depends=[zoo]; };
   dynetNLAResistance = derive2 { name="dynetNLAResistance"; version="0.1.0"; sha256="018y3m648ni31rlisjfnrx1d10mm48wpxanlnnxxpnqxjcywg2x8"; depends=[doParallel foreach igraph]; };
   dynfrail = derive2 { name="dynfrail"; version="0.5.2"; sha256="1q7ml24j0ycy2bwpa14vl96315ni7x9rfp0qmf36w00mylgc3ry6"; depends=[dplyr magrittr Rcpp RcppArmadillo survival tibble tidyr]; };
   dynia = derive2 { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; };
@@ -5950,29 +6213,29 @@ in with self; {
   dynpanel = derive2 { name="dynpanel"; version="0.1.0"; sha256="073kfl5g4d7v8wd2qnpixqrxbac3cqj35z03ax2zlb8h2afa7j62"; depends=[gtools]; };
   dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; };
   dynprog = derive2 { name="dynprog"; version="0.1.0"; sha256="1rvn2zyhdi60y01zbvfv4him6iz2ljdr7ivkr7m7y7yd1lg547ax"; depends=[rlang]; };
-  dynr = derive2 { name="dynr"; version="0.1.12-5"; sha256="1l9waqwg5mkqy8ipryickrkf141mjpzdvsc4qbw8bq4rkrgykklc"; depends=[ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 xtable]; };
+  dynr = derive2 { name="dynr"; version="0.1.13-4"; sha256="11qs6zj73y8x1pvlnq09f1sapdg9b933a45il0p8w23zj1232205"; depends=[ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 xtable]; };
   dynsbm = derive2 { name="dynsbm"; version="0.5"; sha256="01vi4qzgp25l4wg2ij9pqrn775x4yj9gck0l397nwjg96pa7x2lz"; depends=[RColorBrewer Rcpp riverplot]; };
   dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; };
   dynsurv = derive2 { name="dynsurv"; version="0.3-6"; sha256="12bfv6bykgsyxryydhjs89yvk7akam5gy89mzn1hv4ilrpc5mlmw"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
-  dynutils = derive2 { name="dynutils"; version="0.1.0"; sha256="0fr9gnsafi02ydmp84kv8lq6q4mcf4sg1izgd4h1s1ljvgwq3yqp"; depends=[crayon desc devtools dplyr glue magrittr processx purrr Rcpp stringr testthat tibble tidyr]; };
-  e1071 = derive2 { name="e1071"; version="1.6-8"; sha256="08n6i26nfckjpxjkzi8phhanc3ahsrirkv5rz38y2jcv7ds031pn"; depends=[class]; };
+  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]; };
   eChem = derive2 { name="eChem"; version="1.0.0"; sha256="0wmf204hqd4s5har5l9bkcbrbmbqbb8m11w2aivi2gs98f3hy51p"; depends=[animation plot3D]; };
-  eDMA = derive2 { name="eDMA"; version="1.5-1"; sha256="0yhywv6bfb1pb6rxkw484kf2knnqar407v5khhs023kdjb01iy8q"; depends=[Rcpp RcppArmadillo xts zoo]; };
+  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]; };
-  eLNNpaired = derive2 { name="eLNNpaired"; version="0.2.3"; sha256="08nck2p5npyw264kgcqmgx5rx7c3h9v892f90xlcd1dnb7dqlan3"; depends=[Biobase globaltest GSEAlm iCheck samr]; };
   eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; };
   eNetXplorer = derive2 { name="eNetXplorer"; version="1.0.1"; sha256="196m8cbd95pc8w03n0nxc625mxwpqpcw3lc3cbrvpzaljmfhqn2v"; depends=[calibrate glmnet gplots Matrix progress RColorBrewer]; };
   ePCR = derive2 { name="ePCR"; version="0.9.9-6"; sha256="1q46njiqasrma9vr8p7m9ndwag53aavbg4l7a4shgys3w862m7kc"; depends=[Bolstad2 c060 glmnet hamlet impute MASS Matrix pracma ROCR survival timeROC]; };
-  eRm = derive2 { name="eRm"; version="0.16-1"; sha256="1wyzqhka7k4a4xclicc098zgi0y2fbx4fray144qx1pyaa8p8075"; depends=[lattice MASS Matrix]; };
+  eRm = derive2 { name="eRm"; version="0.16-2"; sha256="0cfd8j8d1x33g77vyc29xd2qjwq7bsqh8c8kvcr02vi1rq3kkvkv"; depends=[lattice MASS Matrix]; };
   eaf = derive2 { name="eaf"; version="1.8"; sha256="1plzvfa2vs3njky7xk9dvic2xapdnzb5iycrksv0qj03ylbh6410"; depends=[modeltools]; };
   earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; };
+  earlygating = derive2 { name="earlygating"; version="1.0"; sha256="0y6xjkh9p8bvanc9p5sycah8v81k85xr8i7vyvjb9g4a64srwhd7"; depends=[betareg doParallel foreach]; };
   earlywarnings = derive2 { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; };
   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.23"; sha256="0mik051b34p66a2ipwi512926wl5r1zdqhdam68cr13sar2c0cbq"; depends=[ca]; };
-  easyDes = derive2 { name="easyDes"; version="3.0"; sha256="1z4ynd1ck2vxsshygjgnhyzg8i41kpnwsfix96nmgwm3861n0phb"; depends=[multcomp PMCMR]; };
+  easyCODA = derive2 { name="easyCODA"; version="0.25"; sha256="079vj7gxbpqcx7jjk6vfv13ng23jglsq1x88i71qvqlqp9vkvs87"; 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=[]; };
@@ -5984,30 +6247,31 @@ in with self; {
   easynls = derive2 { name="easynls"; version="5.0"; sha256="1ma2q4y5dxk6q99v880vqfsgy1fha96j7pi8ch699l0pi6bx0d6c"; depends=[]; };
   easypackages = derive2 { name="easypackages"; version="0.1.0"; sha256="00paxdwz4bw3imqhcsw6hj1h0gmnpishlxcj79n826vhdy23jc4y"; depends=[assertthat devtools]; };
   easypower = derive2 { name="easypower"; version="1.0.1"; sha256="1vf0zv55yf96wjxja6ifdjvgc9nw0jl0hnc1ygyjd8pmwbgdz9bl"; depends=[pwr]; };
-  easyreg = derive2 { name="easyreg"; version="1.0"; sha256="01wpqr2vfa245xln1zmqr1a9bibj0cnx60bw24l1q1li7r13wjyy"; depends=[car nlme]; };
+  easyreg = derive2 { name="easyreg"; version="2.0"; sha256="0qxcrgcc306g4i2wnph94wa7sj06mqxi96cvbpnk9mi46ps0l1kw"; depends=[car nlme]; };
   ebGenotyping = derive2 { name="ebGenotyping"; version="2.0.1"; sha256="1jllzc7kvvckrws8qhgvwy626llyb68sp1davp7swx48sf7rwcxc"; depends=[]; };
   ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; };
-  eba = derive2 { name="eba"; version="1.7-2"; sha256="00hlmnknif9yr4wzw0n1fzkrgbciv7ljc0gkfq34v3vvy3dmdsvq"; depends=[nlme]; };
+  eba = derive2 { name="eba"; version="1.8-0"; sha256="0241l0vf1791vxkahxlf9d2bd1073hyl0nfmccafzaa0k76z369w"; depends=[nlme]; };
   ebal = derive2 { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; };
   ebdbNet = derive2 { name="ebdbNet"; version="1.2.5"; sha256="0kal4sqx12y04696ilwnwkmss4rn16dkbnalgqimz6i4jhz8n23h"; depends=[igraph]; };
-  ebimetagenomics = derive2 { name="ebimetagenomics"; version="0.3"; sha256="1nvdpgq88yf7a89qy896wc1h7afjwj90jdbpm144fn12b2pba0a7"; depends=[breakaway sads vegan]; };
+  ebimetagenomics = derive2 { name="ebimetagenomics"; version="0.6"; sha256="0jaz7l71pnf3i2q83mx0pjqli9sn30a4b9vshcmp70v3h6xdj9wx"; depends=[breakaway sads vegan]; };
   ebmc = derive2 { name="ebmc"; version="1.0.0"; sha256="0v9hkzy8ljddmi6wdjd1jga4ib566ikr1vgrvxba67ka524r6bbp"; depends=[C50 DMwR e1071 pROC randomForest rpart]; };
   ecb = derive2 { name="ecb"; version="0.2"; sha256="17hj4d48j6rran64ajzlgkgz17mab51fa3lz8rm3mw0qhahkjlmc"; depends=[curl httr rsdmx xml2]; };
   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]; };
-  echo_find = derive2 { name="echo.find"; version="1.1.1"; sha256="074qk22dsz29w88ydrwshjzzhrh86wyyjiiwiahq4ns5m64szw7n"; depends=[minpack_lm]; };
+  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]; };
   echogram = derive2 { name="echogram"; version="0.1.1"; sha256="0f93s9f1ghin8129vb3bvsp7jmy2hfrx97p86hci8b2y4f7b83qh"; depends=[geosphere readHAC]; };
-  echor = derive2 { name="echor"; version="0.1.0"; sha256="0242yk02qkcfrivxc3zgaw3awmj4b6ra38h1gg21795yrpzcyv02"; depends=[dplyr httr jsonlite lubridate purrr sf tibble tidyr]; };
+  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]; };
   eclust = derive2 { name="eclust"; version="0.1.0"; sha256="01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428"; depends=[caret data_table dynamicTreeCut magrittr pacman pander stringr WGCNA]; };
-  ecm = derive2 { name="ecm"; version="4.0.0"; sha256="09678l6sh61f51jfpmkk4bkxind8jdn6izw6bizshr1bvk8lapjc"; depends=[car]; };
+  ecm = derive2 { name="ecm"; version="4.3.0"; sha256="0nck8hfiqpkq8wm2jrzxi12aq9pnq58wgaizygdqf2m40bjz47gv"; depends=[car]; };
   eco = derive2 { name="eco"; version="4.0-1"; sha256="08fblbr9qp2v0cp69hy68c18xjqvx0nsnx42n2vd1gc6r7apapj6"; depends=[MASS]; };
   ecodist = derive2 { name="ecodist"; version="2.0.1"; sha256="04piv52b4b9rgv1gy6s3b1lzapc0rqiwp1yi7f8yzgjd9329kc5g"; depends=[]; };
   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.6"; sha256="1izb7ssb5a5r5qky3jzyp2j5p1qlhq7vhl8nhz2xhkiks8xgf4xg"; depends=[bbmle dplyr igraph intergraph MASS Matrix minpack_lm plyr sna spatstat_utils tnet]; };
+  econet = derive2 { name="econet"; version="0.1.7"; sha256="0pvr9bv4ix5xvr0hg61j1iizdi2n5vs8widl91cj1ci90g52dvrk"; 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]; };
@@ -6016,9 +6280,10 @@ in with self; {
   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]; };
   ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; };
-  ecoval = derive2 { name="ecoval"; version="1.2"; sha256="098n31py05f0ram733jdc85ki3fcpjc40yn7wsi7g74jyhdb1qms"; depends=[jpeg rivernet utility]; };
+  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]; };
   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]; };
@@ -6046,11 +6311,11 @@ in with self; {
   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]; };
-  eeptools = derive2 { name="eeptools"; version="1.2.0"; sha256="14cmvshalfvh1zd1gp2dsp42kjxw2pdfixwlk9zvlw7ncx9y83j3"; depends=[arm data_table ggplot2 maptools vcd]; };
+  eeptools = derive2 { name="eeptools"; version="1.2.1"; sha256="0idrwh6khz1sbslx35kmm6f79njam0xl48r3aiy70p2l569rj89h"; depends=[arm data_table ggplot2 maptools vcd]; };
   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.1"; sha256="11kqp0si5jm3ffw7d1kq5b6qwdzwijdp1n2hv8a3fa5vppkp43ws"; depends=[ggplot2 reshape2 seqinr shiny viridis]; };
-  effects = derive2 { name="effects"; version="4.0-2"; sha256="10anvrn5v04i985d06fxv099970vvjllms7iwpbpa488zv5k9b81"; depends=[carData colorspace estimability lattice lme4 nnet survey]; };
+  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]; };
   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=[]; };
@@ -6059,58 +6324,65 @@ in with self; {
   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.0"; sha256="0qlx1wm50zh5mp3bn6lkkq43d19ji2fwa4x0z5f98qhmhxa74lck"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rootSolve rstan StanHeaders testthat]; };
-  egoTERGM = derive2 { name="egoTERGM"; version="1.0.0"; sha256="10q52552srz2s9v3r3k4y8v8jfcb1arirw3mr1p9a5nbixdcnp8z"; depends=[boot btergm ergm GGally Matrix network sna speedglm statnet xergm_common]; };
+  eggCounts = derive2 { name="eggCounts"; version="2.1-1"; sha256="121hmqav8x0d6aqzbz96dv0rdc6mv070v5rvaz13rj17ix5y92yi"; 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.06-02"; sha256="1q0kvgz04d80drvgli1pmra6dcn77swk8z19sj3lkqx3qmgjqn7m"; depends=[dplyr igraph network plyr purrr shiny survey tibble tidyr]; };
-  eha = derive2 { name="eha"; version="2.5.1"; sha256="0www19cc80xg2hi1ibajqnp931gda9pk95cnx976lq1kpxzb2pyl"; depends=[survival]; };
+  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]; };
   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=[]; };
+  eikosograms = derive2 { name="eikosograms"; version="0.1.1"; sha256="13s5wqcc8iwnhn3msrh9dfrvq9bwlby93p9v5wcnrm8m9iskax1s"; depends=[plyr]; };
   eive = derive2 { name="eive"; version="2.3"; sha256="073hwx944db7zxq6yib6yvciaic11k49zl1iqphippcd5ygkad80"; depends=[Rcpp]; };
+  eivtools = derive2 { name="eivtools"; version="0.1-8"; sha256="0ynmrql6dv10m7cwba5mzwlbvp6ab53nzqqvk3ihwyiqzmnnmpk4"; depends=[R2jags]; };
   eiwild = derive2 { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[coda gtools lattice]; };
-  eixport = derive2 { name="eixport"; version="0.3.0"; sha256="1ykv5jqri4zkshawck3lfl6jrzw24k27gwhi02rckzbrg2nb3909"; depends=[ncdf4 raster sf sp]; };
+  eixport = derive2 { name="eixport"; version="0.3.6"; sha256="0wzp7jxs80drp428m6kgx419vzrmiw6spgv9ldrakbfkjjnrzsa6"; depends=[cptcity ncdf4 raster sf sp]; };
   elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; };
   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"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; };
+  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]; };
   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]; };
   elections = derive2 { name="elections"; version="1.0"; sha256="0ig3pd1dw978g2sg4ynzd3p15nk6hx17pxvbxfi5rm131mjdmjdm"; depends=[]; };
   electionsBR = derive2 { name="electionsBR"; version="0.3.0"; sha256="18aq1yz2l2g4cjbmk18n5vl8x8lkp90xwm82l0bg1z1smyv3agan"; depends=[data_table dplyr haven magrittr]; };
-  electoral = derive2 { name="electoral"; version="0.1.0"; sha256="0y4kkxm8vmj4gsan6qyhg28b0b6hgl4fghslk21d8w5w6syln4kh"; depends=[dplyr ineq tibble]; };
+  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]; };
   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=[]; };
   ellipse = derive2 { name="ellipse"; version="0.4.1"; sha256="0g82vc51m3c1k0hnpp2zla6amxxgk2mmkl8ssnsc49jv3599r6hs"; depends=[]; };
-  elliptic = derive2 { name="elliptic"; version="1.3-7"; sha256="1bzd5x0yph76jh59ljl875grm52s8xpnmbgww1jjxx0hgkv7938g"; depends=[MASS]; };
-  elmNNRcpp = derive2 { name="elmNNRcpp"; version="1.0.0"; sha256="0jl5vr2zszsapdvwcwg1m2li20k377jzyzdrz4inirsqfy5zlymq"; depends=[KernelKnn Rcpp RcppArmadillo]; };
+  ellipsis = derive2 { name="ellipsis"; version="0.0.1"; sha256="02mv63ldvlqrcggxidxy5iiikpqia1z4ckjpnd7fjy91lvwy52ka"; depends=[]; };
+  elliptic = derive2 { name="elliptic"; version="1.3-9"; sha256="0gw1klhp9l7xjmwgh43wrvwnvvyz7mbnfjn49hxy3yqsi4fjgnw1"; depends=[MASS]; };
+  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]; };
-  embryogrowth = derive2 { name="embryogrowth"; version="7.4"; sha256="10h80jy391bm1avmh347ly3a1vhlhbpfbhrf39xl7x4nwcckd6bp"; depends=[deSolve HelpersMG numDeriv optimx]; };
+  embed = derive2 { name="embed"; version="0.0.1"; sha256="1xfk0zvs3bw10bipkqzjdgpz20kyrczk7lhsx6wyg6zrc7i3kk9f"; depends=[broom dplyr 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.2"; sha256="135dnc7djxa7kyhaa0rd42m396ccic4mgd5pq4qj8zqgd2swj2aa"; depends=[boot ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 rgeos]; };
+  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]; };
   emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
   emg = derive2 { name="emg"; version="1.0.7"; sha256="1d4l9kcji6ba137f1qqjl763q2fd6bxryxsarc3iwi3mfi2b580m"; depends=[]; };
-  emil = derive2 { name="emil"; version="2.2.8"; sha256="02xjf8ipqr136y3pa375lwpg6h63yvbphhghs9jjxfl2r4fdkvcn"; depends=[data_table dplyr ggplot2 lazyeval magrittr Rcpp tidyr]; };
+  emhawkes = derive2 { name="emhawkes"; version="0.9.0"; sha256="1h6map6w66q91s6g1qr9wfk589cbvva1banqrxzzf29g7ihl15vh"; depends=[maxLik]; };
+  emil = derive2 { name="emil"; version="2.2.10"; sha256="05f0i33rd9pp7kkpry1v1ysgny3bwi712glxlcj6qm4fmi0ciik6"; depends=[data_table dplyr ggplot2 lazyeval magrittr Rcpp tidyr]; };
   emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; };
   emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
-  emmeans = derive2 { name="emmeans"; version="1.2.2"; sha256="1ivrg1lp6cqffgg8hnfpw65zbkms6fbsgbw8nprbzfvfk7rrd8wd"; depends=[estimability mvtnorm plyr xtable]; };
+  emmeans = derive2 { name="emmeans"; version="1.3.0"; sha256="0kdyy4qp332c4yyvp1cnh48h6ks6ffir5rjcv0py0vm3m8c3hh61"; depends=[estimability mvtnorm plyr xtable]; };
   emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
   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=[]; };
   empiricalFDR_DESeq2 = derive2 { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[DESeq2 GenomicRanges]; };
-  emplik = derive2 { name="emplik"; version="1.0-3"; sha256="0b52383m2djdcg9b1a7r10k5pkzljz6dalvbg2gg962ckvpndb11"; depends=[quantreg]; };
-  emplik2 = derive2 { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; };
-  emuR = derive2 { name="emuR"; version="1.0.0"; sha256="19740da4m22v9ys1z8q80khf71fjbaisn1f6whgal7p3cinvkcr3"; depends=[base64enc compare DBI dplyr httpuv jsonlite MASS purrr RCurl readr RSQLite shiny stringr tibble uuid wrassp]; };
+  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]; };
   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=[]; };
@@ -6119,10 +6391,10 @@ in with self; {
   endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; };
   endorse = derive2 { name="endorse"; version="1.6.0"; sha256="1j75sb2di2c092dilbjj5qsvb52h3zmm7wxflf9kg7xw227wq3zw"; depends=[coda]; };
   endtoend = derive2 { name="endtoend"; version="1.0"; sha256="0x8f6h0mznmncqdwvsp2f0x524g5clgvk64qflf373lyn6h1v0ap"; depends=[]; };
-  energy = derive2 { name="energy"; version="1.7-4"; sha256="12skvlridfq4jd5mh0yxl79ps0zi2xnlh4hsdgxad0gm7qky8awd"; depends=[boot Rcpp]; };
+  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]; };
   enetLTS = derive2 { name="enetLTS"; version="0.1.0"; sha256="0lqnhrsg9fnkn8z5crdrajpgavk1knr9z4sbdffpa6q9n8s5pmhr"; depends=[cvTools ggplot2 glmnet reshape robustHD]; };
-  english = derive2 { name="english"; version="1.1-3"; sha256="032yc8ls3i6k5il40k3b0n55n2pj8zkm5kackrvsdsslywhainkw"; depends=[]; };
+  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]; };
   enpls = derive2 { name="enpls"; version="6.0"; sha256="07cwxxxsz2rj6d9dhmbfbv1vmk753ca7yy8ssq8lp4lxz3n4cp6p"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; };
   enrichR = derive2 { name="enrichR"; version="1.0"; sha256="0lfdr45sdyqhvgz8q4qdbk12mpv86d6id665kq6aaslgr8jggfmn"; depends=[httr rjson]; };
@@ -6138,35 +6410,41 @@ 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.3"; sha256="1m97lmgf42ifzafz91g69nnf4q918464xir9cqjjn6ch5i7lvi65"; depends=[fitdistrplus investr modeest sn]; };
+  enveomics_R = derive2 { name="enveomics.R"; version="1.4.1"; sha256="1clq688whspmn4z1rdrhfnjc68p1yphw0myllps3gh148hqxh8mp"; 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]; };
   envirem = derive2 { name="envirem"; version="1.3"; sha256="1axgbjl4wh44vd5r9n9rbxxsi35k806r1kdvrcmmpkzwam6zd2lp"; depends=[raster RSAGA]; };
   envlpaster = derive2 { name="envlpaster"; version="0.1-2"; sha256="11a5n40k1ln5gxxvwq1vh4dhmhifhlm89hkhf36qnhj4bjh3v3y0"; depends=[aster aster2 caTools MASS]; };
+  envnames = derive2 { name="envnames"; version="0.3.0"; sha256="1gssjkpx7ngxpbn05c3c74myp4131wx032cf27gxvsvnqb6nn7j5"; depends=[]; };
   epade = derive2 { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; };
   epandist = derive2 { name="epandist"; version="1.1.1"; sha256="0hxgbjns5bk82rgcmykxifnnxcnqdzmkimkkmpdif64zr5g3gjdg"; depends=[]; };
-  epanet2toolkit = derive2 { name="epanet2toolkit"; version="0.2.1"; sha256="18drz4pi2mqqwp2ji3a8k6mxh04n8yrwggf2p1k7bg3jchgh0kx3"; depends=[]; };
+  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-96"; sha256="0gy2w49mbi9rpxw8bxb5d6i0zddl319ba1wcp24km165h9pvrs9d"; depends=[BiasedUrn survival]; };
+  epiR = derive2 { name="epiR"; version="0.9-97"; sha256="06x502f8pyyigafjb1cyc3d0qbvfk1qj5vy7n30lvz9hvp1rgph2"; depends=[BiasedUrn survival]; };
   epibasix = derive2 { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; 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]; };
+  epimdr = derive2 { name="epimdr"; version="0.6-1"; sha256="1lcl9sk3c958dm225w33kaln76y4x9mkx5y2c9kh8wd0xz891p8v"; depends=[deSolve phaseR polspline shiny]; };
   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]; };
-  episheet = derive2 { name="episheet"; version="0.2.0"; sha256="15c4xbam9b60xkkgmbswj4raln49hk43pxp2l75a7j1wykgkif95"; depends=[dplyr ggplot2 magrittr tidyr]; };
+  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]; };
   epistasis = derive2 { name="epistasis"; version="0.0.1-1"; sha256="0dfh26bs72i01hpxpgpgyiwpmg9mjpib8zynhc5ssxa0skm518wz"; depends=[glasso igraph Matrix tmvtnorm]; };
   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.0"; sha256="1699v13478379waxkjsimxsq92ya2vd98kddvsv0dr7fldwl4png"; depends=[digest distcrete stringi]; };
+  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]; };
   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]; };
+  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.4.0"; sha256="0lh4fw16fb6qisygq8k7yf1cg6gm2yi8fqfsfwlaacb43d12bxzm"; depends=[dplyr magrittr purrr tidyr xml2 xslt]; };
+  epubr = derive2 { name="epubr"; version="0.5.0"; sha256="01ggkwv6l7j7zs70s53vjajfh9i0i7zvajmbqq1ij48b3mrc6y05"; depends=[dplyr magrittr purrr tidyr xml2 xslt]; };
   epxToR = derive2 { name="epxToR"; version="0.3-0"; sha256="0ckz7cvqsdilfkqap88brh4av9zv1fl3ijs4h4vlwwn7qvdcnhay"; depends=[httr XML]; };
   eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; };
   eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
@@ -6174,28 +6452,29 @@ in with self; {
   equalCovs = derive2 { name="equalCovs"; version="1.0"; sha256="18w7panyd6mhdr3x1iz9fkrw7min22rishs4xhkxgxs3nnyglkrn"; depends=[]; };
   equaltestMI = derive2 { name="equaltestMI"; version="0.1.0"; sha256="1zqhgx1x6lqjwqisl3ydb6yqp3jn6x7dgnc57r93v73sjx2j5aiz"; depends=[lavaan]; };
   equate = derive2 { name="equate"; version="2.0.7"; sha256="07cji0z139fk70d4wvrpk5m34fq1pfnqrsw336lgnp5a7zp3jz7n"; depends=[]; };
-  equateIRT = derive2 { name="equateIRT"; version="2.0-5"; sha256="0pkcg2331yaq05sn7164qvw3zqq5jxzh34k0c48zbam240ga94js"; depends=[mirt statmod]; };
+  equateIRT = derive2 { name="equateIRT"; version="2.1.0"; sha256="1g8gs00ralh5zw1fv3xd4c2xrb8gxgb7srcp0hgbpr0f7hw53fjm"; depends=[mirt statmod]; };
   equateMultiple = derive2 { name="equateMultiple"; version="0.0.0"; sha256="0q29bv8bb0c3sprhnkbbpn31phw37dwgk23v5ny4abzvlcgwncdb"; depends=[equateIRT numDeriv Rcpp RcppArmadillo statmod]; };
   equivalence = derive2 { name="equivalence"; version="0.7.2"; sha256="170l5gnk0dkjkfsx7qyrw56ircwsjzz9cvhakgyrqh7bj5734i79"; depends=[boot lattice PairedData]; };
-  erah = derive2 { name="erah"; version="1.0.5"; sha256="00vygdrngbp53wip2x6dni3ygwax309i9si3gyqkxxbbkpv24b7i"; depends=[caTools HiClimR igraph ncdf4 nnls osd quantreg Rcpp signal XML]; };
+  erah = derive2 { name="erah"; version="1.1.0"; sha256="1jp75z9y97v0dr656qqcf3npsijk91x5f2lyiwjy54yrzlf5bxp5"; depends=[igraph ncdf4 nnls quantreg Rcpp signal XML]; };
   erboost = derive2 { name="erboost"; version="1.3"; sha256="09hlpn6mqsmxfrrf7j3iy8ibb2lc4aw7rxy21g3pgqdmd9sbprim"; depends=[lattice]; };
   ercv = derive2 { name="ercv"; version="1.0.0"; sha256="1h0v0gscf1ks1shkdvkn1g8r8x5jsb66a4m7rnpdfwbp2ijh41gp"; depends=[]; };
   erer = derive2 { name="erer"; version="2.5"; sha256="0wgzd7r63d20vghmbilqn1p5033i5p31asya1gzwlipgyfxmqp0b"; depends=[lmtest systemfit tseries urca]; };
-  ergm = derive2 { name="ergm"; version="3.8.0"; sha256="1j4rqgxnwg4hcjg2knw3kvwad97035fxp9dqxx4pz6nlkmcib2js"; depends=[coda lpSolve MASS Matrix network robustbase statnet_common trust]; };
-  ergm_count = derive2 { name="ergm.count"; version="3.2.2"; sha256="1zg07vm5y6n6r687sbdy5hcinsircm4zzkx5w4849s9kwjlnpn0b"; depends=[ergm network statnet_common]; };
-  ergm_ego = derive2 { name="ergm.ego"; version="0.3.0"; sha256="1152g9zz2wach0hbj27knxficvhf062alqa0wpj6nyqj2vsgnchh"; depends=[coda ergm network RColorBrewer statnet_common]; };
-  ergm_graphlets = derive2 { name="ergm.graphlets"; version="1.0.3"; sha256="0xk45ialjckvjs96k19skk7imilcahgyzfwc74h6yand5q3mg6fz"; depends=[ergm network statnet_common]; };
-  ergm_rank = derive2 { name="ergm.rank"; version="1.0.1"; sha256="0k5ffqxn9fspbg82j2cmrcyav3nqjk7cnsq48xwy9i3z3vaq704k"; depends=[ergm network statnet_common]; };
-  ergm_userterms = derive2 { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[ergm network statnet_common]; };
+  ergm = derive2 { name="ergm"; version="3.9.4"; sha256="0bmxha66p6i0sk9csav4wv9v7bz153c7zgwfdd1q8abmiwxpi3al"; depends=[coda dplyr lpSolve MASS Matrix network purrr rlang robustbase statnet_common tibble trust]; };
+  ergm_count = derive2 { name="ergm.count"; version="3.3.0"; sha256="184kxbabrdm8ywmr8pmz34wqyrv6712abggb2pf3mpiv7nblqjz1"; depends=[ergm network statnet_common]; };
+  ergm_ego = derive2 { name="ergm.ego"; version="0.4.0"; sha256="07r0wfx1414d54l5y43axkp1av9ig1bwyxs8011w2grkmxhawavj"; depends=[coda ergm network purrr RColorBrewer rlang statnet_common tibble]; };
+  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.2"; sha256="1rbgp5ba7drghfgcjfg546210m7pknfmgcbk4n68jpy39c267rvn"; depends=[igraph Rdpack stringi stringr]; };
+  erhcv = derive2 { name="erhcv"; version="0.1.3"; sha256="01wrjrcvpavw0yd4vhhyiyjda3m4mrh4dirh1a48bwy10nvfb4x0"; depends=[igraph 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=[]; };
   errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; };
   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.2.1"; sha256="1hf7nqyhyv0n4qn5bzs1gb59fbn6vsiji0va8hpzzw3af0h3dqzy"; depends=[]; };
+  errors = derive2 { name="errors"; version="0.3.0"; sha256="1mdsqnsrrrx0fqpasllv05j2m1ykv6qj8il0647i9sxfqmsijjhk"; depends=[uuid]; };
+  esDesign = derive2 { name="esDesign"; version="1.0.0"; sha256="0d56zg9wvkds4jqrw3gdyz2hgyrhsghky3cbjfkgfba4lzing8zn"; 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]; };
@@ -6204,22 +6483,22 @@ 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]; };
   esreg = derive2 { name="esreg"; version="0.3.1"; sha256="19ikfy0g8yd224ah4gyq2k29lz3gagc6vrcv53awvdadqw0cpz8l"; depends=[quantreg Rcpp RcppArmadillo]; };
-  ess = derive2 { name="ess"; version="0.1.1"; sha256="1i94sfg8r9mnzcmyddq3zb56gwkgqdclyx90a5plpyy5insk13d7"; depends=[haven httr rvest stringr tibble xml2]; };
   essHist = derive2 { name="essHist"; version="1.1.1"; sha256="06wmvwjgbb1bfsjn4bv3p2m0i5nc6shn2p62kjp3iv6z42f5wndc"; depends=[Rcpp]; };
-  essurvey = derive2 { name="essurvey"; version="1.0.1"; sha256="0ks2qx6pzw5g1q6hzaymlcy6slkapw8iajn10gs7l1h5ybdf5w6l"; depends=[haven httr rvest stringr tibble xml2]; };
+  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.8.0"; sha256="0xn1rk5z5n9llg9l55wab2lpcvx3azbrkjrfwi84mc3xk1m24y3p"; depends=[Formula Rcpp RcppEigen rlang]; };
+  estimatr = derive2 { name="estimatr"; version="0.12"; sha256="1xqhbr8dp86vli1da47whl130ljdn8l6h8j1lgsa12dfkz5amj6d"; depends=[Formula 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]; };
   esvis = derive2 { name="esvis"; version="0.2.0"; sha256="0l4c87l9n94q14hwky7d7i4h9c5zh8r04zlcz9w4mx7ixfd34zir"; depends=[sfsmisc]; };
   etable = derive2 { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[Hmisc xtable]; };
   etasFLP = derive2 { name="etasFLP"; version="1.4.0"; sha256="04d526yajakzivlcsz8631p0j482cbbgfpdmzkc9zr1m4495xxif"; depends=[fields mapdata maps rgl]; };
-  ether = derive2 { name="ether"; version="0.1.4"; sha256="1q6qxda5iw8zj7gy9h35apij5mbndd969ddip7zn5d720131kqra"; depends=[dplyr httr jsonlite Rmpfr]; };
+  ether = derive2 { name="ether"; version="0.1.5"; sha256="03skydbw4ch0lhhlm57qgg4q0vyd4rwzsq3v2w40jrczpxpdsn9q"; depends=[dplyr httr jsonlite Rmpfr]; };
   etl = derive2 { name="etl"; version="0.3.7"; sha256="045hkh95ki3s10l9mz4710ws2i9and4rqb0qk1c5sfslglc0riq5"; depends=[DBI downloader dplyr lubridate readr rlang rvest stringr tibble xml2]; };
-  etm = derive2 { name="etm"; version="1.0.3"; sha256="1srbllbmc2l1kcw2zi15sja8g3bkwz8bvy7k8al45dhyz8zdrxra"; depends=[data_table lattice Rcpp RcppArmadillo survival]; };
+  etm = derive2 { name="etm"; version="1.0.4"; sha256="0ws103b3pmli0z4xbyfxkly2wnnnxnnwc0r66qjjqjrlvm7pffl1"; depends=[data_table lattice Rcpp RcppArmadillo survival]; };
   etma = derive2 { name="etma"; version="1.1-1"; sha256="0g9244yx50y1gw0f37hskbcgyv4nldmzr86v3rmf3afabmjbyzjj"; depends=[]; };
   etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; };
   etseed = derive2 { name="etseed"; version="0.1.0"; sha256="1kqbhvryqzmckk91ynn68yd7msqdsl6h818r164180f10flszr37"; depends=[httr jsonlite R6]; };
@@ -6227,10 +6506,10 @@ in with self; {
   eulerr = derive2 { name="eulerr"; version="4.1.0"; sha256="1y4s4g49sy7bkkbadj7a8la86h9yy9lzra5jawy2ig1aa3k81d98"; depends=[GenSA lattice polyclip 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.1"; sha256="1934lzxzs0l96c3bwwy5lpgm8kxrd55hdcmbn4prg2pzzj32wxfv"; depends=[broom classInt curl dplyr httr jsonlite RColorBrewer readr sf sp stringi stringr tibble tidyr]; };
-  eva = derive2 { name="eva"; version="0.2.4"; sha256="03jsiz6bkavwxpgllxaw8czahmm2rh5h8hhk5j7i9clcjx244vvj"; depends=[EnvStats Matrix]; };
-  evaluate = derive2 { name="evaluate"; version="0.10.1"; sha256="070vvmnbdlp7sz2zhza7fhd2a6mlwiln8fn4hyzhsiizbn4n79y9"; depends=[stringr]; };
-  evaluator = derive2 { name="evaluator"; version="0.3.0"; sha256="1dgihzai2p47zjfjb4wnl5rvwahfsxcaqaywdsf039p0g820nr8f"; depends=[dplyr extrafont furrr ggplot2 mc2d purrr readr readxl rlang scales stringi tibble tidyr viridis]; };
+  eurostat = derive2 { name="eurostat"; version="3.2.9"; sha256="0nwsjyhyflsq48kf8w6x3fv2qscqq0pz0dl93s221nbgd94qlyad"; depends=[broom classInt dplyr httr jsonlite RColorBrewer readr sf sp stringi stringr tibble tidyr]; };
+  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]; };
   evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; };
   evclust = derive2 { name="evclust"; version="1.0.3"; sha256="0cd0a8w0ixd9ilcqlxiaql4l2r49qrqnllb9qpg3xgnlxka3yb5m"; depends=[FNN limSolve Matrix R_utils]; };
   evd = derive2 { name="evd"; version="2.3-3"; sha256="1d2r8ppblxrq6s60pf0gv4rp8ja58j8lbpax8a996ais1hpfzi9g"; depends=[]; };
@@ -6239,6 +6518,7 @@ in with self; {
   eventInterval = derive2 { name="eventInterval"; version="1.3"; sha256="0nybzy2mpmazcvz06mkv7l9741mjm3i2q2sindq0777vb2k4504v"; depends=[MASS]; };
   eventdataR = derive2 { name="eventdataR"; version="0.2.0"; sha256="11apbbj68x1kxpwvihf4ng7wxy54jl1aw7r9hyq6gn7h8sk6lpjn"; depends=[]; };
   events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; };
+  evian = derive2 { name="evian"; version="2.0.0"; sha256="18j8yl647xwr02mr0f8v9jwrqm0mr6s2jfhsanl4ggyq2v7nyw1d"; depends=[doParallel foreach ProfileLikelihood sandwich]; };
   evidence = derive2 { name="evidence"; version="0.8.10"; sha256="02kqk95kx4nv13fg6z55a5rv6sq6lv8azg0jjxbkg1j6hg15p7ai"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; };
   evidenceFactors = derive2 { name="evidenceFactors"; version="1.00"; sha256="12wndimbygn7h57f3q0xmxmvqrcdj98f0a58m22z2l0vmym53rhb"; depends=[sensitivitymv]; };
   evir = derive2 { name="evir"; version="1.7-4"; sha256="1h7a7z7v5k33y5hsdfczsri3vpbwspfgazhv4saknv2h11rgfpki"; depends=[]; };
@@ -6246,35 +6526,36 @@ in with self; {
   evobiR = derive2 { name="evobiR"; version="1.1"; sha256="0502xj1gv2g943vfqyllz4sr5z4mixf5vqlqi2v96mymnv9iwsr8"; depends=[ape geiger phytools seqinr shiny]; };
   evolqg = derive2 { name="evolqg"; version="0.2-5"; sha256="11n0gxkxhg1d2ziwbipqvyccgnsrzm3mk4xy2d7nxn662q1yl2ah"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; };
   evolvability = derive2 { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; };
-  evoper = derive2 { name="evoper"; version="0.4.0"; sha256="11l55jj7f4ggwvimvl3d2sv2nyds29bl4dai6ycpgnff7wwdv43g"; depends=[boot deSolve futile_logger ggplot2 plot3D plyr reshape rrepast]; };
+  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]; };
   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]; };
-  exact2x2 = derive2 { name="exact2x2"; version="1.6.2"; sha256="172g6ahgd7j42bjidp6svjl70ws3bz58vb8vxgnalii6awcizkcm"; depends=[exactci ssanv]; };
+  exact2x2 = derive2 { name="exact2x2"; version="1.6.3"; sha256="11ayh6j6jj4p4bns3s2c2nmnigdzr6hpwjp4b2i7qw67kd321agn"; depends=[exactci ssanv]; };
   exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
   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.3.0"; sha256="1z4lw115y5ijjb603rvy63a5gvhgymkq00ak0z6da2y5p6ym5rp3"; depends=[checkmate devtools filesstrings magrittr ore purrr readr roxygen2 rprojroot stringr styler]; };
+  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=[]; };
   excerptr = derive2 { name="excerptr"; version="1.4.1"; sha256="0z5gayf7kkhdg7ad2w4ycar5dd42jdjybrhzfmkqb3xr9pdrnijg"; depends=[git2r rprojroot rPython]; };
-  excursions = derive2 { name="excursions"; version="2.3.3"; sha256="16clwp76hq1q3m7ixjq1rv83vagxyj2fcs4jdsgvl9pzh5syzd3x"; depends=[Matrix sp]; };
+  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]; };
-  exifr = derive2 { name="exifr"; version="0.2.1"; sha256="0969ip7vwhs3r9zwy5l1gqg886yl4gfw8ss2frnq9nmqpn1ib1v2"; depends=[curl dplyr jsonlite purrr tibble]; };
+  exifr = derive2 { name="exifr"; version="0.2.2"; sha256="1na5d28x2s6lgwydfnhjvkya8kwsf4nh894f1inhzchk7g5cj475"; depends=[curl dplyr jsonlite purrr tibble]; };
+  exiftoolr = derive2 { name="exiftoolr"; version="0.1.1"; sha256="0qip3r2vvxj0ax2pf150hmka70yiv9k2vlfj5pxyminri7scvf39"; depends=[curl jsonlite]; };
   exp2flux = derive2 { name="exp2flux"; version="0.1"; sha256="1b3ychb4wcf6dbccx2ddms5xygdgc296cnw4474fm81yrfjznplv"; depends=[gage igraph sybil]; };
   expandFunctions = derive2 { name="expandFunctions"; version="0.1.0"; sha256="0661l4ab0xhjidmh8ycvymhp3wgxafm7nd1c59bfpxhyhz76n1p4"; depends=[glmnet orthopolynom plyr polynom]; };
   expands = derive2 { name="expands"; version="2.1.2"; sha256="15r5wld63kwk3kcl5x09dj0n1mgcl076lcjsmf0vbh10x4n0avrk"; depends=[ape commonsMath flexclust flexmix gplots matlab moments NbClust plyr RColorBrewer rJava]; };
   experiment = derive2 { name="experiment"; version="1.1-4"; sha256="08d9m72l6n2ygy5x8aakzv3n71ybqy1i8yzv55f7r4w1kk4pbk5i"; depends=[boot MASS]; };
   expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; };
   expint = derive2 { name="expint"; version="0.1-5"; sha256="12ki8j17p070kq2mdzzai755wy1n6kvinax0ldd63kynij9n0gdh"; depends=[]; };
-  explor = derive2 { name="explor"; version="0.3.3"; sha256="1b3swb7ikp2ik3300ljg2rll5gka4l4lfg95bqbgap3ph4dclv7y"; depends=[dplyr DT ggplot2 highr scatterD3 shiny tidyr]; };
+  explor = derive2 { name="explor"; version="0.3.4"; sha256="1gdahxglpk7wyf89ixqaqw95rzac4kii2qyxkk3b26hg5chfnd7k"; depends=[dplyr DT ggplot2 highr scatterD3 shiny tidyr]; };
   exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; };
-  expm = derive2 { name="expm"; version="0.999-2"; sha256="1mihl67kvv1xv0figp25jkmwfn4iwkcx15cng2348y8gm6zybw9q"; depends=[Matrix]; };
+  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]; };
   expp = derive2 { name="expp"; version="1.2.2"; sha256="0xr24xzplgamj8dkjk9n9jmrbyw056z57hkm9h4j43g63vxrinlj"; depends=[deldir rgeos sp spatstat spdep]; };
-  exprso = derive2 { name="exprso"; version="0.3.6"; sha256="0df3c79iscgrdj14d82vibsxz85zb99j55b3r6jw0zqs5czd8rhd"; depends=[cluster e1071 frbs gtools kernlab lattice MASS nnet plyr randomForest ROCR rpart sampling]; };
+  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]; };
   exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
@@ -6287,14 +6568,15 @@ in with self; {
   extfunnel = derive2 { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; };
   extlasso = derive2 { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; };
   extraBinomial = derive2 { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; };
-  extraDistr = derive2 { name="extraDistr"; version="1.8.9"; sha256="1fg8vjpal33y51iqzglk1yvy46d7js0l0wfbdy698lq8a06hq19p"; depends=[Rcpp]; };
+  extraDistr = derive2 { name="extraDistr"; version="1.8.10"; sha256="00lvqp5bb3iak5myiz4rqm887bkq9sdh7aybmz84mmfni6q01m28"; depends=[Rcpp]; };
   extraTrees = derive2 { name="extraTrees"; version="1.0.5"; sha256="1rvvp2p9j8ih8fid1n17606pa23bjg3i2659w1l6w0jkb1p23zcx"; depends=[rJava]; };
-  extracat = derive2 { name="extracat"; version="1.7-5"; sha256="1jj3mkn7s0m4dhnbrqhhxx6k2macmjjrmd7v7rqb5wivj5g7b89v"; depends=[colorspace data_table ggplot2 hexbin plyr reshape2 scales TSP]; };
+  extracat = derive2 { name="extracat"; version="1.7-6"; sha256="1a4ppfr9lsr1hlbf6m47sm8kflq8rp2khp1vc9xmnr9jxlwz3l2d"; depends=[colorspace data_table ggplot2 hexbin plyr reshape2 scales TSP]; };
   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=[]; };
   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]; };
@@ -6314,7 +6596,7 @@ in with self; {
   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]; };
   fCopulae = derive2 { name="fCopulae"; version="3042.82"; sha256="10wknqrrs5j63v7qnp5qmk85688r36vli4r99i49y2i2nv10yp5r"; depends=[fBasics fMultivar timeDate timeSeries]; };
-  fDMA = derive2 { name="fDMA"; version="2.2.3.1"; sha256="0lkidcc9r3psngdn60wk5zk6k32qxgklcrk23jhf88qnrfqbasw4"; depends=[doParallel foreach forecast gplots iterators MSwM png psych Rcpp RcppArmadillo tseries xts zoo]; };
+  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]; };
   fExpressCertificates = derive2 { name="fExpressCertificates"; version="1.2"; sha256="1r4qkhf7alasbwjz910b0x4dlzm72af06kv7v2vwyzvf3byn21c5"; depends=[fCertificates Matrix mvtnorm tmvtnorm]; };
   fExtremes = derive2 { name="fExtremes"; version="3042.82"; sha256="1n0afql4csgsqf7j9x2v8yxncvpknms643l9knm0fqb4pdbaw58c"; depends=[fBasics fGarch timeDate timeSeries]; };
@@ -6330,7 +6612,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=[]; };
-  fabricatr = derive2 { name="fabricatr"; version="0.4.0"; sha256="0z04n2n44anpci8m4m5hs83nwhiczil7lkg8glcgngrdh994k8hc"; depends=[rlang]; };
+  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]; };
   facerec = derive2 { name="facerec"; version="0.1.0"; sha256="1dipcnxjz6yd34w0jrrvj5p0pwdgz1l5m9zvri7mflnz7g34gmaj"; depends=[dplyr httr jsonlite knitr magrittr rlang snakecase stringr]; };
@@ -6346,7 +6628,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.2.0"; sha256="1acd404fl0bc6xsal39vgx4j5jdqa24csn15cmw26yach7dxrm87"; depends=[callr igraph MakefileR withr]; };
+  fakemake = derive2 { name="fakemake"; version="1.3.0"; sha256="1w2zrx5imkmcd9aikis2r54k2g9g6l0q7n3d18vjbk02js3f4jv4"; depends=[callr igraph MakefileR 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]; };
@@ -6356,16 +6638,17 @@ in with self; {
   fancycut = derive2 { name="fancycut"; version="0.1.2"; sha256="1xg5qjxf77g10h07x6rvb8c3klc9gbr77bkw352qpas268pkswl2"; depends=[]; };
   fanovaGraph = derive2 { name="fanovaGraph"; version="1.4.8"; sha256="1da7yskh2gn4arrrnalkl3izqyyrm0yf0il4v2izs7di7qlw3m6v"; depends=[DiceKriging igraph sensitivity]; };
   fanplot = derive2 { name="fanplot"; version="3.4.1"; sha256="1xj1hdz3i9c9wdx7ryiqag69khh3544v4474ilxxiyahxg2r6m45"; depends=[]; };
-  fansi = derive2 { name="fansi"; version="0.2.3"; sha256="1jcnzl8qdav5niv52xa1r8jp5c4wsnhsddjlnrc2ss76pzwgwvfv"; depends=[]; };
+  fansi = derive2 { name="fansi"; version="0.4.0"; sha256="02f2rx7v7wz6w97m2slwky2i5y8f9iafycmkyr3siy3z3k8fj171"; depends=[]; };
   faoutlier = derive2 { name="faoutlier"; version="0.7.2"; sha256="0h2azbkxpz03qjmq558mh7dkpv87vbvminvg69wqsx21m6hdl5r3"; depends=[lattice lavaan MASS mirt mvtnorm pbapply sem]; };
   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]; };
   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]; };
   fastDummies = derive2 { name="fastDummies"; version="1.2.0"; sha256="0w7764b64isvlimly06i46hk1rspd3bjrqi2f2gafcwz5lk2jc3s"; depends=[data_table tibble]; };
-  fastGHQuad = derive2 { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp]; };
+  fastGHQuad = derive2 { name="fastGHQuad"; version="1.0"; sha256="1rjia8wggadr9xwxcmzmal0rc4g6pa3dr5888fbbnb6abl8b2lrj"; depends=[Rcpp]; };
   fastGraph = derive2 { name="fastGraph"; version="1.1"; sha256="1vbi5yssnh8hcbmrq1r437vpvj8hqd3vc8wmcy0nbyvnmyjaxkvb"; depends=[]; };
   fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; };
   fastICA = derive2 { name="fastICA"; version="1.2-1"; sha256="108z2ymby5y4h8l4l2krqwm28rya93gq09yylgilnm3afvfrfabg"; depends=[]; };
@@ -6373,7 +6656,7 @@ in with self; {
   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]; };
   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.1.0"; sha256="145gkz777zx80bxx1zwwj4diswl6yf2v02wgfpy3rvk2q225f1id"; depends=[dplyr ggplot2 lattice maxLik miscTools mosaic numDeriv]; };
+  fastR2 = derive2 { name="fastR2"; version="1.2.1"; sha256="15mqsdy79zvd4srrszdjp0kh9lfcq3yxp7j5d4xcqbjbwsgy68il"; depends=[dplyr ggplot2 lattice maxLik miscTools mosaic numDeriv]; };
   fastSOM = derive2 { name="fastSOM"; version="1.0.0"; sha256="1x4kxys7mxlxz7cfbjig44za8m8p19xgzcs5y2wn9320sx8b0wc0"; depends=[]; };
   fastTextR = derive2 { name="fastTextR"; version="1.0"; sha256="0l0f9jvsa68a3vd6mwbhsqd12729nd6nwsnlzrhsg9wj9rx8kpmi"; depends=[Rcpp]; };
   fasta = derive2 { name="fasta"; version="0.1.0"; sha256="0wnppxn3039dj58xm0b66fsyq537bk8k8m56im11xj1iwc3zc6vw"; depends=[]; };
@@ -6382,11 +6665,12 @@ in with self; {
   fastcmh = derive2 { name="fastcmh"; version="0.2.7"; sha256="0hib3r3pkfdi67bdy4pf1pw6869vq4b3pg1pq1zwpyy76nbnq9vl"; depends=[bindata Rcpp]; };
   fastcox = derive2 { name="fastcox"; version="1.1.3"; sha256="0jn19v6mkwgyz8x63xrfgkgnf0f2rq338r5qkhz690mdzr4c47a3"; depends=[Matrix]; };
   fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; };
+  fasterElasticNet = derive2 { name="fasterElasticNet"; version="1.1.2"; sha256="1hr0wc6s6zpq1hkfgshf0dqjxb7s2849bb8lb04nmi6p42r3628g"; depends=[Rcpp RcppArmadillo]; };
   fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; };
   fasterize = derive2 { name="fasterize"; version="1.0.0"; sha256="0q8n1r5n06yr6vmnwrdajx8923646bzm7ywgn2f0zxl214plf56s"; depends=[raster Rcpp RcppArmadillo sp]; };
   fastmaRching = derive2 { name="fastmaRching"; version="1.1.0"; sha256="085xr5i6h6vwl1flzbkwqsm8d815s0p02p0mir60jqjvy0s7haip"; depends=[raster rgdal sp]; };
   fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; };
-  fastnet = derive2 { name="fastnet"; version="0.1.5"; sha256="0l14ahrk4p5ils5rqwkj25f7xxhjqxpibgcy942c6pyc33rbsbcl"; depends=[doParallel foreach igraph tidygraph]; };
+  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]; };
   fastrtext = derive2 { name="fastrtext"; version="0.2.5"; sha256="0zbd2sxzarxic90d2pkbn7fak5gyb81b180m91f784smb3sx1p1j"; depends=[assertthat Rcpp]; };
@@ -6399,13 +6683,14 @@ in with self; {
   fbar = derive2 { name="fbar"; version="0.4.3"; sha256="1raq8ak01gcnmcsaa3fdfqi40d67v7nfjr212jzvq7wp2qk3j10i"; 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]; };
   fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; };
-  fclust = derive2 { name="fclust"; version="1.1.3"; sha256="1wpdvpfama90x8rj5yv54q7k318ad4y6pi33vsyh0rsb3fdrkqkr"; depends=[]; };
+  fclust = derive2 { name="fclust"; version="2.0.2"; sha256="032iqrnsbs2ckhlxw9gnsqxpxj38hqnrlq46k11rvyf5zlpnci99"; depends=[MASS Rcpp RcppArmadillo]; };
   fcm = derive2 { name="fcm"; version="0.1.3"; sha256="1mqk6szczsixdvw0inkypij4cw2syng5l5ccw0xk55kc21l1lzn0"; depends=[ggplot2 reshape2]; };
   fcr = derive2 { name="fcr"; version="1.0"; sha256="17jrz5zp1msd2khl1lwnb5sgxcigagni556rhn7qm9g0aykbh8yj"; depends=[face fields mgcv]; };
   fcros = derive2 { name="fcros"; version="1.5.6"; sha256="0n1zbzl6g9k3smdpgyb3xsa2w8ir4bdagv7w644x1jck5rd0xn2j"; depends=[]; };
   fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; };
-  fdANOVA = derive2 { name="fdANOVA"; version="0.1.1"; sha256="16i0mnbxyjbw06havl277c6vi7mq5rak9cjzp8c2zvr8cakalkg4"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; };
+  fdANOVA = derive2 { name="fdANOVA"; version="0.1.2"; sha256="1pycq5a4czqzi8wcfmlc9ncg827j7n0qxyj90wcv39nbcrnl3da1"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; };
   fda = derive2 { name="fda"; version="2.4.8"; sha256="0n39rzbhg1hipzn51rzmbchn2358qgapg08iv7lmiqj5y7i9qns2"; depends=[Matrix]; };
   fda_usc = derive2 { name="fda.usc"; version="1.4.0"; sha256="0gp19c5lxp0g4690vdr0gpw89rl9v3l6872mf7hr8nsyyd6776vn"; depends=[fda MASS mgcv nlme rpart]; };
   fdaMixed = derive2 { name="fdaMixed"; version="0.5"; sha256="1k2b3z2jj37j6njvxalg8640zlcvi1cm7wkcwp0pia21wydz75ip"; depends=[Formula Rcpp RcppArmadillo]; };
@@ -6416,7 +6701,6 @@ 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.2"; sha256="1iyplxm6niywfhmdnliy9nvvax1w6sijar8gpsj853cdfvn6kz5m"; 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=[]; };
@@ -6431,14 +6715,15 @@ in with self; {
   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]; };
+  fedregs = derive2 { name="fedregs"; version="0.1.0"; sha256="1ydkw1090n8kw26d89wrzs86xq47mahdj41pgf8x1m292xcffvjm"; depends=[dplyr httr magrittr purrr rvest stringi tidytext xml2]; };
   fedreporter = derive2 { name="fedreporter"; version="0.2.1"; sha256="18hs358iyxmbh28jy9f65zvanpr6bk4gq75qbj255y1zzdsjr9x1"; depends=[httr jsonlite]; };
   feedeR = derive2 { name="feedeR"; version="0.0.7"; sha256="08mnfi96qkr1fj53ywqmya957swcwrfd3hqk0qaf2ni96sxxnp98"; depends=[digest dplyr lubridate RCurl XML]; };
   fence = derive2 { name="fence"; version="1.0"; sha256="18l3fliww60d9n9hbfdny5vr9mi78krwpjj5sypdsb77d6332h9q"; depends=[fields ggplot2 lme4 MASS sae snow snowfall]; };
-  fergm = derive2 { name="fergm"; version="0.2.1"; sha256="14asdvr98nh6rayqff9xda54w95bjg4g2f72a21rhyc932d7589g"; depends=[ergm extrafont ggplot2 matrixStats network reshape2 rstan statnet stringr]; };
+  fergm = derive2 { name="fergm"; version="1.1.4"; sha256="1d979z2m5f13i1w9d8kh9rnaafavsap169w0nycpd5j2f3dfhyn7"; depends=[ergm extrafont ggplot2 matrixStats network reshape2 rstan]; };
   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.3"; sha256="1nz97bndxxkzp8rq6va8ff5ky9vkaib1jybm6j852awwb3n9had5"; depends=[bit fastmatch ff]; };
+  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=[]; };
   ffstream = derive2 { name="ffstream"; version="0.1.6"; sha256="036ikhah4y85khgfmvxwsn3vavvw1is8i9k2lw474wxlh4cxa3kd"; depends=[Rcpp]; };
   fftw = derive2 { name="fftw"; version="1.0-4"; sha256="0172kpxzjx8239r2jbcqqbpcpqygrxk36a2kmh00f73mrq0kjhc0"; depends=[]; };
@@ -6447,28 +6732,30 @@ in with self; {
   fgof = derive2 { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; };
   fgpt = derive2 { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; };
   fgui = derive2 { name="fgui"; version="1.0-8"; sha256="024fzd1c7iwqprn26hwjb9l2qlvvyzl449d7iixy0x69djwsrysv"; depends=[]; };
+  fieldRS = derive2 { name="fieldRS"; version="0.1.1"; sha256="1zyi1qnyn9wi2rcf1d512dyrlkws2adp2wamzbrcbcgv8l4kysz7"; depends=[caret ggplot2 raster rgeos sp spatialEco]; };
   fields = derive2 { name="fields"; version="9.6"; sha256="1v7z48a8jmdcil28rj8c3455k6rssr5v9qi6dyhhpbb193bj8121"; depends=[maps spam]; };
-  fiery = derive2 { name="fiery"; version="1.1.0"; sha256="0251vfr7b8r4xjgcf8gyh1ddj0lj73fl0pim0k3vpzva5wmwigs1"; depends=[assertthat crayon desc future glue httpuv later R6 reqres stringi uuid]; };
-  fiftystater = derive2 { name="fiftystater"; version="1.0.1"; sha256="1nri9vsqif03xrmm3g5llasqm49hj169mgv046f2l0mh9vp0fqpc"; depends=[]; };
+  fiery = derive2 { name="fiery"; version="1.1.1"; sha256="07cfrzajr5knmz5ngczkdd2kzjfdnn1y4b0z73daxwhk4dq8j6ji"; depends=[assertthat crayon future glue httpuv later R6 reqres stringi uuid]; };
   filehash = derive2 { name="filehash"; version="2.4-1"; sha256="1x7an7rsy5pz2qr86m511rsv297vacxwk3y1a71754yq739qgq6h"; depends=[]; };
   filehashSQLite = derive2 { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[DBI filehash RSQLite]; };
-  filelock = derive2 { name="filelock"; version="1.0.1"; sha256="11mmq296zg62gnxjk7dyr866kihihmsjpfg6bcc7hv6ivh4812nn"; depends=[]; };
+  filelock = derive2 { name="filelock"; version="1.0.2"; sha256="00ql5fw1hidpfnm0szaavf43ahmsnvdbi8i5lr1nrcc90yaiaadc"; depends=[]; };
   filematrix = derive2 { name="filematrix"; version="1.3"; sha256="1v3aj1ng742msb0sfdnjsbqb508mqjf8jlq2v33vxldhradw5w0b"; depends=[]; };
   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.5.0"; sha256="04axsnk1912h1i6b2qp9cxxs5jd1vkwgxzg2kjw43gnm36a7188w"; depends=[checkmate magrittr matrixStats ore purrr Rcpp rlang stringr tibble]; };
-  filling = derive2 { name="filling"; version="0.1.0"; sha256="0avlfl06nd8wn76ydii09ng2fqp92d4n9v2y5vg16m3my58l0srd"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; };
-  finalfit = derive2 { name="finalfit"; version="0.7.8"; sha256="1jkmagr512h5vvlqyszi6zihpzbmam571bgks5js0d3wbhjs9j38"; depends=[ggplot2 gridExtra Hmisc lme4 magrittr mice plyr pROC scales stringr survival survminer]; };
+  filesstrings = derive2 { name="filesstrings"; version="2.7.0"; sha256="02v565in9sw1j01wyqmi3y42l1rgqqrkmfis808nh2lsgf6l1a0f"; 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]; };
   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=[]; };
   findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; };
-  fingerPro = derive2 { name="fingerPro"; version="1.0"; sha256="17r23x8cdllr8slk56dsmrwc4ns69b3cqy59mxxbsjnhjl3di6x8"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL reshape rgl scales]; };
+  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.8"; sha256="168z59y2mqz53qhzavzynh6y11d453dd6j5928ahg6x24hjz6d4w"; depends=[curl dplyr DT httr jsonlite miniUI purrr readr shiny shinycssloaders]; };
+  fingertipsR = derive2 { name="fingertipsR"; version="0.1.9"; sha256="1sg2rsk41nxvwy7brikh685gqg5i5d9x2jralgap69qcpmy30gpv"; 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]; };
+  firebehavioR = derive2 { name="firebehavioR"; version="0.1.1"; sha256="1hf7j9nqqa2i92y73c1yniw6lgmjrl8fag9r4xnkd8vpiw453ck4"; depends=[ggplot2]; };
   fishMod = derive2 { name="fishMod"; version="0.29"; sha256="0pbs4z27vwa3c42xdw3mr6l2i581bgvn2pk52kawbcnnlsff92ar"; depends=[]; };
   fishdata = derive2 { name="fishdata"; version="0.1.3"; sha256="04162m1j570cdwhffkwjs1x1qlsc20djj1jwx2hl2cqmbp584ppq"; depends=[]; };
   fisheyeR = derive2 { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; };
@@ -6478,18 +6765,18 @@ in with self; {
   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=[]; };
-  fitODBOD = derive2 { name="fitODBOD"; version="1.1.0"; sha256="15ylldlq12mrw06pzww54hsl8nb9krs5w1cgh037km9sndsswvji"; depends=[hypergeo]; };
+  fitODBOD = derive2 { name="fitODBOD"; version="1.2.0"; sha256="00wdpvccb1xf69ry5x9aqwiid4srpibpl640fbn1xxy3gcr5vpwn"; depends=[hypergeo]; };
   fitPoly = derive2 { name="fitPoly"; version="3.0.0"; sha256="0ws1vsh8if9i9i7820ak32b0bysjc0z09nbrk17qpms0b11cpc3g"; depends=[foreach]; };
   fitTetra = derive2 { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
   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-9"; sha256="18x9454g598d54763k3hvi33iszifk7sxvhd1zg5r8z1vpixx3z6"; depends=[MASS survival]; };
+  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]; };
   fitteR = derive2 { name="fitteR"; version="0.1.0"; sha256="1kgnyl7am966vkfap8gmvchlpankrcj5dv5aj7ws8ix9shr76db6"; depends=[dplyr DT maxLik R_utils shiny]; };
-  fitur = derive2 { name="fitur"; version="0.5.25"; sha256="0f33c4mg0257s9c0qldryihaq8p3y07j2nwghjpqhi3rv4mrg2xf"; depends=[actuar e1071 fitdistrplus ggplot2]; };
+  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=[]; };
   fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; };
-  fixerapi = derive2 { name="fixerapi"; version="0.1.5"; sha256="0mp492n75wh8ws85gh5q9bbq709a78z14pipc8vjxk0fizhxwwdc"; depends=[jsonlite tibble tidyr]; };
+  fixerapi = derive2 { name="fixerapi"; version="0.1.6"; sha256="0ikf8dn0l9c9gshp4bph3wasl0bh6lfybinc8n1rvb202231hmgb"; depends=[jsonlite tibble tidyr]; };
   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]; };
@@ -6498,22 +6785,22 @@ in with self; {
   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=[]; };
   flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; };
-  flatxml = derive2 { name="flatxml"; version="0.0.1"; sha256="0rg6khx6sgxhmvh3j8m1ady8bya2904n3maynb7393rp9s8jvb9p"; depends=[RCurl xml2]; };
-  flexCWM = derive2 { name="flexCWM"; version="1.8"; sha256="0x6rmag3gdlph1xd1xbnfxxzl4rmp4z7zsvagbcwbri21ia29s14"; depends=[ContaminatedMixt mclust numDeriv statmod]; };
+  flatxml = derive2 { name="flatxml"; version="0.0.2"; sha256="1f7pc3chzimkg23490qvppy63sk4ds3aaahc36sa4dc4qmhabyms"; depends=[RCurl xml2]; };
+  flexCWM = derive2 { name="flexCWM"; version="1.9"; sha256="02afmg7d008mfgja7pqxk0fdgmgqk9vq7xy13ijancg6fm3x8prk"; depends=[ContaminatedMixt mclust numDeriv statmod]; };
   flexPM = derive2 { name="flexPM"; version="2.0"; sha256="0h3qs9w9pc2nc24q1diz7j3s93y40ijpmgq2l0xg9mzcgjz9kz8c"; depends=[survival]; };
-  flexclust = derive2 { name="flexclust"; version="1.3-5"; sha256="19ihdhmhaglccqpvrpc51367gkfafg4jdpabbk0j6mh2n16hi511"; depends=[lattice modeltools]; };
+  flexclust = derive2 { name="flexclust"; version="1.4-0"; sha256="0x7wxk8y46ndyz6fdacym0rd6p9wh3pcfr28chjcg5d7fm849zl2"; depends=[class lattice modeltools]; };
   flexdashboard = derive2 { name="flexdashboard"; version="0.5.1.1"; sha256="0fy3nbrr67zqgd44r2mc850s5sp0hzfcw3zqs15m8kxzj1aw067x"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; };
   flexmet = derive2 { name="flexmet"; version="1.0.0.0"; sha256="0xhr4i46s3k7a4yz2sd1sphn8wz27xcl580s2kqkr1ifg8941kv8"; depends=[]; };
   flexmix = derive2 { name="flexmix"; version="2.3-14"; sha256="0sl4zxh1sb2sr5q7svjw9ihrm219jzn82yrc9d43q6r1b8bpyz43"; depends=[lattice modeltools nnet]; };
   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.4"; sha256="12f33szyxf4b7ipz4j9sli6miwkjq2309rpinaxmnsqsafd1zn3b"; depends=[gdtools htmltools knitr officer R6 rmarkdown stringr]; };
-  flifo = derive2 { name="flifo"; version="0.1.4"; sha256="1yilfnblarimc8mlvvwsgib5sxcfgvgsvgpyzddxb39g6fb7lffs"; depends=[bazar pryr]; };
-  flip = derive2 { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[cherry e1071 Rcpp RcppArmadillo someMTP]; };
+  flextable = derive2 { name="flextable"; version="0.4.5"; sha256="09j2y0z7rkc0w1cl9pp1cpk6fnzzfr6245mxa3ca42z9k2cy2jfl"; 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.1"; sha256="0jb9im2p3x20y356av749mni3cka2byhv7glz7qhdmsdryrdizh7"; depends=[]; };
-  float = derive2 { name="float"; version="0.1-1"; sha256="0bzwc48l4wijrxz3swrp720q9jsa74qwv6s8zpigbnjkspsqy3vi"; depends=[]; };
+  flipscores = derive2 { name="flipscores"; version="0.2"; sha256="0b55qxdrn6m0pbk4aj9zr1d9s7id6pclsaz939p48jmqx07zayjg"; depends=[]; };
+  float = derive2 { name="float"; version="0.2-0"; sha256="14kkd724knd7v1wdl6qy88izk94qa1rb9cfd8myqa3va582fc5zj"; depends=[]; };
   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]; };
@@ -6525,7 +6812,7 @@ in with self; {
   flsa = derive2 { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; };
   fluoSurv = derive2 { name="fluoSurv"; version="1.0.0"; sha256="1dv4lf7k28bih2qqkpy15f7d14ibxk48p3z6sj3dj5yvh25mhv81"; depends=[]; };
   flux = derive2 { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; };
-  fluxweb = derive2 { name="fluxweb"; version="0.1.1"; sha256="0y05syshj3njzhqjpgs02ils4pzw6vfvny3nng0l9pdp55015b9g"; depends=[]; };
+  fluxweb = derive2 { name="fluxweb"; version="0.2.0"; sha256="1ssq90fqm4p0j4g171mx208lmgz3hkxs8hgsffkawpmxgacs0gh1"; depends=[]; };
   fma = derive2 { name="fma"; version="2.3"; sha256="1z7shh9ng3q7ax22cwg86y79jzz5gbchdny2rppzzm0lkvvyy5pm"; depends=[forecast]; };
   fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; };
   fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; };
@@ -6538,7 +6825,6 @@ in with self; {
   foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; };
   focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; };
   foghorn = derive2 { name="foghorn"; version="1.0.2"; sha256="17bng0fxjqrlni11vwmghimk0h38mlyjyxizrbs1fycb8khlqh94"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; };
-  fold = derive2 { name="fold"; version="0.2.6"; sha256="09w157h1r1sgay37240v0f1a5ra97nra7fn4im4v69avpl34yxd2"; depends=[csv dplyr encode lattice lazyeval magrittr metaplot rlang spec tidyr]; };
   fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; };
   fontHind = derive2 { name="fontHind"; version="0.1.1"; sha256="0qz3bj8vdy6jayy84p3vyxfwqll4v4qlklwq9wl981ii2k7g0vxf"; depends=[extrafont ggplot2 hrbrthemes]; };
   fontLiberation = derive2 { name="fontLiberation"; version="0.1.0"; sha256="1w1rl0g4ayyp8lwppmz9yzj9cizg7i50g07216jkm1q5w0is9pmc"; depends=[]; };
@@ -6549,34 +6835,38 @@ in with self; {
   foolbox = derive2 { name="foolbox"; version="0.1.0"; sha256="1wqswfsanak9p0hpgbblva4b90pamlq1hcjf4xzwd3awjicsp56y"; depends=[magrittr rlang]; };
   forams = derive2 { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; };
   forcats = derive2 { name="forcats"; version="0.3.0"; sha256="0mxn1hng43zdjh1v8shd80hrszrqahcpaqxs1s1sif0qxh84d0cm"; depends=[magrittr rlang tibble]; };
-  foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.2"; sha256="1wr99jq8a0cbc7n5sdzr0gwnxsv8sjqy1x1lrazxswyj49xc06i4"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; };
+  foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.6"; sha256="0vz80p227fvw18rrar5d1ikz42j47jsly0h1wmiy9gww14rcnncd"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; };
   foreach = derive2 { name="foreach"; version="1.4.4"; sha256="0j2yj0rn0d5nbzz9nq5rqqgnxhp9pbd92q4klsarl2xpsn8119y0"; depends=[codetools iterators]; };
   forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; };
   forecast = derive2 { name="forecast"; version="8.4"; sha256="13qq25b4r4fl18yl1wb441pqk98yqhi2gidy6si1kxgifq1xyp39"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca uroot zoo]; };
-  forecastHybrid = derive2 { name="forecastHybrid"; version="2.2.12"; sha256="0qvn7qn5ddpiql1464rnhn7dlp015szj0v2bbs4i5v88flp831wv"; depends=[doParallel foreach forecast ggplot2 zoo]; };
+  forecastHybrid = derive2 { name="forecastHybrid"; version="3.0.14"; sha256="0n97lw1hhi9qkdp37nn66b073v0sn67i4d1aqx0rwwqz6643sqib"; depends=[doParallel foreach forecast ggplot2 zoo]; };
   forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.2-0"; sha256="1rnf2a7sri52sm976iicab660qk07pmz8jmd3q71dg4hmc30yf9j"; depends=[Rcpp]; };
-  foreign = derive2 { name="foreign"; version="0.8-70"; sha256="11mql8q3i1q593dvd351fhvkvfab25li80d1ahl4xjjzy52qdkc6"; depends=[]; };
+  foreign = derive2 { name="foreign"; version="0.8-71"; sha256="1mv04w3ycz0ymsszn8aa87k6k5sb8mg8lhf1b8w4zpfrphpkkliv"; depends=[]; };
   forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; };
   forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
-  forestControl = derive2 { name="forestControl"; version="0.1.1"; sha256="0qfj4qf0d1bb1wllhpg9r8gvg353zdqv7py9a3hm33yhs3l5x0g5"; depends=[Rcpp]; };
+  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]; };
   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]; };
   forestplot = derive2 { name="forestplot"; version="1.7.2"; sha256="1cqk0fwpbn4an6xn28kpvqmcp3mgv8isg8dy755sv5fkqzzjz1dg"; depends=[checkmate magrittr]; };
   forestr = derive2 { name="forestr"; version="1.0.1"; sha256="0m26x7ngl89ngk1qhg50npmwli2npmjs9pfb9rg5hmx4fzr8k63i"; depends=[dplyr ggplot2 plyr]; };
+  forge = derive2 { name="forge"; version="0.1.0"; sha256="13s0fd3wknx824spw18jdiciglb7mjxdycbbsjm68989ic6nfcpi"; depends=[rlang]; };
   formatR = derive2 { name="formatR"; version="1.5"; sha256="19sd23vgs4ac0fwlw40j3676k6mramb0ajlq8hdw23kjwdx1jk47"; depends=[]; };
   formattable = derive2 { name="formattable"; version="0.2.0.1"; sha256="1s7jjgm0j24vdwm39933ygh6xnxcfvzy4kl2mmfgas4czfcmd4rf"; depends=[htmltools htmlwidgets knitr rmarkdown]; };
   formula_tools = derive2 { name="formula.tools"; version="1.7.1"; sha256="15d3ikfmsh9zszfgfkrxb3jkipl41inm7n6bhs73kwlnklnygq2g"; depends=[operator_tools]; };
   formulize = derive2 { name="formulize"; version="0.1.0"; sha256="1fz8q48z4zvfglxzmmjznb7lcfrrfqmnws85jfkihs3ff43h7ccc"; depends=[recipes rlang]; };
   fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; };
+  forward = derive2 { name="forward"; version="1.0.4"; sha256="0qhssp8mymy5wgzfkp1xa8s81j803g0ckg647ind6ms26320hq0x"; depends=[MASS]; };
   forwards = derive2 { name="forwards"; version="0.1.0"; sha256="0pb101gdf2a4plalhhm34aixkss3lzfg8yj6yfi0d6khjmaza33i"; depends=[]; };
   fossil = derive2 { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; };
   fourPNO = derive2 { name="fourPNO"; version="1.0.4"; sha256="08l359fj39sdbq48qk05805kv25rw1wq93db0b7rvsi3iyi2lngk"; depends=[Rcpp RcppArmadillo]; };
   fourierin = derive2 { name="fourierin"; version="0.2.2"; sha256="0hy033bzybdc214z10wnbqph5f83fsr13admnzwb1d2drpbljnc8"; depends=[Rcpp RcppArmadillo]; };
   fpCompare = derive2 { name="fpCompare"; version="0.2.2"; sha256="10a87bpbpvrbrpyfx7ygyr9b7wd3fp79nd4g2ggl1gz3b1daqgxq"; depends=[]; };
   fpa = derive2 { name="fpa"; version="1.0"; sha256="0kgpl9qq0l10h0vdd2f8vnir0kdylh1jvvv5z4d9ygj1pl9qywhk"; depends=[fields reshape]; };
-  fpc = derive2 { name="fpc"; version="2.1-11"; sha256="04alsqb5gbhsjg1000d8w52pmpnlwca29r0s12f7n7mdccdv6xar"; depends=[class cluster diptest flexmix kernlab MASS mclust mvtnorm prabclus robustbase trimcluster]; };
+  fpc = derive2 { name="fpc"; version="2.1-11.1"; sha256="1ari57hkgqsxh6khr6j52cfrzc0096cnn1q7ghxk2z4brdd4rznc"; depends=[class cluster diptest flexmix kernlab MASS mclust mvtnorm prabclus robustbase trimcluster]; };
   fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; };
+  fpeek = derive2 { name="fpeek"; version="0.1.0"; sha256="0cx5ycpnk4c0q3qqn8miz0mxbz2v5cpzvl7fh2fzfig05qsvfx31"; depends=[Rcpp]; };
   fpest = derive2 { name="fpest"; version="0.1.1"; sha256="013r8295spm02j558aqvnrnbkg2g73gl5vi4lqzngbw8yr8qlkri"; depends=[]; };
   fpmoutliers = derive2 { name="fpmoutliers"; version="0.1.0"; sha256="108bp3smk9jnckd5237xly4ywmal03rq1kidq5z61l6zrhc3yfh9"; depends=[arules doParallel foreach Matrix pmml pryr R_utils XML]; };
   fpow = derive2 { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; };
@@ -6591,23 +6881,26 @@ in with self; {
   fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; };
   fragilityindex = derive2 { name="fragilityindex"; version="0.1.0"; sha256="06f7w0ff8mmydgylz5a0z29fc78spvmay3sjq0rz9k44w4bb9z3q"; depends=[pbapply stringr survival]; };
   frailtyEM = derive2 { name="frailtyEM"; version="0.8.8"; sha256="0mfhhb025wzwvch5bcvvfsljki34xahdkqli7lvqbhhihba00r1p"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; };
-  frailtySurv = derive2 { name="frailtySurv"; version="1.3.4"; sha256="0nsrgkfr726hkf2x3df0jgb35b6siaq7jhydzddjf4az8d08akvw"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; };
-  frailtypack = derive2 { name="frailtypack"; version="2.12.6"; sha256="0w2v5ik4ryvl5hph9cwxcrrglwpqbyirfrayyw9g0l1wdc1mfvi4"; depends=[boot MASS nlme statmod survC1 survival]; };
+  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]; };
   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]; };
   frbs = derive2 { name="frbs"; version="3.1-0"; sha256="0ngvi7lg6aviwic8f4ya03khyzh3ksglpmsnrdjjznwj874y2wim"; depends=[]; };
-  freegroup = derive2 { name="freegroup"; version="1.0"; sha256="1x0n3mjm37b83lxa0bcylbrn1c0sdvl54mz317a8g2y2ydk7h3zi"; depends=[magrittr]; };
+  fredr = derive2 { name="fredr"; version="1.0.0"; sha256="1hv51m0ihdpb73rp2gwj2q2xpjzlqpf9p3xzqdmy9nhwpfbj14nh"; depends=[httr jsonlite rlang tibble]; };
+  freegroup = derive2 { name="freegroup"; version="1.1-0"; sha256="0ssshs2d6l2ip1xx9x581w0cdnd2459a1mh360ybwajkjgak2ci6"; depends=[magic magrittr plyr]; };
   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.1.0"; sha256="0hz9wnn1pi09v4azi02ai7hh4iwml90pdrs329y3p8qzxmvry56b"; depends=[fontquiver]; };
+  freetypeharfbuzz = derive2 { name="freetypeharfbuzz"; version="0.2.4"; sha256="1wilz554dx4glgm8nzd5gzbi6ja6gynmj3fx61s1sqas1jnby1gh"; 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]; };
   freqparcoord = derive2 { name="freqparcoord"; version="1.0.1"; sha256="011p8xh0i0x0w5rv5qz5a7fxwdhxd8l2bqi9bxv5almxd0y7ajqx"; depends=[FNN GGally ggplot2 mvtnorm]; };
   frequencies = derive2 { name="frequencies"; version="0.1.1"; sha256="0d52kf4r13n59990xhra9i6gfvs4sn7ix54d0c0g56p1rj7hnh79"; depends=[dplyr]; };
-  frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.2.0"; sha256="02ha5jfkjaxyfp7x1h0xx32ijha2dh7h52z687a9y9azrqvjv0jp"; depends=[knitr pbapply urca vars]; };
+  frequency = derive2 { name="frequency"; version="0.3.1"; sha256="0m3vgcwldl7zv0nwdwfz80qanibmfp8j5iv79kydhrmzzr04rbf5"; depends=[DT ggplot2 gtools knitr rmarkdown]; };
+  frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.2.1"; sha256="006cb7x65if7md5w6w90nacdmg39pv7dc8zxvchc52kmfzlps0ds"; depends=[knitr pbapply urca vars]; };
   freqweights = derive2 { name="freqweights"; version="1.0.4"; sha256="1iy2vzv4wc2883yq8r31wpspa7gm7cd4wkgvbh7mwafll463zni2"; depends=[biglm data_table dplyr FactoMineR fastcluster plyr]; };
   frite = derive2 { name="frite"; version="0.1.0"; sha256="0qi03m8n05hx0ghh12zqrjvsqhyir4q9qmxb657d4vzajmih0bhn"; depends=[assertthat magrittr purrr stringr tictoc]; };
   frm = derive2 { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; };
@@ -6618,7 +6911,7 @@ in with self; {
   frontier = derive2 { name="frontier"; version="1.1-2"; sha256="1vpjd57cc6niwqibhz1ib46zj57d5a9m40yaq7kr9awk9di65ryz"; depends=[Formula lmtest micEcon miscTools moments plm]; };
   frontiles = derive2 { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; };
   frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; };
-  fs = derive2 { name="fs"; version="1.2.3"; sha256="1kbdz8hl96b2gs5vrfnwzgimn8qf8gk6ggicr7jylxzp21zzsry5"; depends=[Rcpp]; };
+  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]; };
   fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; };
@@ -6628,30 +6921,31 @@ in with self; {
   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"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[BH zoo]; };
-  ftsa = derive2 { name="ftsa"; version="4.8"; sha256="1qwz3mk9dnf44016dy2dgpq0ivs2wzi5kq24jw3lbkgdjig2h6f5"; depends=[colorspace fda forecast MASS pcaPP rainbow sde]; };
+  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]; };
   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.0.1"; sha256="08pwasz1rpnnq81mvaldjiqv79wbvw5ma89skk95h0k2pbahblka"; depends=[aRxiv crminer crul data_table hoardr httr jsonlite magrittr microdemic pdftools rcrossref rentrez rplos storr tibble whisker xml2]; };
+  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=[]; };
-  funData = derive2 { name="funData"; version="1.2"; sha256="0y3ar26d6hxc4bg263qjqfb92ivhkphzizhz91wrzbfxha9dcrzz"; depends=[abind fields foreach]; };
+  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.0"; sha256="0bd58pdsg9036vk54fayvzr6il56bamrvn5vhqc3g92papp9jlm8"; depends=[fda MASS]; };
-  funModeling = derive2 { name="funModeling"; version="1.6.7"; sha256="0blanw0aw7qvcs6a8ryaqvi322gaz65g6flijkbssf681im9pmjr"; depends=[dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales]; };
+  funHDDC = derive2 { name="funHDDC"; version="2.2.0"; sha256="1s4k6wvs6x88c7whw0bkb3pfhp8wqcmzlsv8div9df0i2fisf3zr"; depends=[fda MASS]; };
+  funLBM = derive2 { name="funLBM"; version="1.0"; sha256="0krx5v1lakrrxk0j249k7sr7c6r40yg1l8l10laf4444j2qn8rjp"; depends=[fda funFEM]; };
+  funModeling = derive2 { name="funModeling"; version="1.6.8"; sha256="16kivxwxds4lmhag2y17bsjpfp08ms17w4n5wznmlvpa3sc7qp1z"; depends=[dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales]; };
   funbarRF = derive2 { name="funbarRF"; version="1.0.1"; sha256="05smi717j4zhbrfqjyvx1rzckygigg1x8c6kb3brbpv8w33gcvx7"; depends=[BioSeqClass Biostrings bold randomForest]; };
   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="0.9.0"; sha256="1b6ckqi2sqg324309l0mqcjpqy5idmm71s30axflr5bcrhxkkiz3"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; };
-  fungible = derive2 { name="fungible"; version="1.5"; sha256="1f4q26rfl7d35ng5nx11mzzv9fhk4zg62j63c59i649wcx1xsan9"; depends=[e1071 lattice MASS mvtnorm nleqslv R2Cuba stringr]; };
+  funcy = derive2 { name="funcy"; version="1.0.0"; sha256="13r3n28fpzg4siqsdgwklgm7y38mjpd6dglwdpn8fyiirh1xmas0"; depends=[calibrate car cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; };
+  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.7.9"; sha256="16nz028cgfhhn4xvhkzy6y1a1p6x4xfzna50q4jaih0pd980i07a"; depends=[knitr magrittr]; };
+  furniture = derive2 { name="furniture"; version="1.8.0"; sha256="1f1s0zwishm73rgdj93z1975manc3a7v51mzz1478h0jp5kd2pql"; depends=[cli crayon dplyr 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]; };
@@ -6661,73 +6955,77 @@ in with self; {
   futile_options = derive2 { name="futile.options"; version="1.0.1"; sha256="0w15agpi88y3qkv6fl72zy2pzyplzgvnj41a4ixhg64mw1sck73s"; depends=[]; };
   futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
   futility = derive2 { name="futility"; version="0.2"; sha256="0njckhwmawqhiznv241yjghh99wl72c4xknp9nzbmvi5j575rnlh"; depends=[]; };
-  future = derive2 { name="future"; version="1.8.1"; sha256="1bpx6b85dd8xq37527h72qszz2dg810xcp975z93hymk1d8hf41a"; depends=[digest globals listenv]; };
-  future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.15.0"; sha256="0r1bnp9mnv8jk9d6dpr94cqn4zihpm7cgxqj0c3l0x9b6i0ny3z2"; depends=[BatchJobs future R_utils]; };
-  future_apply = derive2 { name="future.apply"; version="1.0.0"; sha256="1jippm805hda75h24grp9pwypf10cp4m4hq55vni7qa9qhyi7r2x"; depends=[future globals]; };
-  future_batchtools = derive2 { name="future.batchtools"; version="0.7.0"; sha256="0sk2qs6fgq241zibjxkmvdgv7xq0lablwwd6px6rxi7asxjv7zbh"; depends=[batchtools future]; };
-  future_callr = derive2 { name="future.callr"; version="0.3.0"; sha256="0z9gmy46n823y38hq4xgc1x3v88hmz5sdfa6xsp0mk1bwlc94q8f"; depends=[callr future]; };
+  future = derive2 { name="future"; version="1.10.0"; sha256="07dmb5gn29pjaya3ljmpbag1wk27i3dr63mcxgjgzkfj9dgshp32"; depends=[digest globals listenv]; };
+  future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.16.0"; sha256="1j4gjgqy2hikpl9x1jf0qvncyi5dsfz3hi4v4x0kw7hzlsgc6f00"; depends=[BatchJobs future R_utils]; };
+  future_apply = derive2 { name="future.apply"; version="1.0.1"; sha256="1i5apv9ywwb5xhq4g0lk5q1sy23zhdvdsrx8fax3nyprinvw5a7l"; depends=[future globals]; };
+  future_batchtools = derive2 { name="future.batchtools"; version="0.7.1"; sha256="0mgppqzw6qgm8dhp9kxh1nb3xpp8mw2aj1m1yaj3wivkb22fdicn"; depends=[batchtools future]; };
+  future_callr = derive2 { name="future.callr"; version="0.3.1"; sha256="0h1nm65f36bpb6anjiyrb3vni5rzx4x047l0a396d2321cxszv7l"; depends=[callr future]; };
   futureheatwaves = derive2 { name="futureheatwaves"; version="1.0.3"; sha256="122b2z86bzxfch67y6cpq8wj62mw0dgkzbmnpwi247kdx7w5mw1f"; depends=[data_table dplyr ggplot2 ggthemes leaflet Rcpp stringr tidyr]; };
   fuzzr = derive2 { name="fuzzr"; version="0.2.2"; sha256="1cwq7a5j6lzrlz9dw3hsfap988rh1kkgf03yni7c33zl69xp5w77"; depends=[assertthat progress purrr]; };
   fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; };
   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.3"; sha256="1mg4c71d0yc42y4iqdwkw13nlkq09parp2xwi1fv700vmnn4gk5w"; depends=[limSolve quadprog]; };
+  fuzzyreg = derive2 { name="fuzzyreg"; version="0.4"; sha256="1m6vfagd5qnxdmdh2ya0vmz8jvbf0fwn95zgqcjwgvmwyafkw5m8"; 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=[]; };
-  fwsim = derive2 { name="fwsim"; version="0.3.3"; sha256="1ix4sl2krlr0b0wfgvy73qhpmkjymqcci3q3v60j20zapi55gxn2"; depends=[Rcpp]; };
+  fwsim = derive2 { name="fwsim"; version="0.3.4"; sha256="0fy87c1x5hihfcppv1pvk3b0pwl6ygqpka40x55gbpkgssdigb1l"; depends=[Rcpp]; };
   fxregime = derive2 { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[car sandwich strucchange zoo]; };
   g_data = derive2 { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; };
   g2f = derive2 { name="g2f"; version="0.2"; sha256="1jsmiv6v8ilpxg1k1npcgqa467hpyw7mzh5m8dp7bxar4j5npsp4"; depends=[KEGGREST minval sybil]; };
+  g3viz = derive2 { name="g3viz"; version="0.1.3"; sha256="0c1filziyp6bqi7i92xcrip10hs0rwxxcnawhqll80jk66lc1kl2"; depends=[cgdsr htmlwidgets jsonlite stringr]; };
   gCat = derive2 { name="gCat"; version="0.1"; sha256="10990ilsjk52kqkcdngj4nq0kcbn4w1syxl1mqjq2n5g1l002yjy"; depends=[]; };
+  gDefrag = derive2 { name="gDefrag"; version="0.1"; sha256="1xzp12p7w4gsy88hjl1n0ylymjbm3wqypqavkb97if94mwhlfqsh"; depends=[igraph maptools rgdal rgeos sp]; };
   gIPFrm = derive2 { name="gIPFrm"; version="3.1"; sha256="08rfdac442picbw1r3xyxjzf2dc57svg44am0714z4r72mshvj04"; depends=[]; };
   gLRTH = derive2 { name="gLRTH"; version="0.2.0"; sha256="1drmmr576n3pbr0q1cnnx4k7r4iz061n2cizv1kpr3wcc1g291pn"; depends=[]; };
-  gMCP = derive2 { name="gMCP"; version="0.8-13"; sha256="19chbcqiw13rppp7s7y8vf42spwnna78xl2mb37n96s23fpj3qpf"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; };
+  gMCP = derive2 { name="gMCP"; version="0.8-14"; sha256="11q2d4a352z7c0ln10mdpms1cl4bh5hqmg9avmbxw54z4i00mdvy"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; };
   gMOIP = derive2 { name="gMOIP"; version="1.1.0"; sha256="122yzwicsq7q98x5dxk1mmf148v2w64jz3pd3535himx85gy9zy3"; depends=[ggplot2 ggrepel]; };
   gMWT = derive2 { name="gMWT"; version="1.1"; sha256="1ws96x3vjswh6m6s9zn3r9gp7xp6ybdkkxsq9a73ng2zqz2qjdl0"; depends=[clinfun Rcpp RcppArmadillo]; };
   gPCA = derive2 { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; };
   gPdtest = derive2 { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; };
-  gProfileR = derive2 { name="gProfileR"; version="0.6.6"; sha256="1n6cj12j102b4x9vhyl4dljp1i0r43p23cnhqbx4als2xfxdlqgi"; depends=[plyr RCurl]; };
+  gProfileR = derive2 { name="gProfileR"; version="0.6.7"; sha256="12nwidbnqmnfy5dnqga26byslvdnkrpz2fi19qfcby6xx0wbndk7"; depends=[plyr RCurl]; };
   gRain = derive2 { name="gRain"; version="1.3-0"; sha256="0xb746pyh8k8w1a8nz7z41bflx5xr0cqdq5l5wj7j464zv2cw6jy"; depends=[functional graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen]; };
   gRapfa = derive2 { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; };
-  gRbase = derive2 { name="gRbase"; version="1.8-3"; sha256="143qvs5mwypswdq344a48kzn83sx9jskdr9w6kxa3fzhdcqlhi7d"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen]; };
+  gRbase = derive2 { name="gRbase"; version="1.8-3.4"; sha256="0b6cl9p3px99vw9jx8wdcm4sh8v7zr6l4w0mk7ilrgbwzg198pyk"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen]; };
   gRim = derive2 { name="gRim"; version="0.2-0"; sha256="0ihl4vsnp6xkcpcf37p2xcqnbvyvjamcz5060f1kirn8xzwzq29y"; depends=[gRain graph gRbase igraph Rcpp RcppArmadillo]; };
   gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; };
   gSeg = derive2 { name="gSeg"; version="0.5"; sha256="1f3appvy78adv9jll47smgw2apm3dkm9zrm17hhdxmcnqypd7ias"; depends=[]; };
+  gStream = derive2 { name="gStream"; version="0.1.0"; sha256="02ww3s3pc7x8kvi697rfilpl5swi33v4k0q5wkv4rf6mc319m5qk"; depends=[]; };
   gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; };
   gWQS = derive2 { name="gWQS"; version="1.1.0"; sha256="03v6b90745nd0jxil39rgay1yh1lrg9p1wbi22yffd29a2arsf22"; depends=[ggplot2 Rsolnp tableHTML ztable]; };
   gWidgets = derive2 { name="gWidgets"; version="0.0-54"; sha256="13lbbbnmkvb559klgsnz0q27qlyv102xakb6yccxsxjw249hm8c2"; depends=[]; };
   gWidgets2 = derive2 { name="gWidgets2"; version="1.0-7"; sha256="02jrv5x7s3jm2ajpdvgsp4zkn65gjy96rvgdxhf9smp1kb6llzg0"; depends=[digest]; };
   gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-7"; sha256="14c933j0wj3lb5da75zxg3w3mfqh0nqk8rczbi4dnqd8sna6jks9"; depends=[gWidgets2 memoise RGtk2]; };
-  gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-5"; sha256="1g0p7bl76rkkrixzw4b1s99gyvi8b5a4vbnsj2wmy7y9grbzndkm"; depends=[digest gWidgets2 memoise]; };
+  gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-6"; sha256="0arh0yxx63m4df1ccrv0q3vkjncwv3ink8vkalp6ashi2932yfma"; depends=[digest gWidgets2 memoise]; };
   gWidgetsRGtk2 = derive2 { name="gWidgetsRGtk2"; version="0.0-86"; sha256="0b1xqffbzxlaaaqf1vzfl0a7b6wnnslsp8v5fbxblv7w951rsc4m"; depends=[cairoDevice gWidgets RGtk2]; };
   gWidgetstcltk = derive2 { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[digest gWidgets]; };
   gafit = derive2 { name="gafit"; version="0.5.1"; sha256="160z3cv22prf7118447dla9g1gimwkfad8zdil3fg8n4l22rk51a"; depends=[]; };
   gaiah = derive2 { name="gaiah"; version="0.0.2"; sha256="1qc3crjxramyxl86dp8mcmvskixny7x6ji0jqf5dqf5r5qc7zrs9"; depends=[dplyr geosphere ggplot2 lazyeval magrittr maptools raster rgeos sp stringr tidyr]; };
   gains = derive2 { name="gains"; version="1.2"; sha256="1nmrhc7qjlyzn04r1qyjdws5fin3idmi789kbxzilax12ya8xr7k"; depends=[]; };
+  galgo = derive2 { name="galgo"; version="1.4"; sha256="1v150flk1x0rixpgvi8crd5iq28w4jk8h2iyv48hz5qmm2pvz1li"; depends=[e1071 MASS nnet R_oo randomForest rpart]; };
   galts = derive2 { name="galts"; version="1.3.1"; sha256="0jg0yng1kc6s0qdhq8ps38dsxdcrgdcn8dl2dlclw6rcbknb6h4k"; depends=[DEoptim genalg]; };
-  gam = derive2 { name="gam"; version="1.15"; sha256="1w6icadyfyqlkz5qijwifa3z96d460m88k8b2iaqj0cf6agmydhy"; depends=[foreach]; };
+  gam = derive2 { name="gam"; version="1.16"; sha256="0blg4gghw5068z180c4bf0s77ky0wspgsi6xpcfnkf2rkvj34182"; depends=[foreach]; };
   gamCopula = derive2 { name="gamCopula"; version="0.0-4"; sha256="1nj5pxcbr6k7k1m44ky306yycpx20pw8awlx7lzyw1rx1hrv5ivb"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; };
   gamRR = derive2 { name="gamRR"; version="0.4.0"; sha256="0grd9d7rar4lq82v55k7c2d3h0g2lh7ny4bpxanqgrq02jkpnz1p"; depends=[boot mgcv]; };
   gamair = derive2 { name="gamair"; version="1.0-0"; sha256="13n2n4b7givzvia93awy7ym0gihl4lr08w3a6ny2pq0f3zbhzw97"; depends=[]; };
-  gambin = derive2 { name="gambin"; version="2.3.0"; sha256="1kwh8s191m6gsjczqc3svf6zp1k4zi86rqz7s94rahg84vwh6a9b"; depends=[doParallel foreach gtools]; };
+  gambin = derive2 { name="gambin"; version="2.4.0"; sha256="0fbn553g61l524x7yraj89plrbf66ywgy674b5hyfcfkx0xaim8n"; depends=[doParallel foreach gtools]; };
   gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-1"; sha256="06n2xk7k24gz95jy1cr6shpfd89ylispq6mn3fvxblqdf8vhdixj"; depends=[mboost stabs]; };
   gamboostMSM = derive2 { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; };
   gamclass = derive2 { name="gamclass"; version="0.58"; sha256="0dldqnbdgrafkm1a9kb0gyyfs0s2g31iv4ndlnnm2rd63ga4xxsn"; depends=[ape car DAAG KernSmooth lattice latticeExtra MASS mgcv randomForest rpart]; };
   games = derive2 { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; };
-  gamesGA = derive2 { name="gamesGA"; version="1.1.3.2"; sha256="0srxsm1zhrx1dpm94mkcsds6rwkx9gi9yfbrkzylhrxgi4g8pvwp"; depends=[shiny]; };
+  gamesGA = derive2 { name="gamesGA"; version="1.1.3.5"; sha256="1xvy0azyjcr077lwpnh6083ypv0j8qjd0frkc6z6vs6fgbv2lv5p"; depends=[shiny]; };
   gamlr = derive2 { name="gamlr"; version="1.13-5"; sha256="0fc27b6qcm01drb7pb14wri2hlb464jig3x7sb8njwrxcqqia14n"; depends=[Matrix]; };
-  gamlss = derive2 { name="gamlss"; version="5.1-0"; sha256="00hiy8k3hls8igkcl2yzgx15mmj4f305zssav5bwsxwijj4m4pv6"; depends=[gamlss_data gamlss_dist MASS nlme survival]; };
+  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_data = derive2 { name="gamlss.data"; version="5.0-1"; sha256="0q0ah8x141172fxh25bk913zzs5njyn24xkah23px1zsh4684gsy"; depends=[]; };
+  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.0-6"; sha256="0xz0968diww9h2z2wgq2h5bgxx3h8nsv0yy4kapcay4ds1nkfyzx"; depends=[MASS]; };
+  gamlss_dist = derive2 { name="gamlss.dist"; version="5.1-0"; sha256="0cfp7l1sw4q1n0f5zvb3gzp5q94w3f2ylvvi1fgdlyzbrjmf5fdc"; 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]; };
-  gamlss_tr = derive2 { name="gamlss.tr"; version="5.0-0"; sha256="02akydpvwl1qkhxpr72lv9qp4z2ra69abyq51b57rh4p60g78vhm"; depends=[gamlss gamlss_dist]; };
+  gamlss_tr = derive2 { name="gamlss.tr"; version="5.1-0"; sha256="1px9lhwad13s544g4ba8m7nxxd425jyakh6x1p4byxl8bn9w9qgr"; depends=[gamlss gamlss_dist]; };
   gamlss_util = derive2 { name="gamlss.util"; version="4.3-4"; sha256="0p8lnwrn7cx97qnxls1x532f3ywszdyib2qiwx5qc7sam59h9c8j"; depends=[gamlss gamlss_dist zoo]; };
   gamlssbssn = derive2 { name="gamlssbssn"; version="0.1.0"; sha256="1l8d4qwmq9dklm9imb3cvlncwa6jygf8kg2j1599h1nfhyyhj2vv"; depends=[gamlss gamlss_dist MASS]; };
   gamm4 = derive2 { name="gamm4"; version="0.2-5"; sha256="11wblnh22xq3m3z25i30v2kd0zlf8wa3cm5z38z56rhk3l2wf5bc"; depends=[lme4 Matrix mgcv]; };
@@ -6741,10 +7039,11 @@ 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=[]; };
   gaselect = derive2 { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp RcppArmadillo]; };
-  gasfluxes = derive2 { name="gasfluxes"; version="0.2-1"; sha256="0cdqyyqb5dcn5978jmwmf06d9jcga5ma72zf3cdz72hbcil4f93k"; depends=[AICcmodavg data_table MASS sfsmisc]; };
+  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]; };
-  gaston = derive2 { name="gaston"; version="1.5.3"; sha256="0y49rgsnzbikm1162awxlamjc2djnxqd9j8if9si4gbmkkp90iwm"; depends=[Rcpp RcppEigen RcppParallel]; };
+  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=[]; };
   gaussfacts = derive2 { name="gaussfacts"; version="0.0.2"; sha256="095x7k7m7sy1gqkbm6wiqn26252dclz62sbnkv6cjvmbdxajl7m9"; depends=[]; };
@@ -6752,14 +7051,15 @@ in with self; {
   gazepath = derive2 { name="gazepath"; version="1.2"; sha256="0h5a9bpgx268yh0zy3y4xfvij1ncx92x5qphjc94xmzbrl0br1mf"; depends=[jpeg scales SDMTools shiny zoo]; };
   gb = derive2 { name="gb"; version="2.3.3"; sha256="0gkdkbwr168vi7lgccla49l43rkmjcfrwlqdr65mg5syzcxrh7nh"; depends=[boot KernSmooth]; };
   gbRd = derive2 { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; };
-  gbfs = derive2 { name="gbfs"; version="1.0.0"; sha256="1kikbsdmh8v2s3kabmfpbwzzwxkzadqz7xpn5ng90npl3j8zaps6"; depends=[devtools dplyr jsonlite lubridate readr roxygen2 stringr testthat withr]; };
-  gbm = derive2 { name="gbm"; version="2.1.3"; sha256="0ayrpq5qm18dsain088mbw0037bijxcy342grb6g2qnp67llpwpa"; depends=[lattice survival]; };
+  gbfs = derive2 { name="gbfs"; version="1.1.0"; sha256="1c68p384fh53vi73xjk6kg51q62w49r74d1miyhxg5w56bwyw9n4"; depends=[dplyr jsonlite lubridate readr stringr]; };
+  gbm = derive2 { name="gbm"; version="2.1.4"; sha256="0lp11s911y2xf9wn9288jl80qqc9wh2jrk49lxsjm94lbws51zli"; depends=[gridExtra lattice survival]; };
   gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; };
   gbp = derive2 { name="gbp"; version="0.1.0.4"; sha256="0awg724gsfwlb0fjcvw0450qdsk4m8x8is16pj5c8fx6nc8rn8bv"; depends=[data_table magrittr Rcpp RcppArmadillo rgl]; };
   gbs2ploidy = derive2 { name="gbs2ploidy"; version="1.0"; sha256="0gdjfqs9ccyaw7vi22wbyc742n1badr5ypr08g6rvi8ka5lmx836"; depends=[MASS rjags]; };
   gbts = derive2 { name="gbts"; version="1.2.0"; sha256="1v8x4dnja8va28rjznyqa6js9wazndijasb95lfj2qwhxhgf5h65"; depends=[doParallel doRNG earth foreach gbm]; };
-  gbutils = derive2 { name="gbutils"; version="0.2-1"; sha256="0br5b1l5dwq65v6d85mki6fpcz4y819ji7w5pgfl3h312q5s627v"; depends=[]; };
-  gcKrig = derive2 { name="gcKrig"; version="1.1.1"; sha256="0bfxwi3ahhgyn1mh00b27iwz3cgabz74r00q4bhl45wjps4vngc3"; depends=[Rcpp RcppArmadillo]; };
+  gbutils = derive2 { name="gbutils"; version="0.4-0"; sha256="01ka10k599c8q7l55jzkrvqlxhzdanc4xnmsh6js5ji5yr7v385f"; depends=[Rdpack]; };
+  gcForest = derive2 { name="gcForest"; version="0.2.7"; sha256="10fjha76sgnrkhwjm0rm4hrbn0643p9dsyb5ahw43x8m5kmw2ydq"; depends=[cli crayon pkgdown reticulate]; };
+  gcKrig = derive2 { name="gcKrig"; version="1.1.2"; sha256="1wqmw56805bny8w6zdj5zn4c89p3x39d5pkp4xslpd5f623zvf6x"; depends=[Rcpp RcppArmadillo]; };
   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]; };
@@ -6774,7 +7074,7 @@ in with self; {
   gdistance = derive2 { name="gdistance"; version="1.2-2"; sha256="0lqpxsg01ibkaq50qyccdhsl2sbb4kh9bcfifs1yzsg45bq27jf8"; depends=[igraph Matrix raster sp]; };
   gdm = derive2 { name="gdm"; version="1.3.11"; sha256="1bsy8fjzc0034hxw5n4ip4lkwr38fiyvw9q21bk17sxn44cnnxz4"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; };
   gdmp = derive2 { name="gdmp"; version="0.1.0"; sha256="1dlzxf17ssm10pw14mk5lk0plgav2mj8xf39dacyg9hlrz9pjwki"; depends=[]; };
-  gdns = derive2 { name="gdns"; version="0.2.1"; sha256="0dvrknhx0d00yi429zjdcs3ghgbpfjhrclkn6cicd049qdp4q396"; depends=[dplyr httr jsonlite purrr stringi tibble]; };
+  gdns = derive2 { name="gdns"; version="0.3.1"; sha256="1vydl7jacldidzx1hhqang9fw8zar8wy4cgdmr9pbw22ffw2qq7s"; depends=[httr jsonlite stringi]; };
   gdpc = derive2 { name="gdpc"; version="1.1.0"; sha256="1q1c9pypkb8dv6bvgizaca4p43krc52fvlvjz9l6nkpazr1qx33d"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; };
   gds = derive2 { name="gds"; version="0.1.0"; sha256="0kc3l93640x8d6g3pa9gbr7ci5hmryg9i1nqpasgnvb6ixv6azbm"; depends=[]; };
   gdtools = derive2 { name="gdtools"; version="0.1.7"; sha256="122k9spymawfnfyksxyapwq9cigydy5nrjwhrwrhy3qkax3aycf6"; depends=[Rcpp withr]; };
@@ -6785,15 +7085,15 @@ in with self; {
   geecure = derive2 { name="geecure"; version="1.0-6"; sha256="0nmnrkfgblv38qvk66bdk8933icr59mayqwljkvmpy59sm6br2k5"; depends=[geepack MASS Matrix survival]; };
   geepack = derive2 { name="geepack"; version="1.2-1"; sha256="13fkz38rsdk1byv6rdpdmphz5dd31r4h8ms49hali6hjh5rydzvy"; depends=[]; };
   geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; };
-  geex = derive2 { name="geex"; version="1.0.3"; sha256="0px197mz3qfx7s4wfdjlgjpss03y7wid1qa34xf4xan05dnrrnzc"; depends=[lme4 Matrix numDeriv rootSolve]; };
+  geex = derive2 { name="geex"; version="1.0.11"; sha256="19qqgr16cd4zsmfgl9ny92ncvf1418ilvhb9h3axw24mkycins61"; depends=[lme4 Matrix numDeriv rootSolve]; };
   geigen = derive2 { name="geigen"; version="2.2"; sha256="0wfd87xd438ri0a9m9dz46jfy4wpm75skc3iyppx80d03kijvcig"; depends=[]; };
   geiger = derive2 { name="geiger"; version="2.0.6"; sha256="1zry3iclj7yciiiysbq6z0kn759c7hdy5fq0dcszkskqcd92qfz1"; depends=[ape coda colorspace deSolve digest MASS mvtnorm ncbit Rcpp subplex]; };
   gelnet = derive2 { name="gelnet"; version="1.2.1"; sha256="10ygdfz9f5xhahlqb2divwvaljhiz8jhsd12wvq0qalx0v1h5j0p"; depends=[]; };
   gem = derive2 { name="gem"; version="0.19"; sha256="11gzqpc9s1bkx1w6ncjylmfqqf3wj5hgca4lzygvlni9xz7pk517"; depends=[signal]; };
-  gemlog = derive2 { name="gemlog"; version="0.26"; sha256="1cbm9rd2zwih5glj5nkmavb27j21dhsrrrr1d0ss6faf00nprbfq"; depends=[signal]; };
+  gemlog = derive2 { name="gemlog"; version="0.30"; sha256="1cznlgl0gwqih63w6vfxj1ln7qfsa60c5l3wx9pri0ngcx75p9rn"; depends=[signal]; };
   gems = derive2 { name="gems"; version="1.1.1"; sha256="174mjnpldb0rwjvwdgpcg1acm526gs0pjf9gi5mn9d3x9yz4r5jx"; depends=[data_table MASS msm plyr]; };
   gemtc = derive2 { name="gemtc"; version="0.8-2"; sha256="0c2a9gz6rvsc5qh66ixxa4dz6lwhcmmsf2vnvxl98c9kbvdwfqm9"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; };
-  genBaRcode = derive2 { name="genBaRcode"; version="1.0.0"; sha256="0313kyhy9bg9rabxk2jdgxq2brhj2kkiq0xyd3mlq6j9c626pqi8"; depends=[ape Biostrings ggnetwork ggplot2 igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist visNetwork]; };
+  genBaRcode = derive2 { name="genBaRcode"; version="1.1.0"; sha256="1x7hf80bqfl6ghd9vk878a86dacphp15wdw9zb198ax083q3jydm"; depends=[ape Biostrings doParallel dplyr foreach futile_logger ggnetwork ggplot2 ggseqlogo ggtree igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist VennDiagram visNetwork]; };
   genBart = derive2 { name="genBart"; version="1.0.1"; sha256="12z5vj41npwawz954zqkjfmg9inh063ilh7m82pn73asrxif0ay3"; depends=[clValid data_table fastcluster ggplot2 gtools limma NMF pca3d psych qusage RColorBrewer reshape2 rmarkdown scales shiny shinydashboard shinyjs statmod stringr VennDiagram]; };
   genMOSS = derive2 { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; };
   genMOSSplus = derive2 { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; };
@@ -6812,9 +7112,10 @@ in with self; {
   genemodel = derive2 { name="genemodel"; version="1.1.0"; sha256="1x6n6k9ifv2swhyrghvm6fsz5vh85cdik8225175i9msvmkh928n"; depends=[stringr]; };
   genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; };
   genepop = derive2 { name="genepop"; version="1.0.5"; sha256="17s3azcq1fjjqi5n8rw071k1as4nnwvppmdaz2l5scn0wv120vcq"; depends=[Rcpp]; };
-  generalCorr = derive2 { name="generalCorr"; version="1.1.1"; sha256="1ihp9pksi47f3fsv7wgrp1z4ylmf5n57n6h27v130mi7k5lh1gdy"; depends=[meboot np psych xtable]; };
-  generalhoslem = derive2 { name="generalhoslem"; version="1.3.2"; sha256="1c6mmgdxdm384fl9yqpij3fvjzzima10knljsf50hl4q9f66lvag"; depends=[MASS reshape]; };
+  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=[]; };
   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]; };
@@ -6835,41 +7136,42 @@ in with self; {
   geoBayes = derive2 { name="geoBayes"; version="0.5.1"; sha256="18m1qxzq97rddbxk99za5yfdcq6nyy4nxgikylfpsb2mxanjxyx2"; depends=[coda sp]; };
   geoCount = derive2 { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; };
   geoGAM = derive2 { name="geoGAM"; version="0.1-2"; sha256="0q09pk2npn4hjymklwfrhz2ybmjpcb6kvqkpn9l3a6cdjgk6bkmj"; depends=[grpreg MASS mboost mgcv]; };
-  geoR = derive2 { name="geoR"; version="1.7-5.2"; sha256="1sy968x154bsc3i3a6mxcwnyixcnmab5bc07dgibi9vzn0nkbbpb"; depends=[MASS RandomFields sp splancs]; };
+  geoR = derive2 { name="geoR"; version="1.7-5.2.1"; sha256="1fb3xm85i36q9l5lspa6fjfa82mv8fnwl30rimrlamss02ff959q"; depends=[MASS RandomFields sp splancs]; };
   geoRglm = derive2 { name="geoRglm"; version="0.9-11"; sha256="0qf3nm0snrmplbwgcac0iinni7h2wqm13lm34zzfl00idzv0k9b9"; depends=[geoR sp]; };
   geoSpectral = derive2 { name="geoSpectral"; version="0.17.4"; sha256="0i2k5k66gmf7zvipcd0a489rnpj14j4a4xw9k5dccpj6ybwd47l7"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; };
   geoaxe = derive2 { name="geoaxe"; version="0.1.0"; sha256="043y7kb24hp66j7pnpqsdixvdmppwp72y8i4f8q7xrkhaqlfb93v"; depends=[jsonlite rgeos sp]; };
-  geoelectrics = derive2 { name="geoelectrics"; version="0.1.5"; sha256="0zy9m5k4b359mn29cd62cnwjm4fc19hy3l8p587yrrhsi20nbyna"; depends=[fields lattice rgl]; };
+  geodetector = derive2 { name="geodetector"; version="1.0-3"; sha256="1x6mr05976vdxxgcb4fd3v7mq2lanrl44nqz6f6rk2dy3yhdqi5c"; depends=[maptools rgdal rgeos sp]; };
+  geodist = derive2 { name="geodist"; version="0.0.1"; sha256="15x0p34qcac8v2ldf7hs4h28z44hvjqqidf5g0x2k6rz7692aqpd"; depends=[]; };
+  geoelectrics = derive2 { name="geoelectrics"; version="0.2.0"; sha256="1dmpaf16750ni4yr36cglfz9pv9jax8jxb3kwn47kxgnx3l8qq98"; depends=[fields lattice rgl]; };
   geofacet = derive2 { name="geofacet"; version="0.1.9"; sha256="0z9xd24hn9j8azd4kal81lz72zy6vv9rvwx1jsmkq7z7f1wwly48"; depends=[geogrid ggplot2 ggrepel gridExtra gtable imguR rnaturalearth sp]; };
   geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; };
-  geogrid = derive2 { name="geogrid"; version="0.1.0"; sha256="1aiar70cy8rf7hc7kwc2g3p02x3zmp6nf9vfjjrjm94mb7yr8s48"; depends=[Rcpp RcppArmadillo rgeos sf sp]; };
-  geohash = derive2 { name="geohash"; version="0.3.0"; sha256="1yabnf0a6jd4r6zh83sxb9wcn4vs8csp7c80qs6pi1nx016lirx7"; depends=[Rcpp]; };
+  geogrid = derive2 { name="geogrid"; version="0.1.0.1"; sha256="1skklrv2k0a0wi86q5d5mn7ma028ggl1pby7gpl3jssh7bgxw8wp"; depends=[Rcpp RcppArmadillo rgeos sf sp]; };
   geojson = derive2 { name="geojson"; version="0.2.0"; sha256="1xvbkdaaf55x015pflvcdy06ayrmhqi3my0sdqb48z129rdbr3i7"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; };
-  geojsonR = derive2 { name="geojsonR"; version="1.0.4"; sha256="0248lb1kgj43czp5z4q7dcrq6ra0jhq62q9x79mgyb83bqn940h8"; depends=[R6 Rcpp RcppArmadillo]; };
+  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.1"; sha256="050dcyhsjjysfp263g1f35aixrdh85zfzkg7dyhn47nr9cfgrss8"; depends=[curl rapidjsonr Rcpp]; };
-  geoknife = derive2 { name="geoknife"; version="1.5.5"; sha256="0azb98zk4ayfm0z9vz5h59490xvng16p3gpdn60ca9mwdikyxks3"; depends=[curl httr sp XML]; };
+  geojsonsf = derive2 { name="geojsonsf"; version="1.2"; sha256="08db4rx9m8q2cz2vzp48421r2whb7bwlls35l893zfqni9yhib89"; 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]; };
-  geomerge = derive2 { name="geomerge"; version="0.3.0"; sha256="12r60rxsi6x30q8h7mx0m50avvssm493qzyxiva7nglydcmhjn9r"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; };
-  geometa = derive2 { name="geometa"; version="0.2-0"; sha256="1dz23jgix8sxnb69hb7jd41kdqifkf95jmcg2f6zqncqa6qg7glk"; depends=[R6 XML]; };
+  geomerge = derive2 { name="geomerge"; version="0.3.1"; sha256="0pvyhpv4vq8mvvlybxhviq8rbazw29dgf9m0xnldaxg9r6lqdp4d"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; };
+  geometa = derive2 { name="geometa"; version="0.3-0"; sha256="0cw29a4zsqvqyj4zmvk92752k65yhxxjqmqp0kl0pnidl18vbp46"; depends=[R6 XML]; };
   geometry = derive2 { name="geometry"; version="0.3-6"; sha256="0s09vi0rr0smys3an83mz6fk41bplxyz4myrbiinf4qpk6n33qib"; depends=[magic]; };
   geomnet = derive2 { name="geomnet"; version="0.2.0"; sha256="0xanzx8p34bac4zcf9j69nivwhllvsrw7x70mzgl95jhg3gvv96a"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; };
-  geomorph = derive2 { name="geomorph"; version="3.0.6"; sha256="1iqz8qzcdrxvz1iywkzbwia40sxj7fkw3mcncdddb9dnq016cfdy"; depends=[ape geiger jpeg Matrix rgl]; };
+  geomorph = derive2 { name="geomorph"; version="3.0.7"; sha256="1q9qdpb08kfs1xs5s9xjxh98wb3hqilqynwzihlz1hsv38p99y38"; depends=[ape geiger jpeg Matrix rgl RRPP]; };
   geonames = derive2 { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; };
-  geonapi = derive2 { name="geonapi"; version="0.1-0"; sha256="1i0pr4zrl06ym947parxk083f1b5p58bdbpm842viq1qqwavfj6z"; depends=[geometa httr openssl R6 XML]; };
+  geonapi = derive2 { name="geonapi"; version="0.2-0"; sha256="1d3dxmnxdmdbz4kfg87mrk6ddachgb0fqvmhpscfzagwfhcs19zw"; depends=[geometa httr openssl R6 XML]; };
   geoops = derive2 { name="geoops"; version="0.2.0"; sha256="0n9n0j849jbqv6y6lqhyhddr5zfz8i9yi03gpg9862nzkvxd3c4k"; depends=[Rcpp]; };
   geoparser = derive2 { name="geoparser"; version="0.1.1"; sha256="0rk2wcig79r28a974bc181p8vypxzbgxcb9rsp24qj9mg02rn5n5"; depends=[digest dplyr httr jsonlite lazyeval purrr stringr tidyr]; };
   geophys = derive2 { name="geophys"; version="1.4-1"; sha256="1s64sbr0chv0z2vaw059khfkv8iga1kr6428kkglgafq5x2d6h3q"; depends=[cluster GEOmap RFOC RPMG RSEIS]; };
-  georob = derive2 { name="georob"; version="0.3-6"; sha256="01gq9ymqk3zyjs5n7nj27ky2bnhc7x7npbipa5bcq7jda6gxirhr"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; };
-  geosapi = derive2 { name="geosapi"; version="0.2-0"; sha256="15w2rd0scv0aywngp2h7nzbgh4ddbgnf54scd454ixgv67m99p5f"; depends=[httr openssl R6 XML]; };
+  georob = derive2 { name="georob"; version="0.3-7"; sha256="1bs54qmj9qwh0pxllmsvc6camw8mk44538yhm164xbm9l344s1vz"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; };
+  geosapi = derive2 { name="geosapi"; version="0.3-0"; sha256="0yl2iaynhx0zgfcfkqp9hbyjh27fzhyra7q30ks9v48s0rhjv1mx"; depends=[httr openssl R6 XML]; };
   geoscale = derive2 { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; };
   geospacom = derive2 { name="geospacom"; version="0.5-8"; sha256="14qyjbq0n43c2zr9gp11gdqgarvmicx3gpq2ql2vjfzrmirxwjgg"; depends=[classInt geosphere maptools rgeos sp]; };
   geosphere = derive2 { name="geosphere"; version="1.5-7"; sha256="186qdm5niq7v3d4w4rngx71znsgi44hnam7698bsx9ar5mg5b6wx"; depends=[sp]; };
   geospt = derive2 { name="geospt"; version="1.0-2"; sha256="1814nn0naxvbn0bqfndpmizjbqcs6rm87g2s378axkn6qpii4bh8"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; };
   geosptdb = derive2 { name="geosptdb"; version="0.5-0"; sha256="0m0dlazhq2za71mi3q8mz2zvz7yrmda7lha02kh9n820bx89v33z"; depends=[FD fields geospt gsl limSolve minqa sp StatMatch]; };
-  geostatsp = derive2 { name="geostatsp"; version="1.7.1"; sha256="141mvwkqk2jpyggmzvm604s37h92gbmzch3d84dq3ng29mc507s2"; depends=[abind Matrix numDeriv raster sp]; };
+  geostatsp = derive2 { name="geostatsp"; version="1.7.2"; sha256="0g1yvdj0bgdpq4mhcyy5yvsb4azm982vknbyzrr2415szv1910kb"; depends=[abind Matrix numDeriv raster sp]; };
   geotech = derive2 { name="geotech"; version="1.0"; sha256="18s7w6h1svc4n1hcgj5njfkf3nflkc53cdwsq5112p3442rlz33f"; depends=[]; };
   geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; };
   geotoolsR = derive2 { name="geotoolsR"; version="1.0"; sha256="1arbyb1q96ya3smn9sqzqji5v21x37iyyxmvlmqmjj75an8ix5dp"; depends=[dplyr geoR ggplot2 tidyr]; };
@@ -6877,51 +7179,52 @@ 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.0"; sha256="1s6mygiwmz2cgg2dcsah4ssnj5hfilf7hfdzvv3qd57imicrlkk5"; depends=[broom ggplot2 ggrepel minpack_lm plyr Rdpack]; };
+  germinationmetrics = derive2 { name="germinationmetrics"; version="0.1.1.1"; sha256="1za2vkprdl2hdpww3p4x5l1ddkcrq6jxj1chhbbq4w31blpvg5hm"; 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.1"; sha256="0gcvd61dyyq29gf2v3kg1y474diwi0hl28rb4w8zf11ac9lc0jvz"; depends=[rlang]; };
-  getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.2.4"; sha256="1468bxmy2iv1kzjnyh5y035lxmi8wfssjk0cjx63i6dg38bhq4cz"; depends=[data_table dplyr hoardr httr raster tibble tidyr]; };
+  gestalt = derive2 { name="gestalt"; version="0.1.4"; sha256="1krmn19cxmbd4l0x5nzhypkr04dv7s82rnnk97szni4wdy2ih892"; 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]; };
-  getTBinR = derive2 { name="getTBinR"; version="0.5.4"; sha256="1xf5b98j4b07namkhmzwmp1xhsn9g42p2zy38xhz4823x13q9yn6"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr scales tibble tidyr viridis]; };
+  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]; };
   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=[]; };
-  gets = derive2 { name="gets"; version="0.15"; sha256="1sz225bymjp2mrklpjagh6x622kpcvh21r0rmimd1mjhqbg0p9vs"; depends=[zoo]; };
+  gets = derive2 { name="gets"; version="0.16"; sha256="0ipnf8jlirwvr9zjyw7dxmm8vqjznlw2k7iy56pm2hyc70ssyxw8"; depends=[zoo]; };
   gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; };
   gfcanalysis = derive2 { name="gfcanalysis"; version="1.4"; sha256="1hjgbiakf01mmaa2jhlnymcsjsj1zssay44p4sdxxxzpx4szs3vv"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; };
   gfer = derive2 { name="gfer"; version="0.1.10"; sha256="1y0ra8k7zka43ibiii16vbwnc3m1i77yc9zj8rhzhmvhajjwad3l"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; };
   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]; };
-  ggFacetSample = derive2 { name="ggFacetSample"; version="1.0.0"; sha256="04h5j54wblrygiscvb6n40b9lz42ssds1yz9qs5hxppiph68k5zq"; depends=[ggplot2 plyr]; };
   ggQC = derive2 { name="ggQC"; version="0.0.2"; sha256="1wi9hb5ihix2vfpzbhpq2clbs7c0qh84qbmdfcxw4lknb0ha9ai1"; 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]; };
   ggThemeAssist = derive2 { name="ggThemeAssist"; version="0.1.5"; sha256="1biw91a8p13h62v4w3yim6ghr98khmyhb3qd0h04asf91vvmpxbv"; depends=[formatR ggplot2 miniUI rstudioapi shiny]; };
+  ggTimeSeries = derive2 { name="ggTimeSeries"; version="1.0.1"; sha256="12gi0zfl8g3x78skpkhska8b3z1pp636shrbx33rkq0iacsipqga"; depends=[data_table ggplot2]; };
   ggallin = derive2 { name="ggallin"; version="0.1.1"; sha256="0hrxa7m07ppvnndivxcgxksdyblb6fw17aw46maqavlvcrz3fjgm"; depends=[ggplot2 scales]; };
-  ggalluvial = derive2 { name="ggalluvial"; version="0.6.0"; sha256="1c7jigi5zph0slfk8z0has3irlm39xlpklzak6s04m2idwl7dcjz"; depends=[dplyr ggplot2 lazyeval rlang tidyr]; };
+  ggalluvial = derive2 { name="ggalluvial"; version="0.9.1"; sha256="0np4dwhxz9q3p9y1w45fyvs4cphi50mbgi9wrinpi3k5i3anv6zf"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; };
   ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; };
   ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.6.0"; sha256="0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"; depends=[beeswarm ggplot2 vipor]; };
   ggbuildr = derive2 { name="ggbuildr"; version="0.1.0"; sha256="0pld635v6fv46ky7s4icwxlcnr7z6bp5ikf20adpkljwhy0wwxak"; depends=[ggplot2 purrr readr]; };
   ggconf = derive2 { name="ggconf"; version="0.1.3"; sha256="0g4xasqhdiqfqahakv6p5npl56f2iakx4bnc9v9zcjr077kdda4n"; depends=[ggplot2 rly]; };
-  ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.1"; sha256="04jq1qpsgy8bgpilp1a02va4vz0adkjwrz9znmhv54q81qiv7h51"; depends=[ggplot2 reshape2]; };
+  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]; };
-  ggdmc = derive2 { name="ggdmc"; version="0.1.3.9"; sha256="07a9g6kwq4hg5zlcxndwmyprl3di7fzsn2960qyixn5bzrfk7sh2"; depends=[coda ggmcmc ggplot2 ggthemes gridExtra loo Rcpp RcppArmadillo rtdists]; };
+  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.4.0"; sha256="0w2w0vwbpcwm9nqvsr2ksyary8ah6ar5gw233sbc8m3z3zx33qc1"; depends=[dplyr effects ggplot2 magrittr prediction purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr tidyselect]; };
+  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]; };
   ggenealogy = derive2 { name="ggenealogy"; version="0.3.0"; sha256="169zkcp13g0ll9941a7hh31fll0mavnkb6fd3kvkibdjm621ymyh"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; };
-  ggetho = derive2 { name="ggetho"; version="0.3.2"; sha256="1279y9mc4jvdpncy4xi80c2jbhkd1cv5k8hz5187dxq45ksan2bg"; depends=[behavr data_table ggplot2 labeling rlang scales stringr]; };
+  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]; };
-  ggfittext = derive2 { name="ggfittext"; version="0.5.0"; sha256="0ih6mqg53y5iaiq003wbzp6qqx4844yh5z9zw5d0k7gqclprmpn5"; depends=[ggplot2 stringi]; };
+  ggfittext = derive2 { name="ggfittext"; version="0.6.0"; sha256="06zhzw7yw7i08pqb9an8gsbf7qmvf9la8s8k1zgril8jsqwf6sfl"; depends=[ggplot2 stringi]; };
   ggfocus = derive2 { name="ggfocus"; version="0.8"; sha256="1gzx9hiaxni7d90wb9apqzw4rxc32gk5nrjxkgvwv52m999jh2wc"; depends=[dplyr ggplot2 magrittr RColorBrewer rlang]; };
-  ggforce = derive2 { name="ggforce"; version="0.1.2"; sha256="1asz6mkgq47hp3c52dyqvzd8fyimid1by0jj263br0k0c572na9w"; depends=[dplyr ggplot2 gtable lazyeval MASS Rcpp scales tweenr units]; };
-  ggformula = derive2 { name="ggformula"; version="0.8.0"; sha256="0rfkg5viznb98rd2xkq8mg8qvmxc8xm0jmiwwjfa3x2ngivgvwnw"; depends=[dplyr ggplot2 magrittr mosaicCore rlang stringr tibble]; };
+  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]; };
   ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; };
@@ -6929,8 +7232,9 @@ in with self; {
   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]; };
-  ggiraph = derive2 { name="ggiraph"; version="0.4.3"; sha256="0mjzx4jhfjr1mb19cgl70g5hfznnshbf08hvlg6hhbavlsk8fclp"; depends=[ggplot2 htmltools htmlwidgets rvg xml2]; };
-  ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.1.0"; sha256="09fiwkaai4sy5kxy4p0c4ldb8ya63czff53hbm6d8fm858fw2byw"; depends=[ggiraph ggplot2 mapproj mgcv moonBook mycor plyr reshape2 scales XML]; };
+  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]; };
+  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=[]; };
   gglogo = derive2 { name="gglogo"; version="0.1.3"; sha256="1dq0bixz44p32kpma5wrqjqklal2ipjmqdwqap0xch542drlpqbn"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2]; };
@@ -6939,78 +7243,86 @@ in with self; {
   ggm = derive2 { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; };
   ggmap = derive2 { name="ggmap"; version="2.6.1"; sha256="0mssb09w818jv58h7mly9y181pzv22sgcd4a079cfpq04bs0wigw"; depends=[digest geosphere ggplot2 jpeg mapproj plyr png proto reshape2 RgoogleMaps rjson scales]; };
   ggmcmc = derive2 { name="ggmcmc"; version="1.1"; sha256="09b89cnmdmiwy18igzxjiq60l1xqjh022fw3rhd5kx7lnh02yza3"; depends=[dplyr GGally ggplot2 tidyr]; };
-  ggmosaic = derive2 { name="ggmosaic"; version="0.1.2"; sha256="1mxa09914j9i8b14brl70a7j7ngycj8wkil3sqkd4jwplaszvhsn"; depends=[dplyr ggplot2 gridExtra NHANES plotly productplots purrr tidyr]; };
+  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]; };
+  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]; };
-  ggplot2 = derive2 { name="ggplot2"; version="3.0.0"; sha256="0kb977hizsvk3b1k3zr717q78bpmbabhl8cj9a3w717nkq1zas67"; depends=[digest gtable lazyeval MASS mgcv plyr reshape2 rlang scales tibble viridisLite withr]; };
+  ggparliament = derive2 { name="ggparliament"; version="2.0.0"; sha256="04za4lm3lir95bgda1rzlsyil2fkac3j5f5f1pjw2samy6pjz80r"; depends=[dplyr ggplot2 rlang]; };
+  ggperiodic = derive2 { name="ggperiodic"; version="0.1.0"; sha256="0fk4nns2rffv9q3904xq81spv5160l2ddzrhs8s96h041fxwgd0z"; depends=[dplyr ggplot2 sticky tidyselect]; };
+  ggplot2 = derive2 { name="ggplot2"; version="3.1.0"; sha256="1msy36r21nlmnpyaw2m9k0ykmnd19b9il01b65w457pfw75prrs9"; depends=[digest gtable lazyeval MASS mgcv plyr reshape2 rlang scales tibble viridisLite withr]; };
   ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; };
   ggplotAssist = derive2 { name="ggplotAssist"; version="0.1.3"; sha256="1g0s1dkbrxmwqjqppagdbnx24s0nbjn09xwxix3dkfssz6drhala"; depends=[dplyr editData gcookbook ggplot2 ggthemes magrittr miniUI moonBook rstudioapi scales shiny shinyAce shinyWidgets stringr tibble tidyverse]; };
   ggplotgui = derive2 { name="ggplotgui"; version="1.0.0"; sha256="1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0"; depends=[ggplot2 haven plotly RColorBrewer readr readxl shiny stringr]; };
-  ggplotify = derive2 { name="ggplotify"; version="0.0.2"; sha256="00qkm0jlhxgihncrygmkahqq0dm6kiyfw00iyrfw0khrd4khpahb"; depends=[ggplot2 gridGraphics rvcheck]; };
-  ggpmisc = derive2 { name="ggpmisc"; version="0.2.17"; sha256="1lx5a0n00994pp16jgz4c5xxsj8px6l9wl0cdsr0dr1d43lqywq1"; depends=[broom devtools dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang splus2R tibble xts zoo]; };
-  ggpol = derive2 { name="ggpol"; version="0.0.2"; sha256="0viq6k5xswhb7dzzjwr59kc7lw6312x015lbx64y3vx71ncbrgkz"; depends=[dplyr ggplot2 gtable plyr rlang]; };
+  ggplotify = derive2 { name="ggplotify"; version="0.0.3"; sha256="14hqlpvnaq5psz1ljcpw9isa06827rg3fm5c1dx159rsjfi56yby"; depends=[ggplot2 gridGraphics rvcheck]; };
+  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.7"; sha256="110ny8p41kmbz0a5rl0mv9cqpjkx6yr3ybflp1r0fmcvhwv7cr3i"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif gridExtra magrittr purrr scales tidyr]; };
-  ggpval = derive2 { name="ggpval"; version="0.2.0"; sha256="1nwf3cz1258khp1barxxp28326bagvlsfhg4rcccbxcpny9vbl7d"; depends=[data_table ggplot2]; };
-  ggquickeda = derive2 { name="ggquickeda"; version="0.1.0"; sha256="00j6gpika8x2yplnirj06vrc55aljcdhd2ln7081kym8xsfrjd2h"; depends=[colourpicker dplyr DT Formula ggplot2 ggrepel gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjs stringr survival tidyr]; };
+  ggpubr = derive2 { name="ggpubr"; version="0.1.8"; sha256="0psl2zndm4wk6nnj1nv305islpxfvfgd87gjh2ph8yqn4mxpnfi1"; 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]; };
-  ggraph = derive2 { name="ggraph"; version="1.0.1"; sha256="0sm1hf2fjfia0s8m5b1x6pi8wvww77rpck86clpa2figwvck8jqr"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; };
+  ggraph = derive2 { name="ggraph"; version="1.0.2"; sha256="0fpmp326mryd1k1qvacjadksrnhbla8h960i18lmrimzrag7692c"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; };
   ggraptR = derive2 { name="ggraptR"; version="1.1"; sha256="1lknd3vibysc00c6b59c0yq2r3dda7zn8bj7gxjzjv90jwpgl0b8"; depends=[dplyr ggplot2 pacman purrr shiny]; };
   ggrasp = derive2 { name="ggrasp"; version="1.0"; sha256="0lini89mcxl30kx38vny9896hdf4afrz5dgivbbikkb2yyfh2cq1"; depends=[ape bgmm colorspace ggplot2 mixtools]; };
   ggrepel = derive2 { name="ggrepel"; version="0.8.0"; sha256="1m3p84d6nh9mzzvxb82vgig3ngcvkz86rjwzl9a66ckdf5p611k3"; depends=[ggplot2 Rcpp scales]; };
-  ggridges = derive2 { name="ggridges"; version="0.5.0"; sha256="1znvsbl3px8dddpjgdrygnpz4s685wizi0jnjvx2hrz58i0chjqj"; depends=[ggplot2 plyr scales withr]; };
+  ggridges = derive2 { name="ggridges"; version="0.5.1"; sha256="0dhwcpy785ac2ny5bjp284595nnybi3554wd0yffsli0vzf7ry01"; depends=[ggplot2 plyr scales withr]; };
   ggsci = derive2 { name="ggsci"; version="2.9"; sha256="0g73x6grbka7ahjh6z23m3wrcifp5rdfdiasbl8lq4sp6rplxwaa"; depends=[ggplot2 scales]; };
   ggseas = derive2 { name="ggseas"; version="0.5.4"; sha256="1jpdijwll5l7bg7cmjnklkxffysi9ckzg50rw2a2cd00zwby11q9"; depends=[ggplot2 rlang seasonal zoo]; };
   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]; };
-  ggspatial = derive2 { name="ggspatial"; version="0.2.1"; sha256="11vminz4kwv1ny4v9h23sp7j7d45q6v4804xv9fp04qgzbzi9lv8"; depends=[abind ggplot2 maptools plyr raster reshape2 rgdal rosm scales sp]; };
-  ggspectra = derive2 { name="ggspectra"; version="0.2.4-1"; sha256="0jp1zfzsnpnvcyw4m7cn4d871pqsniyrhv3j5riir6fa4ll4nmcb"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; };
-  ggstance = derive2 { name="ggstance"; version="0.3"; sha256="0sr84nasr8x8ib3mdsjck73gbfg9xba50s5nxdij0ah9xqnpyhpi"; depends=[ggplot2 lazyeval plyr purrr]; };
-  ggstatsplot = derive2 { name="ggstatsplot"; version="0.0.4"; sha256="19rr5cq9s9w4ivdr42ia0vqf62vsq0l1d3f3icp0zy0r9jzsdfwp"; depends=[apaTables boot broom coin cowplot crayon dplyr effsize ggcorrplot ggExtra ggplot2 ggrepel glue gtable jmv lmerTest magrittr MBESS purrr purrrlyr rlang scales sjstats tibble tidyr WRS2]; };
+  ggsolvencyii = derive2 { name="ggsolvencyii"; version="0.1.0"; sha256="0qg2qlgnbndrjsri0n628niin2m4g7mhz59szr1cid88kakj33n9"; 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]; };
+  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]; };
   ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; };
-  ggtern = derive2 { name="ggtern"; version="2.2.1"; sha256="05dszysn1qr5s4ji4il91pv19xjh5yd09w9f153fmg4cyfl716iz"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; };
-  ggthemes = derive2 { name="ggthemes"; version="3.5.0"; sha256="0drbzzb4i5jq1579fx1wmgh87ybnswjn7srak2l8g771ip49xwb8"; depends=[assertthat colorspace ggplot2 scales]; };
+  ggtern = derive2 { name="ggtern"; version="3.0.0"; sha256="1qfgxid4bpzfmjz4jg9rg2sc12xzymadi06ryf4kwb06z4krd1k3"; 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.3"; sha256="1p7c8f83da30grj5n0v80p5djp6z0r62z5zqpv2a3ahn61w1gm9l"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
+  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]; };
+  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.1"; sha256="1jnl017hkzhiic0fndprs68xx3njlijxkaqj9d65xazcwynaq436"; depends=[ggplot2]; };
+  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]; };
-  giRaph = derive2 { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; };
   gibble = derive2 { name="gibble"; version="0.0.2"; sha256="0a9h3q0kwk9aagcpnmih59vbm5n7hdjpa4idwagky351almblmr6"; 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-1"; sha256="1b1f92v54r9aqbwia549abjiw712ps4s58yw2n9p9894m4ijc88v"; depends=[igraph lavaan qgraph]; };
+  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]; };
   gistr = derive2 { name="gistr"; version="0.4.2"; sha256="0bh325pf37v307isdlvdglripfki8xr6gh7n8mgi4cjparzhrh23"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
-  git2r = derive2 { name="git2r"; version="0.21.0"; sha256="11xgddmxzh9cy85k8fb90il43qswpvryz0h9r0j1gbclfg2f9004"; depends=[]; };
+  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]; };
   githubinstall = derive2 { name="githubinstall"; version="0.2.2"; sha256="0hqh86r2007hzdbm8rr0fwqhhsna7ji8sdgmdnrxkxraa5f2pfz3"; depends=[curl data_table devtools httr jsonlite mockery]; };
   gitlabr = derive2 { name="gitlabr"; version="0.9"; sha256="0i9sqqvn9xzknybsj9nmi6kclw8c35shy658li17455d28gv4653"; depends=[base64enc dplyr httr magrittr purrr stringr tibble yaml]; };
   gitter = derive2 { name="gitter"; version="1.1.1"; sha256="10m4rs6mhg7xn8dfd41ai0bnn5bnxn6cgqip22hrrpj0i2lzky6l"; depends=[EBImage ggplot2 jpeg logging PET tiff]; };
   givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; };
-  gjam = derive2 { name="gjam"; version="2.2.4"; sha256="16gfb199mhpg0yp7xy9x8nlpcfmhkks92fwfa1ryv6plkzn6rhkl"; depends=[MASS RANN Rcpp RcppArmadillo]; };
+  gjam = derive2 { name="gjam"; version="2.2.6"; sha256="16csy2vr4ly09f5nqwad1ik1nj0yhmxs1jj1rjqdi2ramh4jlwlx"; depends=[MASS RANN Rcpp RcppArmadillo]; };
   gk = derive2 { name="gk"; version="0.5.1"; sha256="1hgxb1lp78pbnj22i7ryf46im301j05y7hh75z2fxvv5nqgg2v75"; depends=[Ecdat lubridate progress]; };
   gkmSVM = derive2 { name="gkmSVM"; version="0.79.0"; sha256="04dakbgfvfalz4rm4fvvybp506dn5fbj5g86ybfhrc6wywjllsz3"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges kernlab Rcpp ROCR rtracklayer S4Vectors seqinr]; };
   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]; };
-  glasso = derive2 { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; };
+  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=[]; };
   glcm = derive2 { name="glcm"; version="1.6.1"; sha256="0xzfhafc7326v3g1xngp584039iknw3q3bcx8f0j4ig125in7sxk"; depends=[Rcpp RcppArmadillo]; };
   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="0.1.0"; sha256="13ca5ms6bbrj3ny5n438v5ma0d7ccnghysz7c8452cpdq8sn87iy"; depends=[fishMod MASS Matrix mvabund mvtnorm Rcpp RcppEigen statmod TMB]; };
+  gllvm = derive2 { name="gllvm"; version="1.0"; sha256="1bhxwv4nggl2pbbr3c53j8jk02l4kwzkdhg4wmv9xlpd3mc2qb07"; 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"; sha256="09bjqz7zih644hba27illlmzfcs94q5h4fdplg948adi1z790las"; depends=[]; };
+  glm2 = derive2 { name="glm2"; version="1.2.1"; sha256="1byqlvpls23gzy7xlbs1kgfr4bsrmsrpc8rzzacf9czap1nlw39y"; depends=[]; };
   glmBfp = derive2 { name="glmBfp"; version="0.0-51"; sha256="15jm450j1f0nl7vqvpb2mwapdlvn7kq2kxf5s96x21siwsz7sssv"; depends=[coda Rcpp RcppArmadillo rms Runuran statmod survival]; };
   glmbb = derive2 { name="glmbb"; version="0.3"; sha256="12yabwswps0fmprh8nb9jdny9xrm13jvc0d9m3w04ppmsvalrmwl"; depends=[digest]; };
   glmc = derive2 { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; };
@@ -7024,7 +7336,7 @@ 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.1.2"; sha256="0c7in0sq7q1dfgk316j0aizycn8mdpjknf1yfp3d670g3275sx87"; depends=[]; };
+  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]; };
   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]; };
@@ -7039,24 +7351,27 @@ in with self; {
   globalGSA = derive2 { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; };
   globalOptTests = derive2 { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; };
   globalboosttest = derive2 { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; };
-  globals = derive2 { name="globals"; version="0.12.1"; sha256="1yfgxnvrd0xnl5ir5835lna3a1zwy0s2apibi270mj5sflrlfwia"; depends=[codetools]; };
+  globals = derive2 { name="globals"; version="0.12.4"; sha256="0szyv1ayyk31bh3xqlkj43020w44xq6s4rw2bxwizyjssxm3b1br"; depends=[codetools]; };
   globe = derive2 { name="globe"; version="1.2-0"; sha256="0xa0q5dac0g7xdlr679f3km8nqxlm7gi4msp9fbfivfvy0rmri96"; depends=[]; };
   glogis = derive2 { name="glogis"; version="1.0-1"; sha256="1sbvcg5slvd2c7fasvbj534x36rh11zq3mxv5z0jwpqd6h1xadmd"; depends=[sandwich zoo]; };
-  glpkAPI = derive2 { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k5za89hc64n2j9djz5bcryrqhq4rmkp87"; depends=[]; };
+  glpkAPI = derive2 { name="glpkAPI"; version="1.3.1"; sha256="06p8zvmshymcw994mmf1ar00kfj645z8dp18yy4i5bl6qydbpb8k"; depends=[]; };
   glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; };
-  glue = derive2 { name="glue"; version="1.2.0"; sha256="0vi9y8ix95g6hjqdz9c9y4119apbdjcypdv0ag8cl6vaxqs5n9qr"; depends=[]; };
+  glue = derive2 { name="glue"; version="1.3.0"; sha256="1vhw5497lpfr4m8lcx9bs0fgdp4ax0sycrk6n8yksp33qd25m7kq"; depends=[]; };
+  glycanr = derive2 { name="glycanr"; version="0.3.1"; sha256="1wygy5r5rdkcxrraqkqs2kd0nj8x2whm6k556pyd1sa4ra8xgvjp"; depends=[coin dplyr ggplot2 tidyr]; };
   gmDatabase = derive2 { name="gmDatabase"; version="0.5.0"; sha256="0prap4a8pvylmvakd2ii87jz9bqf0vvfsxdi4iwa40nx444hqhx2"; depends=[DBI digest foreach RMySQL shiny]; };
   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.3"; sha256="09vgrfv5dj0myys0rl767wn0xx1yvmm176c48812ysj2kj3fa29v"; depends=[RCurl XML]; };
+  gmapsdistance = derive2 { name="gmapsdistance"; version="3.4"; sha256="1hazf6xb4ja6h2lrl63kbd78wzny9sljiid9rq1r3szn3l1mc7dn"; depends=[RCurl XML]; };
+  gmat = derive2 { name="gmat"; version="0.1.0"; sha256="1fpkx91fwr6cj6jn9a4lsj5f3nhvg8lyxandqbv9z5imb73d1gci"; 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]; };
   gmodels = derive2 { name="gmodels"; version="2.18.1"; sha256="0s8kd8krqk4kwv2zqxpsfy3w8qdwf5naf4b5l383vidq9sil0qb2"; depends=[gdata MASS]; };
-  gmp = derive2 { name="gmp"; version="0.5-13.1"; sha256="0xh9dli4i7hyjywsn2h780cxl3k7v0q421djyr1wshk7l9s5701g"; depends=[]; };
+  gmp = derive2 { name="gmp"; version="0.5-13.2"; sha256="1xd6jjra4niqv1kps91y348lwgvy73p2faxaia4gfzdnrpw7wsxf"; depends=[]; };
   gmt = derive2 { name="gmt"; version="2.0-1"; sha256="1g1sj9gq3h3s0pdcfvzg7iifkns5azn3pa83if0d3yzc28cjf0yz"; depends=[]; };
+  gmvarkit = derive2 { name="gmvarkit"; version="1.0.3"; sha256="1497n11a7m5mbb8d3hcr89yhfh64vqsxi2w6kvlrxmmx95q2cp70"; depends=[Brobdingnag mvnfast pbapply]; };
   gnFit = derive2 { name="gnFit"; version="0.2.0"; sha256="0cji4zjslh18dfj0l827r6br4hx2f0akiaxrg7fhhyyyhgdcjnsm"; depends=[ismev rmutil]; };
   gnlm = derive2 { name="gnlm"; version="1.1.0"; sha256="0fv89cvbnp9n3lgg6y4sqmz9jzcgwj7vd92rwg7hixwrjyqpan4z"; depends=[rmutil]; };
   gnm = derive2 { name="gnm"; version="1.1-0"; sha256="01d7wxsh4d9w4jh8vn62sjzgpll650yl3klfhlaa8j0qwpxr2fml"; depends=[MASS Matrix nnet qvcalc relimp]; };
@@ -7066,7 +7381,7 @@ in with self; {
   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]; };
   gof = derive2 { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp5jpyml8ybn7xqswp8am82vpg"; depends=[]; };
-  gofCopula = derive2 { name="gofCopula"; version="0.2-3"; sha256="1xigbv9mc0c1j3qc0nay0fjwmqvw91cy3x1z6m56bgkgfli7gp2l"; depends=[copula doParallel foreach MASS numDeriv R_utils SparseGrid VineCopula]; };
+  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]; };
   gofastr = derive2 { name="gofastr"; version="0.3.0"; sha256="02jn4xbbafl7siwvkqns1818wmw813x9cvqfcnpnmcippiqhrb0b"; depends=[data_table quanteda slam SnowballC tm]; };
   goft = derive2 { name="goft"; version="1.3.4"; sha256="15n1av7r6w8hihxlgw9pd570qgrlcprkkacln15chvjs3b0i60la"; depends=[fitdistrplus]; };
@@ -7081,14 +7396,15 @@ in with self; {
   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.6.1"; sha256="1g28py8amkfq8cgf297w9yv1n26wm2alb6gmcal3i39qfadkdhsv"; depends=[BH Rcpp]; };
+  googlePolylines = derive2 { name="googlePolylines"; version="0.7.1"; sha256="194wh92z65g1f4b1a5pdv2jlwkmdr3fjkj9kai993kn7zkpbkpa0"; 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]; };
-  googledrive = derive2 { name="googledrive"; version="0.1.1"; sha256="1fshv85s4ldw2kc7lbbdvrl260pz76z04awx1n6lg0f5xmba9rfg"; depends=[curl glue httr jsonlite purrr rlang tibble uuid]; };
+  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]; };
   googlesheets = derive2 { name="googlesheets"; version="0.3.0"; sha256="11q07nxys72wkxx9mawmjyf20gvwvrb7h3gpa73h6lgh2vgrwnv8"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tibble tidyr xml2]; };
-  googleway = derive2 { name="googleway"; version="2.7.0"; sha256="129yyy21sdbhhffg23jkhs0d6f03di4da5mwgg8x8ckv7r9jraw8"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; };
+  googleway = derive2 { name="googleway"; version="2.7.1"; sha256="0axpr81p3gdp1nmfn000lk288sdn8z5qmzjvagdxqn5j44hq6sj1"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; };
   goric = derive2 { name="goric"; version="1.1-0"; sha256="1smjq9vljszgngs5i6x55jwg0imzc5gsfdqxzcs4541fp3pvk999"; depends=[MASS Matrix mvtnorm nlme quadprog]; };
   govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; };
   gower = derive2 { name="gower"; version="0.1.2"; sha256="1mbrj1lam3jfbby2j32shmmj5cn09zx3rkxbamq7q8sdg39b54gb"; depends=[]; };
@@ -7115,32 +7431,33 @@ in with self; {
   granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; };
   granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; };
   grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; };
-  graphTweets = derive2 { name="graphTweets"; version="0.4.0"; sha256="1zw04s61wjgrx6r6fspp59y5l3bfjf68klcrkp7alaap5dpjsn9a"; depends=[dplyr igraph magrittr purrr reshape2 rtweet splitstackshape]; };
+  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]; };
   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.2.0"; sha256="0fdvi2nn7g39mc85jg3rgwyk2wjh2k60pd9lyivfbg3140k1yawh"; depends=[ROptSpace]; };
+  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]; };
   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.6.0.0"; sha256="0w8dqnj8di3fm2vp1bz2wdyh207rh9vwqc25mhxg73jjmls8rd33"; depends=[assertthat data_table fastmatch forecast hutils ineq magrittr Rcpp rsdmx zoo]; };
-  gravity = derive2 { name="gravity"; version="0.6"; sha256="15ngk6a5f6xjvisk6ma625iaw4ybg7722xgmnr4rnlmsgm95v668"; depends=[censReg glm2 lmtest MASS multiwayvcov sandwich survival]; };
-  grec = derive2 { name="grec"; version="1.2.0"; sha256="1djmi5nm4xdxzyikll3wcgfabqr952qqlyxad8frvxy878a85fpw"; depends=[imagine raster]; };
+  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]; };
+  grec = derive2 { name="grec"; version="1.2.2"; sha256="0xr17xq4hvl6zaajj04cwymmpzfnbwb86z0ziarj5bc5wjfw0yb2"; depends=[imagine raster]; };
+  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]; };
   grex = derive2 { name="grex"; version="1.8"; sha256="0z81dlzk5vv51nwhfiijzpxgf71m4fsrfqzrbxx2kyf3f8c9xg1r"; depends=[]; };
-  greybox = derive2 { name="greybox"; version="0.2.2"; sha256="1kgxcg9502gn766p4qvdbixi25gc81xg49wlzv02gcsqf2nzrl1c"; depends=[forecast lamW]; };
+  greybox = derive2 { name="greybox"; version="0.3.2"; sha256="1vqkq015qzlqqajhxswiqikaw4ykjs5rasdwyjxj2ggq1ks78px8"; 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.0"; sha256="1pfpgnnzqasai797kizmpv4sgr0i38amppmqwba22rs5mrz72c9w"; depends=[DiceKriging Matrix Rcpp RcppEigen sandwich]; };
+  grf = derive2 { name="grf"; version="0.10.1"; sha256="03i6gidz4jrwqcc60c4gv0l83d5ckm5pg5vm8bgbxc6dbg1636z3"; 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]; };
   gridGraphics = derive2 { name="gridGraphics"; version="0.3-0"; sha256="1p94flvq5h3x817pl1m0aj3sim87x6zdbpv9xrgdnqw3rxfzwgqs"; depends=[]; };
   gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; };
   gridSVG = derive2 { name="gridSVG"; version="1.6-0"; sha256="06nxp0h6clsfxcx5lf11sgzq7v4ijbynh6hldbnpm6pqwn18hb0j"; depends=[jsonlite XML]; };
-  gridsample = derive2 { name="gridsample"; version="0.2.0"; sha256="0hpfhkma60h59z3akjqs7igs6zg00xs3jlq3sm48gxbjrk7fb5sm"; depends=[data_table deldir geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; };
+  gridsample = derive2 { name="gridsample"; version="0.2.1"; sha256="062aryy26x07m31r6m0fj1zgnjhivlh1fikx9lv2rdgk0rh4yzz0"; depends=[data_table geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; };
   gridsampler = derive2 { name="gridsampler"; version="0.6"; sha256="0wqpqg9c372sv8zqks6v93gawiyfghw58hn7m8q45dxpqm16ss3k"; depends=[BiasedUrn ggplot2 plyr reshape2 shiny shinyBS shinythemes]; };
   grnn = derive2 { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
   groc = derive2 { name="groc"; version="1.0.6"; sha256="0x7rrf5bw05s257xhzklpc6hslpjnzjx02hlrz4r9zixbfffmawc"; depends=[MASS mgcv pls robust robustbase rrcov]; };
@@ -7150,19 +7467,19 @@ 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.1"; sha256="19rdn86zzv40f0ha0q043wj538scbj1x2j80bwllcbl78cmpq3i3"; depends=[broom crayon dplyr glue magrittr purrr rlang robust rstudioapi sjstats skimr tibble tidyr]; };
+  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]; };
   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]; };
   growfunctions = derive2 { name="growfunctions"; version="0.14"; sha256="1pvyiw20fxm3l4giyq4iizc67yy36i6wq4ch2qyqg4mfd4bki2g4"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo reshape2 spam]; };
   growth = derive2 { name="growth"; version="1.1.0"; sha256="0d1hc56ybp5chckqv5q5jvpgbl7xn9dkbc4dd4sz5gawn1hngbxm"; depends=[rmutil]; };
-  growthcurver = derive2 { name="growthcurver"; version="0.2.1"; sha256="0q70g940ggpwnx2cpq2j8ambfbj9sqw6ivyp9cya1nbn05bah9ds"; depends=[caTools minpack_lm]; };
+  growthcurver = derive2 { name="growthcurver"; version="0.3.0"; sha256="0q7g00b9sxxlq8yscmmccr8r4mwzpc707arbrr46iii8ra9icvlb"; depends=[minpack_lm]; };
   growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; };
   growthrate = derive2 { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[clime Matrix mvtnorm]; };
   growthrates = derive2 { name="growthrates"; version="0.7.2"; sha256="1szyc85gi0wgg98br53lxqpamic1srvfiyq1m818j38xnlyj1lxw"; depends=[deSolve FME lattice]; };
   grpSLOPE = derive2 { name="grpSLOPE"; version="0.2.1"; sha256="1r9irf83f7szhkdqis2rakil8fsr3rqsfrj4dmbg3r3rnr8wl8nh"; depends=[SLOPE]; };
-  grplasso = derive2 { name="grplasso"; version="0.4-5"; sha256="15bqckq9qjdlllhfpb21vzgi9msbl544alkrz01w1vvb3hk1847y"; depends=[]; };
-  grpreg = derive2 { name="grpreg"; version="3.1-4"; sha256="0lxr83imsg3g9nk2cmvmg6mying23f05f5q2xniiqvayrd7i4ii9"; depends=[Matrix]; };
+  grplasso = derive2 { name="grplasso"; version="0.4-6"; sha256="0xr6plgnc3lp93rd4jk4dqjix8kgl8s2b68fh41k6jwd5y8d7pks"; depends=[]; };
+  grpreg = derive2 { name="grpreg"; version="3.2-0"; sha256="0jvkdmhm7q22z7faz1k8n87jw3f16bqr7yqmj2nqap1ha7c1ib8m"; depends=[Matrix]; };
   grpregOverlap = derive2 { name="grpregOverlap"; version="2.2-0"; sha256="1kq8wxpx21irwckndgfkzdy5jgzf7pmcwpclmjzjxznv6cyaikd0"; depends=[grpreg Matrix]; };
   grpss = derive2 { name="grpss"; version="3.0.1"; sha256="01bjjhv3vkvn5h363g5a9dlm7kzq10q7ixmrc0kkq5hsbs31vl3x"; depends=[doParallel foreach grpreg MASS]; };
   grr = derive2 { name="grr"; version="0.9.5"; sha256="0arbcgrvhkwb5xk4nry1ffg2qj0v8ivhjghdr505ib4357g0c9i9"; depends=[]; };
@@ -7186,7 +7503,7 @@ in with self; {
   gstat = derive2 { name="gstat"; version="1.1-6"; sha256="0snvga824v1kbd3xp46652bv6drfrgkjsi5zrbdcliqpqz79wk9f"; depends=[FNN lattice sp spacetime zoo]; };
   gsubfn = derive2 { name="gsubfn"; version="0.7"; sha256="00j6b8b6xsx6v370h220x233rpk6asca78165y3d48jpwvwisdc9"; depends=[proto]; };
   gsw = derive2 { name="gsw"; version="1.0-5"; sha256="0lv4x4is53xybgg205dncizpnqnakqk47b5wgys2kr4ixqc8jipb"; depends=[testthat]; };
-  gsynth = derive2 { name="gsynth"; version="1.0.6"; sha256="0fzdlflrl9qlvbzjdspws3naabwyphwqys01wp4wkw5y7whq0mar"; depends=[abind doParallel foreach GGally ggplot2 mvtnorm Rcpp RcppArmadillo]; };
+  gsynth = derive2 { name="gsynth"; version="1.0.9"; sha256="1m9s3gymm0z6frfzmz7kv8cbdnla2vp4aam5b2zzcxwflzwbplm3"; depends=[abind doParallel foreach GGally ggplot2 MASS mvtnorm Rcpp RcppArmadillo]; };
   gt4ireval = derive2 { name="gt4ireval"; version="2.0"; sha256="1d567iz57xqszm45l1wq4n2qrrmyz8ssll1vllfmncb9ibbnx4f3"; depends=[]; };
   gtWAS = derive2 { name="gtWAS"; version="1.0.0"; sha256="1pk7m1apgksbh8a3xb94aj3wp9dbcv5rm6brdcjb5fsgxj7iaq5c"; depends=[]; };
   gtable = derive2 { name="gtable"; version="0.2.0"; sha256="0vz7073m0a2q12qzzihrfh5c2kx5jqi5l7z470fxmwqghdllh7l0"; depends=[]; };
@@ -7195,13 +7512,12 @@ in with self; {
   gtheory = derive2 { name="gtheory"; version="0.1.2"; sha256="1xc1jl69z5csalqk3hx83s53awcl1fjq6p0x2pczhs7dsvwd6lks"; depends=[lme4]; };
   gtools = derive2 { name="gtools"; version="3.8.1"; sha256="0f5syk1qq6cjq6hwymvkiyhzwa389z94722v881ipbfqkd2q8505"; depends=[]; };
   gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; };
-  gtrendsR = derive2 { name="gtrendsR"; version="1.4.1"; sha256="08zfh73viv9p1c4qmw3jnywa5xzbm39kfi60whl0w5pvh3q9pksf"; depends=[anytime curl ggplot2 jsonlite]; };
-  gtsf = derive2 { name="gtsf"; version="0.1.0"; sha256="11b1rgqzyywpk0qjm575l98irbifgkdlfhhynccils5y8f7vyhf8"; depends=[assertthat dplyr magrittr readr rlang sf stringr tibble]; };
+  gtrendsR = derive2 { name="gtrendsR"; version="1.4.2"; sha256="1rph2iv9dirzw1acgq7n56ra20jdynq99biah5v6nybmxdbmznzd"; depends=[anytime curl ggplot2 jsonlite]; };
   gtx = derive2 { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
   guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; };
-  gumbel = derive2 { name="gumbel"; version="1.10-1"; sha256="12rkri8bvgjn0ylf1i4k9vpb8mvbasidvx2479kmis2rc1p07qq7"; depends=[]; };
+  gumbel = derive2 { name="gumbel"; version="1.10-2"; sha256="0s9idcrssnl683abwky9zvqylciy0b51z935yfvb2bm8b0b0b4ij"; depends=[]; };
   gunsales = derive2 { name="gunsales"; version="0.1.2"; sha256="02vz16lhym72vvf48yai1g371wygdlmi63a6ylc147l0b69jgw31"; depends=[data_table dplyr ggplot2 seasonal x13binary zoo]; };
-  gustave = derive2 { name="gustave"; version="0.3.0"; sha256="1vijf5x07l507r0li6hs0hhxia83llpykllcrkhm00ms5na7p4jz"; depends=[MASS Matrix]; };
+  gustave = derive2 { name="gustave"; version="0.4.0"; sha256="1swnkb1134mnlnfpdchyhmrhr0r5nw90yczsg52hwbhj8hjl2axp"; depends=[Matrix]; };
   gutenbergr = derive2 { name="gutenbergr"; version="0.1.4"; sha256="1xf9h0ikfzgq6bzzxa7wih29cgbfk6lgdv041fprxbd9rz38agi9"; depends=[dplyr lazyeval purrr readr stringr urltools]; };
   gvc = derive2 { name="gvc"; version="0.5.2"; sha256="0cfvli6ap5kw3agv94d7g7rhmlxd66yyngc7c9pl4fsxf7sm6nx4"; depends=[decompr diagonals]; };
   gvcR = derive2 { name="gvcR"; version="0.1.0"; sha256="0r54924b9a65k11p8y3p7jxbvmpb7s7vs87v65hhl98gxacj5hk8"; depends=[dplyr eda4treeR lme4 magrittr]; };
@@ -7214,28 +7530,31 @@ in with self; {
   gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
   gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; };
   gyriq = derive2 { name="gyriq"; version="1.0.2"; sha256="12vbnhianzi4l43czaxrbnbkz1h8lvmwjys0y3c2ml3g6dmwwfji"; depends=[CompQuadForm irlba mvtnorm survival]; };
-  h2o = derive2 { name="h2o"; version="3.20.0.2"; sha256="1pchml5d8py4cnii5lmmw65cglixvgwgvl592kl3ix09w34grsps"; depends=[jsonlite RCurl]; };
+  h2o = derive2 { name="h2o"; version="3.20.0.8"; sha256="17piklf91fmpf7bl4sk300bwnvsxljad925whs2h12xhqgw3amgv"; depends=[jsonlite RCurl]; };
   h2o4gpu = derive2 { name="h2o4gpu"; version="0.2.0"; sha256="06d2rrr27xvnsai6zjiaiw0jjfzdza1cc39c03d6pjkvnh0mqh2c"; depends=[magrittr reticulate]; };
   h5 = derive2 { name="h5"; version="0.9.9"; sha256="14p7i1sj24ky87kd7qr3n9fc9l64s0bp0rwbyl6i2x69xn75gpsx"; depends=[Rcpp]; };
-  hBayesDM = derive2 { name="hBayesDM"; version="0.5.0"; sha256="174z98jvi04df04lpdxh3j8lmjvgrg287nxfnrcvjkibc0jiss4m"; depends=[ggplot2 loo Rcpp rstan rstantools]; };
-  hIRT = derive2 { name="hIRT"; version="0.1.2"; sha256="0pqp6bycr13di1hbi5sqnkiannz2hyg0ysshswv2i9fp0vkhdhqf"; depends=[pryr rms]; };
-  hNMF = derive2 { name="hNMF"; version="0.6"; sha256="0a6wf9mhv3b7wb8kimjqm1sj9k8d2j98p7i707bgn5hvmyc39bnf"; depends=[MASS NMF nnls oro_nifti R_matlab rasterImage spatialfil]; };
+  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]; };
   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=[]; };
   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=[]; };
   haplo_stats = derive2 { name="haplo.stats"; version="1.7.9"; sha256="19kxascqq5qz0zdxx0w837ji207y1z2ggxkl4vmlbay03k2dw2mx"; depends=[rms]; };
-  haploR = derive2 { name="haploR"; version="2.0.3"; sha256="0m2pqrg1734x2ab19dqf5mqgrzibd2l5g6800if0a92bi51q67bx"; depends=[DT httr plyr RUnit tibble XML]; };
+  haploR = derive2 { name="haploR"; version="2.0.6"; sha256="0f0i687wrsmli1z48vghwbd4595nwvv2bajnn0jkyi9fw9r2vnn0"; depends=[DT httr plyr RUnit tibble XML]; };
   haploReconstruct = derive2 { name="haploReconstruct"; version="0.1.2"; sha256="17zdl9c3yy6jdzv1wp0ailbga456pmmybzxh3dldymhj8qf32cx0"; depends=[data_table dbscan foreach gplots igraph matrixStats stringi zoo]; };
   haplotyper = derive2 { name="haplotyper"; version="0.1"; sha256="0pcshlh29c4zazhkcq4371kqh9inrbx494y5a1qb1k2c92fkax31"; depends=[]; };
   haplotypes = derive2 { name="haplotypes"; version="1.0"; sha256="0pwihfi6g4jrnkha9s9rksq0fc8j04mlrwf0295rmy49y19rg84s"; depends=[network]; };
   happybiRthday = derive2 { name="happybiRthday"; version="0.0.1"; sha256="0rrvi5kx09p74xwxvqcwibbh4qjlk4jxb89grx74chjxk9ak2yv8"; depends=[data_table dplyr gh lubridate tidyr]; };
+  happytime = derive2 { name="happytime"; version="0.1.0"; sha256="03iblwb6w2dh9sibfi4nlswidck13hzsn7123838zp4sxfnrp041"; depends=[]; };
   hapsim = derive2 { name="hapsim"; version="0.31"; sha256="0jw6iw89d4y8wjy58biv40szp123ql7frz1mmdjdxljmwaby963h"; depends=[MASS]; };
   harmonicmeanp = derive2 { name="harmonicmeanp"; version="1.0"; sha256="071ysgyi8daq8q1vqzgypkz4bgaxr0iw4djv906vkfx5ywihr768"; depends=[FMStable]; };
   harrietr = derive2 { name="harrietr"; version="0.2.3"; sha256="0n6vsqysj4ijh06z6nqmj8x1z4w9711dxhbfp8p8fwi0l75pj0cj"; depends=[ape dplyr ggtree lazyeval magrittr rlang tidyr]; };
+  harrypotter = derive2 { name="harrypotter"; version="0.1.0"; sha256="0h02rli2l42a2vjgrw7fqxib31pyqcyhqam499bpybk5crqnpffx"; depends=[ggplot2 gridExtra MASS]; };
   harvestr = derive2 { name="harvestr"; version="0.7.1"; sha256="0xgxzbfbc33asfm8sl2y60ki6bwgd6vdh9nz466crkx7m9lsvll8"; depends=[digest foreach plyr]; };
   hash = derive2 { name="hash"; version="2.2.6"; sha256="0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"; depends=[]; };
   hashFunction = derive2 { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; };
@@ -7258,29 +7577,32 @@ in with self; {
   hda = derive2 { name="hda"; version="0.2-14"; sha256="0azfxyws7yslcqplfddmdp5ngk91j5h7llvrg77yh5z0kkd09j1b"; depends=[e1071]; };
   hdbinseg = derive2 { name="hdbinseg"; version="1.0.1"; sha256="0fy9cqrygsnxkb3nxg56md19svrvkbijpxkqfk9p18cj5ibwrq94"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; };
   hddplot = derive2 { name="hddplot"; version="0.59"; sha256="18llkpawm12cjxlcrlra60m16virfpjqiaqkvy9mb3wq1zif61rh"; depends=[MASS multtest]; };
-  hdf5r = derive2 { name="hdf5r"; version="1.0.0"; sha256="1s6p4cj909kc635fh5xpl87bqlcdj3dn3r1wk5g40abimk2b0pva"; depends=[bit64 R6]; };
+  hddtools = derive2 { name="hddtools"; version="0.8.2"; sha256="02gbqlzwxc77gllgz9sf2s73y4ngyb4warabdfyj2sm2g7jl6y12"; depends=[gdata Hmisc raster RCurl rgdal rnrfa sp stringr tibble XML zoo]; };
+  hdf5r = derive2 { name="hdf5r"; version="1.0.1"; sha256="0h222q80li8rs3cv4c5lvv3g91ygd51w43ay6fwyk9q9d315vwrj"; depends=[bit64 R6]; };
   hdi = derive2 { name="hdi"; version="0.1-6"; sha256="1lzy4jcz14j1qi6z4j1sq7z3z75n8jygnzlvqjf45vn1sqil17cq"; depends=[glmnet linprog MASS scalreg]; };
   hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; };
   hdm = derive2 { name="hdm"; version="0.2.3"; sha256="0nj7pbkygzbiraw1b3pqv3bnkjhi1a0h48q0zgkcq8y79kj2f8cl"; depends=[checkmate Formula ggplot2 glmnet MASS]; };
-  hdme = derive2 { name="hdme"; version="0.2.0"; sha256="03fmn7yxgx56329923pzqkjfrdg0aw2i7jj1sdf0cphzmi7m426n"; depends=[ggplot2 glmnet Rcpp RcppArmadillo Rdpack]; };
+  hdme = derive2 { name="hdme"; version="0.2.1"; sha256="0kcpc0ygjk8d6v099x1m5hi6dbapjcc0lzjsg9779i6bbf43mls2"; depends=[ggplot2 glmnet Rcpp RcppArmadillo Rdpack]; };
   hdnom = derive2 { name="hdnom"; version="5.0"; sha256="0g7l5km18j11qfw8iq9ybl8lzdq6fk2g7cjc2yjsm3ava60n4xqh"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; };
   hdpca = derive2 { name="hdpca"; version="1.0.0"; sha256="1sv7caw4nhpcvsb7fxpvf2b5zskvfsv004hrqc51b5jx4fsc7y92"; depends=[boot lpSolve]; };
   hdrcde = derive2 { name="hdrcde"; version="3.2"; sha256="1901mg2k2ch9fzn1n9k0kmxkgd1m4pxvrda7mv0mp64nf4mx43xw"; depends=[ash ggplot2 KernSmooth ks locfit RColorBrewer]; };
   hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; };
-  healthcareai = derive2 { name="healthcareai"; version="2.1.0"; sha256="1bzlgdf3gfgayw0axiwhbm9x2rqfyibkwymw2mm28fdz65r4n73i"; depends=[broom caret cowplot data_table dbplyr dplyr e1071 ggplot2 glmnet lubridate MLmetrics purrr ranger recipes rlang stringr tibble tidyr xgboost]; };
+  healthcareai = derive2 { name="healthcareai"; version="2.2.0"; sha256="1i1xnxd2v8qbv8pqn7w3ivh1yv4nvxm5llwhxd24gfzqkxck7c3w"; depends=[broom caret cowplot data_table dbplyr dplyr e1071 ggplot2 glmnet lubridate MLmetrics purrr ranger recipes rlang ROCR stringr tibble tidyr xgboost]; };
   heatex = derive2 { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; };
   heatmap_plus = derive2 { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; };
   heatmap3 = derive2 { name="heatmap3"; version="1.1.1"; sha256="14zkij0gr9awzic71k2j7pniamkywfvwrifdk7jbds70zsi30ph5"; depends=[fastcluster]; };
   heatmapFit = derive2 { name="heatmapFit"; version="2.0.4"; sha256="1rswp1wp58f21fpyjybcvvmnn53kr54ij83hp05qbvl7yn1fsnrb"; depends=[]; };
-  heatmaply = derive2 { name="heatmaply"; version="0.15.0"; sha256="0314nmlfwvgb9xmfvnw15l4is59dq1yq8i9461bykhj26jppyib2"; depends=[assertthat colorspace dendextend ggplot2 gplots htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; };
-  heatwaveR = derive2 { name="heatwaveR"; version="0.3.0"; sha256="1pfbhjnky0403hwjy29ady4q41vsgk3m3mwdki5ybkp9hx0c3zm3"; depends=[data_table dplyr ggplot2 lubridate Rcpp RcppArmadillo RcppRoll tibble zoo]; };
+  heatmaply = derive2 { name="heatmaply"; version="0.15.2"; sha256="0h8s5djzj4mrmaswlcaap6jbwxrkbzc43bbqik3qf8vrqz335w04"; depends=[assertthat colorspace dendextend ggplot2 gplots htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; };
+  heatwaveR = derive2 { name="heatwaveR"; version="0.3.3"; sha256="0j2p1lndzsp90hcnf2w4wn3brjs1si1ag1qk8n1jxy3c3wlapiak"; depends=[data_table dplyr ggplot2 lubridate Rcpp RcppArmadillo RcppRoll tibble zoo]; };
   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]; };
   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]; };
   helsinki = derive2 { name="helsinki"; version="0.9.29"; sha256="0bn5iyxjn9qs6f0dmhv51ssayywbx1rayh80zbzk0gsm94nhs0d9"; depends=[maptools RCurl rjson sp]; };
   heplots = derive2 { name="heplots"; version="1.3-5"; sha256="1vyhfkp66gi17jni3gsbv9kn1s0n00qigr13q8xbzbgylz5jjiln"; depends=[car MASS]; };
   here = derive2 { name="here"; version="0.1"; sha256="1vb5dxqdpimy51q1gjsypyq14p2hhvj7wsvh6g35pj1g03cyg9av"; depends=[rprojroot]; };
@@ -7289,7 +7611,7 @@ in with self; {
   hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; };
   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.0.2"; sha256="0dffkn11pm1x5jafc7yzy0jh4c2qqipfzhw205qiqxk5gny185k8"; depends=[DiceDesign MASS Rcpp]; };
+  hetGP = derive2 { name="hetGP"; version="1.1.0"; sha256="1m752a250msayqz8kwdi1r6lrww9pmc6qb6l9hlnfl2ds3qiks83"; depends=[DiceDesign MASS Rcpp]; };
   hetmeta = derive2 { name="hetmeta"; version="0.1.0"; sha256="023bdjsv0ibisz47vaap9yamzjna4hhndk3haw2g1cm92wnrdra5"; depends=[metafor]; };
   hett = derive2 { name="hett"; version="0.3-2"; sha256="1kmspw0738pdall5scmllsa79dynliai2glk1h5rzm4030r5rd6j"; depends=[lattice MASS]; };
   heuristica = derive2 { name="heuristica"; version="1.0.1"; sha256="1myivlqw6a8wh97ma9lrpgvaqb0vn4kj8yp9r4z5vc4pxgmm48g6"; depends=[Hmisc]; };
@@ -7300,11 +7622,12 @@ in with self; {
   hflights = derive2 { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; };
   hgam = derive2 { name="hgam"; version="0.1-2"; sha256="1flcc67n8kbh9m5phdfl587xg1x935zbp305y0gdmkc8vpkiwpcf"; depends=[grplasso lattice rgl]; };
   hglasso = derive2 { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; depends=[fields glasso igraph mvtnorm]; };
-  hglm = derive2 { name="hglm"; version="2.1-1"; sha256="1vr1332db60fqbck0nplfw5dnxpb7sa3irh80k2hyx4aw74ckr2k"; depends=[hglm_data MASS Matrix]; };
+  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]; };
   hhh4contacts = derive2 { name="hhh4contacts"; version="0.13.0"; sha256="17f31xhh6kk7sx5d5dvpwpvl72wd45zgb4fcpdayx3yrm719csz9"; depends=[surveillance]; };
-  hhi = derive2 { name="hhi"; version="1.1.0"; sha256="0f0b6a2zr2nipcx4p8n2wx088kndh6bd150f80619kjfizr55x2d"; depends=[ggplot2]; };
+  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]; };
   hiPOD = derive2 { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; };
   hiddenf = derive2 { name="hiddenf"; version="2.0"; sha256="0shc1kfiq527mkc5i97zcm51hsvknnhjg7dyfvbfqyk145v6sz00"; depends=[]; };
@@ -7317,7 +7640,7 @@ in with self; {
   hierfstat = derive2 { name="hierfstat"; version="0.04-22"; sha256="1fav2v2996v5kb1ffa6v5wxfm921syxg6as034vd3j4jfhdibyfx"; depends=[ade4 adegenet gtools]; };
   hiertest = derive2 { name="hiertest"; version="1.1"; sha256="17maf1w4vkqknxff3f00fzv136j3dbbigyzl4vq4sln9j27w10r3"; depends=[]; };
   highD2pop = derive2 { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; };
-  highSCREEN = derive2 { name="highSCREEN"; version="0.2"; sha256="0lgwxavshqd826g1zmjakhxlbngbhrc36nc8wsh9nakklx4nq9g4"; depends=[gplots]; };
+  highSCREEN = derive2 { name="highSCREEN"; version="0.3"; sha256="179l82n7l7dfn40k6zgigw56ggwqyi34gllc2wvcw3yvfnd3l7s4"; depends=[gplots]; };
   highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; };
   highcharter = derive2 { name="highcharter"; version="0.5.0"; sha256="1myypff80mxcgc3j0sflalhqz344c2zz2p90aarli1pbys9v8ynp"; depends=[assertthat broom dplyr htmltools htmlwidgets igraph jsonlite lubridate magrittr purrr quantmod rlist stringr tibble tidyr xts zoo]; };
   highfrequency = derive2 { name="highfrequency"; version="0.5.3"; sha256="1d218504ghg8d3cwmsxwkznxpr2wy5li062i2lynbxzrhrk59i0l"; depends=[chron cubature MASS mvtnorm numDeriv robustbase sandwich timeDate xts zoo]; };
@@ -7325,12 +7648,13 @@ in with self; {
   highlightHTML = derive2 { name="highlightHTML"; version="0.2.1"; sha256="06k2idx9aadjd6xp6kadm9jh7ap1hwg7vh0bc8vw9ll82wcp1nv1"; depends=[]; };
   highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; };
   highr = derive2 { name="highr"; version="0.7"; sha256="1dzknqk4x7iiiq1jkh9bqm5qcvs7mbqxbkn5955050payavabfya"; depends=[]; };
-  highriskzone = derive2 { name="highriskzone"; version="1.4-2"; sha256="1q9y34nj73kg5y6qy4kb023vyzbdb0f6x23asq20bj5pmz2l25y1"; depends=[deldir fields ks Matrix mvtnorm rgeos spatstat]; };
+  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]; };
   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=[]; };
-  hisse = derive2 { name="hisse"; version="1.8.5"; sha256="1lhxj0cz3sdidpafll64fg1797y0472yxcr21dp2b83qbygkwfgl"; depends=[ape data_table deSolve GenSA nloptr phytools subplex]; };
+  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]; };
   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=[]; };
@@ -7349,7 +7673,7 @@ in with self; {
   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.2.0"; sha256="13bjycnr1v524c5wxigdd3kn8bx1sgwdqb10hbmbyjxffabacafr"; depends=[digest R6 rappdirs]; };
+  hoardr = derive2 { name="hoardr"; version="0.5.0"; sha256="15s0803cgh0gxxrz4ipicyzgy528sj6g9pc453cdcg079vd8dw12"; 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]; };
@@ -7369,10 +7693,12 @@ in with self; {
   housingData = derive2 { name="housingData"; version="0.3.0"; sha256="0ngfx2vjx705xixzpz0rgx1481cr2szj4yfi5g7ma1hhivddl7d1"; depends=[]; };
   howmany = derive2 { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; };
   hpcwld = derive2 { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgzh1bivrvrsr8lgxxw3sbkw88lwb40"; depends=[multicool partitions]; };
+  hpiR = derive2 { name="hpiR"; version="0.2.0"; sha256="0l9x0w6a3ssqcysw8bwmml541nags3b1wxbvipg4rqjfazpdxji4"; depends=[caret dplyr forecast ggplot2 gridExtra imputeTS knitr lubridate magrittr MASS plyr purrr rlang robustbase zoo]; };
   hpoPlot = derive2 { name="hpoPlot"; version="2.4"; sha256="176bf93gjwbi2z7nz81w4aycwax6f7jxvs3236zrmf0f0f4m7bkc"; depends=[functional magrittr Rgraphviz]; };
   hqmisc = derive2 { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
   hqreg = derive2 { name="hqreg"; version="1.4"; sha256="1j6zp3rmpjx409vm7kq159mlawg87wsq0ypdkan34yxxv9py2jmi"; depends=[]; };
-  hrbrthemes = derive2 { name="hrbrthemes"; version="0.5.0"; sha256="0bayblwwf4fwjc21c7zhdipvfxycfil4xkja0dirvvhk5zwszgnx"; depends=[extrafont ggplot2 htmltools knitr magrittr rmarkdown scales]; };
+  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]; };
   hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
   hsm = derive2 { name="hsm"; version="0.2.0"; sha256="066shjikqrrkxpnra4zknax1a0sk5nx9ms1br58vwqqvqq479rym"; depends=[]; };
@@ -7384,8 +7710,8 @@ in with self; {
   htmltab = derive2 { name="htmltab"; version="0.7.1"; sha256="0lymagm7z6zn0ddygqxi831ikk74112lkqkbvs5j1djhmr359ajc"; depends=[httr XML]; };
   htmltidy = derive2 { name="htmltidy"; version="0.4.0"; sha256="090rj1fzdsa8m4g33d4mx92dm8afh173i4hqa4zym8c909jwh9qn"; depends=[htmltools htmlwidgets Rcpp XML xml2]; };
   htmltools = derive2 { name="htmltools"; version="0.3.6"; sha256="18k8r1s8sz1jy7dkz35n69wj20xhmllr53xmwb4pdzf2z61gpbs4"; depends=[digest Rcpp]; };
-  htmlwidgets = derive2 { name="htmlwidgets"; version="1.2"; sha256="04c4d0mfcy3dkdlbxnaccpdgxvyxfdwfmmh5djim6v9hyg0j2z8s"; depends=[htmltools jsonlite yaml]; };
-  htree = derive2 { name="htree"; version="1.0.0"; sha256="1yw29rk752g3sc50igcgnxfsp7ydcmrlwpacch5c8yjg5di06ymb"; depends=[]; };
+  htmlwidgets = derive2 { name="htmlwidgets"; version="1.3"; sha256="04jsdh14l2zifbjpbbh23w7bxz1wpsas0zb2gy2zwv4yqamzzr7i"; depends=[htmltools jsonlite yaml]; };
+  htree = derive2 { name="htree"; version="2.0.0"; sha256="15bi5c2p4aghihp3k12s78447j2x9hbsaq56b5lc8jmd1vf0jdwb"; depends=[]; };
   hts = derive2 { name="hts"; version="5.1.5"; sha256="0mvsxrk7wkfn81hbk8a80fckiqiwdbvhq42k7c6lm69gamnbak2f"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; };
   httk = derive2 { name="httk"; version="1.8"; sha256="1snwqqvacxgl4cyadx5la87xh4kxiqpdmyq4szqz5r1aq2sxrr03"; depends=[data_table deSolve msm mvtnorm survey truncnorm]; };
   httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
@@ -7393,7 +7719,7 @@ in with self; {
   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]; };
-  httpuv = derive2 { name="httpuv"; version="1.4.4.2"; sha256="03lc8j98c6fx9g431is0q5zm4y4phjg99h7w6y6c38cjg7kphr72"; depends=[BH later promises Rcpp]; };
+  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]; };
   huge = derive2 { name="huge"; version="1.2.7"; sha256="134d951x42vy9dcmf155fbvik2934nh6qm2w5jlx3x2c6cf7faq4"; depends=[igraph lattice MASS Matrix]; };
@@ -7405,11 +7731,11 @@ in with self; {
   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.1.0"; sha256="05vywa9lgnpvrkly5mbc4wlxc5v7cz58zgm6wynbxpc58m6smi73"; depends=[data_table fastmatch magrittr]; };
-  huxtable = derive2 { name="huxtable"; version="4.0.1"; sha256="1z93py9nnfpvqkackgxvr2pnd642zcvqks9x01m4nh6dsbh52bs7"; depends=[assertthat dplyr glue htmltools knitr rmarkdown stringr tibble tidyselect]; };
+  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]; };
   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"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; };
+  hwwntest = derive2 { name="hwwntest"; version="1.3.1"; sha256="1mz5svx5vbisdl5wxdnwip13pq4slyigc7j52l526rr9n0l0pr5v"; depends=[polynom wavethresh]; };
   hybridEnsemble = derive2 { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[ada AUC e1071 FNN genalg GenSA glmnet kernelFactory NMOF nnet nnls pso quadprog randomForest reportr Rmalschains ROCR rotationForest rpart soma tabuSearch]; };
   hybridHclust = derive2 { name="hybridHclust"; version="1.0-5"; sha256="0w06vna66hlmvx10dl1l0nzbnxkd634gxjz26w015f83vpmfc5vz"; depends=[cluster]; };
   hybridModels = derive2 { name="hybridModels"; version="0.3.5"; sha256="0bg065j3y3xwxlib9i78pa0ghlblyp4qq1kmh3j02w8xi00rnrs6"; depends=[doParallel foreach ggplot2 GillespieSSA reshape2 stringr]; };
@@ -7419,19 +7745,19 @@ in with self; {
   hydroTSM = derive2 { name="hydroTSM"; version="0.5-1"; sha256="053id9ldr10mafww3vas9fiy16lz0n1mqqfg6wjsbm5r15jkz3ha"; depends=[automap e1071 gstat lattice maptools sp xts zoo]; };
   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.0.0"; sha256="09dcn2wfd06waxzq8cv8lxyw07kavjp30qc2czn2gamrak8xvrl9"; depends=[jsonlite pingr plyr readr stringi stringr tibble]; };
+  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=[]; };
-  hyfo = derive2 { name="hyfo"; version="1.3.9"; sha256="03f3irmhndwfnv4i121gwxb2yv1868pggzyr80pgp4969qzddacm"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; };
+  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-1"; sha256="107cp6na0srqax42fmvcsrviy631hg6phqmkc0cxz1zdxxxw6442"; depends=[partitions Rcpp]; };
+  hyper2 = derive2 { name="hyper2"; version="1.0-4"; sha256="00999k891s5l2wcnn6ych1v60ckqd2qxyckrfxh4kxnq9891hqcx"; depends=[magrittr partitions Rcpp]; };
   hyperSMURF = derive2 { name="hyperSMURF"; version="2.0"; sha256="1aczsph6ax5xfd5rfvsd9bmgaq3j2f5f82fx8whrgbin0hxz19d8"; depends=[randomForest unbalanced]; };
   hyperSpec = derive2 { name="hyperSpec"; version="0.99-20180627"; sha256="12bgp3nm9mwi5w3v8a9fnm4a2cxid3la0r3sxs10azikn5yw0ib5"; depends=[ggplot2 lattice latticeExtra lazyeval testthat XML]; };
   hypercube = derive2 { name="hypercube"; version="0.1.0"; sha256="0iv3cfs636mwijm2rjk427izf0gk5lh2fknd7bmb8pd188ckwqmf"; depends=[stringr]; };
-  hypergate = derive2 { name="hypergate"; version="0.7"; sha256="02i8aywpdp0daxqrqnxfp2xk60jby268c064lcbggjb9nbm04q0m"; depends=[lattice]; };
+  hypergate = derive2 { name="hypergate"; version="0.8"; sha256="0kfw5k8p3scyxc41ylc14bpny14ynbn9l0fjg6bgmgxqsss54d7h"; depends=[]; };
   hypergea = derive2 { name="hypergea"; version="1.3.6"; sha256="1k1525bkkj83j2nn9ixidb8vjvdmc4l9jvfarzgg532gg7wn3841"; depends=[]; };
   hypergeo = derive2 { name="hypergeo"; version="1.2-13"; sha256="13jdiy216znwhr91iqnh03mvkmyscw439syb3h4i67dd78sphnvd"; depends=[contfrac deSolve elliptic]; };
   hypersampleplan = derive2 { name="hypersampleplan"; version="0.1.1"; sha256="1sk3s1jm46ac4i7p433s3kyngj86kq2821zzhp30a3y8vi1j2psq"; depends=[]; };
-  hypervolume = derive2 { name="hypervolume"; version="2.0.10"; sha256="16q2h42c2q4b6hq5h6lkxgwizdln1nbq1l7n5f226zjlfrvgk8fx"; depends=[data_table e1071 fastcluster geometry hitandrun ks maps MASS mvtnorm pdist progress raster Rcpp RcppArmadillo rgeos rgl sp]; };
+  hypervolume = derive2 { name="hypervolume"; version="2.0.11"; sha256="1lfxsqvkzych9zvknxf4fnsfav9kv8cjss0pr4ny1wbmbvdxbbqc"; depends=[data_table e1071 fastcluster geometry hitandrun ks maps MASS mvtnorm pdist progress raster Rcpp RcppArmadillo rgeos rgl sp]; };
   hyphenatr = derive2 { name="hyphenatr"; version="0.3.0"; sha256="0mv77njy0ha7bj3kw620fk9r8cdzqd0v3ipikihqxq47fr57ml0v"; depends=[Rcpp stringi]; };
   hypothesestest = derive2 { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; };
   hypothesisr = derive2 { name="hypothesisr"; version="0.1.1"; sha256="0z06risagphhvqiw4lrxy52q6q2yr10w2yxsm8iz1wh9ik097pcv"; depends=[dplyr httr jsonlite]; };
@@ -7439,8 +7765,8 @@ in with self; {
   hzar = derive2 { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; };
   iBATCGH = derive2 { name="iBATCGH"; version="1.3"; sha256="0pnkkabzi57czcwd9i15nwv8ggwvyxmvn1wam7yrrrbvmi17lmrm"; depends=[msm Rcpp RcppArmadillo]; };
   iBST = derive2 { name="iBST"; version="1.0"; sha256="02p7lcr1wrf21v4568jc8hmjcijy3fnbv77s8nlhv2s4p0pgzh5x"; depends=[Rcpp rpart survival]; };
-  iC10 = derive2 { name="iC10"; version="1.1.3"; sha256="19dlrwj47zmdgmvzjfs5qa9fqq8g9ywhgy5mqbp99n7d9hg4ybxh"; depends=[iC10TrainingData pamr]; };
-  iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.0.1"; sha256="1x1kgxiib9l7whm2kmbv1s912hgpl7rdpqpn67nlkiswnr27hqn4"; depends=[]; };
+  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]; };
   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]; };
@@ -7451,8 +7777,8 @@ in with self; {
   iGSEA = derive2 { name="iGSEA"; version="1.2"; sha256="1xlz8mbxqnrwyqj7jwma7vmvjlaccajbfxf3hi4wp5qs2pch8806"; depends=[]; };
   iGasso = derive2 { name="iGasso"; version="1.4"; sha256="17xxqncl5xcphdqclghcazygcgibf8ijdf4kkl3ga11xf70sahj2"; depends=[CompQuadForm lattice]; };
   iMRMC = derive2 { name="iMRMC"; version="1.1.0"; sha256="04wpqdds5vfqvl8n5g64vnyh4a40dxjh8l1bgw1vdz1372n0421g"; depends=[]; };
-  iMediate = derive2 { name="iMediate"; version="0.4"; sha256="0pwvzd0k9m2jd7sizl436vs63rg9yinisrb0flz34yj5avn6rmb0"; depends=[mediation mvtnorm plotly]; };
-  iNEXT = derive2 { name="iNEXT"; version="2.0.12"; sha256="1041r5k0k3kzik5vwyd62s4yc85lnnxbg5gbbl0kl629kikymb6y"; depends=[ggplot2 reshape2]; };
+  iMediate = derive2 { name="iMediate"; version="0.5"; sha256="0gr0nibfdmiyxz8n7pfcl1d2gxhl5g2pi9yhnmsvqzry4j3x27yw"; depends=[mvtnorm plotly]; };
+  iNEXT = derive2 { name="iNEXT"; version="2.0.17"; sha256="1gg9zzcfjn70scz9kmn37rvz3lnbkbd4a59xmfy56x9xgs3wrxwp"; depends=[ggplot2 reshape2]; };
   iNOTE = derive2 { name="iNOTE"; version="1.0"; sha256="1969xmgfv9405r09zpd2icvjd9vvzw4dx5qaqxk1a0jvbvhp3h88"; depends=[CompQuadForm mixtools plyr]; };
   iNextPD = derive2 { name="iNextPD"; version="0.3.2"; sha256="06wka2qr1jm3hvi8j0b19fr21v72gmqknz8dg0l5wl91m0prqns3"; depends=[ade4 ggplot2 iNEXT Rcpp]; };
   iRF = derive2 { name="iRF"; version="2.0.0"; sha256="1ll4lxg743p2zipxcq13yjsc7j7dk766dcyixwxilllbisg0dh8y"; depends=[AUC data_table doParallel dplyr foreach Matrix RColorBrewer Rcpp]; };
@@ -7465,7 +7791,7 @@ in with self; {
   iWISA = derive2 { name="iWISA"; version="1.0-2"; sha256="0jqi1kh7jlc04nb9d1w711q4i8j1vgwbxjls09z7853kv22wxfyz"; depends=[fda ggplot2 waveslim]; };
   iWeigReg = derive2 { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; };
   iadf = derive2 { name="iadf"; version="0.1.0"; sha256="02zx9n4ncg10bbydrr05631vzc4w2b1jg3x6xiaffg7x5rh4mnyf"; depends=[dplR dplyr manipulate rlang tibble tidyr]; };
-  ibd = derive2 { name="ibd"; version="1.3"; sha256="0a94vn5awn425qw99y8y38xivgzq16s3yvpkgld54p7jwhvmgxln"; depends=[car emmeans lpSolve MASS multcompView]; };
+  ibd = derive2 { name="ibd"; version="1.4"; sha256="1755zbsy7ym5xpnma1r2hdii11p42765k8xxf3dfv6mbhxiyzpbq"; depends=[car emmeans lpSolve MASS multcompView]; };
   ibdreg = derive2 { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; };
   ibeemd = derive2 { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; };
   ibelief = derive2 { name="ibelief"; version="1.2"; sha256="1zh6bpg0gaybslr1p05qd5p2y5kxbgyhgha4j4v5d69d78jwgah9"; depends=[]; };
@@ -7481,32 +7807,32 @@ in with self; {
   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.0"; sha256="0wd5d9zlhy9wh3phy4mz8zg0jv08hjizvlscaj208a64lwkzvq7g"; depends=[checkmate icd_data magrittr Rcpp RcppEigen testthat]; };
+  icd = derive2 { name="icd"; version="3.2.1"; sha256="0knhiy18jckdyxvhp80hif1wnfg6r8fvl7h6ixb0q3lgqdc79749"; 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.7"; sha256="1fc6l3mqnm4rcg49bk2plfa011g7nay71gzd4nxnjisifmw6qi2s"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; };
+  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=[]; };
   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-1"; sha256="0fsc79id8mcdp53xsrhzy43mvhginr3sixqhsxwvcz497kwdyj4a"; depends=[]; };
+  icesTAF = derive2 { name="icesTAF"; version="1.6-2"; sha256="1r8dsc3dm6ziscgl7xr84b07myflwkdnpqjf0wjd3d0h5x8xdkdh"; 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.4"; sha256="0vm2k2pjsnikb80crzhxs1wpxpjjigyny5ldini6sxg3lwhc14l3"; depends=[ggplot2 Rcpp tidyr]; };
+  icr = derive2 { name="icr"; version="0.5.8"; sha256="1grakn7c7slm2msdm8r059ky0s77apl80xhy65isxwj7ica64i9k"; depends=[ggplot2 Rcpp]; };
   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.2.4"; sha256="0j64pmccg01lscvjg9z97ypv3svl4jbvs4819jn4kc9ni6gq4fai"; depends=[dplyr gtools MASS maxLik Rdpack scales shiny]; };
+  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]; };
   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]; };
-  idm = derive2 { name="idm"; version="1.8.1"; sha256="14cy1gv12wjpsv5jih7pgq5d36gfpdc56ih4mc6hx638qkkyk87z"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; };
+  idm = derive2 { name="idm"; version="1.8.2"; sha256="04f0i0kwdxywmj2i184knx5a5v9svx0lbam6wpz49hghg7qpy0w5"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; };
   idmTPreg = derive2 { name="idmTPreg"; version="1.1"; sha256="1329sjb4dnw3yiyg16whbj4l2v0kg8phg1x4ysvyp2kqkmw14yq6"; depends=[doParallel foreach survival]; };
   idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; };
   ids = derive2 { name="ids"; version="1.0.1"; sha256="1s6ga94gds5ydr9f8qbjfgfpg2dvbnkcrlybqlb33hk3c0c2l8dn"; depends=[openssl uuid]; };
@@ -7522,42 +7848,44 @@ in with self; {
   ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; };
   ifultools = derive2 { name="ifultools"; version="2.0-4"; sha256="0pv2msaa1rmj8csxdclzi2jwg9pfdvh87blj9j3xa3myisglq092"; depends=[MASS splus2R]; };
   ig_vancouver_2014_topcolour = derive2 { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; };
-  igraph = derive2 { name="igraph"; version="1.2.1"; sha256="1hcr6b1lz030lgay1bz8y8sxaf2j93ds8n8gsqr6qhssz141hd2m"; depends=[magrittr Matrix pkgconfig]; };
+  igraph = derive2 { name="igraph"; version="1.2.2"; sha256="1bggm7b8v3bh7q2589w26qvd7sgs69m4qiij7d0rbm0ykkgxm8lx"; depends=[magrittr Matrix pkgconfig]; };
   igraphdata = derive2 { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; };
   igraphinshiny = derive2 { name="igraphinshiny"; version="0.1"; sha256="1ww5s4jfihzcx4k35lbhzsf54z720xh7b2p5alzk843m6rx77986"; depends=[igraph shiny]; };
   igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
   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.1.0"; sha256="0hb201qcwynbdi2fzspvv9sdhyx0cypbsvhawhcwj5zqdp6f507f"; depends=[checkmate fields filesstrings magrittr purrr Rcpp readr rlang stringr]; };
+  ijtiff = derive2 { name="ijtiff"; version="1.4.2"; sha256="1wqh8cwcpzfnkcm2ljabbkfaddmd9dxvaqsc3vp1ivnmq426fh99"; 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.1.1"; sha256="02ws4l52a3jrgqmn76p6p54mnb0ypvkd39yj8pqn8qg8l44fp3nw"; depends=[dtt imager magrittr Rcpp]; };
+  imagerExtra = derive2 { name="imagerExtra"; version="1.2.0"; sha256="1r94zcnfvd92qqls76ma3vgc8bnhah5jlminnbp9knr0jar8r0xp"; depends=[fftwtools imager magrittr Rcpp tesseract]; };
   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]; };
   imdbapi = derive2 { name="imdbapi"; version="0.1.0"; sha256="11v7c0s7qqf02b186md5lhgkgmywkn8lmmanlz3gfcxca26g047y"; depends=[dplyr httr stringr]; };
   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.5.1"; sha256="043n14samxl85by7vihrc7nv45kaj287m0ab04fssvfn8rnprqlh"; depends=[checkmate data_table ggplot2 glmnet Metrics partykit R6]; };
+  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]; };
-  imp4p = derive2 { name="imp4p"; version="0.6"; sha256="1aaj62ia87khkdkw6lx59dcx3lq1clfdzw7gbi0ffy99lp608q6s"; depends=[imputeLCMD Iso Rcpp truncnorm]; };
+  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=[]; };
   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=[]; };
   imprProbEst = derive2 { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; };
+  imptree = derive2 { name="imptree"; version="0.5.1"; sha256="0f087000092ydnpj3ch4mbip8wp32scn8xw4vlkq5lf6130gfs1b"; depends=[Rcpp]; };
   imputeLCMD = derive2 { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[impute norm pcaMethods tmvtnorm]; };
   imputeMDR = derive2 { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; };
   imputeMissings = derive2 { name="imputeMissings"; version="0.0.3"; sha256="1dfhi235j1qz2mv89j92b903j5mdwlzisiyvvi9mmiacdj5ln89z"; depends=[randomForest]; };
   imputeMulti = derive2 { name="imputeMulti"; version="0.6.4"; sha256="0ngjbj8pl5mwprrgy234a5p9dhf615z7ymfv8184hby1z6ib3mgl"; depends=[DBI gtools Rcpp RSQLite]; };
   imputePSF = derive2 { name="imputePSF"; version="0.1.0"; sha256="0xfd2mybg0cbi3n35j28s4xq4iwr5rq4mqwgdqml7l2rlzidcwc8"; depends=[PSF]; };
-  imputeR = derive2 { name="imputeR"; version="2.0"; sha256="0xyvy785jb1mv06jq25cnsbgiywi3857sdiizcjck7bx970lk02n"; depends=[caret Cubist gbm glmnet mboost pls rda reshape2 ridge rpart]; };
+  imputeR = derive2 { name="imputeR"; version="2.1"; sha256="1xsawars52jhxfpl4hx8ghhndrvqk9vrrgajrrz2xrzi88kf6in2"; depends=[reshape2]; };
   imputeTS = derive2 { name="imputeTS"; version="2.7"; sha256="12y6qzy00kb7jap4h92f3zpgdazlw3y4zydhv7gzfsmx1ka7nsfm"; depends=[forecast magrittr Rcpp stinepack]; };
   imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.1"; sha256="0yxvwk1bcsid116a4zqsagf2dl3vhzva559bfjjcqdgyniapcmcj"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; };
   imputeYn = derive2 { name="imputeYn"; version="1.3"; sha256="1b21w1aa5f7yiq8k0wa86wvbg4ij7f6ldwn6asfqwb0b90rvsgvs"; depends=[boot emplik mvtnorm quadprog survival]; };
-  imsig = derive2 { name="imsig"; version="0.1.0"; sha256="0qjr2xbha6ikcfmkl0crhf9akrbygwsk87xhb45q8633fk3ssw51"; depends=[ggplot2 gridExtra HiClimR igraph RColorBrewer survival]; };
+  imsig = derive2 { name="imsig"; version="1.0.0"; sha256="01ww48x9a189dvr81bangfhchr70l0sg26jdpcxf41nh2fmslfxx"; depends=[ggplot2 gridExtra HiClimR igraph RColorBrewer survival]; };
   in2extRemes = derive2 { name="in2extRemes"; version="1.0-3"; sha256="1lgsqm29zmjyf8kynyra2p3q7bs4fyd7ac4v6s3pbahzhhzdk94y"; depends=[extRemes]; };
   inTrees = derive2 { name="inTrees"; version="1.2"; sha256="1mwn2ijkyw0y9xcgrr56wxd2326ikarlsi79l59dplvlx2iwbi6c"; depends=[arules data_table gbm RRF xgboost xtable]; };
   inaparc = derive2 { name="inaparc"; version="0.2.0"; sha256="0rgbnvvqzbx4j40qz32l1bxmg3wwzbl6719wb9m3xpakblvhhxs2"; depends=[kpeaks lhs]; };
@@ -7565,16 +7893,16 @@ in with self; {
   inbreedR = derive2 { name="inbreedR"; version="0.3.2"; sha256="09fr13ckyn2skiigkn4qdx5g080gcmyyrvzhcp0wrml9wpmy0h4z"; depends=[data_table]; };
   incR = derive2 { name="incR"; version="1.1.0"; sha256="0q41bs7pf6hqyfwvcwc2sxq44jq95qq3qsddz53f8gphwjsyf1v7"; depends=[dplyr ggplot2 lubridate maptools rgeos]; };
   inca = derive2 { name="inca"; version="0.0.3"; sha256="1g9js84xa5b6jl8gp4k0c55kjazfaw5g9biwk4v6vz3vwkwayyzh"; depends=[Matrix Rcpp RcppArmadillo]; };
-  incadata = derive2 { name="incadata"; version="0.6.1"; sha256="05i0zifdzc1w6p6annhzp9rdd4v82gx2sxi4lqpdnraaczdrhgbb"; depends=[backports decoder dplyr rccmisc rvest sweidnumbr xml2]; };
+  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.3.1"; sha256="0qylfim4gc9i9dyhyjpfar95rznbf1lh06hvvjmxxyrc1a7lzaxw"; depends=[ggplot2 ISOweek]; };
-  inctools = derive2 { name="inctools"; version="1.0.11"; sha256="08a1aqsx1f1mkykpgbqbgvai60zxj9zwpmxynyajbm4lwr3rc6rp"; depends=[cubature doParallel dplyr foreach ggplot2 glm2 magrittr plyr pracma tmvtnorm]; };
+  incidence = derive2 { name="incidence"; version="1.4.1"; sha256="13c518hlhpmdl4vw4xbb593arw2pvzsj18dpvdzg7n2f8lslbyr8"; 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.2.0"; sha256="1wkfbrwq616nj1k0rmwvbnqy8ngrmxc49d6j69s5vpws2g3ga00j"; depends=[assertive dplyr ggplot2 magrittr rlang tibble]; };
+  infer = derive2 { name="infer"; version="0.3.1"; sha256="0yzminwsndx1aizb91palzvlmg9pp7hnx0zfpifbj1vv00jz6d1c"; 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]; };
@@ -7592,13 +7920,13 @@ in with self; {
   infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; };
   ini = derive2 { name="ini"; version="0.3.1"; sha256="04yqij344dwm0xqgara8xia42mlmij3i8711qbb5534w05a1l6bv"; depends=[]; };
   injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; };
-  inlabru = derive2 { name="inlabru"; version="2.1.3"; sha256="09sdbzg3cdg43clkwnahkhyns019gjya55m6zhq340mgrnirx2i5"; depends=[ggplot2 rgdal rgeos sp]; };
+  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.0"; sha256="0hhw87zvqd2mplpbmbh1y91pyfgyqamw4wiz74a6qwn705bcymah"; depends=[checkmate dplyr GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos sp xtable]; };
-  inpdfr = derive2 { name="inpdfr"; version="0.1.6"; sha256="0fwznjsq4wccqfnb3a5ic1nyx538jxmlcv59xdz06y6raczjp9q9"; depends=[ca cluster entropart metacom R_devices RColorBrewer SnowballC stringi tm wordcloud]; };
+  inlmisc = derive2 { name="inlmisc"; version="0.4.3"; sha256="0y13mxibdnn1397wbxx52gvk213mgslqg40ymcrzgvwb4c7rp8sn"; depends=[checkmate dplyr GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos 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.0"; sha256="11r21ljif0pwswmmdzbyy3i9q2rwxn7izhr44dkiwcyjv7yig54j"; depends=[ape aphid kmer openssl phylogram xml2]; };
+  insect = derive2 { name="insect"; version="1.1.1"; sha256="0gvjml5f7c8k6vsp1s5l85avmh7j6asy2ljkhcrwy6hybf8z1dj5"; depends=[ape aphid kmer openssl phylogram 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]; };
@@ -7610,12 +7938,13 @@ in with self; {
   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.2"; sha256="1vdrdig82xbg4ax67vsr00v28z40qd54kcw6b8cml59sqn13zxl2"; depends=[alabama doParallel foreach numDeriv]; };
+  intccr = derive2 { name="intccr"; version="1.0.3"; sha256="0sk43k8zw2ssa6cc8ljxd51q7489kq1bb2r1j5rp18895kq3c8wc"; 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=[]; };
   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]; };
   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]; };
@@ -7632,7 +7961,7 @@ in with self; {
   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=[]; };
-  intsvy = derive2 { name="intsvy"; version="2.1"; sha256="0fsib9w1zvg3phmzrspdc3d44rl5p222j0j9xmdhpcq9r6sy0bp9"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; };
+  intsvy = derive2 { name="intsvy"; version="2.3"; sha256="1hm7jkh8p3hspbb20185zgs5y4c3zp9wvj02m0s67qiq8sf5nv0h"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; };
   intubate = derive2 { name="intubate"; version="1.0.0"; sha256="03ikqwai7wdahdfyzdy42xs8qpdhl9gmbak2qd82yxjl62956i8c"; depends=[]; };
   inum = derive2 { name="inum"; version="1.0-0"; sha256="1b013ak4d0iiwk5a0s7vvsl34d0hs881iq7zrvah4skb89x82cpm"; depends=[libcoin]; };
   invGauss = derive2 { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[optimx survival]; };
@@ -7640,13 +7969,15 @@ in with self; {
   investr = derive2 { name="investr"; version="1.4.0"; sha256="0l47bfwxssfr3maprkpwnmgxnxccl3ch4grc7f968iiqk83mcxw9"; depends=[nlme]; };
   invgamma = derive2 { name="invgamma"; version="1.1"; sha256="12ga2y4wc9bc5zz6vimvxwgjpsx3ys3209nq63gscbw559ydxa5a"; depends=[]; };
   io = derive2 { name="io"; version="0.3.0"; sha256="16mnbxq217ixfg2qfqrj97qqfpc5dj622hf80nwray6hp47lbw2s"; depends=[filenamer stringr]; };
+  ioanalysis = derive2 { name="ioanalysis"; version="0.1"; sha256="13hkcks9sm7swmvd1lzzz5gqs02mjdqhrx06f7bkbf77dxckxb8z"; depends=[]; };
   ioncopy = derive2 { name="ioncopy"; version="2.1.1"; sha256="1lkav3xvh2qazfmcxwisrjy8wzf639a4md71499jj5rmy650crys"; depends=[shiny]; };
   ionflows = derive2 { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; };
   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.2.4"; sha256="17xw0xjj6xy99f41ln043agaqcw6q3s0i99as06471kyscgan8n7"; depends=[dplyr eurostat forcats magrittr plyr tidyr]; };
+  iotables = derive2 { name="iotables"; version="0.3.4"; sha256="08hw05samkkdvpbhjqr653brmciszah5faydiqvrdgl02yvjmdw4"; 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]; };
   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]; };
@@ -7654,16 +7985,16 @@ in with self; {
   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-6"; sha256="1vrw1pqcpnc04x1r2h9grdfm6bivs358sww5gg90jwlvxcw69lxq"; depends=[class MASS nnet prodlim rpart survival]; };
-  iprior = derive2 { name="iprior"; version="0.7.1"; sha256="01sav9594grc413kf6s9jnp4hs4q9f9424qphm91xckydiqisaav"; depends=[doSNOW foreach ggplot2 mvtnorm Rcpp RcppEigen reshape2 scales]; };
+  ipred = derive2 { name="ipred"; version="0.9-7"; sha256="0q53cqs46501wsd4cmfsmr78l8nv1hkbamk9m0ns5qy02df5r254"; 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.2"; sha256="1m5rw66qbv5pa91ywvir2i0wnwa0j6z75242bc468d2hakz62k99"; depends=[httr jsonlite]; };
-  iptools = derive2 { name="iptools"; version="0.4.0"; sha256="0c3j5sl129xl75p14qr880ll1y3yss3zqg39zbj2jp6wcv9rvafx"; depends=[AsioHeaders BH ISOcodes Rcpp]; };
-  ipumsr = derive2 { name="ipumsr"; version="0.2.0"; sha256="0rmcl2jq12yvc5lqyi1mi5ggl59w2g6zvf3w1zpnb261vlrvikda"; depends=[dplyr haven purrr raster Rcpp readr rlang stringr tibble tidyr xml2 zeallot]; };
+  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]; };
+  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]; };
   iqLearn = derive2 { name="iqLearn"; version="1.5"; sha256="1zn43zvx0mjzh96bm73scacmladamy8jmhxim7hcfq39cfhiw3c8"; depends=[]; };
-  irace = derive2 { name="irace"; version="3.0"; sha256="1p7amffds888zfg05lfkmvl2ciydmf8bn42g2kgfy13k9r2bk96r"; depends=[]; };
+  irace = derive2 { name="irace"; version="3.1"; sha256="0r3hbsx8c40kxs62xy3pnivy6ava2xrg0h39j95zrmiqdma77sxq"; depends=[]; };
   ircor = derive2 { name="ircor"; version="1.0"; sha256="07apa4l4ib11xw25d44b403s3la29sqlid13q41hjrlfxafm91ld"; depends=[]; };
   irlba = derive2 { name="irlba"; version="2.3.2"; sha256="0f7wb12wa0zbyllk5adcf4f517wgjpkhsx4j176i9ax6xy7jvprz"; depends=[Matrix]; };
   irr = derive2 { name="irr"; version="0.84"; sha256="0njxackqj8hyf9j1yszwxbnaxgp27fc2bwyyf7dip72wc12f81n5"; depends=[lpSolve]; };
@@ -7676,7 +8007,7 @@ in with self; {
   irtreliability = derive2 { name="irtreliability"; version="0.1-1"; sha256="15qs8bvgrwajj5kfd57rd34l1p2805ilyd7w60ngrqc14d6az9d2"; depends=[fastGHQuad ltm mirt]; };
   isa2 = derive2 { name="isa2"; version="0.3.5"; sha256="17vm0906szhrh2k5x694vwcfijbzmd1v3axpszfybc0lgds437cv"; depends=[lattice]; };
   isdals = derive2 { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; };
-  isdparser = derive2 { name="isdparser"; version="0.2.0"; sha256="061wi94rj3iyvf3dgvcjy0x46hvwhr4ifx0jhirz44bj0c8g3h7j"; depends=[data_table tibble]; };
+  isdparser = derive2 { name="isdparser"; version="0.3.0"; sha256="1fdp4zk3pzpi5m026rlsrhyl4r5rfxy9sr8d04w2i0316rziv7kc"; depends=[data_table tibble]; };
   isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; };
   island = derive2 { name="island"; version="0.2.1"; sha256="0fg5nlg5iq3cl3i8xx9qq4vvizdklg6adjxmp2qrg0dyfvkllhsq"; depends=[]; };
   ismev = derive2 { name="ismev"; version="1.42"; sha256="19giigxwf62cdkf7mglsca649n2ignb9bxyg9zl7im1vm3ngnmqd"; depends=[mgcv]; };
@@ -7694,15 +8025,16 @@ in with self; {
   itan = derive2 { name="itan"; version="1.0"; sha256="082vh5gvh8hgyhk8nswll16ldhnp0pfpxnz1yx05zsc4nzvm92cf"; depends=[ggplot2 reshape]; };
   itcSegment = derive2 { name="itcSegment"; version="0.8"; sha256="032wj34313m3wigdfalq356srdzg0cvnvxnaxwxws6bc44r78izf"; depends=[maptools raster rgeos sp]; };
   iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; };
+  itemanalysis = derive2 { name="itemanalysis"; version="1.0"; sha256="1ksbd69mca45jlr2gpars87cf4jfm5rx6sz009sv6a83x831x5rq"; depends=[car ggplot2 polycor]; };
   iterLap = derive2 { name="iterLap"; version="1.1-3"; sha256="079d4hxf1ha8pgibzb4r1yk7xqpzndd7hjbp8294qb26jvvcnd8q"; depends=[quadprog randtoolbox]; };
-  iterators = derive2 { name="iterators"; version="1.0.9"; sha256="16sycjq912ix52fjxjhcwiaqr0yj1v5iqmrvjljd3z857031w06y"; depends=[]; };
-  iterpc = derive2 { name="iterpc"; version="0.4.0"; sha256="0py11pvhl71v9fl0a6n317va8cggih4l0afn6yldnah9ai2cakvy"; depends=[arrangements gmp iterators]; };
+  iterators = derive2 { name="iterators"; version="1.0.10"; sha256="1s3iykfvccpnzs73z90rx18qvbvgw2dgl4nfcrvm5m1850qb5qd9"; depends=[]; };
+  iterpc = derive2 { name="iterpc"; version="0.4.1"; sha256="0q08bdr5v849z2431f2sdh9f7aagjxm34si0kn0bp85dnlqri8rx"; depends=[arrangements gmp iterators]; };
   itertools = derive2 { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; };
   itertools2 = derive2 { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; };
   itree = derive2 { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; };
   itsadug = derive2 { name="itsadug"; version="2.3"; sha256="0wzdy82h05264n9cr84w5j98vz24was9hh1y0wdp56ws3dfbav9m"; depends=[mgcv plotfunctions]; };
-  itsmr = derive2 { name="itsmr"; version="1.8"; sha256="1w2sjdw9s4smsqdbjabj9jjync0fb931aajjbqhm49cx0g72hi8g"; depends=[]; };
-  itunesr = derive2 { name="itunesr"; version="0.1.1"; sha256="1h6yyqcmvm9dfwscmq5ghqi3r4fdracw1n206058j9bdjpakxqkl"; depends=[curl jsonlite lubridate xml2]; };
+  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]; };
@@ -7716,56 +8048,66 @@ in with self; {
   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.1.1"; sha256="18iah8sq64p7c6rxs21w8rbxvbmbh03jzqbam1ilp46ayfqzk9qc"; depends=[corpcor lfa]; };
+  jackstraw = derive2 { name="jackstraw"; version="1.2"; sha256="1aciv0km63nqhiakqvy3v8bz31mjlknfdz2lkcv2g3pfhwi3fxh7"; depends=[cluster ClusterR corpcor lfa qvalue]; };
   jacpop = derive2 { name="jacpop"; version="0.5"; sha256="056c82d4a10rgq0p4p63y9i94dy1kqp3yh7xms9nx9q2xb940xb5"; depends=[]; };
-  jagsUI = derive2 { name="jagsUI"; version="1.4.9"; sha256="1c2fq7q3kvf092j6r9ci0gigjpb61dj19phzm8mqi05q2k08siin"; depends=[coda lattice rjags]; };
+  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]; };
   janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; };
-  janitor = derive2 { name="janitor"; version="1.0.0"; sha256="0q6mq8s8k7yyx2459nhjvlxjaqxn61k3dpxdhcq0fyk37dafva79"; depends=[dplyr magrittr purrr rlang snakecase tidyr]; };
+  janitor = derive2 { name="janitor"; version="1.1.1"; sha256="0sqp6sajdzs8wwvsfkkfpgak9fzknjfffqpgjm6an7spdvsl2js0"; depends=[dplyr magrittr purrr rlang snakecase tidyr]; };
   jaod = derive2 { name="jaod"; version="0.1.0"; sha256="0wh1nlfhks4c1dga6h7554pg44pamj73x5in71k2xw0yp292zm6x"; depends=[crul jsonlite tibble]; };
+  jarbes = derive2 { name="jarbes"; version="1.7.0"; sha256="1wvix7a1wv6mb4i1r3axixyvrwg6sj5pnc22ajri0d3dbdmklv23"; depends=[ggExtra ggplot2 gridExtra MASS mcmcplots R2jags rjags]; };
   jcext = derive2 { name="jcext"; version="0.1"; sha256="18vmf57l2kv3rvi6laqp948m8mjkdxdy0vi4xp68480b2mjmvij1"; depends=[ggplot2 maps RColorBrewer rworldmap sp stringr]; };
-  jcolors = derive2 { name="jcolors"; version="0.0.2"; sha256="0d71sdvj7hwafj0sx2z1nyza5j2lfd8y5yj1p94yrw32wi7b89jn"; depends=[ggplot2 scales]; };
+  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.0"; sha256="0s5gsgsznn8n39s0s35qxdl0q7bkvqlrf9xhland3xlzcrvpyp2g"; depends=[igraph lpSolve pcaPP]; };
+  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]; };
   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]; };
   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.8.6.2"; sha256="0an3ni6lz85cfcra69mycka6x1hgaas6rv6ybbnikmrv846sx03n"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; };
-  jmvcore = derive2 { name="jmvcore"; version="0.9.1"; sha256="01qv3m1vsabydlkshmqrg15y8nnrzkg49pq2ryxi3r6jw486qq1s"; depends=[base64enc R6 rjson stringi]; };
+  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]; };
   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]; };
   joineRML = derive2 { name="joineRML"; version="0.4.2"; sha256="06a7iicq3fngsmmi8qcz2fdzdzvym5s70s3aaqlzxnl4sj9km3g2"; depends=[cobs doParallel foreach ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival]; };
   joineRmeta = derive2 { name="joineRmeta"; version="0.1.1"; sha256="0d9wwb3v43v30xjy67j366mhwixzz79bm67j01fqmcdsnmn3qpjn"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm nlme statmod survival]; };
-  joint_Cox = derive2 { name="joint.Cox"; version="2.15"; sha256="1lcli1p1qv0ws1zqs845wb2swhm5vvbixsxs8yzihc5r7igyalg7"; depends=[survival]; };
+  joint_Cox = derive2 { name="joint.Cox"; version="2.16"; sha256="1qlynvahk57ayndc23i0jr8a702z4k1darf4y5i90lza40f32jhp"; depends=[survival]; };
   jointDiag = derive2 { name="jointDiag"; version="0.3"; sha256="0pra70jcnkqkzrxz5vc6lzi637rp5w8n9wbv9ix718vnd0j3fm3n"; depends=[]; };
   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-2"; sha256="0zyqwa2y08asj9xqwnngh6da1b9cqcx8pzc9cxwrmgnxd5nnsjb7"; depends=[lme4 survival]; };
+  jomo = derive2 { name="jomo"; version="2.6-4"; sha256="05g2rj9g7rgyb22b0gybw042nydyqsqsb31v05hifzavri8ij01x"; 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]; };
   jpndistrict = derive2 { name="jpndistrict"; version="0.3.2"; sha256="0n935zwxjjnl1w0xd790gm22pdm8ng48x79iazfkjzj8dpwymdsg"; depends=[dplyr jpmesh leaflet magrittr miniUI purrr rlang sf shiny tibble tidyr]; };
-  jqr = derive2 { name="jqr"; version="1.0.0"; sha256="1jdr3wb1fd2zjmmdicqhskgk7xbn5y6998fi9szj86p8smfckl74"; depends=[lazyeval magrittr]; };
+  jqr = derive2 { name="jqr"; version="1.1.0"; sha256="00x5a61bsn2ywzc2haz19f6h0sqhlx7z3k1n9y0729dwm4id89ms"; depends=[lazyeval magrittr]; };
   jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; };
   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]; };
   jsonld = derive2 { name="jsonld"; version="2.0"; sha256="0mplsx2fq7pvxli1rd851cqhkaxk3y93aa46x57yf4z5rgjy34vm"; depends=[curl jsonlite V8]; };
   jsonlite = derive2 { name="jsonlite"; version="1.5"; sha256="00lfg464jhf7k01bal9pcjvbdf5cxk6xi2h46hccp1x3h883g434"; 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]; };
   jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; };
-  jtools = derive2 { name="jtools"; version="1.0.0"; sha256="0w0yw0pl2arwx4d5w83d73y7cq9papqkdg6sfk9qj1whgcd28chv"; depends=[cli crayon ggplot2]; };
+  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=[]; };
+  jubilee = derive2 { name="jubilee"; version="0.2.5"; sha256="0j16325vxlr797gr39g6mdrgfas1qvxhajfsrmzr4hflqibw03gk"; depends=[data_table readxl xts yaml zoo]; };
   jug = derive2 { name="jug"; version="0.1.7"; sha256="01m6hyr26f6zih49pz2bmmr8ypdl1qiz0wv3padcy68kaccf44a4"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 webutils]; };
-  junctions = derive2 { name="junctions"; version="1.0.1"; sha256="1mfzhizfzpsrlc23kdi658a1svw4p3wh1la7zpf5fk2bbksw0v97"; depends=[Rcpp]; };
+  junctions = derive2 { name="junctions"; version="1.1"; sha256="1v5jx4mw6x4q3fivsvidd49b8czzbvv5icj39h6jrpmqvrnc8w32"; depends=[Rcpp]; };
   junr = derive2 { name="junr"; version="0.1.3"; sha256="0wcglpziyi6z4n7w70srziljba3jkb27iqxbxz4kk6774c7valbf"; depends=[httr jsonlite]; };
   jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; };
   jwutil = derive2 { name="jwutil"; version="1.2.1"; sha256="1n9q2p167cmp134p8qpknfg4avi4nzxqmazyr1gs63sk5x51yk48"; depends=[Rcpp testthat]; };
@@ -7793,41 +8135,42 @@ in with self; {
   keep = derive2 { name="keep"; version="1.0"; sha256="12803hhrs9v94rv6qaihk1f1ls7lx4cy2pa30v4p1r2z9afx9bjf"; depends=[]; };
   kehra = derive2 { name="kehra"; version="0.1"; sha256="1cc0bmbg0dncay50ap7cs2516qngzz3ddaab0jk5r6lwfq87h8qx"; depends=[Hmisc raster reshape2 sp stringr xts zoo]; };
   kelvin = derive2 { name="kelvin"; version="2.0-0"; sha256="04xdgpmysksm79m3vqmb4zra3pq09nv99w4fbdla1lmy7z8pkdrk"; depends=[Bessel]; };
-  kendallRandomWalks = derive2 { name="kendallRandomWalks"; version="0.9.2"; sha256="1h02394gq8cmz7bw6k2yg4qjzmns7i6bzafkdw3x9ycf4d9l6p80"; depends=[dplyr EnvStats ggplot2 nleqslv tibble tidyr]; };
+  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.1.6"; sha256="1xgxf9xg8b7dpnbc5dnysd4s2n74877s16f353hrbybf6m768kik"; depends=[magrittr R6 reticulate tensorflow tfruns zeallot]; };
+  keras = derive2 { name="keras"; version="2.2.0"; sha256="0h6rx44c7w0d8gvnchbqfblqmayh47v14vg6ilnfkcb35djws3la"; depends=[magrittr R6 reticulate tensorflow tfruns zeallot]; };
   kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; };
-  kerasformula = derive2 { name="kerasformula"; version="1.0.0"; sha256="1hhzrrg4ryajzlih8wj2j0z3wb0ksi5zycaf9njvbd0jvfxxbzdy"; depends=[dplyr keras Matrix]; };
+  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]; };
-  kergp = derive2 { name="kergp"; version="0.2.0"; sha256="1xamj19v84m1f9ls8ac8xbm6airyjf96i1l48yy4l2rvjdmx6m9l"; depends=[doParallel MASS numDeriv Rcpp testthat]; };
+  kergp = derive2 { name="kergp"; version="0.4.0"; sha256="0b5milibiacxmflrbddl6fjkc54cv0q5w8dqpxikx2vly4as9g5z"; depends=[doFuture doParallel MASS nloptr numDeriv Rcpp testthat]; };
   kernDeepStackNet = derive2 { name="kernDeepStackNet"; version="2.0.2"; sha256="04bdggxvggmppp289n2zw6ijdm7y05gws6z7bp6fr8n1zsxy2w3c"; depends=[caret DiceKriging DiceOptim GA GenSA glmnet globalOptTests lhs matrixStats mvtnorm Rcpp RcppEigen]; };
   kerndwd = derive2 { name="kerndwd"; version="2.0.2"; sha256="0nf5hyb274gn02n4lygwryv1jaqff77i040bd8gs1xykgvy6jxny"; depends=[]; };
   kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; };
   kernelboot = derive2 { name="kernelboot"; version="0.1.5"; sha256="0m31akhya7390lbkw0cjxcrzw28njbz4smd35m93aarb2lgpcj4k"; depends=[future future_apply Rcpp]; };
-  kernlab = derive2 { name="kernlab"; version="0.9-26"; sha256="0xv0slf3ggw3sswsi34416lb1g3h1pqkrr2h7r1n1kvgii3l0jcm"; depends=[]; };
+  kernlab = derive2 { name="kernlab"; version="0.9-27"; sha256="1m0xqf6gyvwayz7w3c83y32ayvnlz0jicj8ijk808zq9sh7dbbgn"; depends=[]; };
   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]; };
   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.0.0"; sha256="0asa62cgs08k0g0yhvsxr2k8rfxy3hqkd4hrv0396394v13b08w5"; depends=[assertthat getPass openssl R6]; };
+  keyring = derive2 { name="keyring"; version="1.1.0"; sha256="1hpfd4hbx43i39l995rg86kfxi7wlyla1gv8mwcdr4xx7z122zzq"; depends=[assertthat filelock getPass openssl R6 rappdirs sodium yaml]; };
   keyringr = derive2 { name="keyringr"; version="0.4.0"; sha256="04f0z6mqj75l5qhiab0zvjsvz3jz1bp6dfazkpgihjmls5k11dnh"; depends=[stringr]; };
   kfda = derive2 { name="kfda"; version="1.0.0"; sha256="0861hzry55gj8ykdd8cwil1wb7234pkmipp4v1749fpmzggq1xgi"; depends=[kernlab MASS]; };
   kfigr = derive2 { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; };
   kgc = derive2 { name="kgc"; version="1.0.0.2"; sha256="14zbcimnglh5jj07dcaxp1dfjaz8syswy29nf8z39qmslv1hg9kk"; depends=[plyr shiny shinythemes]; };
   kgschart = derive2 { name="kgschart"; version="1.3.5"; sha256="1gdsrmnv8z99cldvig7grlq8gsbv3wpx7zdamw85lz563n4ln94d"; depends=[abind deepnet ggplot2 gridExtra magrittr matrixStats nnet png shiny stringr]; };
-  kidney_epi = derive2 { name="kidney.epi"; version="1.0.0"; sha256="1n264l2snbmx72hp67gzkwwzkmivi1f4nddh3zhxvy028y47w643"; depends=[]; };
+  khroma = derive2 { name="khroma"; version="1.0.0"; sha256="0bws0p5gyla7vlplayqqjl7rygwk5jz3dwbk0rlz38hcafrlzh1l"; depends=[]; };
+  kidney_epi = derive2 { name="kidney.epi"; version="1.1.0"; sha256="191yrqdviwvfl62c62qqfa154hglxpfwcxllhgwlm8nsysg46z5i"; depends=[]; };
   kimisc = derive2 { name="kimisc"; version="0.4"; sha256="0nbjspbq9akhmamfdn192p5b6ki7xqhp422ih6v77xsnrhl5m24z"; depends=[memoise plyr pryr]; };
   kin_cohort = derive2 { name="kin.cohort"; version="0.7"; sha256="0wijsjz0piz5j9rm2nr3d5dfpiyba740mbfbkmfll9pz72s58wz8"; depends=[survival]; };
   kineticF = derive2 { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; };
   kinfit = derive2 { name="kinfit"; version="1.1.14"; sha256="0gb43pghgllb9gzh8jzzpfmc46snv02ln4g3yqsdah3cyqnck0ih"; depends=[]; };
   kinship2 = derive2 { name="kinship2"; version="1.6.4"; sha256="19r3y5as83nzk922hi4fkpp86gbqxdg1bgng798g1b073bp6m9yj"; depends=[Matrix quadprog]; };
-  kirby21_base = derive2 { name="kirby21.base"; version="1.6.0"; sha256="1l9ynmkh27m6c3862j7xqiydanknd1zplqvsay5amh7k13isj9gg"; depends=[git2r]; };
-  kirby21_fmri = derive2 { name="kirby21.fmri"; version="1.6.0"; sha256="15dhb7d2xrka55gg4f1n74dysj74c4fv9hpdx2n1vc79n90zl6yr"; depends=[kirby21_base]; };
-  kirby21_t1 = derive2 { name="kirby21.t1"; version="1.6.0"; sha256="0zanqmndm15fld31g7zpam3y3z63aw1sgk74ya2l95cn21ln34a3"; depends=[kirby21_base]; };
+  kirby21_base = derive2 { name="kirby21.base"; version="1.7.0"; sha256="0drm9h1f91yb75v9jzcaysj2cijcana949xvq8bgkqklmf9zwfl5"; depends=[git2r]; };
+  kirby21_fmri = derive2 { name="kirby21.fmri"; version="1.7.0"; sha256="1z2l6bn53mwkll9ki4169lqlz6wcfp29xzdrqyw606j2xrs4wc22"; depends=[kirby21_base]; };
+  kirby21_t1 = derive2 { name="kirby21.t1"; version="1.7.0"; sha256="0bv8rrk9jh02h3gill1g2w246j4zv98cjchz7i2c092lvqps8szs"; depends=[kirby21_base]; };
   kissmig = derive2 { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; };
-  kitagawa = derive2 { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; };
+  kitagawa = derive2 { name="kitagawa"; version="2.2-2"; sha256="0hl2l42jz4wkcx94cqycw8zb3ffg72fp2f310sh5icrcnyw43bmp"; depends=[kelvin]; };
   kknn = derive2 { name="kknn"; version="1.3.1"; sha256="1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112"; depends=[igraph Matrix]; };
   klaR = derive2 { name="klaR"; version="0.6-14"; sha256="1g995df6286sd64nw7q9bihzkqhrasks45n8xk678y57kcadksai"; depends=[combinat MASS questionr]; };
   klausuR = derive2 { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; };
@@ -7835,7 +8178,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]; };
-  kmed = derive2 { name="kmed"; version="0.0.1"; sha256="0vcks4n0dpfd5cl5b8mhvhw6r2f3y12jn3d3j3dkj2grxmb9lh4c"; depends=[ggplot2]; };
+  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]; };
   kml = derive2 { name="kml"; version="2.4.1"; sha256="1my9gcripiqc6iphycjr3srj8qxy05yvd0648vblygrx2qym5hy2"; depends=[clv longitudinalData]; };
@@ -7852,51 +8195,53 @@ in with self; {
   knnIndep = derive2 { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; };
   knncat = derive2 { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; };
   knnp = derive2 { name="knnp"; version="1.0.0"; sha256="038bl834zjmwdhfh5skhsjk2jqizx285g1w4y7ji9h0h03akn5nd"; depends=[doParallel foreach forecast parallelDist]; };
-  knockoff = derive2 { name="knockoff"; version="0.3.0"; sha256="0irqbidp00rh07xsfyyv5d3ksa4fn9vv49rsy8ah2gb9y41iy046"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; };
-  knor = derive2 { name="knor"; version="0.0-5"; sha256="19wjrcmfam1ck5vbidksmy923d5p5llikjxn0v248vzfz96ia1yc"; depends=[Rcpp]; };
+  knockoff = derive2 { name="knockoff"; version="0.3.2"; sha256="1ky69f3hwwgy2il097mx0z7aakxsq692g9ink8z8cb4wnrp4bk07"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; };
+  knor = derive2 { name="knor"; version="0.0-6"; sha256="0mri7lw6jwkksyxidyqm2xrkjh1vd6dylxd24gd18j9blf342p7d"; depends=[Rcpp]; };
   knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; };
   kntnr = derive2 { name="kntnr"; version="0.4.1"; sha256="0d78mgmz2yhfbf4m5jaa28aazaw2wf9vf1vxl53wrnpy0hxw329y"; depends=[base64enc dplyr httr jsonlite lazyeval lubridate purrr rstudioapi stringr tibble]; };
-  koRpus = derive2 { name="koRpus"; version="0.10-2"; sha256="1ykaky10zkj76w44fhk6kb6dqz1pgncmdnz4r2amcm08a8h96gsr"; depends=[data_table]; };
+  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.1"; sha256="1sys4ymh0ja2zb14k6hq455563np7n8jzmgakkjdghfi38lxndam"; depends=[httr jsonlite xts zoo]; };
+  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.5"; sha256="110ckinwzgv8b6g1cj0k0vva19abi44psf9vmqifs3450v90bq8z"; depends=[MASS Rcpp]; };
+  kohonen = derive2 { name="kohonen"; version="3.0.6"; sha256="0b1039j69v43ppyczwpagriiv669gnxh3s40dhjq0mb3a6fxrpcb"; 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]; };
-  komaletter = derive2 { name="komaletter"; version="0.2.0"; sha256="17xkc22ci2gqypcfs1yhyzfmpsh8bmjbw6yms27cbqg4m4jdgm9v"; depends=[rmarkdown]; };
+  komaletter = derive2 { name="komaletter"; version="0.3.0"; sha256="09yvb8ijm1s5d89mrl8j56n8x8q1lq2siprw8191ys3jidmk6ha7"; depends=[rmarkdown]; };
   konfound = derive2 { name="konfound"; version="0.1.0"; sha256="1w85gsms061d5hik3bc7x5gc7cp6c9h8l8q8q60isj1r0n60a81s"; depends=[broom dplyr ggplot2 margins pbkrtest purrr rlang tidyr]; };
   kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; };
   kpeaks = derive2 { name="kpeaks"; version="0.1.0"; sha256="1qxpncwyshv35h1190py6a69mljabfcjjs7v17a2rb5asahy3rk8"; depends=[]; };
   kpmt = derive2 { name="kpmt"; version="0.1.0"; sha256="15d26khc0v3kc1c7l1avqp48pfqmc6xj32029mv7myivr41ashk3"; depends=[matrixStats]; };
   kpodclustr = derive2 { name="kpodclustr"; version="1.0"; sha256="1fywgdj4q3kg8y9lwnj6vxg9cwgs5ccwj6m3knfgg92f8ghnsbsw"; depends=[clues]; };
   kriens = derive2 { name="kriens"; version="0.1"; sha256="1qi65k9fsbbkbw0w40rv60p5ygrvr10rmlyxdaqa5bdpcmrbly5z"; depends=[]; };
+  krige = derive2 { name="krige"; version="0.1-1"; sha256="0r52i29k5835r99vip1b0xxsqdg71m7zlbgq5002iav1ig6l7k71"; depends=[MASS mvtnorm]; };
   kriging = derive2 { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; };
-  krm = derive2 { name="krm"; version="2018.1-24"; sha256="0qysv61vjdz8674hn6mk0913dkm2bfkqmr7cybls9z9h4i068vdk"; depends=[kyotil]; };
-  ks = derive2 { name="ks"; version="1.11.2"; sha256="0q99b6jv61cni5fgxvygbg8hs4fyhdmbgdzwgny7mrp1jr84izcx"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv multicool mvtnorm]; };
+  krm = derive2 { name="krm"; version="2018.8-17"; sha256="0d4isfzhlz9kxq0sbb1m60wnvcnlqzz8d45hiikgf1dfbngkyh2a"; depends=[kyotil]; };
+  ks = derive2 { name="ks"; version="1.11.3"; sha256="0z749c3xzpf6n0g7xcfplrhap1di8k7kcfr7vigh95ywnigyhs8d"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv multicool mvtnorm]; };
   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.4-0"; sha256="1vqkriqhzdzs3kldjqgl15sm25lbfqzisglk2r96rjgxbj8k59w7"; depends=[proxy relations sets]; };
-  kstIO = derive2 { name="kstIO"; version="0.1-0"; sha256="04s8lyg7622zcq947qlx5brwf1an7icg94i5di8vwjp7d8zgczq6"; depends=[MASS pks sets stringr]; };
+  kst = derive2 { name="kst"; version="0.5-0"; sha256="05vq23j9q4q1nh9s92z303pwma0mh0b7h64aha3xvilfs3sbhvwq"; 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=[]; };
   ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; };
   kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; };
   kutils = derive2 { name="kutils"; version="1.45"; sha256="0qx40d5nk8q0kv09l73bcn7dbch89b9zi8yp75v39vcy4qxdnc2b"; depends=[foreign lavaan openxlsx plyr RUnit xtable]; };
   kvh = derive2 { name="kvh"; version="1.3"; sha256="0dhdvka7sdh7qcq5cz5xsv8dbxr1lr4n7wf033smsz4nvwgjixr3"; depends=[Rcpp]; };
   kwb_hantush = derive2 { name="kwb.hantush"; version="0.2.1"; sha256="0rjnhhzvjhhl0r2ixz9vkgnqkrnnk772253zy7xkpadj7ws69jsf"; depends=[hydroGOF lattice]; };
-  kyotil = derive2 { name="kyotil"; version="2017.12-27"; sha256="0xd64xg3nj0pj0ziycq4ndpl8kwxfng96ag8zmqzzxk85zw2vyq3"; depends=[]; };
-  kza = derive2 { name="kza"; version="4.0.0"; sha256="0yfn6ijbskdkcgbgk4fwhgiiy34cw9k9vy1psi779mqd9kyjf56j"; depends=[]; };
+  kyotil = derive2 { name="kyotil"; version="2018.10-17"; sha256="12rrr7ynjwhcskjkfkv11q5xpdfn9j27vmnsd0r0vc2w2b25217k"; depends=[]; };
+  kza = derive2 { name="kza"; version="4.1.0"; sha256="128r4xmqxy1i1svcmv8786qqmriyqygd8d49cp53x8gb56k011xa"; depends=[]; };
   kzfs = derive2 { name="kzfs"; version="1.5.0.1"; sha256="0gd945x1ppdw15iqcn5ijzmh07hs7zg8rjb85231bcqbh98djvfm"; depends=[digest kzft]; };
   kzft = derive2 { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; };
   kzs = derive2 { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; };
   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-1"; sha256="0sqzvz78p50afp892p7ghy4fmy9p3a2ik51bzzwrx6r96ax7w971"; depends=[tgp]; };
+  laGP = derive2 { name="laGP"; version="1.5-2"; sha256="1gpvp07m3ixhsvvcx0px9wx2f603zbsj4cqrx8w1azwrms5y2qj4"; 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.0.1"; sha256="0iwk8p3m2g6732q2pilwr3wlaiys15khd54r0vxsp2irlw77lzrg"; depends=[]; };
+  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]; };
@@ -7906,23 +8251,25 @@ in with self; {
   lacm = derive2 { name="lacm"; version="0.0.3"; sha256="0qhvffiw2bcpnv6l4y4h12ss59yc2j0hwsg2nr4a7w4nh6yk9fwc"; depends=[numDeriv statmod]; };
   laeken = derive2 { name="laeken"; version="0.4.6"; sha256="1rhkv1kk508pwln1d325iq4fink2ncssps0ypxi52j9d7wk78la6"; depends=[boot MASS]; };
   laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; };
-  lagged = derive2 { name="lagged"; version="0.1-1"; sha256="062a9hrnp2bsahsdasml0wzqpapyslfiwy9q2mvwqsl6j2pqkk0s"; depends=[]; };
+  lagged = derive2 { name="lagged"; version="0.2-0"; sha256="053wv4z1859v4j00x6l707v6w5zdyk3r1a6naxs601607yn27n5h"; depends=[]; };
   lagsarlmtree = derive2 { name="lagsarlmtree"; version="1.0-0"; sha256="0nrrr2n2q228d1c7qrhcnczmr374i56p7kr868yl19g8ddd3gx3w"; depends=[Formula partykit spdep]; };
   lakemorpho = derive2 { name="lakemorpho"; version="1.1.1"; sha256="0asrp9rvyi5ykxw922qx25rgxvyc9mh4sc7qkbpwzqw8xvgpad2z"; depends=[cluster geosphere raster rgdal rgeos sp]; };
   laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; };
   lamW = derive2 { name="lamW"; version="1.3.0"; sha256="00qa1sxyqb2r7f9yidg43cq2v1285f45xpm3z928jpi424mpg0fc"; depends=[Rcpp RcppParallel]; };
   lambda_r = derive2 { name="lambda.r"; version="1.2.3"; sha256="0cc6pszs6yccn0hgjpyn9gspv9aiva9d91ba0640i5m0l5xy7n0c"; depends=[formatR]; };
   lambda_tools = derive2 { name="lambda.tools"; version="1.0.9"; sha256="1wslxxh6rxny3n06y16dqwpczi3k42vrq4pbwwshl6kzhl56r45b"; depends=[lambda_r]; };
+  lamme = derive2 { name="lamme"; version="0.0.1"; sha256="1x9jl79iqikpjixajly1k8w2nkzskns2m0v242giknl0ikw298h1"; depends=[]; };
   landest = derive2 { name="landest"; version="1.0"; sha256="1lp5sfqk0n7i23fmwjgzsabml1fsji1h9xq5khxzaz1bzqv1s08g"; depends=[survival]; };
   landpred = derive2 { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; };
   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]; };
-  landscapetools = derive2 { name="landscapetools"; version="0.3.0"; sha256="0ssrqcac3x8fca0vx63nzzac38kx8vlbffkzahmag24c6b1y6dzq"; depends=[checkmate dplyr extrafont ggplot2 magrittr purrr raster rasterVis tibble tidyr viridis]; };
+  landscapemetrics = derive2 { name="landscapemetrics"; version="0.2"; sha256="1blriglh2kplcndcrgyxw6llhffxy2lbra8brpji6ma7552nb4xl"; depends=[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]; };
   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.3"; sha256="1rjdmnfgf6nj03ddsak56y6gii8kj2vayri2l26hg1n0ap99z1bs"; depends=[callr jsonlite lintr R6 repr stringr styler]; };
+  languageserver = derive2 { name="languageserver"; version="0.2.5"; sha256="07j0s5s689szasvh4h5hn2250yfly35gjv88g7ggzy71i9vw0cdv"; depends=[callr collections desc jsonlite lintr R6 repr stringr styler]; };
   lans2r = derive2 { name="lans2r"; version="1.0.5"; sha256="1m3hz85gl9m4vafdy7mj3z560d11mdwlwvnzy8n7d1cjqryn7a2b"; depends=[dplyr ggplot2 lazyeval R_matlab reshape2 tidyr]; };
   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=[]; };
@@ -7932,31 +8279,32 @@ in with self; {
   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=[]; };
   latdiag = derive2 { name="latdiag"; version="0.2-4"; sha256="051chvky3hlfr4hwm9qickl6aaxwnxa88zksmzczqfspby771hq6"; depends=[]; };
-  latentnet = derive2 { name="latentnet"; version="2.8.0"; sha256="05r7hzj5i7rgpxl798lwi2m62l1qkl5zdza0q2awcd5ydkgj34hp"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; };
-  later = derive2 { name="later"; version="0.7.3"; sha256="04j2phymxgkk4hv9pfa5w3s98w5d7fvm11blrdhxmray4n618msw"; depends=[BH Rcpp rlang]; };
+  latentnet = derive2 { name="latentnet"; version="2.9.0"; sha256="0gmv4h6zijhgypkasr1y45lx7ksfhfpdgrqqxan4qnxfqp3kxbrr"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; };
+  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.3"; sha256="1zsdz3nvhifxbhp69nigq1crgm39g6gmc8xl5akp5jdidmzyrh84"; depends=[]; };
+  latexpdf = derive2 { name="latexpdf"; version="0.1.6"; sha256="07g33z5lyxinlrzpk6pd41m4c4bbfql611yqcqxasf8wra9bb0jr"; depends=[]; };
   lattice = derive2 { name="lattice"; version="0.20-35"; sha256="0pcnmaz3lr62ly0dcy5hnnqxshc4yqd43hrvlz3almgc9l7sna88"; depends=[]; };
-  latticeDensity = derive2 { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[spam spatstat spdep splancs]; };
+  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.2"; sha256="1r47pps39cgvxhg1s0bqknf4jl91pbb0c76q5icxivhwb172fqcm"; depends=[numDeriv SQUAREM survival]; };
+  lava = derive2 { name="lava"; version="1.6.3"; sha256="0cayjspry3r2lcbvl77v5v52b2zarri3b8xsf87pw5a3jn9anxcf"; 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.3.3"; sha256="08h9nfbjbq6l5drmq07js2b6ylv29wfrddqdlpsnysi99sj8i8aq"; depends=[ggplot2 lava MASS Matrix multcomp mvtnorm nlme reshape2 sandwich]; };
-  lavaan = derive2 { name="lavaan"; version="0.6-1"; sha256="0k0mm66i5xfb06rc7b6is16nn7k2limas5mhlr9d5nwbqz87g4i2"; depends=[MASS mnormt numDeriv pbivnorm]; };
+  lavaSearch2 = derive2 { name="lavaSearch2"; version="1.4"; sha256="0mr3vranmsrd9acr16gryib89dn2x19wwwd4wx3dgwwby18mc5j3"; 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]; };
   lavaanPlot = derive2 { name="lavaanPlot"; version="0.5.1"; sha256="01bx1snd3zhc8dmq0f407qhw2d00f6d38qpr791qc1mq5kr3d8qj"; depends=[DiagrammeR lavaan stringr]; };
   lawn = derive2 { name="lawn"; version="0.4.2"; sha256="17nj88n5xzhjkwm0hi8g9h5a3nclvkq3k1pv3690ph14g4l9lgcj"; depends=[jsonlite magrittr V8]; };
   lawstat = derive2 { name="lawstat"; version="3.2"; sha256="03ppzyx3x6vx1n2k5l8gl9j2q2mnqa1im5smxnrlncan7yzjy7sf"; depends=[Kendall mvtnorm VGAM]; };
-  lazy = derive2 { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; };
+  lazy = derive2 { name="lazy"; version="1.2-16"; sha256="1psh3sng1pm23pjwy7iszb21ys7d29ry34ymvpgxj6zdhywwi5n7"; depends=[]; };
   lazyData = derive2 { name="lazyData"; version="1.1.0"; sha256="0mbmmx6dh8ph4lrx1b4gxbwz3jwxv4nqi0xvfzpzrm3bwbsjc634"; depends=[]; };
   lazyWeave = derive2 { name="lazyWeave"; version="3.0.2"; sha256="1a7l0rgkp3xq2s6bikciq778fwyr282baa6jk9ip4a71s931p2ag"; depends=[Hmisc labelVector]; };
   lazyeval = derive2 { name="lazyeval"; version="0.2.1"; sha256="0q9zx78ncy2ffzrf9sh053069kd3w1xn1ss3gsbyf3y4jhza9cw3"; depends=[]; };
-  lazyrmd = derive2 { name="lazyrmd"; version="0.2.0"; sha256="0ahm1wspvm625lx7y2zz05bvv66rlswphs84vpkcqb0dqfcn3s48"; depends=[digest htmltools htmlwidgets knitr rmarkdown]; };
+  lazyrmd = derive2 { name="lazyrmd"; version="0.2.0.1"; sha256="0yzamy1bfq0d7mnrr24wzvvw6lq7rhfs6qnqypfmym65j5kfj0f8"; depends=[digest htmltools htmlwidgets knitr rmarkdown]; };
   lazysql = derive2 { name="lazysql"; version="0.1.3"; sha256="18vff80rl8ckjwfqi9dhzs1q35a1wrxvynidji6dy2kvvk38xnpa"; depends=[checkmate magrittr plyr]; };
   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]; };
   lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; };
   lbreg = derive2 { name="lbreg"; version="1.2"; sha256="0wcw5w07fgmxwzmamf380l8vxw9fnxhbrhcwwfy6x87xby3bzr1b"; depends=[MASS]; };
   lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; };
@@ -7970,44 +8318,48 @@ in with self; {
   ldat = derive2 { name="ldat"; version="0.2.0"; sha256="04l544js7xzaywd2mj3kcz40gxn98primzmzd1ihk35lqmpd7h8y"; depends=[BH lvec Rcpp]; };
   ldatuning = derive2 { name="ldatuning"; version="0.2.0"; sha256="18nm4hj7733c1cp03hyddnivhiiyv7ndnw9m6j3af019jjmvf215"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; };
   ldbod = derive2 { name="ldbod"; version="0.1.2"; sha256="1ylzkswnhf4jnjx2ijasy49pj78ffx333za0bx2fnf3g85kicqiv"; depends=[mnormt RANN]; };
-  ldbounds = derive2 { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dryq3ww0dqxd0qf5xx1bs3w934sf99l46bhs"; depends=[lattice]; };
+  ldbounds = derive2 { name="ldbounds"; version="1.1-1.1"; sha256="10rmkidvvhwnrkc62c5ld44xhbvx1k8mch28h1yryakn8gznp3p8"; depends=[lattice]; };
   ldhmm = derive2 { name="ldhmm"; version="0.4.5"; sha256="1pax1hl0h07nc9d34pf0jqgpcxr7y7dpqcm2hlclrmsinhj9q8vi"; depends=[ecd ggplot2 moments optimx scales xts zoo]; };
   ldr = derive2 { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; };
   leabRa = derive2 { name="leabRa"; version="0.1.0"; sha256="08yiwyfg9bp4i9w5yyw9p63wyvgj39kd64y3h21j2jmpw8zxncdq"; depends=[plyr R6]; };
   leaderCluster = derive2 { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; };
   leafSTAR = derive2 { name="leafSTAR"; version="1.0"; sha256="16zfaj0v6dx6mhy6m126lxa6w0dzfw4acm83jlbrizaz52amhv6a"; depends=[]; };
-  leaflet = derive2 { name="leaflet"; version="2.0.1"; sha256="01ngvwj2w0hlxz24x32ffwkcd5rrbm1w57mp7mlaapi3yfnxaxlq"; depends=[base64enc crosstalk htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp viridis]; };
+  leaflet = derive2 { name="leaflet"; version="2.0.2"; sha256="051i5qmwa0zbk4jpjrx9kzk4g8qg9c3cavvhw19yj08fjhh8si7s"; depends=[base64enc crosstalk htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp viridis]; };
   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]; };
   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]; };
   leapp = derive2 { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[corpcor MASS sva]; };
   leaps = derive2 { name="leaps"; version="3.0"; sha256="11gjmn1azrjw5xlvdb4gknj9985kck9x8zb9np1rnk2smp6pka2m"; depends=[]; };
   learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; };
+  learnPopGen = derive2 { name="learnPopGen"; version="0.9.8"; sha256="1f1wf7g3r68vd0d89cbqb3ik61h67sy40j86628yb7r0x0xk85dn"; depends=[gtools phytools]; };
   learningCurve = derive2 { name="learningCurve"; version="1.1.2"; sha256="02dl5rlvwa8dvhknf4kdfg3aial54shnxrq7k2k8yj2dj0qh062c"; depends=[ggplot2 gridExtra scales tibble]; };
   learningr = derive2 { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
   learnr = derive2 { name="learnr"; version="0.9.2.1"; sha256="0jbk0g6fkw7zs8ykzhsvh9vvz8xmc4v03bqzjsa5mmpxpqan5vx5"; depends=[evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs rmarkdown rprojroot shiny withr]; };
   learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; };
   learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; };
+  ledger = derive2 { name="ledger"; version="1.0.1"; sha256="0f97wxzkhssf0z5kslsx530b4a27fdiiakiylqbfam7xzlqz34yj"; depends=[dplyr rio rlang tidyr]; };
   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]; };
-  lero_lero = derive2 { name="lero.lero"; version="0.1"; sha256="1jndsgy48fn085ilkh8dfc3w76kfnfj0x70d1m3h59zxi3x9lb82"; depends=[stringr]; };
-  lessR = derive2 { name="lessR"; version="3.7.5"; sha256="1irsi3i6kih7mdkwvd42dknhgz16v7mdrdvfqsrqa85cshpl7aad"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png robustbase sas7bdat triangle]; };
+  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]; };
+  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]; };
   lettercase = derive2 { name="lettercase"; version="0.13.1"; sha256="0s2s42v6a3mlz6084sk5wcbap3czgbd53f9p64pxwd1yfj18lbyx"; depends=[stringr]; };
   lexRankr = derive2 { name="lexRankr"; version="0.5.0"; sha256="1l0p4qg6lcpp1f2n6mh1glvxzy3bis0c1ra8x9z5v26x31wmwq68"; depends=[igraph Rcpp SnowballC]; };
-  lexicon = derive2 { name="lexicon"; version="1.0.0"; sha256="0wgf5gvmvybdsijnm4hqkigzr25p3i50y3mxp98cngrm1nqdiq7m"; depends=[data_table syuzhet]; };
+  lexicon = derive2 { name="lexicon"; version="1.1.3"; sha256="085s7k1ywzmsadwmsp1gc2yspv8hp3pp3cjvpq1s39cnwpgi0h0w"; depends=[data_table syuzhet]; };
   lexiconPT = derive2 { name="lexiconPT"; version="0.1.0"; sha256="0w53gnr29nzc1ib54rnxdycs0c5f7vpv586qmvxxzy4ar16kisaq"; depends=[]; };
   lfactors = derive2 { name="lfactors"; version="1.0.4"; sha256="1r8qlwj3zsm233jfx9ag0q5g1knvjmbwl3785pwcd12zi6f68dcc"; depends=[]; };
   lfda = derive2 { name="lfda"; version="1.1.2"; sha256="0y59iigcpmyrmsiwrpv5agja6vz3wxmxd9sl5hbf1ybm4d0lyky4"; depends=[plyr rARPACK]; };
-  lfe = derive2 { name="lfe"; version="2.8"; sha256="138lnrag64hwjgcsyp9y56kq4gby5c9dqfcsl88b7j02hfly7kfv"; depends=[Formula Matrix sandwich xtable]; };
-  lfl = derive2 { name="lfl"; version="1.4.1"; sha256="0r9459mmnx1khpw24w943y1x4xl3zcws2cvv61216yzb0xbqwhc0"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; };
+  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.1.0"; sha256="0gaid5aihc9dk3igbm8jhsspl1k4k3prqvn7j2vsm92jc7m00iyw"; depends=[ggplot2 ks localgauss logspline mvtnorm]; };
+  lg = derive2 { name="lg"; version="0.2.0"; sha256="0127dprv1zdr9m3m84lak4998d0mjfv9809ylzhr7r8a6zy1qdv8"; depends=[ggplot2 ks localgauss logspline mvtnorm]; };
   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]; };
@@ -8016,15 +8368,16 @@ in with self; {
   lhs = derive2 { name="lhs"; version="0.16"; sha256="09clh386i5iig8x36lx02p01zqq0kb9hzvw5slv1ggmjnp1rklcw"; depends=[]; };
   libamtrack = derive2 { name="libamtrack"; version="0.6.3"; sha256="0pdwrz19q1yls0rgr4579f31j86awizx3j31h7vdh6y70ngpmb82"; depends=[]; };
   libcoin = derive2 { name="libcoin"; version="1.0-1"; sha256="1i38v0pq5snx9clhgfiymk6lq87h41pajhp2dvin30snnq0py6qq"; depends=[mvtnorm]; };
+  librarian = derive2 { name="librarian"; version="1.3.0"; sha256="1nlk5v7lk56w4gq97lv1d4k1wza8zankvrzcl0996zqlgz6imz0d"; depends=[devtools]; };
   librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; };
   libsoc = derive2 { name="libsoc"; version="0.6.4"; sha256="1hdnqgnvzm5116gphxa55k2bc3ksr607px2s2yg1ilmmxdghdccw"; depends=[]; };
-  libstableR = derive2 { name="libstableR"; version="1.0"; sha256="0qk70rl76lz2izgp2c1asx0yvi8xgfq1yg579kcygxk4pnxjdwv4"; depends=[Rcpp]; };
-  lidR = derive2 { name="lidR"; version="1.5.1"; sha256="0r6y07ciajn13rhb8n57xnj1lzvz3hvjb4hm29hxclny93c45l16"; depends=[data_table future gdalUtils geometry gstat lazyeval mapedit mapview memoise RANN raster Rcpp rgeos rgl rlas settings sp]; };
-  lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.2"; sha256="012pfiz4l8xrwrjlzwfc0vxw1wpw2n2f2vj39mlpmg5aswg4mm8k"; depends=[markovchain Rcpp]; };
+  libstableR = derive2 { name="libstableR"; version="1.0.2"; sha256="1gkcgbc8a7ks9x8mqmlz98hk55q3qy62izam7csz1s0r5dzsyqcr"; depends=[Rcpp RcppGSL]; };
+  lidR = derive2 { name="lidR"; version="1.6.1"; sha256="0x5ns3p1qvakk999x42qlrhy71plvcqxp65fbj9kc07npyj6bfgw"; depends=[assertive concaveman data_table future gdalUtils geometry glue gstat lazyeval mapedit mapview memoise RANN raster Rcpp rgeos rgl rlas settings sp]; };
+  lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.5"; sha256="18dlp6bm9hsr99y85fxdbapn8s1daqsynpiqf2cfhyffqiwll97f"; depends=[markovchain Rcpp]; };
   lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; };
   lifelogr = derive2 { name="lifelogr"; version="0.1.0"; sha256="1wygvw61ygpww0kahxhmjdncwg4zc2cshs0brzw18nfqaj8vpfav"; depends=[dplyr fitbitScraper ggplot2 lazyeval lubridate modelr plyr R6 shiny stringr tibble tidyr]; };
   lift = derive2 { name="lift"; version="0.0.2"; sha256="0ynsyl6lw7z7bvwzk2idgxzzqji5ffnnc3bll9h4gwdw666g7fln"; depends=[]; };
-  liftLRD = derive2 { name="liftLRD"; version="1.0-7"; sha256="18gcp5b5jmx37ri4b3nnqvsd0crk5wp53dh5p50arflzw0pn7qn1"; depends=[adlift nlt]; };
+  liftLRD = derive2 { name="liftLRD"; version="1.0-8"; sha256="1m24f4mc70l808cpkcdm91hzb5b3bkzibvgyfi9zs6cs8apcvmy3"; depends=[adlift nlt]; };
   liftr = derive2 { name="liftr"; version="0.9"; sha256="1yg9ql6rklrdcd2qds223naryg3rbdi1mbqrlf5jc3cwzhllcsa9"; depends=[knitr rmarkdown rstudioapi stringr yaml]; };
   liger = derive2 { name="liger"; version="0.1"; sha256="0q26qdy7kgqj70ka2gcpji8ni2w8kxnznhp4ig2251xllw9j7dz4"; depends=[matrixStats Rcpp RcppArmadillo]; };
   lightsout = derive2 { name="lightsout"; version="0.3"; sha256="0ypniqf9wk35dd9j57wd7gxchr5hy25fwhmkndz2z8b9ajhm3c9b"; depends=[magrittr shiny shinyjs]; };
@@ -8033,6 +8386,7 @@ in with self; {
   likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.50"; sha256="009alsxsv9fjpihp3zl0a94y6cvr49nh21skba64lzz9fypm9j8l"; depends=[alabama cond digest nleqslv pracma Rsolnp]; };
   likelihoodExplore = derive2 { name="likelihoodExplore"; version="0.1.0"; sha256="13cnql7pbx8qq1j3cfb3lkzzf2k55shpfa0jd00z30ys6imxzcfn"; depends=[lazyeval plyr]; };
   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]; };
   limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; };
@@ -8043,16 +8397,20 @@ in with self; {
   linear_tools = derive2 { name="linear.tools"; version="1.3.0"; sha256="14lp3gifzbid82lkr7rdqajz2abp8m7y8irpwx6s8w66djjfckda"; depends=[ggplot2 magrittr plyr pryr scales stringr]; };
   linearQ = derive2 { name="linearQ"; version="1.0"; sha256="0c6ccllv4zf8zgs3957zjvnkdwbv2ryrs0f5lzk1clc233vm7acm"; depends=[Rcpp stepR]; };
   linemap = derive2 { name="linemap"; version="0.1.0"; sha256="0qkbmpfr742xbs3xn5ppx6q0prwrr9mk1c1mv050cm47dm7jcs6l"; depends=[sf]; };
+  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]; };
-  link2GI = derive2 { name="link2GI"; version="0.3-0"; sha256="0jzk1p9cygcw0xz9hqfzx74acl4ymn3jmcjj0dxrmknsvfdzcl2d"; depends=[gdalUtils raster rgdal rgrass7 RSAGA sf sp]; };
+  linguisticsdown = derive2 { name="linguisticsdown"; version="1.0.1"; sha256="1y0iwbdkm37h6777p409ac7w8xqp70g2jjcfhxpvnrvvk4v0hrrk"; depends=[dplyr 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]; };
   linkim = derive2 { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
+  linkprediction = derive2 { name="linkprediction"; version="1.0-0"; sha256="0p2abdq6ad689236w2d0khlycpjgy6j7xrlb96ngl6csgxwm07bl"; depends=[igraph intergraph]; };
+  linkspotter = derive2 { name="linkspotter"; version="1.2.0"; sha256="0wk27jn8jr5rskjxbixshmp2dl0l74hrc8r6x3rvhy0x0b00zks2"; depends=[dplyr energy ggplot2 Hmisc infotheo mclust minerva pbapply rAmCharts shiny tidyr visNetwork]; };
   linl = derive2 { name="linl"; version="0.0.2"; sha256="1n3sljyycsppk11ri9jijsif3g7v4n8xvk1n4hhx0qg65kh7wmry"; depends=[knitr rmarkdown]; };
   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.1.4"; sha256="18rqpm0cg233hclcqskdh3mfpwpbawc582j800mjalii233jzr36"; depends=[]; };
+  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]; };
   liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; };
   liquidSVM = derive2 { name="liquidSVM"; version="1.2.1"; sha256="0nw8n4qg2jijbnlza15ifzqsl4pj7gjzi4nd71zp7h0aw5mnp80x"; depends=[]; };
@@ -8065,24 +8423,24 @@ in with self; {
   listdtr = derive2 { name="listdtr"; version="1.0"; sha256="08drps03nndpdxswyv8bjm1bcckjav5pjj7fdx3dzyn0v4dfy619"; depends=[ggplot2]; };
   listenv = derive2 { name="listenv"; version="0.7.0"; sha256="0ma5jsri2zqkrlsm9nqpikl7imbwfy1glsmk13mblw0q245h49k1"; depends=[]; };
   listless = derive2 { name="listless"; version="0.0-2"; sha256="1gr6l4vih7j28kg2mj1xj2yhlpwjc4p894vsxri25vq0r9kgcdym"; depends=[magrittr tidyr]; };
-  listviewer = derive2 { name="listviewer"; version="2.0.0"; sha256="0fq9jdb9yahm095m5ja9j7hlv3ggigj14nlf1pdk26xj2685j8n9"; depends=[htmltools htmlwidgets shiny]; };
+  listviewer = derive2 { name="listviewer"; version="2.1.0"; sha256="09jkrrq4zyzgi66vkpm5n7isxpbckx5hjk39nik766hzarj5i7rs"; depends=[htmltools htmlwidgets shiny]; };
   liteq = derive2 { name="liteq"; version="1.0.1"; sha256="080ljgb2qsfmyppnlp9acmskgq94pmdbbgbhygqkxvzda5bbas8h"; depends=[assertthat DBI rappdirs RSQLite]; };
-  littler = derive2 { name="littler"; version="0.3.3"; sha256="1cbsnm4ffzld93b9q8g6g6h6yskjfwa8j1xani5682ipb7r290x7"; depends=[]; };
+  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.7"; sha256="018k2l3klhkxsb6b8xvrvxajgahb6zd02cngkkayfz2477iy8kdl"; depends=[breakDown data_table dplyr forestmodel ggplot2 lubridate MASS mlr shiny]; };
+  live = derive2 { name="live"; version="1.5.8"; sha256="0idnavgmvhq2w6fa46ssaxhj5v8p3x1q8zcgmknp47s9c2h8yfrc"; depends=[breakDown data_table dplyr 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.1"; sha256="1cvm58kivjw77a2fy1jwsajzl1d0i3i123p6glpwdlqn6rlharck"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; };
+  llama = derive2 { name="llama"; version="0.9.2"; sha256="0knlmfddp70ddhjb9slyibbb9qj7pfybqccv3i4f545qxmmykj2n"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; };
   lle = derive2 { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[MASS scatterplot3d snowfall]; };
   lllcrc = derive2 { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[combinat data_table plyr VGAM]; };
   llogistic = derive2 { name="llogistic"; version="1.0.0"; sha256="1mddwcfp6c5g36japybjrlirz0q8l7am8akbiv8c6z7jka2nwi00"; depends=[]; };
   lm_beta = derive2 { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; };
   lm_br = derive2 { name="lm.br"; version="2.9.3"; sha256="1xadz0rygm58igk0ig0w45132gnsvjxvwqzca4m6v6i6lz9x55pf"; depends=[Rcpp]; };
   lmPerm = derive2 { name="lmPerm"; version="2.1.0"; sha256="1ss2hcfxqvfq4n6hypv7jp0n0apby9payxzaswaysr5368lkidn3"; depends=[]; };
-  lmQCM = derive2 { name="lmQCM"; version="0.1.1"; sha256="1rznr5ky9ngfl8afqh22r4bxkzjyibrwr62f30dcdvpyh863hj0h"; depends=[Biobase genefilter nnet]; };
+  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-17"; sha256="0czwdy1s8h3slaw73pz0h8qmqczf5135fz6i46i2dv1ql2pbq49x"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
+  lme4 = derive2 { name="lme4"; version="1.1-18-1"; sha256="01ar4fak8zj7c1vmh9m576wchxj5qzpfqn637s7fh3fl6cpz0alq"; 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]; };
@@ -8104,11 +8462,12 @@ in with self; {
   lmom = derive2 { name="lmom"; version="2.6"; sha256="0wxlclzypg6dnvk09k26pdgn3nijl06xsa9rny5l03xzar01mz5s"; depends=[]; };
   lmomPi = derive2 { name="lmomPi"; version="0.5.0"; sha256="07ggfzgvhc6kkqs8bbs6z01rbhgb0ki2y4li6r0nkiby1wcpx0py"; depends=[lmom stringr]; };
   lmomRFA = derive2 { name="lmomRFA"; version="3.1"; sha256="1gq5sjdywz1jbsshrh350zad7iifml2yj8an5xa63ghxiskrxscx"; depends=[lmom]; };
-  lmomco = derive2 { name="lmomco"; version="2.3.1"; sha256="0nyl18kipsab4ka5ywbmw28kkr6i09w4lc9pa96m1fh765zghjxi"; depends=[goftest Lmoments MASS]; };
-  lmridge = derive2 { name="lmridge"; version="1.1"; sha256="1r4g7482iz4b7jk0gj169bj96ip2wyrff1ndkwhf0qzg6r6vqa8d"; depends=[]; };
+  lmomco = derive2 { name="lmomco"; version="2.3.2"; sha256="1gqwn5yjd3zcwd5nysayf88vjhj2j1qxfgqcw63q7f2ih0xk1lqp"; depends=[goftest Lmoments MASS]; };
+  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]; };
-  loa = derive2 { name="loa"; version="0.2.43.3"; sha256="0krrv5sicm4xvgilri8nwby6jlidx375b4sk273hxq7bhayw4hqq"; depends=[lattice MASS mgcv plyr png RColorBrewer RgoogleMaps]; };
+  loa = derive2 { name="loa"; version="0.2.44.2"; sha256="16yrkl8l4wa4i3iizncm58l75l46acfr2lf4vn53crcci9xra333"; depends=[lattice MASS mgcv plyr png RColorBrewer RgoogleMaps]; };
+  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=[]; };
   locfdr = derive2 { name="locfdr"; version="1.1-8"; sha256="1falkbp2xz07am8jlhwlvyqvxnli4nwl188kd0g58vdfjcjy3mj2"; depends=[]; };
@@ -8119,9 +8478,10 @@ in with self; {
   loder = derive2 { name="loder"; version="0.2.0"; sha256="0m6g8c25dmq0wgpy8y6cbggymxdvqwb6lp2yzs5bgpq183512spb"; depends=[]; };
   loe = derive2 { name="loe"; version="1.1"; sha256="1n16pgfxg9vcn729xxjbbvavg2ywbdcch9v2ph8nv3z7psc0q46c"; depends=[MASS]; };
   log4r = derive2 { name="log4r"; version="0.2"; sha256="07q8m7z2sxm6n25a62invf76qakxdsijfh3272spc8xrmdmyw6rj"; depends=[]; };
-  logKDE = derive2 { name="logKDE"; version="0.1.0"; sha256="1jp36v8dfdli85lzcya4nvw17fjrsfldm8v487k1s1d1s9qz55vl"; depends=[pracma Rcpp]; };
+  logKDE = derive2 { name="logKDE"; version="0.3.2"; sha256="09gachibj0klqa9ijw572lwphbh9qj6zqray5byq1dh7zsiq516q"; depends=[pracma Rcpp]; };
+  logNormReg = derive2 { name="logNormReg"; version="0.2-0"; sha256="1mry2vqb9sqv17xw26k637w3i3zqjgayz2ql43rbz2f5248lm0yc"; depends=[]; };
   logOfGamma = derive2 { name="logOfGamma"; version="0.0.1"; sha256="0r7di0l646ycfmdjk8hli6b0v7qj0i8z3i8i7rwd3fsblb2q22vd"; depends=[]; };
-  logbin = derive2 { name="logbin"; version="2.0.3"; sha256="0jvld5lh69288g80ypvqyg0s0nip9hgd8p09b91xp11vnlap0g02"; depends=[glm2 turboEM]; };
+  logbin = derive2 { name="logbin"; version="2.0.4"; sha256="01gwfq9r2yy28iymxa402r8jp8km953cb5i60xnskcpzh8bv4rmf"; depends=[glm2 turboEM]; };
   logconcens = derive2 { name="logconcens"; version="0.16-4"; sha256="11bk03kjlb747g54axmb0nayz226g41xvanbw79aij76vjbglv7y"; depends=[]; };
   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]; };
@@ -8131,16 +8491,19 @@ in with self; {
   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]; };
   logihist = derive2 { name="logihist"; version="1.0"; sha256="1q3322rh3g31c5i80aw54pln0m1jgxmbx30cn31nlh3ijkvnpq9a"; depends=[ggplot2]; };
-  logistf = derive2 { name="logistf"; version="1.22"; sha256="0npwqbl8rfvn6w2y0qpkckj44mvjjccj0cn9axp2wcs03cmz0rp8"; depends=[mgcv mice]; };
+  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=[]; };
   logitchoice = derive2 { name="logitchoice"; version="0.9.4"; sha256="1vkw7cwp7nwrsj9ifn4gz21zbw9da5rph9lr3w466zxkzdkbldqj"; depends=[]; };
-  logitnorm = derive2 { name="logitnorm"; version="0.8.36"; sha256="0iag05fhzrizi74bjkl909ky7zxi9yzqx6im2ki86bpczijyfxb8"; 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.6.5"; sha256="0ak13nfgaima6g75rxbghl7xmagfp4qshj09x1fxh2r2rcags7dk"; depends=[gnm qvcalc]; };
+  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]; };
   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=[]; };
   longCatEDA = derive2 { name="longCatEDA"; version="0.31"; sha256="0dji41lsknfwmgb2fczzm37dm97wvi45rh878w7pwlzwdh9vq8va"; depends=[]; };
   longROC = derive2 { name="longROC"; version="1.0"; sha256="1fs11vqi4hy99d7shzzdvd6ic5gay6rh2027w6j0qpd04n8q88m8"; depends=[survival]; };
@@ -8148,17 +8511,19 @@ in with self; {
   longclust = derive2 { name="longclust"; version="1.2.2"; sha256="1yxxz8apbl1vaqzrsiq7r5ss87j2li595bkvibpkwslgwzv47dcs"; depends=[]; };
   longitudinal = derive2 { name="longitudinal"; version="1.1.12"; sha256="1d83ws28nxi3kw5lgd5n5y7865djq7ky72fw3ddi1fkkhg1r9y6l"; depends=[corpcor]; };
   longitudinalData = derive2 { name="longitudinalData"; version="2.4.1"; sha256="0lnvcfgj721bawl1ciz0jw83mfsnzkhg6jn824vr3qdm4rbib2vd"; depends=[class clv misc3d rgl]; };
-  longmemo = derive2 { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; };
-  longpower = derive2 { name="longpower"; version="1.0-16"; sha256="0hbv43y0fgbv1qiczy4kibqc7pk7whrz4kyxshg8730y8g9wyxdi"; depends=[lme4 nlme]; };
+  longmemo = derive2 { name="longmemo"; version="1.1-1"; sha256="0myn2xpg0mw3x5zma0y1dza2jg3x9zj9z8xv2z8l2q9pm228xn0d"; depends=[]; };
+  longpower = derive2 { name="longpower"; version="1.0-16.1"; sha256="0ywzx9rsh53mqlzxm0dzmwpxdyj187pxhjwd7cf463l4vm49qgmy"; depends=[lme4 nlme]; };
   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.1.1"; sha256="023vrnbn4pikiq6l57phwy9zy1lp6vxrkinrffaxwicvaj58c931"; depends=[]; };
+  loon = derive2 { name="loon"; version="1.2.0"; sha256="1ch5hzpyvq0vil8fwpkpjh8yxyq876shy9kyr6svs2x7jc132qvr"; 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=[]; };
-  lori = derive2 { name="lori"; version="0.1.0"; sha256="1sqwfai0h776i3g0gxqfagisayv428gzw9540d90nzbrg9vkj28j"; depends=[ade4 FactoMineR glmnet lars lattice logmult NLRoot pdist psych svd]; };
+  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]; };
   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=[]; };
@@ -8166,12 +8531,11 @@ in with self; {
   lpc = derive2 { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; };
   lpdensity = derive2 { name="lpdensity"; version="0.2.2"; sha256="1fv1biyc12zg0wfqcr5kp761fy6n6879knvlxr2zjp6rjssi3h6d"; depends=[ggplot2]; };
   lpint = derive2 { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; };
-  lpirfs = derive2 { name="lpirfs"; version="0.1.0"; sha256="0xkm6ds44v3g0vnh6nribysg1fbphgx81zklx82xmi5cvl5z69c1"; depends=[doParallel dplyr foreach ggplot2 mFilter Rcpp RcppArmadillo vars]; };
+  lpirfs = derive2 { name="lpirfs"; version="0.1.3"; sha256="17jgk0y5xgm3g1wl0mq0sjjw1ghvs009cr5qhh5hpb1k5yk14q4n"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo]; };
   lplyr = derive2 { name="lplyr"; version="0.1.12"; sha256="1wcab8wwdzpgb61q83gfn2d34vsrd3qa4xyb9sqna6krss1ii1in"; depends=[bazar dplyr lazyeval magrittr]; };
   lpme = derive2 { name="lpme"; version="1.1.1"; sha256="0si90nkgl8bqk8yvd2igdsrngiwqh8891072pfpzipifnd0f5448"; depends=[decon flexmix locpol Rcpp RcppArmadillo]; };
   lpmodeler = derive2 { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; };
   lpridge = derive2 { name="lpridge"; version="1.0-8"; sha256="0jk4l95z9rcdqkc8lpp4sf1mg2dqj67rhqw1iafrxy5lx4jfaqqx"; depends=[]; };
-  lqa = derive2 { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; };
   lqmm = derive2 { name="lqmm"; version="1.5.4"; sha256="117g38m650mi28ff19nd71dadbdphd1ladmrip2kbsnkpcz2q37p"; depends=[nlme SparseGrid]; };
   lqr = derive2 { name="lqr"; version="1.7"; sha256="110c18wc3y3nkdwjgrksw20kvvy65822njrpy4gwb100ifigw0v7"; depends=[ghyp spatstat]; };
   lrequire = derive2 { name="lrequire"; version="0.1.3"; sha256="03c8h9v2xhlv7bj5jv117a27gaqaly2kdxs9zyihsm9yh9rg3d79"; depends=[]; };
@@ -8180,39 +8544,40 @@ in with self; {
   lsa = derive2 { name="lsa"; version="0.73.1"; sha256="1af8s32hkri1hpngl9skd6s5x6vb8nqzgnkv0s38yvgsja4xm1g5"; depends=[SnowballC]; };
   lsasim = derive2 { name="lsasim"; version="1.0.1"; sha256="0bwk6bv0wp30v6p55nyd1hcvwnjjddwccyy1swf6sg7lw3fy657p"; depends=[]; };
   lsbclust = derive2 { name="lsbclust"; version="1.0.5"; sha256="005kswkpp3qmrg5ij8999xambyyry5wajkawiwhv45niyi2hlkxv"; depends=[clue doParallel foreach ggplot2 gridExtra mvtnorm plyr Rcpp reshape2]; };
+  lsbs = derive2 { name="lsbs"; version="0.1"; sha256="14aq80zg89lq7hffv1v1m4n7hbzqzxkazcga4y2fq40ij3v7kv6n"; depends=[ks Matrix numDeriv]; };
   lsdv = derive2 { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; };
   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.2"; sha256="0girzjmkmqym5bnw492991smyhvlz7xw70n8hlswpa4lw3x15q2n"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; };
-  lsm = derive2 { name="lsm"; version="0.1.6"; sha256="1j68jvb7gvgr77wpq1gzh1jw3cs94im1zrlnvw4jnbgbzsmpql99"; depends=[]; };
+  lslx = derive2 { name="lslx"; version="0.6.3"; sha256="1a6s1a2g87h1fd0w5ckjgmanqpvwfp6hh8mshc61917w3g8y1rdg"; 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]; };
   lspline = derive2 { name="lspline"; version="1.0-0"; sha256="0bc1nfpp1r5fi8rrg295k4r8pm03baqplrzwmk3sn4kdbp0apvgk"; depends=[]; };
-  lspls = derive2 { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; };
+  lspls = derive2 { name="lspls"; version="0.2-2"; sha256="1cmffkyc881659l9m1miwhr3jfpwb0xb9n5chg317vcm8l9r4wcn"; depends=[pls]; };
   lsplsGlm = derive2 { name="lsplsGlm"; version="1.0"; sha256="1qh68r033fwq1hc19h2srl1k6znvvvrcp38ghxadsksjfxllvniy"; depends=[]; };
   lsr = derive2 { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; };
   lss = derive2 { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; };
+  ltable = derive2 { name="ltable"; version="1.0"; sha256="1sx6bknbfkays899yq7wqpvc7izz757smaw9g9i7wii7d7a75plr"; depends=[]; };
   ltbayes = derive2 { name="ltbayes"; version="0.4"; sha256="0kv5k56hmc1m7bv5pmmmk46822szsgwqgpwydn0x56az7xn6hjk6"; depends=[mcmc MHadaptive numDeriv]; };
   ltm = derive2 { name="ltm"; version="1.1-1"; sha256="1qrgzwx5l58qf5rfp1knxc84r0g943q5sdr3ky74zzwpnmrf2vf7"; depends=[MASS msm polycor]; };
-  ltmle = derive2 { name="ltmle"; version="1.0-1"; sha256="0g3nybhxz7mivqkzvlzkasc1m489s4fsi4874wvlhqg3x3mww0x9"; depends=[Matrix matrixStats speedglm]; };
+  ltmle = derive2 { name="ltmle"; version="1.1-0"; sha256="1mlsggl0vdnlgf8j0bjmh4zrfdpmkfi9jhar35npxz9r0yfjmw8f"; depends=[Matrix matrixStats speedglm]; };
   ltsa = derive2 { name="ltsa"; version="1.4.6"; sha256="10wmw9r00400ng2zlysd8jqgypjclshxj83x32002j2a9cz4f186"; depends=[]; };
   ltsbase = derive2 { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; };
-  ltsk = derive2 { name="ltsk"; version="1.0.5"; sha256="0x142w2l6qaqw1kmx5kix7lkadaw2kl8dqx11d091vqj2imi9wlr"; depends=[fields gstat sp]; };
   ltxsparklines = derive2 { name="ltxsparklines"; version="1.1.2"; sha256="1jnygg7wm2768lrrzball8rn8f60xy4nc3a18h4d32jpnbhifj13"; depends=[]; };
   lubridate = derive2 { name="lubridate"; version="1.7.4"; sha256="14a823il77w3wmmnzr89vwrqp50y56dh5raycnaw6c8nv5xsh32i"; depends=[Rcpp stringr]; };
   luca = derive2 { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[genetics survival]; };
-  lucid = derive2 { name="lucid"; version="1.4"; sha256="1kwl9h7ynp8nhny51xskrbgc3060bawxjkdijhsjzss2hbbygwds"; depends=[nlme]; };
+  lucid = derive2 { name="lucid"; version="1.6"; sha256="0acsnvxvr9qr6ib48dg6byqvfdw5rl65j72nvv3pvvisqj22b0pg"; depends=[nlme]; };
   lucr = derive2 { name="lucr"; version="0.2.0"; sha256="0v5g72cl9fg3b3ix34bsmjwwqrnm4ivgcd5mm98c5jd8rrz1xkwq"; depends=[httr Rcpp]; };
   ludic = derive2 { name="ludic"; version="0.1.6"; sha256="0srs3bx9cw89mlpg8b8vcmz2gnsv729j3n23pnnxgbh2w7xf705b"; depends=[fGarch landpred Matrix Rcpp RcppArmadillo]; };
   lue = derive2 { name="lue"; version="0.2.1"; sha256="0is5rd1dz91bzphmfbbzi3s6rgc5g9qza2r26k70xs67dgn0qbjq"; depends=[ncdf4 raster]; };
   lulcc = derive2 { name="lulcc"; version="1.0.2"; sha256="1vlaidyqgx5vnf8w2y1a1jmmq7z4195avnv1mryhh414r5r1kpy0"; depends=[lattice raster rasterVis ROCR]; };
-  lumberjack = derive2 { name="lumberjack"; version="0.2.0"; sha256="0yn6482wrwinabys3awp0jjnzs6mnv29jjpvr980m1jm15nwva4g"; depends=[R6]; };
+  lumberjack = derive2 { name="lumberjack"; version="0.3.0"; sha256="00br82x9n6x96ksqqgahc1ydffl9cv8lysm57pk2mxm0fzbcph2p"; depends=[R6]; };
   lunar = derive2 { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; };
   lutz = derive2 { name="lutz"; version="0.2.0"; sha256="1ypi61b0l5pig2lvvq9lmqkqcsxhnf154lxridp0amv5rcmf2fxy"; depends=[V8]; };
   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"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[ellipse ergm igraph MASS network]; };
+  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]; };
   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]; };
@@ -8221,12 +8586,12 @@ in with self; {
   m2b = derive2 { name="m2b"; version="1.0"; sha256="0agzw67mmwrw1f61yn24z5w1pgjssdapg3li0a53i3ylnij45mzr"; depends=[caret caTools e1071 geosphere ggplot2 randomForest]; };
   m2r = derive2 { name="m2r"; version="1.0.0"; sha256="07zrqhva00jsp9da9ryzi8pjdrwri2mw0mqgg91r3rnl7id8safq"; depends=[gmp memoise mpoly pryr stringr]; };
   mAr = derive2 { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; };
-  mBvs = derive2 { name="mBvs"; version="1.1"; sha256="0nkm0yyzl3ajjfhprnkr7d4mkvwd86lf6ic9cyqx76isfwwz3wyq"; depends=[]; };
+  mBvs = derive2 { name="mBvs"; version="1.3"; sha256="0vxwdi45pd79c3lz507wlw2alvf501q27lwvd34j6y68p3vyv1vj"; depends=[]; };
   mExplorer = derive2 { name="mExplorer"; version="1.0.0"; sha256="1563d9r7f25vw5vsph21z3dwz9n40dpaiyx28ay1bbp5i1x2l3rb"; depends=[nnet qusage]; };
-  mFilter = derive2 { name="mFilter"; version="0.1-3"; sha256="1cz9d8447iiy7sq47civ1lcjafqdqs40lzxm2a4alw4wy57hc2h6"; depends=[]; };
+  mFilter = derive2 { name="mFilter"; version="0.1-4"; sha256="0zfsa301f1sh1wqg9ap63n5p3952y6b37c4whi2sijinfkx4q2vv"; depends=[]; };
   mGSZ = derive2 { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; };
   mHG = derive2 { name="mHG"; version="1.1"; sha256="1rz5ncrvvv9h9grls15apa63v2nh9j87fmp4mwjjil37jx6a5zki"; depends=[]; };
-  mMPA = derive2 { name="mMPA"; version="0.1.0"; sha256="1p9rzk1x5ldb3afr53f195vb4jdj8kw50rmv961k2jsw128mrzr5"; depends=[]; };
+  mMPA = derive2 { name="mMPA"; version="1.2.0"; sha256="0g4zjknz52fpk7f436j95aw93aa8q2jwcrb1pqkm294kr276nnd9"; depends=[]; };
   mQTL = derive2 { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; };
   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]; };
@@ -8234,6 +8599,7 @@ in with self; {
   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=[]; };
   maboost = derive2 { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[C50 rpart]; };
   macc = derive2 { name="macc"; version="1.0.1"; sha256="1qj4mlikbqrxa6m46527xmxdbk7b3l95z6jdgpmi0ifywjiv52a4"; depends=[car lme4 MASS nlme optimx]; };
   machQA = derive2 { name="machQA"; version="0.1.4"; sha256="1rdrjy9sxql2c9y691a1jrmgsv7m1ihsschixxb6wc7aahf7mav6"; depends=[machina plyr]; };
@@ -8241,32 +8607,33 @@ in with self; {
   macleish = derive2 { name="macleish"; version="0.3.2"; sha256="1kna1wq3p6xfzfdhw8dpdfvy4l656xcrra1f0ir86a815pm2a8l3"; depends=[dplyr etl lubridate readr rgdal rgeos sp]; };
   mada = derive2 { name="mada"; version="0.5.8"; sha256="17d41kpxjf6h8j83w6jhxm71f03nc8i2aw0xaqzrpcf5rxxy8wv8"; depends=[ellipse mvmeta mvtnorm]; };
   maddison = derive2 { name="maddison"; version="0.1"; sha256="1ji51wnj0ybjd30b4bwn5npyswrmcfrbxcmdlngwzvca1knh8g1c"; depends=[]; };
-  maditr = derive2 { name="maditr"; version="0.5.1"; sha256="029jhapxssnrnmdf8cmdaw87gdd970538jvz6cq9k9iavw7zki7y"; depends=[data_table magrittr]; };
-  madness = derive2 { name="madness"; version="0.2.3"; sha256="0qmqgrjxb0853m9kdi8cl1b9q9dljdi2zylw22asfv77f323413z"; depends=[expm Matrix matrixcalc]; };
+  maditr = derive2 { name="maditr"; version="0.6.0"; sha256="1h2qvl84v0lp4fnsraar9kvlglifxjbpsascnrz3db5lrn1w53j0"; depends=[data_table magrittr]; };
+  madness = derive2 { name="madness"; version="0.2.5"; sha256="1cdryb65hlqc5b1xm5xs5r3gv8zd4kq17q79345b0p8r0m6addip"; depends=[expm Matrix matrixcalc]; };
   madr = derive2 { name="madr"; version="1.0.0"; sha256="0lzg75kphz4a0w6n0jbsq87g72jvrbkyas4j813mryq2nv4lmsl4"; depends=[]; };
   madrat = derive2 { name="madrat"; version="1.22.1"; sha256="0wk2svhi4209p8ab8i2g9q22kswpisphb2a9ln5lzwdhnryk4ya9"; depends=[digest magclass spam stringr]; };
   mads = derive2 { name="mads"; version="0.1.5"; sha256="1ac34iff9hvl1bxk3gs5s3i311g9y59nd6v9jhvnfd6wfhck7krs"; depends=[mrds]; };
   madsim = derive2 { name="madsim"; version="1.2.1"; sha256="11gfyimbz363p5xy1x6rsz5fcgzcr55myc5aaz5lazjkcnfn17aq"; depends=[]; };
   mafs = derive2 { name="mafs"; version="0.0.3"; sha256="1apacrk8y5b5ids62vd1kn2k28bya9pydxxmdw2dhjyzkgrakdhn"; depends=[cmprsk colorspace CombMSC Epi etm forecast forecastHybrid fracdiff ggplot2 ggseas gtable munsell numDeriv plyr quadprog Rcpp scales tictoc tidyr timeDate tseries zoo]; };
   magclass = derive2 { name="magclass"; version="4.51.1"; sha256="1p4pbwjkn9ic3vqjh9m4b18s78f8wx0815n4dyg9pin8p14klzil"; depends=[abind maptools ncdf4 reshape2 sp]; };
-  magic = derive2 { name="magic"; version="1.5-8"; sha256="083cgpp3v03li0h8597b3g21pd9lkbmn9pyssblnhc800mpc52vz"; depends=[abind]; };
+  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]; };
   magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; };
-  magick = derive2 { name="magick"; version="1.9"; sha256="1z6wci73kaqp3ky0pfzq9mifrhs3fdsnlzqx57c3f7aryh6f2ry2"; depends=[curl knitr magrittr Rcpp]; };
+  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]; };
   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.1"; sha256="0aqf7hfbajfsszmqx1id8pp8yj6fzvdsdis9z4s87llf0vxq4agl"; 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.1"; sha256="1c1bvfs1azvlci2yrgw5xlr460fdjwikm3vsdfz8lj1xzs1w220c"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal sp stringi tidyr xml2]; };
+  malariaAtlas = derive2 { name="malariaAtlas"; version="0.0.2"; sha256="07hmnaacqkywalsajx5mzql7sil0196k930faaha0ync09idz7kz"; 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]; };
-  manet = derive2 { name="manet"; version="1.0"; sha256="1hb5mv05zcv4s2bpyh3vgkyf4r78fyvcwl3p1kwlwqn9cv1lgci2"; depends=[combinat igraph MCMCpack]; };
+  manet = derive2 { name="manet"; version="2.0"; sha256="1dnacgkdjmn7yiqk71qx5jgfipbpvqfdnrdd8wm0b9p8kgw4x7n4"; depends=[combinat igraph mclust MCMCpack]; };
   mangoTraining = derive2 { name="mangoTraining"; version="1.0-7"; sha256="0lw46j44jhdcyh079a7zjmxcnv5c6qsfachinlwv3ild1gwggr3p"; depends=[]; };
   manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; };
   manifestoR = derive2 { name="manifestoR"; version="1.3.0"; sha256="1bxmlg6fmr4ky9m7b65rrylspwhwc8k9s1cbxnx9dyl33wh39ci6"; depends=[base64enc dplyr DT functional htmltools htmlwidgets httr jsonlite magrittr NLP psych tibble tm zoo]; };
@@ -8275,7 +8642,8 @@ in with self; {
   mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; };
   mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; };
   mapdata = derive2 { name="mapdata"; version="2.3.0"; sha256="0xnxh73rgcq55zrw81a2bq8yd67bxc2rafp4shf6nyrqj04iip0y"; depends=[maps]; };
-  mapedit = derive2 { name="mapedit"; version="0.4.1"; sha256="1dy87kmwra917716r99hp139fbxy3z0cx03cw61b832isizd0b51"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras mapview miniUI sf shiny]; };
+  mapdeck = derive2 { name="mapdeck"; version="0.1.0"; sha256="1d93gg0s0xn4gqrrc6p94fppyhqibfjsmxml2ck6skacryd40wm3"; depends=[googlePolylines htmltools htmlwidgets jsonlite magrittr scales shiny viridisLite]; };
+  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]; };
   mapmisc = derive2 { name="mapmisc"; version="1.7.2"; sha256="0w0yvdnxk6gjcc86b6imq764va9f9hjan3ayw7qrbjpqx16fs7dx"; depends=[raster sp]; };
@@ -8284,12 +8652,12 @@ in with self; {
   mapr = derive2 { name="mapr"; version="0.4.0"; sha256="169ah9v7cpw3hmaj6n575gi1zwazf4vh59n46zghb1x68nc2gqs0"; depends=[data_table ggplot2 gistr jsonlite leaflet RColorBrewer rworldmap sp spocc]; };
   maps = derive2 { name="maps"; version="3.3.0"; sha256="05i2ppl5z4p8rawgqmy3z4ia05fcblpq1vvrmrkgkkpdlhczx6hr"; depends=[]; };
   mapsRinteractive = derive2 { name="mapsRinteractive"; version="0.1.0"; sha256="1qjc5hffrk2bjw6ihlna1h0k3q9s9i19l0q0mgvcm9wpjy4c8gra"; depends=[gstat raster rgdal rgeos sp]; };
-  mapsapi = derive2 { name="mapsapi"; version="0.3.5"; sha256="0v33kkny98xql6m6rp2xh39rsp00r1crpin8gqw5wh5x28n20sna"; depends=[bitops magrittr plyr sf xml2]; };
-  maptools = derive2 { name="maptools"; version="0.9-2"; sha256="075lmb3b62171cw2dg8fv1vwmvfzg39r1ji7jwb8s5k9dz88ry1v"; depends=[foreign lattice sp]; };
+  mapsapi = derive2 { name="mapsapi"; version="0.3.7"; sha256="1mf971himbcmyfbbjppp1clwdi102kh5cvgyzpfwj9rsgx4mqjfw"; depends=[bitops magrittr plyr sf xml2]; };
+  maptools = derive2 { name="maptools"; version="0.9-4"; sha256="1753kgyc4kmbb5h6knz5wgvvvj8v77kzm8lz0kwz05m5k3spa24k"; depends=[foreign lattice sp]; };
   maptpx = derive2 { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; };
   maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
-  mapview = derive2 { name="mapview"; version="2.4.0"; sha256="0gm9swj2i9f6wk0lc4kpr2f1171lys9pbycw272h3l984x8syy61"; depends=[base64enc brew gdalUtils htmltools htmlwidgets lattice leaflet png raster Rcpp satellite scales sf sp svglite uuid viridisLite webshot]; };
-  mar1s = derive2 { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; };
+  mapview = derive2 { name="mapview"; version="2.6.0"; sha256="1k8y9kj3qrih3fn0xw7nz0irhprdv8fqpxjad2djsvabmn11l51b"; depends=[base64enc brew htmltools htmlwidgets lattice leaflet png raster Rcpp satellite scales sf sp stars svglite uuid viridisLite webshot]; };
+  mar1s = derive2 { name="mar1s"; version="2.1.1"; sha256="1ljkvgxrramfx1rnp2rg6516mjxaa6s96amrnmqymnyjz7wlf37l"; depends=[cmrutils fda zoo]; };
   march = derive2 { name="march"; version="1.4"; sha256="1wfhm33k2j5yim56sg0wd02ypfhlp9fc138vmdsdjp6nh4y23hnj"; depends=[]; };
   marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; };
   marelac = derive2 { name="marelac"; version="2.1.9"; sha256="07xhlsdzz2j5smh3v4hpm8zp4ljg9aa3i67j65hs1cq27q1jg1n7"; depends=[seacarb shape]; };
@@ -8301,27 +8669,29 @@ in with self; {
   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]; };
-  markovchain = derive2 { name="markovchain"; version="0.6.9.11"; sha256="0mmsj5vskbp7cs28iak5wmvx6ixq9xdd14niv7iixa19mmwc8p1d"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
+  markovchain = derive2 { name="markovchain"; version="0.6.9.12"; sha256="042qwp0zywbqz99sp70ykjlckfpch5p02szah651x1inp2im8fc6"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
   marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; };
-  marmap = derive2 { name="marmap"; version="1.0"; sha256="187zqmpdd4kl5dviphfzdhjlaa9bss1gx4wxxc8zgn4q1g66f4c2"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; };
+  marmap = derive2 { name="marmap"; version="1.0.2"; sha256="03xmp7jz2jja7m92yczc2nlcyv4qlcy7lnj3nk5wb3alh1vxlyga"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; };
   marqLevAlg = derive2 { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
-  mase = derive2 { name="mase"; version="0.1.1"; sha256="1s8hcsz3ja3rghsv0fz82mlz4sx7dwx8y7h97minhrnj9aby9g82"; depends=[boot dplyr foreach glmnet magrittr MASS Matrix Rdpack rpms survey]; };
+  mase = derive2 { name="mase"; version="0.1.2"; sha256="1023xvv6yngbc183hb13057spjildywqd0jw2w9jway3zv4dbw9v"; depends=[boot dplyr foreach glmnet magrittr Matrix Rdpack rpms survey]; };
   mason = derive2 { name="mason"; version="0.2.6"; sha256="01ppc7f18kf4xv4lrhib0cfm85v658grmxpny3h3kdb4pi4rbspy"; depends=[broom dplyr lazyeval magrittr tidyr]; };
   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-5"; sha256="083gnqjxvzgqd0lvg13qwzw3cp1imp4xn2nacspfxqg4878jjpn3"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; };
+  matchingMarkets = derive2 { name="matchingMarkets"; version="0.3-6"; sha256="1vl9gmz155l6qrz0sqpirwhbd99j15zxp7gj8q6m88y5dpnhpkqs"; 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]; };
+  mathgraph = derive2 { name="mathgraph"; version="0.9-14"; sha256="11wcnjligjc0m0ibi7v5f9w4j2g0fmw33za8407d9fqdb0i5pf60"; depends=[]; };
   mathpix = derive2 { name="mathpix"; version="0.3.0"; sha256="1a49yda4r9a6pbs641ch2kmxg3pf8zxfrfi30r19z6g15jfgdrvf"; depends=[base64enc httr magick purrr rstudioapi texPreview]; };
   matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; };
   matlab = derive2 { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; };
-  matlabr = derive2 { name="matlabr"; version="1.5.0"; sha256="0gy639fv0b85h4z96b2b3m635q4w62q63kfxfqny3pwr0r5vsc2p"; depends=[stringr]; };
+  matlabr = derive2 { name="matlabr"; version="1.5.2"; sha256="1ba6cajnzldb1gmn7rf0b198h6mdh58r3frm0z0cmvbinspwz3x7"; depends=[stringr]; };
   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]; };
-  matrixStats = derive2 { name="matrixStats"; version="0.53.1"; sha256="0bkiz5fm09d3512mfr2ymj9qsb1b8aic5l5m6fkaf5j7nsgvqw6z"; depends=[]; };
+  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]; };
   matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; };
   matrixpls = derive2 { name="matrixpls"; version="1.0.5"; sha256="04sshb88rq2mp3y4rrs6nkzr4kc380vx380r911c7j975l55a183"; depends=[assertive lavaan MASS matrixcalc psych]; };
@@ -8331,6 +8701,7 @@ in with self; {
   maxTPR = derive2 { name="maxTPR"; version="0.1.0"; sha256="13x5rz0mfha5pzahkk4x67ncz9v77sa690cyl6wigwsldsrvzr3h"; depends=[aucm Rsolnp]; };
   maxadjAUC = derive2 { name="maxadjAUC"; version="0.1.0"; sha256="04zdaqmavhhrj63s2k5pqncvlzbfnxan7r0fagfka9dypwwcl5qm"; depends=[aucm Hmisc Rsolnp survival]; };
   maxent = derive2 { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[Rcpp SparseM tm]; };
+  maximin = derive2 { name="maximin"; version="1.0-1"; sha256="1w3b24p6r974jgd7i93wisb25n7hjk0va8bb5n0xxfdrv3z0k591"; depends=[plgp]; };
   maxlike = derive2 { name="maxlike"; version="0.1-7"; sha256="0gi33hcjj456sjw7l3q4n46k4cb6m3ml3ycd93pnajxacl24swbb"; depends=[raster]; };
   maxmatching = derive2 { name="maxmatching"; version="0.1.0"; sha256="1xbwrhmr8gzvlcprib7nzvqrcd355bhx7wkqxrvfk4g7dvskf9ka"; depends=[igraph]; };
   maxnet = derive2 { name="maxnet"; version="0.1.2"; sha256="1rfcylbv068pz4jgry5ijszwf5fibz566s5iv0ar8dhv0fhjr86z"; depends=[glmnet]; };
@@ -8338,23 +8709,25 @@ in with self; {
   mazeGen = derive2 { name="mazeGen"; version="0.1.3"; sha256="192xygg3l4rpqp49sgd5hpp4h3f8wjhyldn0l8abxhsks7jd2kfb"; depends=[igraph]; };
   mazealls = derive2 { name="mazealls"; version="0.2.0"; sha256="14j6syw1zkgs4cnmxzqpm6klmgvck2gg97wkzmy9al6n0biy8gmb"; depends=[TurtleGraphics]; };
   mazeinda = derive2 { name="mazeinda"; version="0.0.1"; sha256="0ns4ib73y4fghf7p1wg0a05js4mqr66dpp49p1h039pqrb0f1vwd"; depends=[foreach]; };
-  mbbefd = derive2 { name="mbbefd"; version="0.8.8.2"; sha256="1168r9gkz3z1qzh3pjh8s0wlpwlrk2rr1p91ldch9c001ym9y6mz"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; };
+  mbbefd = derive2 { name="mbbefd"; version="0.8.8.3"; sha256="02iijakxl96m6n1rv0xsacsyjj5b093sl07lmp62hwyv9hf3jh4k"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; };
   mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; };
   mbest = derive2 { name="mbest"; version="0.6"; sha256="1x0f7y5hj6a35wq1xn6g7jyjn9c4zryahwlf07qrypgrcnj2m8vx"; depends=[abind bigmemory foreach lme4 logging nlme]; };
   mbgraphic = derive2 { name="mbgraphic"; version="1.0.0"; sha256="0b4xr2ycx8v56fp40lnxv69qfp0yzai2hdwk3kw4wsmir91d2a91"; depends=[diptest dplyr extracat GGally ggplot2 gridExtra hexbin magrittr mgcv Rcpp scagnostics scales seriation shiny]; };
-  mbir = derive2 { name="mbir"; version="1.3.1"; sha256="0wprbgjf02ybjn3yakyvz0niv2szarlmmcizdyjsaksh21byd46x"; depends=[]; };
+  mbir = derive2 { name="mbir"; version="1.3.4"; sha256="151pixrqg6wj8605vf8cscmh2a1f171k8a4fzkqv4dl8f1ivwphp"; depends=[effsize psych]; };
   mblm = derive2 { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; };
   mbmdr = derive2 { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; };
-  mboost = derive2 { name="mboost"; version="2.9-0"; sha256="0hfw69h3j4hwwrdinmazl4abhij2drki5jp9i9qz30gyy16wf0f2"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; };
+  mboost = derive2 { name="mboost"; version="2.9-1"; sha256="02ia3y0fxfjl02fb1nnl93j640fyl18jm15cgxyybhf27w4jdvb7"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; };
   mbrglm = derive2 { name="mbrglm"; version="0.0.1"; sha256="0yxq1xk8qy5hpiqqldyrs78lp4ggdp5lj2lmh8rqq1xvsfr6nrh4"; depends=[enrichwith nleqslv]; };
   mc2d = derive2 { name="mc2d"; version="0.1-18"; sha256="1ljw8ms661bsdqbfpjvvrif9n0c2i6lzxyqj4rxhxsp3dj18w3g3"; depends=[mvtnorm]; };
   mcGlobaloptim = derive2 { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; };
   mcMST = derive2 { name="mcMST"; version="1.0.1"; sha256="18ka76g9pgpycaw0hl8vxpabd8584q1l5d3xmrzy1zwincsg7vgs"; depends=[BBmisc checkmate ecr ggplot2 gtools lhs parallelMap reshape2 vegan]; };
   mcPAFit = derive2 { name="mcPAFit"; version="0.1.4"; sha256="1h5kiry8bvdrgyqf7cqsag0b7rscwc7phayzf6h4css1667bvm0g"; depends=[PAFit RColorBrewer Rcpp]; };
-  mcbiopi = derive2 { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; };
+  mcbiopi = derive2 { name="mcbiopi"; version="1.1.6"; sha256="1caw2sy15hw2zw0bdynwnsa7hn4rly34hlxp06nwm5lssz8l2597"; depends=[]; };
   mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; };
-  mcca = derive2 { name="mcca"; version="0.3.0"; sha256="0fmlqk4q2vy7gzxhvb9249f1644jlvy755cpda8kvwp9qk55bp4p"; depends=[caret e1071 MASS nnet pROC rpart]; };
+  mcca = derive2 { name="mcca"; version="0.4.0"; sha256="07qqd1v70322s8z20zmhni5kfvy9izl5k2z62gdwkk29d76rg8s1"; depends=[caret e1071 MASS nnet pROC rpart]; };
+  mccf1 = derive2 { name="mccf1"; version="1.0"; sha256="1d8dw3kb2p3n3kgpihbxmwvg4blvaiss4s09452xz0d1gkjk4y01"; depends=[ggplot2 ROCR]; };
   mcclust = derive2 { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; };
+  mccmeiv = derive2 { name="mccmeiv"; version="1.1"; sha256="0k9hbdxzj2nhwckxhm4w69n93xin56c1s3fw93pp5mp82m586y5c"; depends=[numDeriv survival]; };
   mccr = derive2 { name="mccr"; version="0.4.4"; sha256="1scqds1yx317qmjappy2h1m564dcmsqqfpdm8pm3plalag16xrhj"; depends=[]; };
   mcemGLM = derive2 { name="mcemGLM"; version="1.1"; sha256="07ky3bvcns24qia9pyvf5lp7764h8gn2g8zr304iz4x9bq6jvsi0"; depends=[Rcpp RcppArmadillo trust]; };
   mcen = derive2 { name="mcen"; version="1.0"; sha256="0dgic137n3qvxljj3f7j3kq3x2rkblxzg55hjbknspwp0i7i4lx8"; depends=[faraway flexclust glmnet Matrix]; };
@@ -8364,9 +8737,9 @@ in with self; {
   mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; };
   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"; sha256="13n3xbdjbpj0ddq9jv2ssd6llrif38ala6c4schih0328cklgpcj"; depends=[Matrix memisc]; };
+  mclogit = derive2 { name="mclogit"; version="0.6.1"; sha256="1flq3g5jbp8nnx066wz35bg8wzlnnp9jp731w87vba483amakcds"; depends=[Matrix memisc]; };
   mclust = derive2 { name="mclust"; version="5.4.1"; sha256="1vcl4nl8by2vj2k9k84imy5m850khkgd8q02a8ica1h8vz9ijgn4"; depends=[]; };
-  mclustcomp = derive2 { name="mclustcomp"; version="0.3.0"; sha256="02j87p2z9z3b8kxnvnm1syjpv6axcs09fs3mnrl1n2q6jyc4gwsr"; depends=[Rcpp RcppArmadillo Rdpack]; };
+  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]; };
@@ -8381,29 +8754,31 @@ in with self; {
   md = derive2 { name="md"; version="1.0.4"; sha256="13z8f3p84kivk6j58fb1qpzrmml41mq9pgv9nv2gvxrhyhanzi46"; depends=[]; };
   md_log = derive2 { name="md.log"; version="0.1.1"; sha256="0ix5nz38xzlhrga40hfhlfss938mrfbni2wysvz2qbpm59qxrhg0"; depends=[futile_logger]; };
   mda = derive2 { name="mda"; version="0.4-10"; sha256="19g6kn6g0shidrjfffklbmzc5w7mcimrxhagx4nmpslg59ibqdkh"; depends=[class]; };
-  mdatools = derive2 { name="mdatools"; version="0.8.2"; sha256="11xlfgcn8gb19alfjp268mlid9g2rl69s1nlm5plwyy5h8x0hvcj"; depends=[]; };
+  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]; };
   mdftracks = derive2 { name="mdftracks"; version="0.2.0"; sha256="0l8dc6ljrhbm8jwadaa3xkf6nx90vyiig15p7rryswczz9hw5ga6"; depends=[hellno]; };
-  mdmb = derive2 { name="mdmb"; version="0.7-19"; sha256="0clygi60wllc04spbm4982qpnsabjapmbjn5k0k9yl1xbd6960g1"; depends=[CDM coda MASS miceadds Rcpp RcppArmadillo sirt TAM]; };
+  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]; };
   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.1.0"; sha256="16c40m5fmj02is4vw9w284dn9pimlqp905p5ka0jw91krawasd2x"; depends=[lubridate parsedate]; };
-  mdsOpt = derive2 { name="mdsOpt"; version="0.3-1"; sha256="0fyzmbaqnj42nhl32cj1kycrqkfx2qvb5vpi0qj98fi6iwsa4psq"; depends=[animation clusterSim plotrix smacof smds spdep symbolicDA]; };
+  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]; };
   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.1.0"; sha256="0k7sddnydxy39idk8z1j2632xyikpvdjdcm9xk72k0yj0cw6mr9r"; depends=[lubridate mds]; };
+  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.3"; sha256="03b3267h61kc9xgyl3j2n6i6rmm31rhzdlqa15qifsld23z72rs0"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; };
+  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=[]; };
   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=[]; };
-  measures = derive2 { name="measures"; version="0.1"; sha256="1sksgp7csmwx3z981fhi2pf75kkxhfjy2zkdw8ds5iz95hd236ih"; 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]; };
   medfate = derive2 { name="medfate"; version="0.2.2"; sha256="1vw9j04063sjwyfdkk94xsgz5zps7vmqha6dbsvi8ncb951cfijp"; depends=[meteoland Rcpp sp spdep]; };
-  medflex = derive2 { name="medflex"; version="0.6-4"; sha256="0nd9izvmmpdw87y5f0hrz2fml51x53zvvn0irdc1ass3cj1b7bxc"; depends=[boot car Matrix multcomp sandwich]; };
+  medflex = derive2 { name="medflex"; version="0.6-6"; sha256="04cjqhyihxf1imbl9y9s58qpy6lmxsh2gwy4bras03hx52slzl5r"; depends=[boot car Matrix multcomp sandwich]; };
   mediation = derive2 { name="mediation"; version="4.4.6"; sha256="0prhpy9y26s388p9gv5sv4h5airixwy6ffjphhxmyp9h07088xxi"; depends=[Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; };
   medicalrisk = derive2 { name="medicalrisk"; version="1.2"; sha256="1zdxv3rj7768kbyxfvr9n0hp4z7y0sf3r7ssqv731hjjp656l6xp"; depends=[hash plyr reshape2]; };
   medicare = derive2 { name="medicare"; version="0.2.1"; sha256="00a1gml2khzisdavnaip6ap4bw45b17nbl9cqb1mqrm4y0p9gm16"; depends=[]; };
@@ -8417,34 +8792,38 @@ in with self; {
   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]; };
-  meme = derive2 { name="meme"; version="0.2.0"; sha256="17zpnspc90nlga3iyl4ahasr70mnrhzja4pz7zhmjddhzjs8x3sz"; depends=[ggplot2 magick showtext sysfonts]; };
+  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.9"; sha256="1gh6shm9nwfjwfi5f4cz2jsldfdnkj6f73279l86wki5gdf36zri"; depends=[lattice MASS repr]; };
+  memisc = derive2 { name="memisc"; version="0.99.14.12"; sha256="0n8gl031n33r4iymlp3mnfilm9qwahxssrk4wlxfyp08w4mjlhjl"; depends=[lattice MASS repr]; };
   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-4"; sha256="1gkxc2bf4fx3vbf1nq1g713hhhx7031wchxmgr2ydwfrighwf8qg"; depends=[lme4 Matrix nonnest2 sandwich]; };
+  merDeriv = derive2 { name="merDeriv"; version="0.1-5"; sha256="1mnrjppn4gw5rikmdxpdx8xd31wj9f3mvjkfznvhig869wzr6p4z"; 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]; };
-  metRology = derive2 { name="metRology"; version="0.9-26-2"; sha256="1i9lxgphn8nmkcp2zgjs6ylbccmfgv9lfch00xmx1xfb538jz82q"; depends=[MASS numDeriv robustbase]; };
+  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=[]; };
-  meta4diag = derive2 { name="meta4diag"; version="2.0.7"; sha256="024rxnqzw9xydy0mm1w38s739qgkzjsifq23bwpvkwj0x0jnwry0"; depends=[caTools shiny shinyBS sp]; };
+  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]; };
+  metaDigitise = derive2 { name="metaDigitise"; version="1.0.0"; sha256="04hycv9dpy39l8fhql69mcn5w97f7sjxrhiz5vbpbawvfbkl0f0l"; depends=[magick purrr]; };
   metaLik = derive2 { name="metaLik"; version="0.43.0"; sha256="1li40pgd9z00nrph9njwn6wysb1i9dkpqzcp6fzds6asvcxlqqfl"; depends=[]; };
   metaMA = derive2 { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; };
   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.1.0"; sha256="1jhlv93a53pnksllrvqiqv5229cvxfa2mk768yncdfv67d04vwj9"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; };
-  metaboGSE = derive2 { name="metaboGSE"; version="1.0.2"; sha256="1nfcjplry2ba98yi3flk6zcvlys57gri3582mylh543xkcvlrifz"; depends=[AnnotationDbi ape Matrix sybil topGO]; };
+  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]; };
   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.2.1"; sha256="1l054p870679ni57l234bvma88s7cpr2ddryb87dxfh5510y86bb"; depends=[ape biomformat cowplot crayon dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr taxa taxize traits vegan zoo]; };
-  metacom = derive2 { name="metacom"; version="1.5.0"; sha256="1zsnzzxv3vsj1swybhh6g8ddffp4xrn081y192xa6a78ii8q4kav"; depends=[vegan]; };
+  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]; };
+  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]; };
   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]; };
@@ -8453,10 +8832,11 @@ 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]; };
   metamisc = derive2 { name="metamisc"; version="0.1.9"; sha256="0wjwx7ncplpchwbz0l4xmsmy0faj2wnqjxvxyi05992v3rjv4j8k"; depends=[ellipse ggplot2 lme4 metafor mvtnorm plyr]; };
-  metansue = derive2 { name="metansue"; version="2.1"; sha256="0mklpnb9m0pynz3x0fin003zz0n1v6i0fdcahny70y1yxiy5agcs"; depends=[]; };
-  metap = derive2 { name="metap"; version="0.9"; sha256="03vg0mb6q7j2z0pkxykbak0hcp6dcak7zxs1lw9hswz9kqrq5jhz"; depends=[lattice]; };
-  metaplot = derive2 { name="metaplot"; version="0.4.9"; sha256="1nbnyh03n1kkkl4v80nbbbnkrzs1a5ri210x9q4m2v87jrcikllw"; depends=[dplyr encode lattice magrittr rlang tidyr]; };
+  metansue = derive2 { name="metansue"; version="2.2"; sha256="0qawsgskvsaj0h6igb4phajs5wwjrr1j07dpn86b6r0fdc2y2xzj"; 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]; };
@@ -8467,24 +8847,24 @@ in with self; {
   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]; };
   meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; };
-  meteoland = derive2 { name="meteoland"; version="0.7.1"; sha256="1nsn4z3gbkcdhgyn13fjcpsyb0lb85kiyy6fhirlnw63dwr56a2l"; depends=[curl ncdf4 ncdf4_helpers qmap Rcpp rgdal sp spdep]; };
+  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.3.1"; sha256="0v6w2gy88mds9ynmlbdx67zhl61x71i9nj2km5wvzrn5kcn1500p"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
+  mets = derive2 { name="mets"; version="1.2.4"; sha256="1xchww1y9zf2h5qfqa1j0vhzzccrh9qj4xzgr23p5svjgcqx8r1b"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
   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]; };
-  mfGARCH = derive2 { name="mfGARCH"; version="0.1.5"; sha256="0p7cnizhf1cgkzhja74p257k31hb6b7y4qnn3k9yawscdmg3zy50"; depends=[numDeriv Rcpp zoo]; };
+  mfGARCH = derive2 { name="mfGARCH"; version="0.1.7"; sha256="086596dj6xz7by6rwddvyl7ap341q5hmpc6pslcjn0yvbc7j0wkh"; depends=[numDeriv Rcpp zoo]; };
   mfe = derive2 { name="mfe"; version="0.1.1"; sha256="0z9ddkck1z14b9cwvaam0xh869lh2fsjm1d3i8giyrcry0vvpp61"; depends=[cluster e1071 infotheo MASS rpart rrcov]; };
   mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; };
   mfx = derive2 { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[betareg lmtest MASS sandwich]; };
   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-24"; sha256="15b76m1f0hz8dbmj9shqvslihdx5b7c48vck9grj5xs1z2y45r9c"; depends=[Matrix nlme]; };
+  mgcv = derive2 { name="mgcv"; version="1.8-25"; sha256="1y2rq6v45pr2wcxihhgmingcdvcsilim2cvskrlb7k2n00qg6v2q"; 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-3"; sha256="066k5z99dssp9w5iav68mka68li1r7f5x2qbp21gnc89syrsqwnw"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; };
+  mgm = derive2 { name="mgm"; version="1.2-4"; sha256="0fyg9dxvrl3biamqc908z1vc7pji1n4l2bwxjfdkwjb5cf6snd3f"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; };
   mgpd = derive2 { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; };
   mgraph = derive2 { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; };
   mgsub = derive2 { name="mgsub"; version="1.5.0"; sha256="03w40vs3vfyrksnzbawyvp02kwrmn7cqhlv6xhfzfbh8jmz55wvr"; depends=[]; };
@@ -8493,6 +8873,7 @@ in with self; {
   mhsmm = derive2 { name="mhsmm"; version="0.4.16"; sha256="009dj0zkj1zry7jr9hf4cknb686z50a2l967if64xm0dvjmp7dgs"; depends=[mvtnorm]; };
   mht = derive2 { name="mht"; version="3.1.2"; sha256="01zcaf9k0qayzm8dn5dvnm5n3qgqpj8r96qhqaa5vbjcr6ci2x2r"; depends=[glmnet Matrix]; };
   mhtboot = derive2 { name="mhtboot"; version="1.3.3"; sha256="1z0p8ny9lpnrshgas7cad2lv7j0blw0n6ihiimw600n70h73jwrn"; depends=[ggplot2 reshape2]; };
+  mhurdle = derive2 { name="mhurdle"; version="1.1-8"; sha256="0nnzhcp9ghx2ifaj8lvhvv1acb3dpwi8m9n1al8zjvfg35wmxwwm"; depends=[Formula maxLik survival texreg truncreg]; };
   mi = derive2 { name="mi"; version="1.0"; sha256="1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l"; depends=[arm Matrix]; };
   miCoPTCM = derive2 { name="miCoPTCM"; version="1.0"; sha256="1lmf6zahfp59ylhdp2cbr7y3vayhim72zazimg4qfld4r9d6kygc"; depends=[distr MASS nleqslv survival]; };
   miLineage = derive2 { name="miLineage"; version="2.1"; sha256="0660vk44ywmj0q2cw7pa2z1r039ncw693dnz7zlgc0ipwak3b0ry"; depends=[data_table geepack MASS]; };
@@ -8504,24 +8885,24 @@ in with self; {
   micEconCES = derive2 { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[car DEoptim micEcon minpack_lm miscTools systemfit]; };
   micEconIndex = derive2 { name="micEconIndex"; version="0.1-6"; sha256="1ihly6qpyg1pms4nkvs6khxxqwr3fwg57i8pg0yhyy1apqxyj2xl"; depends=[miscTools]; };
   micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; };
-  mice = derive2 { name="mice"; version="3.1.0"; sha256="0xpn215yfzib4hw09cwilnyg9zbvq460njavfvm84mvgwbm25byi"; depends=[broom dplyr lattice MASS mitml nnet Rcpp rlang rpart survival]; };
+  mice = derive2 { name="mice"; version="3.3.0"; sha256="1p0ipbqk5aqdi7iikw3qrjyvdi9sdhpnw1h5mwakwvv0yl0pzbyx"; depends=[broom dplyr lattice MASS mitml nnet Rcpp rlang rpart survival]; };
   miceExt = derive2 { name="miceExt"; version="1.1.0"; sha256="07xj9f5w0kh4d1yj8mx1jydvhd0vwpvvrb6h67xz5gb1ban4k6c6"; depends=[mice RANN RANN_L1]; };
   miceFast = derive2 { name="miceFast"; version="0.2.3"; sha256="0ngb2qs71x0i8ffyb1qlbz2wk6c87m1r74l547c5pc9agnc227m0"; depends=[Rcpp RcppArmadillo]; };
-  miceMNAR = derive2 { name="miceMNAR"; version="1.0.1"; sha256="1f9cikqcyj5hh8ray2bx8yhhvv378vsk5d6k7hl44c54qgna61cf"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; };
-  miceadds = derive2 { name="miceadds"; version="2.13-63"; sha256="1a4d0bvvc2w9d6zp8pxrcgsn8jrydbkl5wwafm6zak54z6rsipj4"; depends=[CDM coda lme4 MASS mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; };
-  micemd = derive2 { name="micemd"; version="1.2.0"; sha256="0l4qzhkxy43xwgfqp2c638fimixdrm94hgiabfds3sc1vbxma4r8"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; };
+  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]; };
   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=[]; };
-  microbenchmark = derive2 { name="microbenchmark"; version="1.4-4"; sha256="0fv2w2vsiz18imf4115nd9chhmf275w2mb49pn7pkxi6z3bamc9c"; depends=[]; };
+  microbenchmark = derive2 { name="microbenchmark"; version="1.4-6"; sha256="1sn1fxgzakm5iqbgc35g3k4yi0iqrkmwz33cvdrphrzh1lxnmi3s"; depends=[]; };
   microclass = derive2 { name="microclass"; version="1.1"; sha256="0hl2s4135k187f0vqmj9snvmnwa5k9fg8ahivfs7ciknrcxfv3nk"; depends=[microcontax microseq Rcpp RcppEigen RcppParallel]; };
   microcontax = derive2 { name="microcontax"; version="1.0"; sha256="0l5mfgda5xagjbh9bwv328k3m7kgggdm90rc8fr1ic59hvg56f3g"; depends=[microseq]; };
-  microdemic = derive2 { name="microdemic"; version="0.3.0"; sha256="1hrl458jwrgjm7ds4scmicf39ssw1gbjxqaq95lhlwi9n0prd7jn"; depends=[crul data_table jsonlite tibble]; };
+  microdemic = derive2 { name="microdemic"; version="0.4.0"; sha256="0i4pkrw02ad8ssvryndf7pxgk5wcyn4126yvl28fxk38249kvc9v"; depends=[crul data_table jsonlite tibble]; };
   micromap = derive2 { name="micromap"; version="1.9.3"; sha256="1iciwy0kcg4qa0xc4gkqcilq33ac1s184vw13cbbkv0d1b5cgkgv"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; };
   micromapST = derive2 { name="micromapST"; version="1.1.1"; sha256="15ch132x3wnpf7rmy25nah7iyfxfk90p7lvavqjhrnavhjsfxbxx"; depends=[labeling RColorBrewer stringr]; };
   micropan = derive2 { name="micropan"; version="1.2"; sha256="1b3hd5c6l9njns372zhqfryibrpqmrjxmc1p5gzdwm7450cs7qky"; depends=[BH igraph microseq Rcpp]; };
-  microplot = derive2 { name="microplot"; version="1.0-39"; sha256="191rgmcq405c91dv0zk7in2r71n8d1m04w624950ykq6qhdjpmpp"; depends=[cowplot ggplot2 HH Hmisc htmltools lattice ReporteRs]; };
-  microsamplingDesign = derive2 { name="microsamplingDesign"; version="1.0.2"; sha256="1wddf09p803hi28kzn6sq86zhgldxi34rrj7c0bpzy476abnp45s"; depends=[abind deSolve devtools ggplot2 gridExtra gtools knitr MASS matrixcalc matrixStats plyr Rcpp RcppArmadillo readr reshape2 shiny stringr]; };
+  microplot = derive2 { name="microplot"; version="1.0-42"; sha256="062dd4k6ryyl44lwbc2qgdsfcs1fiv9j2n6lx9driw6vng533b6q"; depends=[cowplot flextable ggplot2 HH Hmisc htmltools lattice officer]; };
+  microsamplingDesign = derive2 { name="microsamplingDesign"; version="1.0.5"; sha256="0dybi3l1cyndn72h7dic2n8ll8xnkd837pyvmqkcivckhsl43p9w"; depends=[abind deSolve devtools ggplot2 gridExtra gtools knitr MASS matrixcalc matrixStats plyr Rcpp RcppArmadillo readr reshape2 shiny stringr]; };
   microseq = derive2 { name="microseq"; version="1.2.2"; sha256="1h828iviraqrm43lhd0s3r7rdlakc6yfc6ngrcrkacpflfcmx3c7"; depends=[Rcpp]; };
   microsynth = derive2 { name="microsynth"; version="1.0.9"; sha256="06k7lag0vlzhrq5x6h7m8q9n209hfal3dzzmpjgxb6i9xdigkr6h"; depends=[boot kernlab LowRankQP MASS nleqslv pracma survey]; };
   midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; };
@@ -8533,9 +8914,9 @@ in with self; {
   migui = derive2 { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; };
   miic = derive2 { name="miic"; version="1.0.3"; sha256="088szscn9v9279w86mypxphp3avv17iijvcvlckx3h1ka75lkx27"; depends=[bnlearn igraph MASS ppcor Rcpp]; };
   milr = derive2 { name="milr"; version="0.3.0"; sha256="0z4d22fd6gd3zbi973vws9jqyh4c4m4i4ajcpxv934vxmbj0cma9"; depends=[glmnet numDeriv pipeR Rcpp RcppArmadillo RcppParallel]; };
-  mime = derive2 { name="mime"; version="0.5"; sha256="0i91m3ivaja1k33jwcvz16pfjypkci27awm8glil7sxhmwaj3izw"; depends=[]; };
+  mime = derive2 { name="mime"; version="0.6"; sha256="00f4gw4sg1kn03s67gficxgb7a7fb6pwhlvrxrml05q1mc2vcxa7"; depends=[]; };
   minPtest = derive2 { name="minPtest"; version="1.7"; sha256="088kckpbfy2yp0pk3zrixrimywrvkaib5ywa7fkr5phnzlsl80sv"; depends=[Epi scrime]; };
-  mindr = derive2 { name="mindr"; version="1.1.0"; sha256="102r7m6jiadgmkw4w7535ba2qfxknj00y4b9hhawcjqm5v67jipz"; depends=[htmlwidgets]; };
+  mindr = derive2 { name="mindr"; version="1.1.5"; sha256="02yszk13h5mm2wyx81byij152r8lj5j7r65icq3cl5skxygl43y7"; depends=[htmlwidgets]; };
   mineCitrus = derive2 { name="mineCitrus"; version="1.0.0"; sha256="031nfhrsc5rlqls3vyrk18lx0pd4ssdk96cmfr4ifaciz0rgv8h2"; depends=[ggplot2]; };
   minerva = derive2 { name="minerva"; version="1.4.7"; sha256="19snlbnk4y0lj7kfypa2g1d1s7bl3xkrxabn8p15hlwwcfb0x7vm"; depends=[]; };
   miniCRAN = derive2 { name="miniCRAN"; version="0.2.11"; sha256="1ffc367ipcxyk2a8f2y46xa01rbr5254cryf1qzzfflb3xj8n6pa"; depends=[httr igraph XML]; };
@@ -8551,9 +8932,9 @@ in with self; {
   minque = derive2 { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; };
   minval = derive2 { name="minval"; version="0.8-1"; sha256="11sr69hmqnh5g2zbfajy3wqc57759basky1w72dnrd38rq50llxs"; depends=[]; };
   minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
-  mipfp = derive2 { name="mipfp"; version="3.2"; sha256="1mds51vkqs2jc5kvxhzh2dmazxgbc14ahg1lxs9mn82my2p743f8"; depends=[cmm numDeriv Rsolnp]; };
-  mirt = derive2 { name="mirt"; version="1.28"; sha256="1ykki146wgdb0smdly0b2hqzvk7b31xmd1kgw69505mbm49yhzvh"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; };
-  mirtCAT = derive2 { name="mirtCAT"; version="1.7"; sha256="038jp680hn17q8hcz346j4i0p913h7gbkqfswn0ygf1kwgsz1mpa"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
+  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]; };
   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]; };
@@ -8570,21 +8951,21 @@ in with self; {
   missRanger = derive2 { name="missRanger"; version="1.0.3"; sha256="00gcnpvvy65v6k5qjk6xavdis02l8s9a56vwi39kw0rw8yhkla73"; depends=[FNN ranger]; };
   mistat = derive2 { name="mistat"; version="1.0-5"; sha256="1vyx918b7iv1wcnk23bnlxljwy0hglpdx5drhrs5qcd45f6jrghc"; depends=[]; };
   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-5"; sha256="1s888r9y2ri39b48h1iypps6lddqkqv3g31l2sjmi2pvyccfpkwb"; depends=[haven jomo pan]; };
+  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.1"; sha256="0p0m081ivpc22z3p8308z12fcdjnid86niwk4i97dvz12dr8v9ws"; depends=[corrplot ggplot2 LDRTools mixOmics phyloseq psych quadprog]; };
+  mixKernel = derive2 { name="mixKernel"; version="0.2"; sha256="0jhgyipy4635inzm0lsbi8inlbiahyfffn2ccnhyil6kaw3ky2pr"; 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=[]; };
-  mixcat = derive2 { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
+  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="4.0"; sha256="1hryscff4i4ayqxv9imnx4g56497s1s95fzqv8wkwcpfcqi20bqf"; depends=[MASS moments plot3D sde]; };
+  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]; };
   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]; };
@@ -8597,15 +8978,15 @@ in with self; {
   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]; };
   mixture = derive2 { name="mixture"; version="1.5"; sha256="1ahr8jw93xnd5hmy3h4sr209ql7gmkwbvnnfmiplbpc17czqgcn4"; depends=[]; };
-  mize = derive2 { name="mize"; version="0.1.1"; sha256="18mnpwwbwlyx0ixsjqai28ahp4g0wncv8c5qwy17xq2zbhwlq3jh"; depends=[]; };
+  mize = derive2 { name="mize"; version="0.2.0"; sha256="13l6f0i6k2y2cqad80zi35vqpkd0p8xl0hmf8djrsk1nmjqap1gc"; depends=[]; };
   mizer = derive2 { name="mizer"; version="1.0"; sha256="0qsf3wd8ipql344i8brv1d7qbr9g5y0qhh00lxj9n8sgjg52x7a5"; depends=[deSolve ggplot2 plyr progress Rcpp reshape2]; };
   mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; };
-  mkin = derive2 { name="mkin"; version="0.9.47.1"; sha256="1cz6f9122im594dvqdmdm9yjlnmwzrx2ka63dgj0zf1ysqzf0872"; depends=[deSolve FME inline minpack_lm R6 rootSolve]; };
+  mkin = derive2 { name="mkin"; version="0.9.47.5"; sha256="1cnzvq3wbkyzxajwk8h7pxyabfw0dbiv6dwga337ssf643rq9a8v"; depends=[deSolve FME inline minpack_lm R6 rootSolve]; };
   mknapsack = derive2 { name="mknapsack"; version="0.1.0"; sha256="1kzmx7d512681a4hjirfgcd7a8rvndb4da66p16gms5nnxzsby9c"; depends=[assertthat data_table lpSolve]; };
   mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; };
   mlDNA = derive2 { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[e1071 igraph pROC randomForest ROCR rsgcc snowfall]; };
   mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; };
-  mlVAR = derive2 { name="mlVAR"; version="0.4"; sha256="08iaq6wq0ngd60nhmlj8c0x8r1fal1zfv2zpd6ll54szcvdbxahr"; depends=[abind arm clusterGeneration corpcor dplyr lme4 MplusAutomation mvtnorm plyr qgraph]; };
+  mlVAR = derive2 { name="mlVAR"; version="0.4.1"; sha256="04ginifm625k7qy5s2s7rwqa5gwi8frrd2vs332jiw2sgpbi45ig"; depends=[abind arm clusterGeneration corpcor dplyr graphicalVAR lme4 MplusAutomation mvtnorm plyr qgraph]; };
   mlapi = derive2 { name="mlapi"; version="0.1.0"; sha256="023vk5bp8cjcq88sapkl87kdxr92bay1dyxl6xirnyj699pyj51k"; depends=[Matrix R6]; };
   mlbench = derive2 { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; };
   mlbgameday = derive2 { name="mlbgameday"; version="0.1.2"; sha256="03mz88y29wkn3510p8kzhapx0gj0mkqf0bgcjc0jpph2r1020c9a"; depends=[DBI doParallel dplyr foreach iterators magrittr purrr stringr tidyr xml2]; };
@@ -8618,24 +8999,24 @@ in with self; {
   mlegp = derive2 { name="mlegp"; version="3.1.7"; sha256="1q0mxvr23qcxvf8k2cgs4m8yfp1gbkmprp964w8viy30japmx16l"; depends=[]; };
   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]; };
   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]; };
   mlmRev = derive2 { name="mlmRev"; version="1.0-6"; sha256="0mvmahnbbp478xwldj4wlsjib4v4afhs07643gxgcqpi56zbd5h7"; depends=[lme4]; };
   mlma = derive2 { name="mlma"; version="4.0-1"; sha256="0pk2h4m74r95dfkqzliixi6z1rwdfc6gbz8c3162y22m919f00vc"; depends=[car gplots lme4]; };
   mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; };
-  mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.3"; sha256="0k0q7l0dja6q5jl4p7fd16c95m83db8c7g34lnaymxll824ai1lq"; depends=[coxme Matrix multcomp multcompView sommer]; };
+  mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.4"; sha256="1m58fp0izp03filb9wzw8fjrgy383p20jpynvgmxngbfp8bvspy6"; depends=[coxme Matrix multcomp multcompView sommer]; };
   mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; };
   mlogit = derive2 { name="mlogit"; version="0.3-0"; sha256="0frggwb1yzfs229ys60qc4acfnq2zwjr6a1zb4fv07s1zlwrvnf1"; depends=[Formula lmtest MASS maxLik statmod zoo]; };
   mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; };
-  mlr = derive2 { name="mlr"; version="2.12.1"; sha256="0b68pgx55f19i3pnci1n87cq2a7kfs6s2248zs1vg4xl5sw9ifww"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; };
-  mlrCPO = derive2 { name="mlrCPO"; version="0.3.4"; sha256="126kbfgcaqlvrpmz7v1l391x4v8sfzw7ccimz341im6n9ygp43rp"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; };
+  mlr = derive2 { name="mlr"; version="2.13"; sha256="07816gbswlv56qacf2byp5a5yg4hicx4kya49h9fmhfxmkkrnwp8"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; };
+  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-2"; sha256="0yc1dij3q6nk15259mvl5bhnm9b70ix8nq5lniq40j1arh5v9nq0"; depends=[alabama basefun BB coneproj numDeriv sandwich survival variables]; };
-  mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-1"; sha256="140bi0kjz5m7amwdxm2mpqn04i5wb1yjviwv34f1qjpzi4walml3"; depends=[mlt numDeriv]; };
+  mlt = derive2 { name="mlt"; version="1.0-3"; sha256="067j6gp5xh30ad46lp7x2n7kd8asbnchzlvsdgm8gq8gkd19icxx"; depends=[alabama basefun BB coneproj numDeriv sandwich survival variables]; };
+  mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-2"; sha256="1dk27iq7ix7j06m34c8wi9433f7kd36499x24bswy89y10lqqsn9"; depends=[mlt numDeriv]; };
   mltools = derive2 { name="mltools"; version="0.3.5"; sha256="045v28w7vz1zjxim8vfc6ncvg2mavr1q332x0hzlqpfzrk7gz4vh"; depends=[data_table Matrix]; };
-  mlvocab = derive2 { name="mlvocab"; version="0.0.1"; sha256="0lv9aqrwm00jdklig80yi5lxj87sh6ysg7qkg0kf1nv05lkvrpb0"; depends=[digest Matrix Rcpp sparsepp]; };
   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]; };
   mmabig = derive2 { name="mmabig"; version="1.0-0"; sha256="1srrfk6dqqfc504w8rhrfag3lzsc55sw3ckkmgph6k8ss99zn285"; depends=[car glmnet gplots mma survival]; };
@@ -8651,7 +9032,7 @@ in with self; {
   mmm2 = derive2 { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; };
   mmmgee = derive2 { name="mmmgee"; version="1.12"; sha256="083hv7g2cy2r9qkwc2fihglf4avsl1dsjyy74mj39gk1pss8mh6j"; depends=[Matrix mvtnorm]; };
   mmod = derive2 { name="mmod"; version="1.3.3"; sha256="1dz6887mlqbagjj98wcabmxj9hvsz8pgsizy1fqkwjhhs44c62y4"; depends=[adegenet pegas]; };
-  mmpf = derive2 { name="mmpf"; version="0.0.4"; sha256="1lskpnhqiimf7ch5xg5f0mpvhxy18a5w9daxpp4133vx1dydm4c2"; depends=[checkmate data_table]; };
+  mmpf = derive2 { name="mmpf"; version="0.0.5"; sha256="1w1ll1l7yzwb1wmlrcfpgqyzni7yb20kxy422y867hx2ndxlfwpz"; depends=[checkmate data_table]; };
   mmpp = derive2 { name="mmpp"; version="0.6"; sha256="16aypjf4i0ya3qgxqrrg8y0xbnq1pnqky1dpkgln5q494hphyg91"; depends=[]; };
   mmppr = derive2 { name="mmppr"; version="0.1"; sha256="0fswkqcw0xkqd9gmqabb61i32zscp5jzfx0z43wq7mrlwynryylv"; depends=[expm reshape2]; };
   mmtfa = derive2 { name="mmtfa"; version="0.3"; sha256="0qfszr6f10v27w1pfns78dyarznqryl4m1ppyqap7l8fc12sliky"; depends=[matrixStats mvnfast]; };
@@ -8660,10 +9041,10 @@ 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.0.0"; sha256="0m8h4g43iwq2ri6y9xk68g2rrikxngqcpqy6jlva84gsxigbzbql"; depends=[dplyr ggplot2 nlme tibble tidyr]; };
+  mnreadR = derive2 { name="mnreadR"; version="2.1.0"; sha256="1299jc72rr8c14kl5510jc5pj2l7l2xwi593a9zg853j4bmx3nim"; 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"; sha256="1h8976rlwykpqrh2p6x3bcyxdhlhcwsi1wvkdk08k6hynbw877cm"; depends=[testthat]; };
+  mockery = derive2 { name="mockery"; version="0.4.1.1"; sha256="1vfmjcjjyw2v5y64hmpfib6v0f6ms4k5ycvc9pmj9l4nkzq2al6b"; depends=[testthat]; };
   mockr = derive2 { name="mockr"; version="0.1"; sha256="0340v6189ivlzzriwk7yhf3v2k651x05fd1xrqfxxjgwhysaqj6z"; depends=[lazyeval]; };
   mod09nrt = derive2 { name="mod09nrt"; version="0.14"; sha256="1wn1y33bj9r712l0f063j5gcl423anjzmvgfy0ddihcrbpz4l7a0"; depends=[]; };
   modEvA = derive2 { name="modEvA"; version="1.3.2"; sha256="0p41fl0k780rx1vmq9laknz01ar6507sj8ss8kphrqkjnymsi2a0"; depends=[]; };
@@ -8678,39 +9059,41 @@ in with self; {
   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]; };
   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-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; };
+  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.1.1"; sha256="11xxklaqizlx36nyx3nzj9xkszg99qsmjqmr59z235h4wkrw8xg3"; depends=[assertive broom dplyr formula_tools janitor knitr magrittr rlang stringr tibble]; };
+  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]; };
   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]; };
   moduleColor = derive2 { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; };
-  modules = derive2 { name="modules"; version="0.6.0"; sha256="0nzypmx8p84dd7pdw7ilrjrc2nji5qzwylb9yn1zmr8wp5lzvidc"; depends=[stringr]; };
+  modules = derive2 { name="modules"; version="0.7.0"; sha256="0ww2abbrd4s6qf8hfhpwg92gpyvbsrwjf6l0837x0705d81cmgw3"; depends=[stringr]; };
   modygliani = derive2 { name="modygliani"; version="1.0"; sha256="01g96cdm4hgbsh6xsdfjg7vp7zb138sxwgv0msrlm27a6p4fcnlx"; depends=[]; };
   moezipfR = derive2 { name="moezipfR"; version="1.0.2"; sha256="0sfl1c7cvm1milcglcvz9lyvgricsdm7shx0jxyn50y7xz0padww"; depends=[tolerance VGAM]; };
   mogavs = derive2 { name="mogavs"; version="1.1.0"; sha256="0lhmwdv991bv7j8k066jr7ii94w60ydjpf5pzmv8jlblf3w2pr02"; depends=[cvTools]; };
   mokken = derive2 { name="mokken"; version="2.8.11"; sha256="1dypdf5gdz0hr3izafzfknyqx2vbr1z77c4c7vqdygv2wzhwy5i1"; depends=[poLCA]; };
   moko = derive2 { name="moko"; version="1.0.1"; sha256="1d1gyv44z8k196hfh8a9iccmlrwb42bj1xzabs07h306gpi9m73d"; depends=[DiceKriging DiceOptim emoa GenSA GPareto mco]; };
-  molaR = derive2 { name="molaR"; version="4.3"; sha256="1bzk7k6d1zbi0fhf9xwdg5mv7dcgajjbb6wxafx4nc2fjxhlldzi"; depends=[alphahull rgl Rvcg]; };
+  molaR = derive2 { name="molaR"; version="4.4"; sha256="0prd2avg3aj4y8zi7yd2sgcary8igqxrjcp0igail84kpnal53zq"; depends=[alphahull rgl Rvcg]; };
   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]; };
   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="1.6"; sha256="0wam3sbf5p7d5ikvmf0z8cghk2lrw2c3qyh9pbffm62vdbq7wx86"; depends=[jsonlite mime openssl]; };
+  mongolite = derive2 { name="mongolite"; version="2.0"; sha256="1icbxsnrah9dxcn1rf678853g8whdj41pj3zwv8kl61vjrg8r6rn"; depends=[jsonlite mime openssl]; };
   monitoR = derive2 { name="monitoR"; version="1.0.7"; sha256="1h1g0m1j13mz37xxwck4s7a0bfqvi0nrzfw60j7bkzaah8zxcc9n"; depends=[tuneR]; };
   monkeylearn = derive2 { name="monkeylearn"; version="0.2.0"; sha256="18lpfs64h0hy4vkdjlnmxwgagvf54kn8a1c866vv00ckyp85fvn2"; depends=[cowsay digest dplyr httr jsonlite magrittr purrr ratelimitr tibble tidyr]; };
   monmlp = derive2 { name="monmlp"; version="1.1.5"; sha256="19cx60csm8mnf6ksg64vlhi8wi1c7bmv9l55y9zmaljblr0kmzxf"; depends=[optimx]; };
   monographaR = derive2 { name="monographaR"; version="1.2.0"; sha256="0sis2kw07ifq54w6p56zspmlnvxvq6ajb0sdvc9fk480sfxg9806"; depends=[circular maptools png raster rmarkdown sp]; };
-  monomvn = derive2 { name="monomvn"; version="1.9-7"; sha256="1bz967sl6ji84x9v0fypjn75d39naaqgvw31n9lgcd5lyj39hbsk"; depends=[lars MASS mvtnorm pls quadprog]; };
+  monomvn = derive2 { name="monomvn"; version="1.9-8"; sha256="1bsn3i0j4mf39cxcyqwb1fgafdyv6bmvsh803d7692h93zc3llqj"; depends=[lars MASS mvtnorm pls quadprog]; };
   monoreg = derive2 { name="monoreg"; version="1.2"; sha256="16n622j1j998a5fhn1c1qbzk5bfa5h09d95ry89gsd00p40hqg0a"; depends=[]; };
   monotonicity = derive2 { name="monotonicity"; version="1.1"; sha256="06irf6jlmhmj70c45ilf66yy2k81i3rg1qgw9ch08mj1j8ahyx7x"; depends=[lmtest MASS sandwich]; };
   monreg = derive2 { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; };
-  moonBook = derive2 { name="moonBook"; version="0.1.8"; sha256="1gdzpjc16l2alvf968011njgl8i7fhi2l5v97b47dh4wlnziq68x"; depends=[nortest survival]; };
+  moonBook = derive2 { name="moonBook"; version="0.2.3"; sha256="0hys56mwbm776ff7dibi8wzyf69qiais9rs1jazv79lk6h56s9s6"; depends=[magrittr nortest purrr sjmisc stringr survival]; };
   moonsun = derive2 { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; };
   mopa = derive2 { name="mopa"; version="1.0.1"; sha256="1v876al1afli002v44b4j2acb6n66f0hzz4bmcl60jyny43d1n0c"; depends=[abind dismo e1071 earth gtools lattice PresenceAbsence randomForest ranger raster rpart sampling sp spam spatstat splancs tree]; };
   mopsocd = derive2 { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; };
@@ -8718,7 +9101,7 @@ in with self; {
   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]; };
   mortAAR = derive2 { name="mortAAR"; version="1.0.1"; sha256="1dgxx5sh0nskzbigr8yq389lsnalp45d6m92q6g07jpqm7nzbazd"; depends=[magrittr Rdpack reshape2]; };
-  mosaic = derive2 { name="mosaic"; version="1.3.0"; sha256="1iaiddg81b49296jch45m9hlybv6iia5vkl2s6pkzjp2ii5yvf8k"; depends=[broom dplyr ggdendro ggformula ggplot2 glue gridExtra lattice latticeExtra lazyeval MASS Matrix mosaicCore mosaicData readr tidyr]; };
+  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]; };
   mosaicCore = derive2 { name="mosaicCore"; version="0.6.0"; sha256="1klw97h6lchw1cpcl8s637ikcl428cckmjq0czi7mibh9q9mw72z"; depends=[dplyr lazyeval MASS rlang tidyr]; };
   mosaicData = derive2 { name="mosaicData"; version="0.17.0"; sha256="04z0mdm52mykqsxsinhmsihn181zf6cw321gayk2rjp7lj7mwdq9"; depends=[]; };
@@ -8728,16 +9111,17 @@ in with self; {
   moult = derive2 { name="moult"; version="2.1.0"; sha256="0k0969fwy648x25xw42w5ncimyw2cbq305rzf4m77p3pf0k50m9b"; depends=[Formula Matrix]; };
   mountainplot = derive2 { name="mountainplot"; version="1.2"; sha256="1bbgkps1yhfa0lmapqkhhl5mc63p0gzszxw2g910dbi1cjc0pphx"; depends=[lattice]; };
   mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; };
-  mousetrap = derive2 { name="mousetrap"; version="3.1.0"; sha256="1r1cpfn6bcgk66lw0la6r3bsv62yhp2m3jkwn0g8rbwrhp9jyl6p"; depends=[cstab diptest dplyr fastcluster fields ggplot2 magrittr pracma psych RColorBrewer Rcpp scales tidyr]; };
-  movMF = derive2 { name="movMF"; version="0.2-2"; sha256="0kk3b16vlr6nbqn9fzgk5pb4nyy9w9b5x7khyvn34b9r0pnqmmds"; depends=[clue skmeans slam]; };
-  move = derive2 { name="move"; version="3.0.2"; sha256="0pi59k2kq1z92qgsbbqn1cjx0rbkjzjhaskk76wv95s3078k062d"; depends=[geosphere httr raster Rcpp rgdal sp xml2]; };
+  mousetrap = derive2 { name="mousetrap"; version="3.1.1"; sha256="150760bpalssalh2grh4jfpw3vsbysnnfvnvy2xk1yrcn3234ynj"; depends=[cstab diptest dplyr fastcluster fields ggplot2 magrittr pracma psych RColorBrewer Rcpp scales tidyr]; };
+  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.6"; sha256="15w11zdi2amzvq7xgz5wsf9136s127inc44x8cl3ra7jy2sbgpiy"; depends=[dismo geosphere ggplot2 gridExtra lubridate maptools move pbapply plyr raster rasterVis RCurl RStoolbox simecol sp zoo]; };
+  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]; };
   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=[]; };
   mp = derive2 { name="mp"; version="0.4.1"; sha256="0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq"; depends=[Rcpp RcppArmadillo]; };
   mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; };
-  mpath = derive2 { name="mpath"; version="0.3-4"; sha256="0qn2nqravnfjjr76p2049z24cwfzy4av8xr2rvpgkan14jcm6xra"; depends=[bst doParallel foreach glmnet MASS numDeriv pscl]; };
+  mpath = derive2 { name="mpath"; version="0.3-5"; sha256="1yv4pl6ph3d5cfrg1li5capcsvl3h321s0bvzl6mkcn0vnm23jdm"; depends=[bst doParallel foreach glmnet MASS numDeriv pscl]; };
   mpbart = derive2 { name="mpbart"; version="0.2"; sha256="1145n0lxmm0kjm2lc358d79hqws48crj17pjvmchl1pbfd7zi4r8"; depends=[bayesm cvTools mlbench mlogit]; };
   mpcv = derive2 { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; };
   mpe = derive2 { name="mpe"; version="1.0"; sha256="17bgdbg1zrf78djd3mwycidwibxvsis7pwkrcynvghcc8l2zfci9"; depends=[mvtnorm]; };
@@ -8752,15 +9136,15 @@ in with self; {
   mpt = derive2 { name="mpt"; version="0.5-4"; sha256="01akz72z6z5ybzika120v4v6ah13hfynh98rzbmqgbchijxbbkz6"; depends=[]; };
   mptools = derive2 { name="mptools"; version="1.0.1"; sha256="1g4fbfwxv9hir0jn22nh9854blgkh0b5jan3lv0888izj4isa1hc"; depends=[animation lattice latticeExtra raster rasterVis sp viridis zoo]; };
   mr_raps = derive2 { name="mr.raps"; version="0.2"; sha256="069vyvsdgc5m7n2fd0h7jrllz789zvsxka7h5wiy36dc7lagd6f8"; depends=[nortest]; };
-  mrMLM = derive2 { name="mrMLM"; version="3.0"; sha256="174d12dxrsndd8hkc4ivfa5wd7ixh3vkkvd1br5zm5rwxbq3c71l"; depends=[coin data_table doParallel foreach ggplot2 lars MASS ncvreg openxlsx qqman sampling stringr]; };
-  mrMLM_GUI = derive2 { name="mrMLM.GUI"; version="3.1"; sha256="17rqky58im1aax29fi3lc6i7kpy3n35ysdhjz9dgmykzhx41xmn2"; depends=[coin data_table doParallel foreach ggplot2 lars MASS mrMLM ncvreg openxlsx qqman sampling shiny shinyjs stringr]; };
+  mrMLM = derive2 { name="mrMLM"; version="3.1"; sha256="0mmnqgirbihq25fcy7bqs6qsw9dz6v1mzlm5ccs6pfpi852460c9"; depends=[bigmemory coin data_table doParallel foreach ggplot2 lars MASS ncvreg openxlsx qqman sampling stringr]; };
+  mrMLM_GUI = derive2 { name="mrMLM.GUI"; version="3.2"; sha256="0xhbkvq9bd0spnpd8acnmf3spsi1kz43wf2na5b122iv7ppwl3ix"; depends=[bigmemory coin data_table doParallel foreach ggplot2 lars MASS mrMLM ncvreg openxlsx qqman sampling shiny shinyjs stringr]; };
   mra = derive2 { name="mra"; version="2.16.11"; sha256="0268msdy4cs2ifpagmwiabi6aav54ckn214ai18aqv2h97hmixw0"; depends=[]; };
   mratios = derive2 { name="mratios"; version="1.4.0"; sha256="0pjcwqx3zykpwyykwgqziwignd41sjm2s1blyjwc1lhymis4ldzq"; depends=[mvtnorm]; };
   mrbsizeR = derive2 { name="mrbsizeR"; version="1.1.1"; sha256="0a69yyxxf4p84c2sx9kkaxgpfyck88cn0ajlnm64arrr9r99iiir"; depends=[fields maps Rcpp]; };
   mrds = derive2 { name="mrds"; version="2.2.0"; sha256="08m5a61rpbw5pv0v0yspihkzihcxazsh6w5kmfvg68s4akjwcnqi"; depends=[mgcv numDeriv optimx Rsolnp]; };
   mreg = derive2 { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
   mregions = derive2 { name="mregions"; version="0.1.6"; sha256="0ix77hqcllhcpldchlnvciiflm6ysylynnnqvczpf8vx7gwa3lrk"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; };
-  mrfDepth = derive2 { name="mrfDepth"; version="1.0.7"; sha256="1v0d1vm7jihg88xd4hwi5j940r5kh74c3nidh6hyvajqq97nidjq"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; };
+  mrfDepth = derive2 { name="mrfDepth"; version="1.0.10"; sha256="138nsjcxrs3ihzscaw0cv15hkr0xnrjnjlyyf9igpcpg76d5m1bb"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; };
   mrgsolve = derive2 { name="mrgsolve"; version="0.8.12"; sha256="04k7mj64gqwnvwsshfn4l3iiqfbsy92qil14ysq4ncjj2h40lgkj"; depends=[BH dplyr magrittr Rcpp RcppArmadillo rlang tibble]; };
   mri = derive2 { name="mri"; version="0.1.1"; sha256="07lqr9fv0nqd626jpqa6x1qxf85r1j4r5brv760dll1p2kl060gw"; depends=[]; };
   mritc = derive2 { name="mritc"; version="0.5-1"; sha256="12sfyw5b1lryczl92xvyvhl37qfx3ybg4y9awsl0b7f51zi0lzy3"; depends=[lattice misc3d oro_nifti]; };
@@ -8774,16 +9158,16 @@ 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.2.2"; sha256="1aa8pvg3immcrpr7b6q1lf4nm8gvq9316s28jvzpp2az5hvc1w00"; depends=[httr jsonlite]; };
+  mscstts = derive2 { name="mscstts"; version="0.3.0"; sha256="1fl3s5hhqkh7paaafm2dy4066g3p3rqcjmbxlsq4v60l3x448p5p"; 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]; };
   mseapca = derive2 { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; };
+  msgl = derive2 { name="msgl"; version="2.3.7"; sha256="18mcn2b7bk6z85yfmpgv8ics3fr2vbafpkn8fcnsc2amklpaplcd"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
   msgpack = derive2 { name="msgpack"; version="1.0"; sha256="1j1nnca9nm3l1r4wjjlb15zr8p6zw1lcgyj4383ndy156bbh1f5a"; depends=[]; };
   msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; };
   msgps = derive2 { name="msgps"; version="1.3"; sha256="0nvxy9a41z5d111gqr1gh521imm795l1li70g1mzrag1gpg810c5"; depends=[]; };
-  msgtools = derive2 { name="msgtools"; version="0.2.7"; sha256="1lk4r9gdhlfarl5z6a48aih682q7dvwa6lf31119lljpa5gmi92y"; depends=[devtools digest hunspell poio tibble]; };
-  msigdbr = derive2 { name="msigdbr"; version="6.1.1"; sha256="0d8jxkfnlybs17s0qfxr1qcg6r4pp4q6c3srmm2r8zp7ln0qkj8j"; depends=[dplyr magrittr rlang tibble]; };
+  msigdbr = derive2 { name="msigdbr"; version="6.2.1"; sha256="1264j1hs74kq7hyh68vfynadfi6mdpq46qm1hnwzkzzhmbzpb9cg"; depends=[dplyr magrittr rlang tibble]; };
   msir = derive2 { name="msir"; version="1.3.1"; sha256="1ipzgdffsqly3dp91pw7yp3h5cwn08l9qsj7cdmrykd42jc98950"; depends=[mclust rgl]; };
   msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; };
   msm = derive2 { name="msm"; version="1.6.6"; sha256="06m7fflb6lgjfnj9v4wjc63x2as8jvc24qmz6jvgm9fw7hnm24px"; depends=[expm mvtnorm survival]; };
@@ -8791,21 +9175,21 @@ in with self; {
   msme = derive2 { name="msme"; version="0.5.3"; sha256="0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh"; depends=[lattice MASS]; };
   msmtools = derive2 { name="msmtools"; version="1.3"; sha256="0p7xpj78cjc1s015ma7vc38kqiy6wvpyixrdinx4ngig1pqfrq4p"; depends=[data_table msm survival]; };
   msos = derive2 { name="msos"; version="1.1.0"; sha256="1dlqmjz5f8h71334kzdjbzvkn0dhysp7fb18g45qqs79cqpf1vzf"; depends=[mclust tree]; };
-  msr = derive2 { name="msr"; version="0.4.4"; sha256="1r7kzicyi380xylw4vl88918gqmvs875f3rssx57yg28swb93sv0"; depends=[colorspace e1071 glmnet RColorBrewer rgl]; };
   mssqlR = derive2 { name="mssqlR"; version="1.0.0"; sha256="0qdnm7cx9cg14vfcnkmcjqr1jpxsw8xlrbnxldvzz44mzv2n878l"; depends=[magrittr RODBC]; };
   mstR = derive2 { name="mstR"; version="1.2"; sha256="0v8cv9pswkvw0lva6jx5vavsb20dawgq83gn4rgydyhvigcl5szd"; depends=[]; };
   mstate = derive2 { name="mstate"; version="0.2.11"; sha256="13kw1n1p2f1f0k5hkcc4732wlhiy3csx8nx2ajrgw06svzksgh3y"; depends=[RColorBrewer survival]; };
   mstherm = derive2 { name="mstherm"; version="0.4.7"; sha256="04jrp0w17svwmrvx356jmh04npbwhk9nvfy3r39vqr82yrvn6jip"; depends=[doParallel foreach nls2 plotrix RColorBrewer]; };
+  mstrio = derive2 { name="mstrio"; version="10.11.1"; sha256="1k407b75kfvqlvlr9wcklf81b2cby3yi6jdi5ka661n5rybcs4nn"; depends=[httr jsonlite openssl]; };
   msu = derive2 { name="msu"; version="0.0.1"; sha256="1vhh9725dbywmzihnmsq1jircpn91r8227j2f76fvma9rwss90p7"; depends=[entropy]; };
   mtconnectR = derive2 { name="mtconnectR"; version="1.1.0"; sha256="068rp4n2afl9qgqrnp0a4lmnq7mq9wrc2yi361bfvib96gzg1fdw"; depends=[data_table dplyr dtw ggplot2 magrittr plyr proxy stringr tidyr XML]; };
   mthapower = derive2 { name="mthapower"; version="0.1.0"; sha256="17svh0q9a982a390fgwgvrc2kygxxgyacb3j6gcksbikjrvkcfpw"; depends=[]; };
   mtk = derive2 { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[lhs rgl sensitivity stringr XML]; };
   mtsdi = derive2 { name="mtsdi"; version="0.3.5"; sha256="0j4hl690n8x7zfpygw5qv0m0jyl8dnz1d3r4314w06h7c578n2kp"; depends=[gam]; };
-  muHVT = derive2 { name="muHVT"; version="0.1.0"; sha256="1lkqas8ghnkgdnnhjmm1aivgabnqgpd3hfk8i3z7bajvi201qvx4"; depends=[conf_design deldir Hmisc MASS plyr sp splancs]; };
+  muHVT = derive2 { name="muHVT"; version="0.2.1"; sha256="0qndbg9m3267s8h7gphcm4rkchfgkyzd1301wr6iajv0shrc98rv"; depends=[conf_design deldir dplyr ggplot2 Hmisc magrittr MASS purrr sp splancs]; };
   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.2"; sha256="14jd0fwc11a5640p0vr5dgfw7f1h7473ybqhalg20n7519jybfcb"; depends=[dplyr ggplot2 jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect]; };
+  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]; };
   mueRelativeRisk = derive2 { name="mueRelativeRisk"; version="0.1.1"; sha256="16yclfmgxc32pv00vyb9fjdh4syax8ynizr8a29haiq22q5fqclh"; depends=[]; };
   muhaz = derive2 { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; };
@@ -8824,14 +9208,15 @@ in with self; {
   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]; };
-  multicastR = derive2 { name="multicastR"; version="1.0.0"; sha256="0gs5pbnf9jr7l1hi6dq54a2isx43gdvbxx0p354r060gddj2xwqd"; depends=[data_table]; };
+  multicastR = derive2 { name="multicastR"; version="1.0.1"; sha256="1sf5mn5hgz34ildga00462j92cr6v19132ns0sf9klwcrir8fqfb"; depends=[data_table stringi xml2]; };
   multichull = derive2 { name="multichull"; version="1.0.0"; sha256="1gc7kxxlbanc6rmmbf6h85jf7kj0a78h23m5vwwqqliv018qsv2n"; depends=[igraph plotly shiny shinythemes]; };
   multicmp = derive2 { name="multicmp"; version="1.1"; sha256="0mz7ksc5h6dy95l3kbsamm191372blhlrj573krc57bj93lmp1a5"; depends=[numDeriv]; };
+  multicolor = derive2 { name="multicolor"; version="0.1.1"; sha256="1n7mxjkpd54y41lr3kwn3gwlka9p812jgazhlm9m6s9bc34sw3y9"; depends=[cowsay crayon dplyr glue magrittr purrr stringr tibble tidyr]; };
   multicon = derive2 { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; };
   multicool = derive2 { name="multicool"; version="0.1-10"; sha256="1ybg9piya9psqg42w9i3zsnavbxhkfklfwl7cb420i5nkq6wpc2v"; depends=[Rcpp]; };
-  multifluo = derive2 { name="multifluo"; version="1.0"; sha256="1blmr2cdbdwfyivvla0nmv2n44m168f3d11g5i7vydh8fl17l8vr"; depends=[ellipse imager]; };
+  multifluo = derive2 { name="multifluo"; version="1.1"; sha256="1hnh1gj6lfnh2fn0v064bszydgsr6p9f7p8yxyw5rdxfrxymiw09"; depends=[agricolae ellipse imager]; };
   multifwf = derive2 { name="multifwf"; version="0.2.2"; sha256="1l6z3pzz6g6w1spp1f918jh6w0jm93qyc882rj8jhn1198d2s8nd"; depends=[]; };
-  multigraph = derive2 { name="multigraph"; version="0.75"; sha256="0y4ibyy7v5hgxilrw5fxhj12597yl9q8zla5xvvhn9g7ir6xvmxd"; depends=[multiplex]; };
+  multigraph = derive2 { name="multigraph"; version="0.91"; sha256="1ind8zqqcy4k97sdimn7bn85nbqwda92z0dp80kilcsvlhf47y35"; depends=[multiplex]; };
   multigroup = derive2 { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; };
   multilaterals = derive2 { name="multilaterals"; version="1.0"; sha256="11zfdhn6qzqz0n31g23bn40wnfzkjndb753iiqvihirphzb74v5v"; depends=[ape igraph]; };
   multilevel = derive2 { name="multilevel"; version="2.6"; sha256="19zrvpq23dn69d7kai1rgw5b8ibmgybnbg6isliq0n8bv9jvrzia"; depends=[MASS nlme]; };
@@ -8840,11 +9225,11 @@ in with self; {
   multimode = derive2 { name="multimode"; version="1.3"; sha256="130sh1r92z7415j4liz7ka1lpq0b5dxwqdh8s2lnd0wyjz8ysh3k"; 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]; };
-  multinets = derive2 { name="multinets"; version="0.2.0"; sha256="05m0xin8wxshmwb3b9cgsvi8037wvmirbyyim1xxx2ppfwrdr2a6"; 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="1.0.0"; sha256="08vwz3d3gwybb1dzxhmzzik636k7y6dvrwkxpdsij7zw9p5gbbgs"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types caTools ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; };
+  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]; };
   multipleNCC = derive2 { name="multipleNCC"; version="1.2-1"; sha256="080wpyifpw41p6jip2ia7439jdhzyb7lbhs2qzzg0hn6c0qq7mrr"; depends=[mgcv survival]; };
-  multiplex = derive2 { name="multiplex"; version="2.8"; sha256="01l3kmvsrrq0c98dv5m25yjjcbc99in6dv9k5h54cyjsw4jsjhns"; depends=[]; };
+  multiplex = derive2 { name="multiplex"; version="2.9"; sha256="1na0w4kzaswgzyw4wq8qmihasgbvbl426a2cx3y672l80rgjhhdh"; depends=[]; };
   multipol = derive2 { name="multipol"; version="1.0-7"; sha256="1rkrg3kayxa05jayg8bk1mm3hcvi76570wqfja5953hd9j4krgha"; depends=[abind]; };
   multirich = derive2 { name="multirich"; version="2.1.1"; sha256="04jr5jvds70j2psyxz12d2my61jcj5hvdyv10pvar2rpqaw0yxyh"; depends=[]; };
   multiselect = derive2 { name="multiselect"; version="0.1.0"; sha256="1cda38zq7c1r56wdfpr5dg0jfw4kzi9p7jq59qm04j461j9ag3q6"; depends=[Hmisc]; };
@@ -8852,19 +9237,19 @@ in with self; {
   multisom = derive2 { name="multisom"; version="1.3"; sha256="0msxmrj4iawxg4vf4r7kj26zalxz4di2w4nxgxiakiig4g4ggy9z"; depends=[class kohonen]; };
   multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; };
   multistate = derive2 { name="multistate"; version="0.2"; sha256="0jdgyzc99k4py39g98c4dlcdl918568ihcyhb7csxbsn1zn1qm9l"; depends=[date relsurv statmod survival]; };
-  multistateutils = derive2 { name="multistateutils"; version="1.1.0"; sha256="1fpfmqwspvrhq4n02ha5vpaybnhg8ylqmixm2r2xrk2x3kq7733r"; depends=[data_table dplyr magrittr networkD3 Rcpp survival tidyr]; };
+  multistateutils = derive2 { name="multistateutils"; version="1.2.0"; sha256="0dngc2vyqgcck1iaf9r116r6xp65axivqq8hl6sa7ib6rgwknhkw"; depends=[data_table dplyr magrittr networkD3 Rcpp survival tidyr]; };
   multitaper = derive2 { name="multitaper"; version="1.0-14"; sha256="04wd9bbhyx7697pfy0fpj02v1csr48hkpqj62h9p8a6w84ji4k68"; depends=[]; };
-  multivariance = derive2 { name="multivariance"; version="1.1.0"; sha256="1yl1qfckpf98j4ca3wv8zw8vd79isaqvq7qkakyhxy0ljx20jmlk"; depends=[abind igraph]; };
+  multivariance = derive2 { name="multivariance"; version="1.2.0"; sha256="07cm2qji04lmxkm4sqigln7rihanaww98d4k8p1rn6d62mcxyizv"; depends=[abind igraph Rcpp]; };
   multivator = derive2 { name="multivator"; version="1.1-9"; sha256="0vbqvhmym46zjr1h4s53sjrddfjpv8wi0sq4lrh2rmqarq068416"; depends=[emulator mvtnorm]; };
   multiwave = derive2 { name="multiwave"; version="1.2"; sha256="1bw071izjxrsk5gx8s49nrlryabpgpg7k2z1ghmk8p6i9m5apnl8"; depends=[]; };
   multiway = derive2 { name="multiway"; version="1.0-5"; sha256="0ni38h16nddwib9nvcby59rsn9913qwhrlkpdkz99fwz8cnl8rw2"; depends=[CMLS]; };
   multiwayvcov = derive2 { name="multiwayvcov"; version="1.2.3"; sha256="1znsmca16jac8s5z0j64cck27pvf88anm1mfblabqchqqcz1ykfc"; depends=[boot sandwich]; };
   multxpert = derive2 { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; };
   muma = derive2 { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[bitops car caTools gplots gtools mvtnorm pcaPP pdist pls robustbase rrcov]; };
-  mumm = derive2 { name="mumm"; version="0.2.0"; sha256="1dizjqi29cw2bpsr0i3a27mys2rs90yhbg1lc7a2nkg7lwqgb993"; depends=[lme4 Matrix Rcpp RcppEigen stringr TMB]; };
+  mumm = derive2 { name="mumm"; version="0.2.1"; sha256="1wjg2pqn2wb9hk9mqgpi3k26qwjnkmp4apx09lxcwrz35bbwhfzv"; depends=[lme4 Matrix Rcpp RcppEigen stringr TMB]; };
   munfold = derive2 { name="munfold"; version="0.3.5"; sha256="17zizx9r0f8dxb7dkgn1nn0fp7ydy6r155p1zfz0v93jc26lc1hb"; depends=[MASS memisc]; };
   munsell = derive2 { name="munsell"; version="0.5.0"; sha256="16g1fzisbpqb15yh3pqf3iia4csppva5dnv1z88x9dg263xskwyh"; depends=[colorspace]; };
-  munsellinterpol = derive2 { name="munsellinterpol"; version="2.0.1"; sha256="1pyqsgx2fhrh264yvg6ybkr4skksn1hlanh8950df1f77h70ji6i"; depends=[geometry rootSolve spacesRGB]; };
+  munsellinterpol = derive2 { name="munsellinterpol"; version="2.1-3"; sha256="0y0ab133sh4c4avdgwjja14z290gczkzv3xlgr0lwdwhfbb60cc2"; depends=[geometry rootSolve spacesRGB spacesXYZ]; };
   murphydiagram = derive2 { name="murphydiagram"; version="0.11"; sha256="0wax9gjhzz8nphzwijqzllz4y25jksf1vqfcbnfb7zafsfv40rib"; depends=[]; };
   musicNMR = derive2 { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; };
   musica = derive2 { name="musica"; version="0.1.3"; sha256="0cfzfar706l0xdb0n11m18mayj5rrplvf4qry36vgxsiaxcba90r"; depends=[data_table lubridate magrittr qmap]; };
@@ -8872,9 +9257,9 @@ in with self; {
   mutSignatures = derive2 { name="mutSignatures"; version="1.2"; sha256="1kbp221lm43a5wiw754yjkd3qidmca20m0i8jlxsqk8ijbp40ky2"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; };
   mutoss = derive2 { name="mutoss"; version="0.1-12"; sha256="1yk7p7pb2xm38d3j19ysgwmix48lvimbhkhjjwk5jmr1a0ysx298"; depends=[multcomp multtest mvtnorm plotrix]; };
   mutossGUI = derive2 { name="mutossGUI"; version="0.1-11"; sha256="08pcca9gzns83az6jbjzv4xhm1wgmchhzz4f54x1aq0nmvsz3qq1"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; };
-  mvLSW = derive2 { name="mvLSW"; version="1.2.1"; sha256="012p828pyzz6xnv2akax5hx79v522dg4a2gqrjss526qylpg5j9l"; depends=[fields wavethresh xts zoo]; };
+  mvLSW = derive2 { name="mvLSW"; version="1.2.2"; sha256="19bz1hryw9jhw2y3cnx4bqykdqpfgdlnmkx7ka8i96yb5xg4791q"; depends=[fields wavethresh xts zoo]; };
   mvMISE = derive2 { name="mvMISE"; version="1.0"; sha256="0lnc5g3ksl5cvwylh8p8baxyvq3z32a2i337q7lhg00j031ccy5c"; depends=[lme4 MASS]; };
-  mvMORPH = derive2 { name="mvMORPH"; version="1.0.9"; sha256="09368vgyb1s18awfr07hs1s40n2h15hy08fmir3ayhdfrdain4k6"; depends=[ape corpcor phytools spam subplex]; };
+  mvMORPH = derive2 { name="mvMORPH"; version="1.1.0"; sha256="0v63wi4la5kw59xdl1bmsc8hh8gfpm89s79dzrkbdkmakm740vvx"; depends=[ape corpcor glassoFast phytools spam subplex]; };
   mvMonitoring = derive2 { name="mvMonitoring"; version="0.1.0"; sha256="03nvq8nmrmrpzyxlsqzww5ghk640115l1jgmgwfahhjxkdpkzfxx"; depends=[BMS dplyr lazyeval plyr rlang robustbase xts zoo]; };
   mvPot = derive2 { name="mvPot"; version="0.1.4"; sha256="04l9dn8amwp366b6lic5fkl4kck0x2m3xcsqz6as4c3h772nhq1w"; depends=[evd gmp MASS numbers]; };
   mvProbit = derive2 { name="mvProbit"; version="0.1-8"; sha256="07dizclqjlwj29yb3xwjihjh8kmn6jiq5cpf8rcirylzykfdv3wk"; depends=[abind bayesm maxLik miscTools mvtnorm]; };
@@ -8885,10 +9270,10 @@ in with self; {
   mvbutils = derive2 { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; };
   mvc = derive2 { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; };
   mvcluster = derive2 { name="mvcluster"; version="1.0"; sha256="0yfl31scdgsiljvpv1yxc5bwwzr6kbhpjwqh2kql7xf0m0hc1pr4"; depends=[Rcpp RcppArmadillo]; };
-  mvctm = derive2 { name="mvctm"; version="1.1"; sha256="00lrnqnzpnvrl84b41ai33iwpyb4qzpjyqrw1d18hj6szybdfhsv"; depends=[Formula MNM nlme quantreg Rfit SpatialNP]; };
+  mvctm = derive2 { name="mvctm"; version="1.2"; sha256="0810bmk748cvbls4djspqvkk65j605djqicqg4rkwy2a799l3rgc"; depends=[Formula MNM nlme quantreg Rfit SpatialNP]; };
   mvcwt = derive2 { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; };
   mvdalab = derive2 { name="mvdalab"; version="1.4"; sha256="18wchy517qd45w5y0sr8lcafb7kmscy0q9vsryk9if6x2jq22lqz"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; };
-  mvglmmRank = derive2 { name="mvglmmRank"; version="1.2-1"; sha256="1gyc1xjyapadrv43kd4kngld37q8drhx4qfcimsvf7jdp33y6g5d"; depends=[MASS Matrix numDeriv]; };
+  mvglmmRank = derive2 { name="mvglmmRank"; version="1.2-2"; sha256="00zxqby8syb959fqgw9i7b0yamgjwddq32jlin6qmnzys5bg1556"; depends=[MASS Matrix numDeriv]; };
   mvinfluence = derive2 { name="mvinfluence"; version="0.8-3"; sha256="0nygsldkm61ny5ljcc1r667rywj239j4x59ssi81cb2005kkjgm5"; depends=[car heplots]; };
   mvmesh = derive2 { name="mvmesh"; version="1.5"; sha256="0my43559jh8ln1fx5rh5vw24vr6kxpd2h5scylfxfv2qfk794l0b"; depends=[abind geometry rcdd rgl SimplicialCubature]; };
   mvmeta = derive2 { name="mvmeta"; version="0.4.11"; sha256="1h1393s7xdi4sv461srsard6w961mcxxmxq9mkmfsgw5hdmkwkr2"; depends=[]; };
@@ -8899,12 +9284,12 @@ 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.1"; sha256="1i1jhvs9h5s07zqa84i1lm3gx70v32agsiymc0v1msqai12plknb"; depends=[MASS Matrix mnormt numDeriv optimx pbivnorm]; };
+  mvord = derive2 { name="mvord"; version="0.3.2"; sha256="0gpm7biwmvimsv7zcc8h8gmzl6f1n52gx68cmz2ppz0d1fv0w8sb"; 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=[]; };
   mvsf = derive2 { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[mvnormtest nortest]; };
-  mvst = derive2 { name="mvst"; version="1.0.1"; sha256="0sv8pd1524pr3xpxplq468dxfd0wipdr41awqwvcljpw5wgl34qa"; depends=[MCMCpack mnormt mvtnorm]; };
+  mvst = derive2 { name="mvst"; version="1.1.0"; sha256="03q0kdychsmn4wcn50b6dqhxn4f2mjvrr5rac942xdv75w8qklc9"; depends=[MCMCpack mnormt mvtnorm]; };
   mvtboost = derive2 { name="mvtboost"; version="0.5.0"; sha256="06zgx1c2470bh3x6s2awzkxbyij6bvzv23xbvamg77v5pz5bjj6h"; depends=[gbm RColorBrewer]; };
   mvtmeta = derive2 { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; };
   mvtnorm = derive2 { name="mvtnorm"; version="1.0-8"; sha256="0la42lylb7cjrcrc285bn69bz9kyg556xw317iz139dp1yswl410"; depends=[]; };
@@ -8917,28 +9302,29 @@ in with self; {
   mycor = derive2 { name="mycor"; version="0.1.1"; sha256="00hqmvga22bv43833s974s7ky7lbry3r2bb5kza7kvkn1p6773rg"; depends=[lattice]; };
   myepisodes = derive2 { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
   mztwinreg = derive2 { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[mclogit rms]; };
-  n1qn1 = derive2 { name="n1qn1"; version="6.0.0-1"; sha256="01bci81lhanxpfl454gl09krgb4229dnq9f34bngwm8ygvdadfgy"; depends=[Rcpp RcppArmadillo]; };
+  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="2017.12-3"; sha256="1k03zrf67il7miap81r2fdnsi15i98wmwc3a8zxn54qfr2w9pcy6"; depends=[drc gdata gWidgets kyotil]; };
+  nCal = derive2 { name="nCal"; version="2018.8-20"; sha256="1idgpzivw5wa423z86rf60ri50cyh8p38p4r493i9b2m9qzzqf1x"; depends=[drc gdata gWidgets kyotil]; };
   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]; };
   nVennR = derive2 { name="nVennR"; version="0.2.1"; sha256="11qkwd8laf67iqyzx3ia424vykvsvy0k9d7labdgqfx2ihd95hh2"; depends=[Rcpp]; };
   na_tools = derive2 { name="na.tools"; version="0.3.1"; sha256="1lbzsckfg297n85kzbin65x1l6qgg9l50hd3xi2gflxc7n2xb8bw"; depends=[]; };
-  nabor = derive2 { name="nabor"; version="0.4.7"; sha256="16dxnvq6yxlrignzvxjdwzwm32fn2a8bsjqjsg5qz94ir7g3pzm6"; depends=[BH Rcpp RcppEigen]; };
+  nabor = derive2 { name="nabor"; version="0.5.0"; sha256="1nj39cdfwrmhgsi3cq8imxv3n6xzc1v6dzdb2cf2hybjk368v4s7"; depends=[BH Rcpp RcppEigen]; };
   nadiv = derive2 { name="nadiv"; version="2.16.0.0"; sha256="0pfg9hbhcjgbfmakl1jqqaf9i07i5z5jk7sh2x7x7p4354z30z9y"; depends=[Matrix]; };
   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=[]; };
   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.3.1"; sha256="0mscn99x3wwf5jdi6khlf6n9w737icf07vhz6yqsqpkzsd8z825w"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr viridis visdat]; };
+  naniar = derive2 { name="naniar"; version="0.4.0.0"; sha256="0b8hi00x6anlkkpw7mr6hiizpw6ljv3m5h9w6c4rj05psv5nm3w2"; 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.1"; sha256="0zb6gwxzmcmk2v1020xc2l3bzrz8kz1b445x3ci6s7pgwh0njxra"; depends=[bit64 RcppCCTZ zoo]; };
+  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]; };
   nardl = derive2 { name="nardl"; version="0.1.5"; sha256="1xi1fkwgkfc1b8qsgi4lrjx419778qk0vxzl23azcziwa6fha5p8"; depends=[Formula gtools strucchange tseries]; };
-  narray = derive2 { name="narray"; version="0.4.0"; sha256="0cr0y8mqwprxk0bv9160xvqxgvqkihn3avzsjm6ccivvb8zlkqxv"; depends=[reshape2 stringr]; };
+  narray = derive2 { name="narray"; version="0.4.1"; sha256="09n50shk2gy1m85kmvq8g3zh2nrikpllv8gph9x2id1p62rbqf1y"; depends=[progress stringr]; };
   nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; };
+  nasapower = derive2 { name="nasapower"; version="1.0.2"; sha256="1p99yl47l1dvyhkl38alzszbk5vs28a2zh3miqxsqmsqzmmjbsd3"; depends=[APSIM crul curl jsonlite lubridate readr tibble]; };
   nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
   nat = derive2 { name="nat"; version="1.8.11"; sha256="1s5hbi1b20jq0qv4px0zrwsivhi2mdlqbwx4lv55mdhj447rxk1x"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; };
   nat_nblast = derive2 { name="nat.nblast"; version="1.6.2"; sha256="0b2gzyzszj2v5girxyv31nvds0837lzvim7x7bs9h897yrxs57k8"; depends=[dendroextras nabor nat plyr rgl spam]; };
@@ -8947,25 +9333,26 @@ in with self; {
   natserv = derive2 { name="natserv"; version="0.1.4"; sha256="0qwf7lapx5gchk8xmdnmxr10j5dnkp52mqnh1ja216z7l841cl07"; depends=[crul data_table tibble xml2]; };
   natural = derive2 { name="natural"; version="0.9.0"; sha256="0zxwbf3gg2h0bhl2w0md3rd162vlsgg0dv3187hc0ax7333cc4cx"; depends=[glmnet Matrix]; };
   naturalsort = derive2 { name="naturalsort"; version="0.1.3"; sha256="0mz801y9mzld9ypp3xmsjw2d8l9q97sdnv09wrci9xi3yg2sjf6d"; depends=[]; };
-  nbc4va = derive2 { name="nbc4va"; version="1.0"; sha256="0y1qpkzjr327qyvmqf129m400rvn6gwk72ccnly6cqq53icrarn4"; depends=[]; };
+  nbc4va = derive2 { name="nbc4va"; version="1.1"; sha256="025p9h1ghrsq4h439gx25ffpyvh2kp1i51hm7kbzx8nmh4ka8aff"; depends=[]; };
   nbconvertR = derive2 { name="nbconvertR"; version="1.0.2"; sha256="1dc9jxfibvb27qwiykj93322nb1ahwrg69zqcc0p9xp0rpsim02w"; depends=[]; };
   nbpMatching = derive2 { name="nbpMatching"; version="1.5.1"; sha256="0f90k9vq05gkc0sgywb98frig63df0ih4z41dq7m2inx1zk5rqns"; depends=[Hmisc MASS]; };
-  ncar = derive2 { name="ncar"; version="0.4.0"; sha256="0in8nvkxgd6p5xdwyqnqlnhskysbja9lw1pw3hl8zfn1qhcgqxl9"; depends=[NonCompart rtf]; };
+  ncappc = derive2 { name="ncappc"; version="0.3.0"; sha256="0bf00iskrd3x43839bwn957mi3qvm2dhcmqa7hl1ib0gp2r1cnzx"; depends=[bookdown Cairo dplyr ggplot2 gridExtra gtable knitr lazyeval magrittr PopED purrr readr reshape2 rlang rmarkdown scales tibble tidyr xtable]; };
+  ncar = derive2 { name="ncar"; version="0.4.1"; sha256="0nqc3ari3ghxygqvb3vfzdqclh77mbhyh3pki86wwx6ym62b1bx0"; depends=[NonCompart rtf]; };
   ncbit = derive2 { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
   ncdf_tools = derive2 { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[abind chron JBTools plotrix raster RColorBrewer RNetCDF]; };
   ncdf4 = derive2 { name="ncdf4"; version="1.16"; sha256="0lwjjis0b83c4l3xvqai4ckzrskd6mychck1iwxcxgjvh0d77mgd"; depends=[]; };
   ncdf4_helpers = derive2 { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[abind ncdf4 PCICt]; };
   ncdump = derive2 { name="ncdump"; version="0.0.3"; sha256="09g98mzpky32z41jf23ahzhyv34l34y1gqq99j2hl4pqlvvhxs9i"; depends=[dplyr ncdf4]; };
-  ncf = derive2 { name="ncf"; version="1.2-5"; sha256="0w7zaiiy1ddahq8nw3q23k6qh4yw2d1iw4wybwiii3spn8hab57s"; depends=[]; };
+  ncf = derive2 { name="ncf"; version="1.2-6"; sha256="1ac1jc7f6ywngbf9h9vb4rfm10cakljn1i48ga815h3m71cagmak"; depends=[]; };
   ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; };
-  ncmeta = derive2 { name="ncmeta"; version="0.0.2"; sha256="1qr0zfyy8g3zrmvg6i6b7sfvl3lavr391rqgf6pqhslg7i9cgpiz"; depends=[dplyr rlang RNetCDF tibble]; };
-  ncodeR = derive2 { name="ncodeR"; version="0.1.0"; sha256="0bjjz9x6cfgkgc6z32pkl5b6khhdl5yjn9mi2b3n184kvpszjygj"; depends=[cli R6 rhoR]; };
+  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]; };
-  ncvreg = derive2 { name="ncvreg"; version="3.10-0"; sha256="0q9rk1mz2rm1h99m093kz7a2p6fl3pj4nqzblp3154q8i1kva7za"; depends=[]; };
-  ndjson = derive2 { name="ndjson"; version="0.6.0"; sha256="0w7a587q45hkzmjhzlyrhk0hw4c8avkfzf4ai0wib5qk3al8gk6n"; depends=[data_table dplyr dtplyr Rcpp]; };
-  ndl = derive2 { name="ndl"; version="0.2.17"; sha256="08h01rw7gsa31zp91q2rsw1ba9yf0fyhz3w8s9xq5788qwc80280"; depends=[Hmisc MASS Rcpp]; };
-  ndtv = derive2 { name="ndtv"; version="0.12.2"; sha256="0jyzdi19n2h6kf8kbibg1lap3mxq9bbn390xwrv2abnc3y437vqb"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; };
-  nearfar = derive2 { name="nearfar"; version="1.1"; sha256="0i2nc1b4vslgjj29x5q24yxv9l3i0g5hcrbm9xy1b3039n70cwix"; depends=[car GenSA MASS nbpMatching]; };
+  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]; };
+  ndtv = derive2 { name="ndtv"; version="0.12.3"; sha256="08bvkfraj2sl879fywsl5k403xfhxfg55yd72nms2z8d3fqgcvj8"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; };
+  nearfar = derive2 { name="nearfar"; version="1.2"; sha256="116rq797a5fascirz8xg465fywjf40j1k5czryvqzpik0if0w00r"; depends=[car GenSA MASS nbpMatching]; };
   neariso = derive2 { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; };
   neat = derive2 { name="neat"; version="1.1.3"; sha256="0d8igx576jhi7f666nwn0wpdyvin974k5cfm7wdszzbnpng5961k"; depends=[igraph]; };
   neatmaps = derive2 { name="neatmaps"; version="1.1.0"; sha256="0qsc0jwnyadbm45qrskpmw12i980q11i988mga8ky3x4fa4jp82d"; depends=[dendextend ggplot2 heatmaply igraph pvclust]; };
@@ -8974,25 +9361,26 @@ 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]; };
-  neotoma = derive2 { name="neotoma"; version="1.7.0"; sha256="0f4s5yw0yj4n8lkvbl2l3ivdclg9pknyss7qhppp85rdxzwxilpq"; depends=[analogue httr jsonlite leaflet plyr reshape2 xml2]; };
+  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.1.0"; sha256="1h33hql0vgkr2ps1ysisdxxb0cnm18mh8sbd3fxy9xf42icwfwdb"; depends=[dataone dplyr purrr rappdirs readr]; };
+  nesRdata = derive2 { name="nesRdata"; version="0.2.0"; sha256="1cr5d600bnslxbm2kknzwivvb4zyfsrf8rbrk3kk0j6dpclx5x6s"; depends=[dataone dplyr purrr rappdirs readr]; };
   nestedRanksTest = derive2 { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; };
-  nestfs = derive2 { name="nestfs"; version="0.8.4"; sha256="1w2wb3wphpx8y17jwpnbqq9igyq854rsa35bhk51m422zhygqygk"; depends=[dgof foreach]; };
+  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.2.8"; sha256="0axac72fj5qhssdpx8k20lgayzpwzcd3pp7cz4mv6cwfzc0y8768"; depends=[haven igraph Matrix]; };
+  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]; };
   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]; };
+  netdep = derive2 { name="netdep"; version="0.1.0"; sha256="0mrbqn5d8iqvs98a0kski0vya135z7l902xafya96s2h288jchx7"; depends=[igraph igraphdata MASS mvrtn]; };
   netdiffuseR = derive2 { name="netdiffuseR"; version="1.20.0"; sha256="0z7k62dipksc8gfppicbknh5sig7jdlr80h15q89bbk26jg5lqsr"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM viridis]; };
   netgen = derive2 { name="netgen"; version="1.3"; sha256="1iywpl9n1yplnd38dff8m9mz1vlfbvplw393grhpav5czcknj160"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; };
   netgsa = derive2 { name="netgsa"; version="3.0"; sha256="0cqyiilpxhdi6zmibn85y1aqwpcs1aialz34klakmllzn6kvdsng"; depends=[corpcor glasso glmnet igraph Matrix]; };
-  netgwas = derive2 { name="netgwas"; version="1.5.0"; sha256="0ixdk602v58ii4awrvj63j0zn90z3csc0lcwajfa8j8ymryc0hgs"; depends=[glasso huge igraph MASS Matrix RBGL tmvtnorm]; };
-  netjack = derive2 { name="netjack"; version="1.0.0"; sha256="016byr8qsmmiyk5wdafn809w2sc71mav7jdxyg4cs48gzp7zslpp"; depends=[brainGraph ggplot2 igraph Rdpack]; };
+  netgwas = derive2 { name="netgwas"; version="1.7.0"; sha256="1jyn0i3i5pjvik9jpgyd9sd28p0ln1xh5nxzssw3nynp4hyqmvix"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; };
+  netjack = derive2 { name="netjack"; version="1.1.1"; sha256="0pb9phfdjfp8yxlv5p0qb6vxhh8vb9iviffzrbj8x8dy3y3c9vp5"; depends=[brainGraph ggplot2 igraph Rdpack]; };
   netmeta = derive2 { name="netmeta"; version="0.9-8"; sha256="0bkfxdz14lg9r51ykwmkmpm6vhbvly35hrcgj6f26g36ihagjksd"; depends=[magic MASS meta]; };
-  netrankr = derive2 { name="netrankr"; version="0.2.0"; sha256="1y56y5wv95d7mmjf8rrwr7cs0k64h9a2qbpind4xp0kakpjihn7m"; depends=[igraph Rcpp RcppArmadillo]; };
-  netregR = derive2 { name="netregR"; version="0.3.1"; sha256="0ki0ywnwjba53bram4dxxdxx631b0rywp1rjgj83nvdbg3mdcp7x"; depends=[Matrix]; };
+  netrankr = derive2 { name="netrankr"; version="0.2.1"; sha256="0csgi09ijp7ygwk7x057l9xjrzyhr7sav8hamh0p6i72l6719ssl"; depends=[igraph Rcpp RcppArmadillo]; };
+  netregR = derive2 { name="netregR"; version="1.0.1"; sha256="0n5absjra0imddz1spy1piij5rdz76wi4g568yby3rbhkm1896rs"; depends=[Matrix]; };
   nets = derive2 { name="nets"; version="0.9"; sha256="1wcr0fj50w3rqxw0k9cb81c2psdkb0dwwwzrjvxv50hksbhyi8kn"; depends=[igraph]; };
   network = derive2 { name="network"; version="1.13.0.1"; sha256="1bbkbqkqf1d7irfwh08c13c2pfypir1ssvlqrln83irqns1ikdv0"; depends=[]; };
   networkD3 = derive2 { name="networkD3"; version="0.4"; sha256="02wxki67drppgfka1is1ykg1f2rxf0x0657c0crj7ipfy62jbf1k"; depends=[htmlwidgets igraph magrittr]; };
@@ -9015,32 +9403,35 @@ in with self; {
   neutralitytestr = derive2 { name="neutralitytestr"; version="0.0.2"; sha256="1p1zjc3fiphkxflsyzrxx8af98aa0gp9pvby63mmrsjb0z7ps948"; depends=[cowplot dplyr ggplot2 ggpmisc pracma scales]; };
   neverhpfilter = derive2 { name="neverhpfilter"; version="0.2-0"; sha256="0m4gbqnjw2nmhf25svznlf6pd0b0mslk52lpirmlj1iv04w1aq1i"; depends=[xts zoo]; };
   newTestSurvRec = derive2 { name="newTestSurvRec"; version="1.0.2"; sha256="06p782md33wqh5wa1735yg5i01d42p74kl7h5qhqs9cd732ls6pz"; depends=[]; };
+  newsmap = derive2 { name="newsmap"; version="0.6"; sha256="1zcpwh8v7lswg0anjhjq8hmz8z9rjmvlyrh6jr5p01sj53mv9sha"; depends=[Matrix quanteda stringi]; };
   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]; };
-  nhanesA = derive2 { name="nhanesA"; version="0.6.4.4"; sha256="0vl8bg718fk97x3yrjkg48hj3lap4gzhri53gzcwz9g4rfyrlwxp"; depends=[Hmisc magrittr plyr rvest stringr xml2]; };
+  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]; };
   nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; };
   nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; };
-  nilde = derive2 { name="nilde"; version="1.1-1"; sha256="09r8xfwpz243xmb5l33fw7wf09lw5q9m57anqd2n5wrxfqzzz57h"; depends=[]; };
+  nilde = derive2 { name="nilde"; version="1.1-2"; sha256="07m52c4gw0vcyb6pya5z7m4y1kiy2zvh0gnhp80hxc7nhyx0rnqd"; depends=[]; };
   nima = derive2 { name="nima"; version="0.5.0"; sha256="1xpzq1mg2l9hnh83hbmxcqz3v0ai62ii7k688i8lpj0xnpsm25pl"; depends=[assertthat devtools ggplot2 ggthemes gridExtra gtools plyr ProjectTemplate scales survival]; };
-  nimble = derive2 { name="nimble"; version="0.6-11"; sha256="12vprr5snz05y3k4lq7x51yz1q4crwx5cn42dvbnff4pf7kpj218"; depends=[coda igraph R6]; };
-  nipals = derive2 { name="nipals"; version="0.4"; sha256="0h9jxmj44x3lllxk1y2izkslafbiab175qrsxlnfcvhnaj13zsds"; depends=[]; };
+  nimble = derive2 { name="nimble"; version="0.6-12"; sha256="1vgyqrcki9z60sxqfyj6smqrq2422g9g95fv5gmmqiwqiv89blxj"; depends=[coda igraph R6]; };
+  nipals = derive2 { name="nipals"; version="0.5"; sha256="1zrn1ykl9scd988wj3mm0j6g5q6lq04iwn2ibgap1lrsd0rw1zbf"; depends=[]; };
   nitrcbot = derive2 { name="nitrcbot"; version="1.2"; sha256="0lainbw9j5aj9s824afpxdjl3q2f728jfpdfji7kpi9hdg8jixhx"; depends=[dplyr httr jsonlite RCurl]; };
   nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; };
   nlWaldTest = derive2 { name="nlWaldTest"; version="1.1.3"; sha256="1cppdz8qvigjdz4sgr1gm2j09zi407xxmryc28zc7ps7rvgy344h"; depends=[]; };
+  nlaR = derive2 { name="nlaR"; version="0.3"; sha256="1s54dpz6z7pgj6jn0jjx8s1m318fbk6ra8wrzfvfbz9bcvgp0i2m"; depends=[rappdirs]; };
   nlcv = derive2 { name="nlcv"; version="0.3.5"; sha256="1ywnm8a13ifqa1bxnf659h1j6mg9iy02vaszyh9p966ps9c1pjab"; depends=[a4Core Biobase e1071 ipred kernlab limma MASS MLInterfaces multtest pamr randomForest RColorBrewer ROCR xtable]; };
   nleqslv = derive2 { name="nleqslv"; version="3.3.2"; sha256="1v9znvncyigw9r25wx2ma0b7ib179b488dl0qsrhp5zrcz7mcjgm"; depends=[]; };
+  nlgeocoder = derive2 { name="nlgeocoder"; version="0.1.3"; sha256="13d30kfgfsny5gnn3yjfnclky6yixaa8sg0m689rszqxrvbrj79x"; depends=[jsonlite]; };
   nlirms = derive2 { name="nlirms"; version="3.4.4"; sha256="1njyfip377a0f6hf9y32s077b4jv4h8ydbjgnl68yfypxbfn2xyx"; depends=[gridExtra gtable]; };
   nlme = derive2 { name="nlme"; version="3.1-137"; sha256="11vyxxc0n36vb8d8g02zr0402ymicvbifwdsqm7gy9iqqnwrn101"; depends=[lattice]; };
   nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; };
   nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
-  nlmixr = derive2 { name="nlmixr"; version="0.9.1-3"; sha256="0pl9dm09wc4wa0y64ncqcrrarmimahgcdzf1hz09aj5r5l5pvfvd"; depends=[BH brew cli crayon dparser fastGHQuad ggplot2 lattice lbfgs magrittr Matrix memoise minqa n1qn1 nlme numDeriv PreciseSums R_utils Rcpp RcppArmadillo RcppEigen rex RxODE StanHeaders vpc]; };
+  nlmixr = derive2 { name="nlmixr"; version="1.0.0-7"; sha256="1ibj2cxf09jnsf08idrd9q0fxg34i2wp56i4f6q4rq21aswh92qd"; depends=[BH brew cli crayon dparser fastGHQuad ggplot2 lattice lbfgs magrittr Matrix memoise minqa n1qn1 nlme numDeriv PreciseSums R_utils Rcpp RcppArmadillo RcppEigen rex RxODE StanHeaders tidyr vpc]; };
   nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; };
   nlnet = derive2 { name="nlnet"; version="1.2"; sha256="00lcyz5csjj9qbhh7yw0qlbnyv32k0c2dpm23v04n9wkdgs67jy0"; depends=[coin e1071 earth fdrtool igraph randomForest ROCR TSP]; };
-  nloptr = derive2 { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrbdc6a2lvfr2g16vid2sax618q6ai089"; depends=[]; };
+  nloptr = derive2 { name="nloptr"; version="1.2.1"; sha256="15yz60kljxwnhm2m3gryjzxl3ynhkhd5jiwc179b1hz6rlzf71hz"; depends=[]; };
   nlr = derive2 { name="nlr"; version="0.1-1"; sha256="12j2hp5fgpdz7pvlpykhf9zp1sw1f6vzhh5ykk9b2diaf3l55zsl"; depends=[GA MASS nlme quantreg robcor TSA tseries]; };
   nlreg = derive2 { name="nlreg"; version="1.2-2.1"; sha256="08pz3qycnsvz175ppj23i2i0wcif6imi6fc117n8802ln3npwm64"; depends=[statmod survival]; };
   nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; };
@@ -9053,44 +9444,44 @@ in with self; {
   nlsmsn = derive2 { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; };
   nlsr = derive2 { name="nlsr"; version="2018.1.28"; sha256="113g656j6zqdqip6dw55pimmwq36xrxgfyix10y3qqn9lxvqrpqq"; depends=[digest]; };
   nlsrk = derive2 { name="nlsrk"; version="1.1"; sha256="0yqcsz5pdhqsrd86g0yx8bdac13fbmvg89phj3v4qvla2jfznjba"; depends=[]; };
-  nlstimedist = derive2 { name="nlstimedist"; version="1.1.1"; sha256="1222vj2w4f8xh7fkrzlyarr7980a6wj047p5p0nw3cfna3mmhi5b"; depends=[broom dplyr ggplot2 lazyeval minpack_lm nlstools]; };
+  nlstimedist = derive2 { name="nlstimedist"; version="1.1.3"; sha256="0wjf18fcm5w82sqza3nmwvqvd14zidvdf72wvkbgfjk4vgcrqj5l"; depends=[broom dplyr ggplot2 lazyeval minpack_lm nlstools]; };
   nlstools = derive2 { name="nlstools"; version="1.0-2"; sha256="0mjn1j9fqqgr3qgdr0ki4lfbd0yrkanvya4y2483q3wklqa6qvjc"; depends=[]; };
-  nlt = derive2 { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[adlift EbayesThresh]; };
-  nlts = derive2 { name="nlts"; version="0.2-2"; sha256="0bx6xqa3j0k01p43vnv5lcv2pryjzgsak77y1cr9rm2xwqa3j6az"; depends=[acepack locfit]; };
-  nmaINLA = derive2 { name="nmaINLA"; version="0.1.1"; sha256="0976jafmdhy2rz5fcarb7hh1vaanm8l2610hk06f5k93xjhypg8j"; depends=[]; };
+  nlt = derive2 { name="nlt"; version="2.2-1"; sha256="10wf00qzf28dxjfvv12wsqxlfn6xz15wk8njrzgsgm9px1g6s21f"; depends=[adlift EbayesThresh]; };
+  nlts = derive2 { name="nlts"; version="1.0-2"; sha256="0s49qjwavl9ns2746nn4zy4h4dh0njfcvznm3qd61qhs7np9w1db"; depends=[acepack locfit]; };
+  nmaINLA = derive2 { name="nmaINLA"; version="0.1.2"; sha256="0layk1pqry2g3xiwmasrnsvmw91sgg7iz15d6iz6hbq4za61hr0k"; depends=[]; };
   nmathresh = derive2 { name="nmathresh"; version="0.1.3"; sha256="09pxbizmvdp2l5j1gs0v3xk2lsyclx5rndaw6b4ccn61m3x060ls"; depends=[ggplot2 gridExtra gtable Matrix nnls]; };
   nmfem = derive2 { name="nmfem"; version="1.0.3"; sha256="1v808k25g0ph1wvx1j89izfxy9szn0m4sf965d8nkygrk184i9gj"; depends=[d3heatmap dplyr mixtools plyr tidyr]; };
   nmfgpu4R = derive2 { name="nmfgpu4R"; version="0.2.5.2"; sha256="05066rgbbp6kj2d67nzf3d1pf32gypz9ammz4ba88yxblydb3cwk"; depends=[Matrix Rcpp SparseM stringr]; };
   nmixgof = derive2 { name="nmixgof"; version="0.1.0"; sha256="0cbwrsxrcf8pn4ycn6r0z8jdidw5l6kdvwyrks69fq4pjzx988d6"; depends=[Rcpp unmarked]; };
-  nmslibR = derive2 { name="nmslibR"; version="1.0.2"; sha256="1ya3dqnkrlvpil2nypcl3pp6f3x20ip40avnrbqgbylak7yqg9yw"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; };
+  nmslibR = derive2 { name="nmslibR"; version="1.0.3"; sha256="1m3bq0vg774kqragdx1ydm4q2if3yn9llbd6ybv3c8bmbdb9h405"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; };
   nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; };
-  nnTensor = derive2 { name="nnTensor"; version="0.99.1"; sha256="0ai3mqyw24mwl6gcz2jmlvfv59y937n675gram1ajwxdlx76fxff"; depends=[fields plot3D rTensor tagcloud]; };
+  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.1.8"; sha256="0fxiq65kd1q7w95m9hhg18xw3l8czi0li60wkr9h3dakmy2s9j7m"; depends=[geosphere lwgeom RANN Rcpp sf sp units]; };
+  nngeo = derive2 { name="nngeo"; version="0.2.2"; sha256="0wjbw1b0ldsl28k3k8i6x0f9msv4a2wwgbvb0wshq0kk0yamanpz"; depends=[geosphere 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]; };
   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]; };
   nomclust = derive2 { name="nomclust"; version="1.1.1106"; sha256="17hb89k72sw3ya0wm3n95mpx4vj7mpl4mzs8qwl2773dh2mcjgjq"; depends=[cluster dummies]; };
-  nomine = derive2 { name="nomine"; version="1.0.0"; sha256="1yaxhac002fxcyiz5x562fnhrsq9h9nx0qmw4rykjsc5l2qbi9gd"; depends=[httr RCurl]; };
-  nomisr = derive2 { name="nomisr"; version="0.3.0"; sha256="0ia1i3gzp7wp8hf57arajbf7063m4jpbb2hl0l03rwg1z4afb7jd"; depends=[dplyr httr jsonlite readr rlang rsdmx tibble]; };
+  nomisr = derive2 { name="nomisr"; version="0.4.0"; sha256="1ns05jpq20ql3pqandfil7zln4b9lls4vpscnaai3mxf9434ga9x"; depends=[dplyr httr jsonlite readr rlang rsdmx tibble]; };
   nomogramEx = derive2 { name="nomogramEx"; version="3.0"; sha256="16235rwblnzn8k53817llwy2pzhnpifh6ij159nxymjm8ar9qpbp"; depends=[pracma rms]; };
   noncensus = derive2 { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; };
   noncompliance = derive2 { name="noncompliance"; version="0.2.2"; sha256="1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6"; depends=[data_table Rcpp]; };
   noncomplyR = derive2 { name="noncomplyR"; version="1.0"; sha256="1a9m6r9cizw42nmy24jdsrsbllg5z84fs8b239axnh1fxzskg2qy"; depends=[MCMCpack]; };
   nonlinearICP = derive2 { name="nonlinearICP"; version="0.1.2.1"; sha256="1m9a1f0yrbjl0nx2l7r76pyi78b2bxj8v4jx92yga91f975mw6np"; depends=[caTools CondIndTests data_tree randomForest]; };
-  nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.3"; sha256="1pcah255hh3lqabxgjb5fsaap4s2d92lvxw9a48l1p4dkmm1lbsx"; depends=[Matrix Rcpp rgl TSA tseries]; };
-  nonmem2R = derive2 { name="nonmem2R"; version="0.1.9"; sha256="06irvlyhfimcx3izbfivvrxc9xbiwvqajvl5n47krgbkbd4r4ag0"; depends=[ggplot2 lattice latticeExtra MASS mvtnorm]; };
-  nonmemica = derive2 { name="nonmemica"; version="0.8.2"; sha256="1nz0sq8a1xgpasii2hpxiz79d501nnfs6awaqpp8m8lviimnhv68"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; };
-  nonnest2 = derive2 { name="nonnest2"; version="0.5-1"; sha256="02pflg6frvsq7azwcr660qj9mpj4q3kjx6xr6v5lshg77mjfhgdg"; depends=[CompQuadForm lavaan mvtnorm sandwich]; };
+  nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.5"; sha256="0vpa8r8b7j2d19da49cw4jg8zm74kvg9npwf4aqwxw8ndkfgpyj0"; depends=[Matrix Rcpp RcppArmadillo rgl TSA tseries zoo]; };
+  nonmem2R = derive2 { name="nonmem2R"; version="0.1.10"; sha256="05ipdkvryx21kqc2kajy1xmpd9w33k8w0z6zq786kp9ks76pmfrb"; depends=[ggplot2 lattice latticeExtra MASS mvtnorm splines2]; };
+  nonmemica = derive2 { name="nonmemica"; version="0.8.3"; sha256="07n6cz2vlg5mk0wvbi86j2v9v12vxpll6zkc6f4nf7cb700r9kwa"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; };
+  nonnest2 = derive2 { name="nonnest2"; version="0.5-2"; sha256="1bq44qqmm59j91m0sny4xnqmxqlga4cm48qdsw8xfs3x19xwmxk6"; depends=[CompQuadForm lavaan mvtnorm sandwich]; };
   nonpar = derive2 { name="nonpar"; version="1.0.1"; sha256="0pxks3nga7jrcvq0pzr1axj3a9xvzky836fl7966a09ws1vff7i4"; depends=[]; };
   nonparaeff = derive2 { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; };
   nonrandom = derive2 { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; };
@@ -9102,7 +9493,7 @@ in with self; {
   nord = derive2 { name="nord"; version="0.0.1"; sha256="0ajymjn2xw7zik62nhjp11g8bkvsqhhsrzi3bl2k70y544wbl3kn"; depends=[ggplot2]; };
   nordklimdata1 = derive2 { name="nordklimdata1"; version="1.2"; sha256="0c2hbh3qy8nrs275lxpzfgqsfgwp81m4kv0layvnjj09fcybm54x"; depends=[]; };
   norm = derive2 { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; };
-  normalp = derive2 { name="normalp"; version="0.7.0"; sha256="1s12x2qln3s4bbqsm4p3cq4g6461z73r858g6ym1awamhbmncnrl"; depends=[]; };
+  normalp = derive2 { name="normalp"; version="0.7.0.1"; sha256="1gvbqirvb0q6c3831qqm5x7nj7rls1v7nfj7mf1nmwg5b0ljakp0"; depends=[]; };
   normalr = derive2 { name="normalr"; version="1.0.0"; sha256="1ahrg188vbhnrnwag0zi6lcb3g0y1mbz06sl3j1wyllq5l918cc7"; depends=[magrittr MASS purrr rlang shiny]; };
   normtest = derive2 { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; };
   normwhn_test = derive2 { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; };
@@ -9116,7 +9507,7 @@ in with self; {
   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]; };
   noweb = derive2 { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; };
-  np = derive2 { name="np"; version="0.60-8"; sha256="17h67a510wh83800ri6g02wvznrlhigxni8shyijz1iaxcpk8k4j"; depends=[boot cubature quadprog quantreg]; };
+  np = derive2 { name="np"; version="0.60-9"; sha256="1z4jcpx8bbgwslv42wrphfd1qfq965qjn0kmfxm5f6hbbycahcgy"; depends=[boot cubature quadprog quantreg]; };
   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]; };
@@ -9130,7 +9521,7 @@ in with self; {
   nplplot = derive2 { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
   nplr = derive2 { name="nplr"; version="0.1-7"; sha256="1h3qv9dlw2gx8km3slyvrl588nif1n87df8xwmm6p75ziqhn2f56"; depends=[]; };
   npmlda = derive2 { name="npmlda"; version="1.0.0"; sha256="1dr25an7cac89jyb8zhmj3ry6lq7sh7zxci1injplnk4gzy17mc5"; depends=[]; };
-  npmlreg = derive2 { name="npmlreg"; version="0.46-3"; sha256="1k1l977g1a86918k6w7h2m8145x7adb8r7q2s4jky8s9ixa14hz3"; depends=[statmod]; };
+  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]; };
   nppbib = derive2 { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; };
@@ -9138,7 +9529,8 @@ in with self; {
   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]; };
-  npsf = derive2 { name="npsf"; version="0.3.1"; sha256="1mv2dzn3gc7b9ynpw8dv22xd31igg4hmkgrds12n9920pghkya44"; depends=[Formula Rcpp]; };
+  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]; };
   npsp = derive2 { name="npsp"; version="0.5-3"; sha256="0ck6iymfc73bzrifdc2sagcliz1yakqk1yv67a3ykha996jsrx99"; depends=[quadprog]; };
   npsr = derive2 { name="npsr"; version="0.1.1"; sha256="1fzvilzjg9z05991sr1s1bdp17kfl6d1580qdllk8is9ac06np0v"; depends=[gmp infotheo MASS]; };
@@ -9146,29 +9538,31 @@ in with self; {
   npsurv = derive2 { name="npsurv"; version="0.4-0"; sha256="1wq4c9yfha5azjhrn40iiqkshmvh611sa90jp3lh82n4bl9zfk20"; depends=[lsei]; };
   nricens = derive2 { name="nricens"; version="1.6"; sha256="0fpgp6k3mhb0qxbx6248k9bscnmlzwj70mqh631a1nc4cpdjvw3q"; depends=[survival]; };
   nsRFA = derive2 { name="nsRFA"; version="0.7-14"; sha256="0sd3br2a5jf6mqbxk8s2i7px9vi9bk3pl8bd5884k40xqcj77irs"; depends=[]; };
-  nsROC = derive2 { name="nsROC"; version="1.0"; sha256="0c99z8kknbrnbyyv7p79sj848aq7b5n4m4r7v1yrcs61ackrdn2n"; depends=[sde survival]; };
+  nsROC = derive2 { name="nsROC"; version="1.1"; sha256="1fi7k61fja98kpn528jprjdycwz01rnqm368m82anxh21k7q4s1m"; depends=[sde survival]; };
+  nsapi = derive2 { name="nsapi"; version="0.1.1"; sha256="06xf2p6f911vwpzky47r35fjgjvlhp13p9pf1zlvjrv66kdw8vbp"; depends=[crul xml2]; };
   nscancor = derive2 { name="nscancor"; version="0.6.1-25"; sha256="183kvzlln5lhmi51dm0skq1165c3hhy1yz5h2g7nxwqk2b4p23xj"; depends=[]; };
   nscprepr = derive2 { name="nscprepr"; version="0.1.1"; sha256="1rd32zywrzyxz6hpn9s6cwjlg8q8rz3cc0p3b5gan8bicx0ilwjc"; depends=[dplyr lubridate stringr]; };
-  nse = derive2 { name="nse"; version="1-00.17"; sha256="16zam539ir29m9ixyim9bqnf3sdy8aaaaly3wf96i3csgysf8pjc"; depends=[coda mcmc mcmcse np Rcpp sandwich sapa]; };
+  nse = derive2 { name="nse"; version="1.19"; sha256="107ri9325ga4kgvs5a3j3698dc3m4v28cb02ypc4dan6f3fa9h8i"; depends=[coda mcmc mcmcse np Rcpp sandwich]; };
+  nseval = derive2 { name="nseval"; version="0.4"; sha256="18avir5zllvm2sbi9616k7dlb8yxhvnbji7xshr4kcfvy1fvn2ia"; depends=[]; };
   nsga2R = derive2 { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l33cr7xawz5w0mm4pwr6djhd8nfhx"; depends=[mco]; };
   nsgp = derive2 { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; };
   nspmix = derive2 { name="nspmix"; version="1.4-0"; sha256="1cd133ncnr4g0n6w4c44q6mda8y1n7cfmsgy1x1kczvwp7cm9kk2"; depends=[lsei]; };
   nsprcomp = derive2 { name="nsprcomp"; version="0.5.1-2"; sha256="1zlc1ximx96f235c0l8qfs6vbp1kpnbf943wxsfahnnlnxvwi59f"; depends=[]; };
-  nucim = derive2 { name="nucim"; version="1.0.0"; sha256="0fyapw6f5wkybr4mwmqpk9wy349j5sa4q26pci1bsy4ly2wf9wx6"; depends=[bioimagetools EBImage fields stringr]; };
-  nullabor = derive2 { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[dplyr fpc ggplot2 MASS moments plyr]; };
+  nucim = derive2 { name="nucim"; version="1.0.6"; sha256="0bw9a2xz2w5jlr2qlbia6jfm2yp09n3gzg8a630p1ks75xvlmkbx"; depends=[bioimagetools EBImage fields stringr]; };
+  nullabor = derive2 { name="nullabor"; version="0.3.5"; sha256="0hnrawf8s2g0xjc9kh2p3pbdnbai7q71z7arab5mnrz6qbiyym34"; depends=[dplyr forecast fpc ggplot2 magrittr MASS moments purrr rlang tibble tidyr tidyverse tsibble]; };
   numDeriv = derive2 { name="numDeriv"; version="2016.8-1"; sha256="07ni52rwiap4wilfz94w5mrqaxr59axxmgn57857ip4p6qkiss0v"; depends=[]; };
   numGen = derive2 { name="numGen"; version="0.1.1"; sha256="1y41wq31r8126dz1sj23smq2k6v9yqczq4ddgzqb73dsrx9dmmc0"; depends=[]; };
   numKM = derive2 { name="numKM"; version="0.1.0"; sha256="0pnwb7skp5jx5ibgfkympq59m9sf71gvk5zc0fwik539vrzfykdf"; depends=[survival]; };
-  numOSL = derive2 { name="numOSL"; version="2.5"; sha256="0wrddd5yvilp66p2m9jbchd0spb55zgl3k63zf3yq3dc8jdrvzvy"; depends=[]; };
+  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=[]; };
   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=[]; };
+  nvmix = derive2 { name="nvmix"; version="0.0-1"; sha256="13pp664n5f06gavny586xrwm1n18jndr0hlqx5fdy68n6py0vz9r"; depends=[qrng]; };
   nws = derive2 { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; };
   nycflights13 = derive2 { name="nycflights13"; version="1.0.0"; sha256="10b05cxpiysvlif59lriprxcyhgk59d3qmcpwwzk88wy6bicl9hn"; depends=[tibble]; };
-  nyctaxi = derive2 { name="nyctaxi"; version="0.0.1"; sha256="187fs819g45f8irx2s9bgwnzr00lyamfv2ra88kyb8q2cq1icwwy"; depends=[DBI dplyr etl rlang stringr]; };
   nzelect = derive2 { name="nzelect"; version="0.4.0"; sha256="19kcbq454yg9g76ix7v3nibgw2203d7vv6f2d6d2zkcc0h08bjm7"; depends=[]; };
   nzpullover = derive2 { name="nzpullover"; version="0.3.0"; sha256="0b3mz5i58m48fa1x7gv4l3gqj0gvrar201ph2l1gkbcnfmazwjp8"; depends=[]; };
   oXim = derive2 { name="oXim"; version="1.2.2"; sha256="1hi4ps36amvgqgj64yc3cvy4sx32z1az6lk5yy1sciy6074k5byb"; depends=[gstat imagine R_matlab sp]; };
@@ -9188,24 +9582,26 @@ in with self; {
   observer = derive2 { name="observer"; version="0.1.2"; sha256="1027827k57qb4xppx0xxxffd1s3n7pz754irdx3v1v3piix8xi8m"; depends=[bazar bit dplyr lazyeval magrittr tibble]; };
   oc = derive2 { name="oc"; version="1.01"; sha256="12idrh4jxxq28lgqzr6jzgrvmmwysh5amzhmmaqn3yz49i17gcaf"; depends=[pscl]; };
   occ = derive2 { name="occ"; version="1.1"; sha256="1aka29qqwbd494kvi15yyyqkb9hks4ky2gcvykxhx2drm2fnsn4g"; depends=[]; };
-  oce = derive2 { name="oce"; version="0.9-23"; sha256="0k5h6k4y9bas2aqwkh1dkxmwgx4d41hxy87zfih5iq8ff61d03rr"; depends=[gsw testthat]; };
+  oce = derive2 { name="oce"; version="1.0-1"; sha256="0wn49xp7zvfipxvx0jdbqqldinbq0ccsqipljsidc3gzhf7jh67p"; depends=[gsw Rcpp testthat]; };
   oceanmap = derive2 { name="oceanmap"; version="0.1.0"; sha256="1kkjc213nn2ks7cqzchbmjvyp9hci8qndv8migpmyf5vjbm7d297"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; };
   ocedata = derive2 { name="ocedata"; version="0.1.3"; sha256="0lzsyaz8zb6kiw86fnaav2g2wfdhyicxvm81ly5a9z4mjch3qj02"; depends=[]; };
   ockc = derive2 { name="ockc"; version="1.0"; sha256="0chzrs3ipa2518r4d35z4fxffgq12p1mwj0hzkxw19gdgq6aa8s7"; depends=[flexclust modeltools]; };
   ocomposition = derive2 { name="ocomposition"; version="1.1"; sha256="0fk8ia95yjlvyvmjw7qg72piqa40kcqq9wlb3flc6a81pys1ycb5"; depends=[bayesm coda]; };
   odbc = derive2 { name="odbc"; version="1.1.6"; sha256="146phrsks0hfd1bfxx452kkq7ximk3fwjz9lqg9fdykar5sr6vjj"; depends=[BH bit64 blob DBI hms Rcpp]; };
   odds_converter = derive2 { name="odds.converter"; version="1.4.8"; sha256="09s8pg55gpsxmrbimzg5rsr1n07la93781sar6vab5p9zn9zxgx4"; depends=[]; };
-  oddsratio = derive2 { name="oddsratio"; version="1.0.2"; sha256="0s9w5iqcabkc7lqdh27nmg7xnw2jpwik5djjlqxb6xgabzls97d6"; depends=[cowplot ggplot2 MASS mgcv]; };
+  oddsratio = derive2 { name="oddsratio"; version="1.0.3"; sha256="1kdqnai8hbhxg9gjn9j7zgm8mw4bd765jkdrwrk9q65fpvc62f5k"; depends=[cowplot ggplot2 MASS mgcv]; };
   odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; };
   odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; };
-  odpc = derive2 { name="odpc"; version="1.0.0"; sha256="1mhak9drp0a7h1yrbk08cs00hbvkfkj8r1y6klhr40sdych4q506"; depends=[forecast gdpc Rcpp RcppArmadillo]; };
-  odr = derive2 { name="odr"; version="0.7.3"; sha256="07jfd809wv92ijgw1r1nq9516zi2rkf3ik243br42glf6lszn19p"; depends=[]; };
+  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]; };
-  officer = derive2 { name="officer"; version="0.3.1"; sha256="1qpy2srk4sqmnqmpaivgp5j5nc3b58mjbibzkq5nw784jni13jmj"; depends=[base64enc digest htmltools magrittr R6 Rcpp uuid xml2 zip]; };
+  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="1.1.1"; sha256="1d011xcrn9zhb4pf9wkwlynvz3kkk95yk2l5qs352ra1dhki7b6k"; depends=[lattice]; };
+  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]; };
@@ -9214,10 +9610,11 @@ in with self; {
   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]; };
   ompr_roi = derive2 { name="ompr.roi"; version="0.8.0"; sha256="1cbrchvpd31lxpxvw2l3q9k5jmffarb1shca8kwm76y5a6zxxq63"; depends=[Matrix ompr ROI slam]; };
+  omu = derive2 { name="omu"; version="1.0.2"; sha256="03mj5xk447gadsnvqrm97cjcyfq4xzkgc46kw85gishv7w9qmqrk"; depends=[dplyr ggfortify ggplot2 KEGGREST magrittr plyr reshape2 stringr tidyr]; };
   oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; };
   onehot = derive2 { name="onehot"; version="0.1.1"; sha256="1cdsz007wr054k5phvihhg4qx0fc039k2s6484m92kws8mb2ziix"; depends=[]; };
   onemap = derive2 { name="onemap"; version="2.1.1"; sha256="0j9c0ynwpzyr548n72wzmmk8gi52qvxlxgzqzn8g6n4v5zmzlkhy"; depends=[fields ggplot2 maps Rcpp reshape2 tkrplot]; };
-  onewaytests = derive2 { name="onewaytests"; version="1.7"; sha256="1lly2pxw08mmm4gqgj3wxa9ayhf90fyqjhnj8hcvr408k9p7bgsb"; depends=[car ggplot2 moments nortest]; };
+  onewaytests = derive2 { name="onewaytests"; version="1.9"; sha256="15zs39krrf7i5g0bp830il3cihwbichsd6swhjxp53j77hwcb0hy"; depends=[car ggplot2 moments nortest]; };
   onion = derive2 { name="onion"; version="1.2-7"; sha256="17jx7saxcsahyyivln4v9fzzcmidy6ygjd9n81skv5jpr491zkgk"; depends=[]; };
   onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; };
   onlineVAR = derive2 { name="onlineVAR"; version="0.1-0"; sha256="1hqriwrlxhbi5v5wpqxfvvcb6np1iaarb3zf84ykfzi4llqqgz24"; depends=[lattice]; };
@@ -9229,19 +9626,19 @@ in with self; {
   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]; };
-  openEBGM = derive2 { name="openEBGM"; version="0.6.0"; sha256="0xzcdahfxdk1zjq6019yvr2mlhyqxbsqx6vd4w95mjq9h3bd5vmr"; depends=[data_table ggplot2]; };
+  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.4"; sha256="1lfc8h64y7zlcyf30pw0zrmzrjh4x4kkij0awmwwzhw402cvb16r"; depends=[ggplot2 InSilicoVA InterVA4 InterVA5 nbc4va Tariff]; };
+  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.4-2"; sha256="1kaq0ww3829qh6wsnaa2asyyqmqhdgm9am70g0vphf7lp9vjk9x1"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr RColorBrewer Rcpp rlang tidyr]; };
+  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]; };
   opencage = derive2 { name="opencage"; version="0.1.4"; sha256="1lqs38lml73axsjlsjkmcsb2irgs40mjrx2cn3k0bjb63qyb9hf5"; depends=[dplyr httr jsonlite memoise]; };
-  opencpu = derive2 { name="opencpu"; version="2.0.5"; sha256="1bs2z3y2zc3aqzfjh6bq3qrpzm106f5xhw7lbyng1bpcp4rch6y3"; depends=[brew curl devtools evaluate httpuv jsonlite knitr mime openssl protolite rappdirs sendmailR sys webutils zip]; };
+  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]; };
   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.4.1"; sha256="1yq0fxlfb203di2y0n23zfy4xyjy1ij52s4kp1fn44pb3gmqhndm"; depends=[digest dplyr httr magrittr]; };
-  openssl = derive2 { name="openssl"; version="1.0.1"; sha256="1qyql5gpwf88bkm1qarjhbqbq4hn6w0d8j4pxb5x7i96is30ap30"; 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=[]; };
   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]; };
@@ -9257,34 +9654,36 @@ in with self; {
   optbdmaeAT = derive2 { name="optbdmaeAT"; version="1.0.1"; sha256="1y1mvcyjihpj1wgjmifhmd10717wr1srp7h87azs4gfypgsiqchn"; depends=[igraph MASS Matrix]; };
   optextras = derive2 { name="optextras"; version="2016-8.8"; sha256="03wqz16q8kn0ndk241h541fa0g5y0nrfg17vph85cm5xvzdd14cc"; depends=[numDeriv]; };
   optiRum = derive2 { name="optiRum"; version="0.40.1"; sha256="1kl9mzh53pwhrxbn89dsjjpfji7k8vmysscd1qd9sw7vqdan8g6x"; depends=[AUC data_table ggplot2 knitr plyr scales stringr XML]; };
-  optiSel = derive2 { name="optiSel"; version="2.0.1"; sha256="0bk2yf7wlkf2v76dybcqvqjy6n4cr72h0l05yfxba3zl8fw7r7na"; depends=[data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv optiSolve pedigree plyr pspline purrr quadprog Rcpp RcppArmadillo reshape2 stringr]; };
+  optiSel = derive2 { name="optiSel"; version="2.0.2"; sha256="0k3651h7ih59w13jzkbh8m5pddi1g1zci5rn9dm3b873yjr2nalx"; depends=[data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv optiSolve pedigree plyr pspline purrr quadprog Rcpp RcppArmadillo reshape2 stringr]; };
   optiSolve = derive2 { name="optiSolve"; version="0.1"; sha256="1wnpj7z0vqf91gzgz6r2ympnljq4mczxnnyk3sq7gvf6df4ic2m1"; depends=[alabama cccp MASS Matrix nloptr plyr Rcpp Rcsdp shapes stringr]; };
   opticut = derive2 { name="opticut"; version="0.1-2"; sha256="1j479wa7mlp62c2y7shha1w7ybhfy8wvjfaz27kmwd1f61ma1g0l"; depends=[betareg MASS mefa4 pbapply pscl ResourceSelection]; };
   optifunset = derive2 { name="optifunset"; version="1.0"; sha256="18pvdl04ln1i0w30ljdb3k86j27zg2nvrn3ws54c1g6zg9haqhbg"; depends=[]; };
   optigrab = derive2 { name="optigrab"; version="0.7.3"; sha256="1vd4b6mh4a137nvsbpx71jibfd67va1m8iya1gasqiflm6qzszcx"; depends=[magrittr stringi]; };
   optim_functions = derive2 { name="optim.functions"; version="0.1"; sha256="1la3v8yd9cdichp3mka4x86hr9lynh6qfg7h9ab6cwijw6kzkn6g"; depends=[lhs randtoolbox stringr]; };
-  optimParallel = derive2 { name="optimParallel"; version="0.7-2"; sha256="1b705gn0f3m3cn1hy5ga6qazvl2kvgc9dmnqky2px1zbkw2n3qy0"; depends=[]; };
+  optimParallel = derive2 { name="optimParallel"; version="0.7-4"; sha256="0415lz5qrhb423h55plws1hjf1fsddg2qf9phm1srvd24dvz2khw"; depends=[]; };
+  optimStrat = derive2 { name="optimStrat"; version="1.1"; sha256="0wlkk0wmhzkxkam0d6lzr5s6hyb51fnvvd64syffgr084ivxymra"; depends=[shiny]; };
   optimbase = derive2 { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; };
   optimization = derive2 { name="optimization"; version="1.0-7"; sha256="09s62ax3w8zijfp2cmh2lvdqbl3nijbjkwq4n3icasi53lzg2179"; depends=[colorspace Rcpp]; };
   optimr = derive2 { name="optimr"; version="2016-8.16"; sha256="02dgwkcjhf6ciwb6x6gyk7nn4v2jras7l1icfd4pjbypiapwnck9"; depends=[numDeriv optextras Rcgmin Rvmmin setRNG]; };
   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="2013.8.7"; sha256="0pbd7s02isj24npi4m1m1f008xqwzvwp3kn472wz8nmy4zrid30s"; depends=[BB dfoptim minqa numDeriv Rcgmin Rvmmin setRNG svUnit ucminf]; };
+  optimx = derive2 { name="optimx"; version="2018-7.10"; sha256="0npzgb5ky3p2iky4917grmysawh7mb5gwz4i7ssmh73ypqnndfhk"; depends=[numDeriv]; };
   optional = derive2 { name="optional"; version="1.1"; sha256="13ajzybylw0q0x6yy6i8qr6l1ar53cyl708zgqaqaj0lkj183zhz"; depends=[magrittr]; };
   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-9"; sha256="04w6ma1f09rjlz2qalfqk894pdkvqszr13n010y7015b3dsyqnkk"; depends=[digest Rcpp RItools survival]; };
+  optmatch = derive2 { name="optmatch"; version="0.9-10"; sha256="1jnvk9r7jc8w5rg8xvhbhj0wmy0l1hhjm8iwyf703939p4xc5z71"; depends=[digest Rcpp RItools survival]; };
   optparse = derive2 { name="optparse"; version="1.6.0"; sha256="1d7v5gl45x4amsfmzn5zyyffyqlc7a82h01szlnda22viyxids0h"; depends=[getopt]; };
   optpart = derive2 { name="optpart"; version="2.3-0"; sha256="125b9sfdk4bdcj1vq5rxlrskv1zra31x8d96pdxnqvcnkmwxm4zh"; depends=[cluster labdsv MASS plotrix]; };
   optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; };
-  optrdd = derive2 { name="optrdd"; version="1.0.1"; sha256="1nvrl04vg5ayrqqf6n3sb8jp37xifl5inh9nyr7pv6szckih6cd2"; depends=[CVXR Matrix quadprog]; };
+  optrdd = derive2 { name="optrdd"; version="1.0.2"; sha256="04c0dz68bs9h7l7bw9l0fahbbr2d0472xcq23pj91c8953n2mkak"; depends=[CVXR glmnet Matrix quadprog]; };
   optrees = derive2 { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; };
+  optweight = derive2 { name="optweight"; version="0.2.0"; sha256="0qpm5i9anzmv03cgdpk3r7pr6gg9l32hrnbrrd65cmkvf5wdxcyj"; depends=[ggplot2 Matrix rosqp]; };
   opusminer = derive2 { name="opusminer"; version="0.1-0"; sha256="1m4gsjylz58pbmhgcy4l9hqdsgy8ra1zg0d3rb6h2qiwfyfm0yh4"; depends=[arules Matrix Rcpp]; };
   orQA = derive2 { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[genefilter gtools nlme Rcpp]; };
   ora = derive2 { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; };
   orca = derive2 { name="orca"; version="1.1-1"; sha256="1wd5nh2vh6j1rp78hbw17qipi67f0wimrbkiarak8f7k5pfiy1zn"; depends=[]; };
   orclus = derive2 { name="orclus"; version="0.2-6"; sha256="0d78mn2vl2yxlvdswyxkxp9zg59b8cvfksz9m56kddn79aps1ikl"; depends=[]; };
-  orcutt = derive2 { name="orcutt"; version="2.2"; sha256="0mwfbbsn39nla083p845xbbgh3y8kkrg0q735kap64jf4pgcyac7"; depends=[lmtest]; };
+  orcutt = derive2 { name="orcutt"; version="2.3"; sha256="0pj7pqzbcg4gp35nsz3avyawmx69dgj0l2w0x8ypw5qwl4zhmnyk"; depends=[lmtest]; };
   ordBTL = derive2 { name="ordBTL"; version="0.8"; sha256="09x3zfmss4fsh3rjghgmpv8y34dnkz4mw696b3k3nvlgk55a1423"; depends=[caret gtools VGAM wikibooks]; };
   ordDisp = derive2 { name="ordDisp"; version="1.0.1"; sha256="1vjki73h8933z36ikwmjn84ldz154mahp2jkd9cbj5n6xsi47fnw"; depends=[VGAM]; };
   ordPens = derive2 { name="ordPens"; version="0.3-1"; sha256="0yzf3qzi4p7xqimihjvr0wkdvj3sy9n3wc86bf4bjbavniq6m69r"; depends=[grplasso mgcv RLRsim]; };
@@ -9294,22 +9693,22 @@ in with self; {
   orderedLasso = derive2 { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[ggplot2 Iso Matrix quadprog reshape2]; };
   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.4-19"; sha256="04fpm4jsjfd90ig2rzd11jafkip74814b60ixis0sii2gr9c8zxb"; depends=[MASS Matrix ucminf]; };
-  ordinalClust = derive2 { name="ordinalClust"; version="1.2.1"; sha256="1035471ni5f8129w23kkj7263p5pa9jlihqdq2skda410lj50vnk"; depends=[progress Rcpp RcppArmadillo]; };
+  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]; };
-  ordinalForest = derive2 { name="ordinalForest"; version="2.1"; sha256="1ancr7xdwhbqq3rj5hijrkjbrcaih8rqcx5r41mykrrp1k1s55dd"; depends=[combinat ggplot2 Rcpp]; };
-  ordinalNet = derive2 { name="ordinalNet"; version="2.4"; sha256="0c9k3p62d482sl0vg94xm6hllk2mic2nd1c5m4vhci5ycavqzdd3"; depends=[]; };
+  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]; };
-  ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.4"; sha256="1s8f8fpiyyxxqlcwa5pn2aj1iggf5r1q7zkvzsik6265krcsbqn6"; depends=[survival]; };
-  ore = derive2 { name="ore"; version="1.6.1"; sha256="0hy1xm03zbmd336g9jjrkdsx1z7ai32jvj1hk8a7bj9wqb5rl8g5"; depends=[]; };
+  ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.5"; sha256="0i66i0qwsc52yj4hpfzk4d8v2nwdd4zr7zgqlxvsk3n8vi65lnqf"; depends=[survival]; };
+  ore = derive2 { name="ore"; version="1.6.2"; sha256="1l1ziljgm5gwjhvjq42wi5vcwbxlaj5dl9w8bhz0wh8vx4ajj07m"; depends=[]; };
   ores = derive2 { name="ores"; version="0.3.1"; sha256="12war455cfcn2llig7pkx05b70dp5y7warjq03ayqq6i7c945mhb"; depends=[httr]; };
   orgR = derive2 { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; };
   orgutils = derive2 { name="orgutils"; version="0.4-1"; sha256="1yc3avhq3786his7nd60zfbzd9inkfrfz938r8378z59zbb1mzqq"; depends=[textutils]; };
   orientlib = derive2 { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; };
   origami = derive2 { name="origami"; version="1.0.0"; sha256="0692n4javr0lwxcd0b83sbbhxbmxxs41sjvlsq5bc5l7n140qaca"; depends=[abind data_table future future_apply listenv]; };
   originr = derive2 { name="originr"; version="0.3.0"; sha256="1r4w8gilr25gdqm3slviwas3s7qkpiyv4ifzp7qkby6vrdswnngb"; depends=[crul data_table jsonlite taxize xml2]; };
-  orloca = derive2 { name="orloca"; version="4.5"; sha256="1zkd80b8rqy3x389c5pwsh0k8q6hy9bg4vvqs2xigxbprz4gyzl7"; depends=[png ucminf]; };
-  orloca_es = derive2 { name="orloca.es"; version="4.5"; sha256="0lnv565c7g69649481w3rlnx0yya7bw9fkpwim9bs639flwh6w96"; depends=[orloca]; };
+  orloca = derive2 { name="orloca"; version="4.6"; sha256="1mhm4m0qmhhb1kca2s5z630f52h3a5ms16aqxrq9a8j9nyd65xh4"; depends=[knitr png ucminf]; };
+  orloca_es = derive2 { name="orloca.es"; version="4.6"; sha256="1yfsvihm8p4ggdfam50i2xg7dy7khww5qqk6g4lry3m1icwx6vsy"; depends=[orloca]; };
   oro_dicom = derive2 { name="oro.dicom"; version="0.5.0"; sha256="05dmhfglp76apyilwicf3n2ylyjhp1gq6b9bnzsiiblpjnfpia43"; depends=[oro_nifti]; };
   oro_nifti = derive2 { name="oro.nifti"; version="0.9.1"; sha256="19w9dzyfmfgxgxb5i0l06b6gzqksx879iwicfs76fwmb1q2ph540"; depends=[abind bitops RNifti]; };
   oro_pet = derive2 { name="oro.pet"; version="0.2.6"; sha256="1dczii7knh9241ksswxk9zg1d69mhk2ilrk4kjv7cj9nfm8fgmja"; depends=[minpack_lm msm oro_dicom oro_nifti]; };
@@ -9323,10 +9722,10 @@ in with self; {
   osd = derive2 { name="osd"; version="0.1"; sha256="1py9p15nrcydr8w9ilxkxabiz9zlqnls8xn9avjkxd8x6602jx6p"; depends=[JADE nnls]; };
   oshka = derive2 { name="oshka"; version="0.1.2"; sha256="02hglpq5lknq93zbcf219lhnhppzgygkhxqixb15f89rxf9fczgs"; depends=[]; };
   osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; };
-  osmdata = derive2 { name="osmdata"; version="0.0.7"; sha256="0gpb8anvm9wmhvdkirhclkyppqz1sd5siclszigff11fw4bxnwj3"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp xml2]; };
+  osmdata = derive2 { name="osmdata"; version="0.0.8"; sha256="0hhfnraxjj54z5p3lnpvklhpmdhihs9lgfb9dm3s9h7kjcknf6x3"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp xml2]; };
   osmose = derive2 { name="osmose"; version="0.1.1"; sha256="0fiijnrvvydhj6j9yb02rn5sg8arcpj3jz977m2zwjgqy878cffg"; depends=[rlist stringr]; };
   osmplotr = derive2 { name="osmplotr"; version="0.3.0"; sha256="0w45riwwjigh1bxf9gx0wdj2yhdizwi6ydprp83pss2z9wph66yb"; depends=[curl e1071 ggm ggplot2 httr osmdata rgeos sp spatstat]; };
-  osqp = derive2 { name="osqp"; version="0.3.1"; sha256="1q7f009xbl15prsn6l18fr307a7z76rw39z6fj380nliq6s5s56z"; depends=[Matrix R6 Rcpp]; };
+  osqp = derive2 { name="osqp"; version="0.4.1"; sha256="0v1sg914l1xz2f2crgwy2pp9k72ak2k1qmqix20j2akqmlvr39p2"; depends=[Matrix R6 Rcpp]; };
   osrm = derive2 { name="osrm"; version="3.1.1"; sha256="14rf5m2pm5w414v2l1dvd6vlvirms93l8rkfbmgcvxwxmc52b187"; depends=[gepaf jsonlite raster RCurl rgeos sp]; };
   osrmr = derive2 { name="osrmr"; version="0.1.29"; sha256="1mkc39v56m7b89nbjzs50kzz8w1i1950gciiw7iyqpdj6g2knwdx"; depends=[assertthat bitops R_utils rjson stringr]; };
   otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; };
@@ -9337,12 +9736,14 @@ in with self; {
   outbreaker = derive2 { name="outbreaker"; version="1.1-8"; sha256="0przz78jzkwl580w83p0aigaykfki2hdzprwqic7dy6yxnpqlpm3"; depends=[adegenet ape igraph]; };
   outbreaker2 = derive2 { name="outbreaker2"; version="1.0.1"; sha256="1v49i9z4kx9l485ib5q91s4z6r03lyijzjrr9zyjgham59rncyij"; depends=[ape ggplot2 magrittr Rcpp visNetwork]; };
   outbreaks = derive2 { name="outbreaks"; version="1.3.0"; sha256="1k0g9x6wvdw8lkpjiv8z1ijp6pg5hri3gawx7zfpnm05g6ncvg81"; depends=[]; };
+  outcomerate = derive2 { name="outcomerate"; version="1.0.1"; sha256="07mwml7r98qjgvrp938sqf7klyspz110583j0zwb72j69n4whmrj"; depends=[Rdpack]; };
   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]; };
   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]; };
+  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=[]; };
   p2distance = derive2 { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; };
@@ -9352,10 +9753,11 @@ in with self; {
   pCalibrate = derive2 { name="pCalibrate"; version="0.1-1"; sha256="04a7dmf9sjw44y53i469f8fjm8as2vwr0pgk4s91l63pxdqnjvfl"; depends=[epitools exact2x2 MCMCpack]; };
   pGLS = derive2 { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; };
   pGMGM = derive2 { name="pGMGM"; version="1.0"; sha256="1hkczz38g8a8253jm8vhm8948fs91g6b2rfzkz47srkkby9ksa4x"; depends=[JGL MASS mvtnorm]; };
+  pGPx = derive2 { name="pGPx"; version="0.1.1"; sha256="0b3pjrk7496nlw1cv5m6yfp02c663452z67y21yhhm26b17nrldv"; depends=[DiceKriging KrigInv pbivnorm pracma randtoolbox Rcpp RcppArmadillo rgenoud]; };
   pKSEA = derive2 { name="pKSEA"; version="0.0.1"; sha256="1k9javxbhx28hf5k3i66ggqwlws2w9qwp01g8f7jmyp92pxr3qqd"; depends=[]; };
   pMineR = derive2 { name="pMineR"; version="0.31"; sha256="1j71dcldzmk4kzspx4v5s3vqqkllgwkckfm1g145qgg26c1gyc6l"; depends=[cluster DiagrammeR stringr XML]; };
   pRF = derive2 { name="pRF"; version="1.2"; sha256="17srabk7mam16rdzc5g9ggdrhjjk8wibny40gxvgzkv7qgq7m80x"; depends=[dplyr ggplot2 multtest permute randomForest reshape2]; };
-  pROC = derive2 { name="pROC"; version="1.12.1"; sha256="05ad69a6fxy9k903cw3h4q59ch2jv6qfg9yjdbw3cgiiazcafrlj"; depends=[ggplot2 plyr Rcpp]; };
+  pROC = derive2 { name="pROC"; version="1.13.0"; sha256="0ain17clympkx09ym7gydylcd93096dxzqx1qzci310yq2l7fknm"; depends=[ggplot2 plyr Rcpp]; };
   pRSR = derive2 { name="pRSR"; version="3.1.1"; sha256="1irx95b7cwvx3gpn9brjjn4k947m8frz542r18nilc9f1159mb3s"; depends=[]; };
   pSI = derive2 { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; };
   pa = derive2 { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; };
@@ -9367,9 +9769,9 @@ in with self; {
   packagedocs = derive2 { name="packagedocs"; version="0.4.0"; sha256="0zw9ana7s42ardphhdaklba02yjj1v8gliq4l98397mjmzc6f4xd"; depends=[crayon devtools digest evaluate highlight htmltools lazyrmd magrittr rmarkdown stringr whisker yaml]; };
   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.2"; sha256="1hqzvhk8zm95vsrvf6bifxkgdgik8hixylslfvzpfcq378zi97yb"; depends=[Rcpp]; };
+  packcircles = derive2 { name="packcircles"; version="0.3.3"; sha256="0gik0splf48zfl40297nh7lbgvd2qqlci99wv841mfy7858ai933"; depends=[Rcpp]; };
   packrat = derive2 { name="packrat"; version="0.4.9-3"; sha256="0d42x4qvz9hs7s5sl2lhklsdc8imrnp2k800xdagrpjilww9jac7"; depends=[]; };
-  pacman = derive2 { name="pacman"; version="0.4.6"; sha256="1vdak1hv3j44dsj6cckzc1a86dg933jqhxdys8fyxacmk101l388"; depends=[devtools]; };
+  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]; };
   pact = derive2 { name="pact"; version="0.5.0"; sha256="043hbydj5f6889xrfsrn8jrgid2nnbsz6d7jpn4hywwa97snw4ny"; depends=[glmnet survival]; };
@@ -9378,6 +9780,7 @@ in with self; {
   pafdR = derive2 { name="pafdR"; version="1.0"; sha256="1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5"; depends=[curl exams stringr]; };
   pagenum = derive2 { name="pagenum"; version="1.1"; sha256="0908rlr9sd1a2qwz0idw8ccxhji73sk24gyrdl071lpnd1rs2wl7"; depends=[]; };
   pageviews = derive2 { name="pageviews"; version="0.3.0"; sha256="031y67nqqvf3fa2273m7z2cldda0ijh63qwkh4gis3hz9hfril0v"; depends=[curl httr jsonlite]; };
+  painter = derive2 { name="painter"; version="0.1.0"; sha256="0qr6p13h50rlavcsamxmijfr4dfrbv1k088m28qf8a4gam3ap85b"; depends=[]; };
   paintmap = derive2 { name="paintmap"; version="1.0"; sha256="1qw5725yjymxmfhffqjx4lbmzj437c7qwr8xrzmf52f0m28nl3vk"; depends=[]; };
   pairedCI = derive2 { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; };
   pairheatmap = derive2 { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
@@ -9385,13 +9788,14 @@ in with self; {
   pairwise = derive2 { name="pairwise"; version="0.4.3-2"; sha256="1kb73jsfyp1daqbrmpwh8l9j28fgiapimfwdypz82m46wza1qgww"; depends=[]; };
   pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-26"; sha256="0dislkyvzckkxl2ccdpalyfbp4pfs6yvzwr175h2xcbzm5jjf35j"; depends=[boot coin MASS MCPAN mcprofile]; };
   palaeoSig = derive2 { name="palaeoSig"; version="1.1-3"; sha256="1zm8xr7fpnnh6l4421vjavi6bg44iars3mna4r5fw3spmbswyv7b"; depends=[MASS mgcv rioja TeachingDemos vegan]; };
-  palasso = derive2 { name="palasso"; version="0.0.1"; sha256="00vwp0xbnp8fj8g7qn81r4j15vwp26pjjh51hc8syi8l7457alhm"; depends=[glmnet Matrix survival]; };
+  palasso = derive2 { name="palasso"; version="0.0.2"; sha256="19syj2qlmnrbz75hhlrslh04k8cmi3bh8r15yq8gwy1mr9kwq3i3"; depends=[CorShrink glmnet Matrix survival]; };
   paleoMAS = derive2 { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; };
   paleoTS = derive2 { name="paleoTS"; version="0.5-1"; sha256="18f5lkgzvndc8s7w7d7dfdlqf37adrmzabpwkavjw1zkpb1dga8c"; depends=[doParallel foreach iterators mnormt]; };
   paleobioDB = derive2 { name="paleobioDB"; version="0.5.0"; sha256="195w0jzg8bhlqbsd3shi161wqr9cff6q85ik0x8w4laazzxs0jhr"; depends=[gtools maps plyr raster RCurl rjson scales]; };
   paleofire = derive2 { name="paleofire"; version="1.2.2"; sha256="0mg03k3yf68js580ljvwcn7xfl0m1s408hb34a9h3mh3a5knm2zc"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; };
   paleomorph = derive2 { name="paleomorph"; version="0.1.4"; sha256="05l55miahkmj8ikq8qz20y6kgxvxmdf04kji898i7fp8qyj4vfpa"; depends=[]; };
-  paleotree = derive2 { name="paleotree"; version="3.1.0"; sha256="1f90f6m6qgywxa134dv8rd43660vkr9n2s82wn0iwq7w89gqlcj2"; depends=[ape phangorn phytools]; };
+  paleotree = derive2 { name="paleotree"; version="3.1.3"; sha256="05669s0lmd9azzpgn5iqayp49lg6sn34z4bqizcbpjviw6jwh72c"; depends=[ape phangorn phytools]; };
+  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]; };
@@ -9403,18 +9807,18 @@ in with self; {
   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.1"; sha256="1axknd1isfjg4wj5b1smvl7qr4wvjdw1kikrghjnp73xh0glr7pp"; depends=[digest Rcpp]; };
+  pander = derive2 { name="pander"; version="0.6.2"; sha256="0gd7rqkpbraznip8jmri9lqa8ajg1sryyplhd6m633wg91whiipi"; 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.1"; sha256="1ianff9clc0318nk0xplnslfqi5sxn773qcvxv3axj247994xpay"; depends=[ggplot2 gridExtra]; };
+  panelView = derive2 { name="panelView"; version="1.0.5"; sha256="1hmb311qimm60l9zvk0nkgh4qy2givm8a8rdmmpfb9bfbbg6clks"; depends=[ggplot2 gridExtra]; };
   panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; };
   panelvar = derive2 { name="panelvar"; version="0.5.1"; sha256="1394lvvpzbcvm2mhxw68k784jyvsnzxiq787kdf4y4538lqgfx1n"; depends=[ggplot2 knitr MASS Matrix matrixcalc progress reshape2 texreg]; };
   pangaear = derive2 { name="pangaear"; version="0.6.0"; sha256="0dykacf5ckhck08rbk6l5kyw51i2p1ncy44agcxj79cr290cd5ck"; depends=[crul jsonlite oai png rappdirs tibble xml2]; };
   papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; };
-  papeR = derive2 { name="papeR"; version="1.0-2"; sha256="1pp6zzdqg9lj61f8p90sxl30vp9knmis7154fmfpm6pynbgr46ms"; depends=[car gmodels xtable]; };
+  papeR = derive2 { name="papeR"; version="1.0-3"; sha256="0c3zziy32wnpvnv7d3kh1gs24pmy9ap2hq0l3ss2h79s5vmc76xi"; depends=[car gmodels xtable]; };
   paperplanes = derive2 { name="paperplanes"; version="0.0.1.9"; sha256="1d9grc95xqxn91lvk8v7w3z90bhl8savkhihwshyjp8ij2xpzfkl"; depends=[]; };
   parSim = derive2 { name="parSim"; version="0.1"; sha256="15d3k91mvbv2hmq0l1jfr0hsv2zkz3cr6axg85kf9bd9q79b85qp"; depends=[dplyr]; };
-  parallelDist = derive2 { name="parallelDist"; version="0.2.1"; sha256="1w6c5ijnynqq7q15f5mflmxcad6yblpdaflh378lf9vm2xdq0yjp"; depends=[Rcpp RcppArmadillo RcppParallel]; };
+  parallelDist = derive2 { name="parallelDist"; version="0.2.2"; sha256="0h7bf2mlfpydqr3msirg07wn041fqlcdha9m8rybix1x3vi778qc"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   parallelMCMCcombine = derive2 { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; };
   parallelML = derive2 { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; };
   parallelMap = derive2 { name="parallelMap"; version="1.3"; sha256="026d018fr2a43cbh8bi2dklzr9fxjzdw5qyq84g2i18v5ibr6bd5"; depends=[BBmisc checkmate]; };
@@ -9424,7 +9828,7 @@ in with self; {
   paramlink = derive2 { name="paramlink"; version="1.1-2"; sha256="0y6wsrxwyavipmrjjznr2n920w0p6qlwapxc9mnkh9c6w3yznka2"; depends=[assertthat kinship2 maxLik]; };
   params = derive2 { name="params"; version="0.6.1"; sha256="0w7k8k7z8p1y2w0dhpfssa868xaikfzfdjw2vlj1yl299k5yisax"; depends=[whisker]; };
   paramtest = derive2 { name="paramtest"; version="0.1.0"; sha256="0yn1s1qkgby8x0qn7cy1zhxzc0wyi7bm30pkvijhn5h5afjpylsy"; depends=[boot]; };
-  paran = derive2 { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; };
+  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]; };
@@ -9432,21 +9836,22 @@ in with self; {
   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]; };
   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]; };
   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.1.1"; sha256="07c3484v8axqxss877dvb6d5gh4vrr8dbvcqgq2xgwb6wcs59nyy"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; };
+  partialCI = derive2 { name="partialCI"; version="1.2.0"; sha256="0hi936yg4g5bg61ix2i68f8q4c5nvvshl2728ynz1rl970qfcrp7"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; };
   partialOR = derive2 { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; };
   particles = derive2 { name="particles"; version="0.2.1"; sha256="0rhxn3c62x3xc9lcy7xbg6r7pgfylan7cz24v8i9icjhl7xfswmv"; depends=[digest dplyr igraph magrittr mgcv Rcpp rlang tidygraph]; };
-  partitionComparison = derive2 { name="partitionComparison"; version="0.2.3"; sha256="1p0f08za30kpmj9ky4jw6i3nl38i7xrslwsj60ih7gvph2jd39ix"; depends=[lpSolve Rdpack]; };
+  partitionComparison = derive2 { name="partitionComparison"; version="0.2.4"; sha256="07w1r4mdi8gv5bjj8shjdjbkply85pp7x5gnwxq96f9g1p4s24pz"; depends=[lpSolve Rdpack]; };
   partitionMap = derive2 { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; };
   partitionMetric = derive2 { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; };
   partitions = derive2 { name="partitions"; version="1.9-19"; sha256="1pklfnjdc094c8nzkqcdvqzdh8v3p5n8jbg4pf9678iw648saiyx"; depends=[gmp polynom]; };
   partools = derive2 { name="partools"; version="1.1.6"; sha256="0w7p88y4ab4v14k16k95cyb5f3yl2g6ban11775rmi2h9xqkfxk8"; depends=[data_table pdist regtools]; };
   partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
-  party = derive2 { name="party"; version="1.3-0"; sha256="1ih3c85s40raq8a0cy952a3g31gf2iwnafy8ij1svzc4hgfzaw2m"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
+  party = derive2 { name="party"; version="1.3-1"; sha256="13h8k2m933g9l4df1jjihn9i7ad0jrjyzga6chy0hb54xxi2asni"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
   partykit = derive2 { name="partykit"; version="1.2-2"; sha256="118zrf9015kh0gicma98ddm80qhicdlhri2h1nwz0wlng9hkyxbg"; depends=[Formula inum libcoin mvtnorm rpart survival]; };
   parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
   passport = derive2 { name="passport"; version="0.2.0"; sha256="1jiwivrz7781zmwxmw13rxl80cr9r5pinnk5bvqz8nhfmlx0zmgd"; depends=[]; };
@@ -9460,15 +9865,16 @@ 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.0"; sha256="1wf6wv9mdiagv3r4d5nviw8c2zxw7hlxa0mm9kk624g1qfhknnz2"; depends=[AnnotationDbi DBI doParallel foreach fpc ggplot2 knitr org_Hs_eg_db pathview rmarkdown shiny]; };
+  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]; };
   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]; };
   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="1.3.1"; sha256="1vr3crp71dibm3jn88wh4gdia2l3z4aqmfns7v5pllqadk9s1064"; depends=[geometry mapproj pbmcapply rcdd]; };
+  pavo = derive2 { name="pavo"; version="2.0.0"; sha256="1mcrx26lbhldmf1wlkpbpa4ld85wjbvr2kjidzb1hb78lqbv05ad"; depends=[geometry imager mapproj pbmcapply plot3D rcdd sp]; };
   pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; };
   pawls = derive2 { name="pawls"; version="1.0.0"; sha256="01sf1cmd216ca5iwmw4hfnxi9lvh16r441cfcaa3n77zhq0i4w7n"; depends=[]; };
   pbapply = derive2 { name="pbapply"; version="1.3-4"; sha256="0lk5kxac09xzdv6vf7ix6r5bfrm7cnpyr2l5mkd4igpciadszzfd"; depends=[]; };
@@ -9476,7 +9882,7 @@ in with self; {
   pbdBASE = derive2 { name="pbdBASE"; version="0.4-5.1"; sha256="0ghdq8ry6fiq8qj3plq2n8isjx6iacnhqd1z73bjckmvp99g221n"; 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-6"; sha256="105nny9d4vm61iarckwf0x6lngkmg3jxys7nigshywhp91073ygk"; depends=[rlecuyer]; };
+  pbdMPI = derive2 { name="pbdMPI"; version="0.3-8"; sha256="0yxzldgvjzzw4adsdv6sh3m3n6xlwfh2rmzn6pgppk8s1brbbjli"; depends=[rlecuyer]; };
   pbdNCDF4 = derive2 { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; };
   pbdPROF = derive2 { name="pbdPROF"; version="0.3-1"; sha256="0a7c31605si062vbwcwngv770axlwyhh00cvdfqw3hv421p61sj8"; depends=[]; };
   pbdRPC = derive2 { name="pbdRPC"; version="0.2-1"; sha256="1pz71zfs9qw96dj3h5mrm734vbbi4drlv9hrw91dbzm3a7jsxg4q"; depends=[]; };
@@ -9501,47 +9907,49 @@ in with self; {
   pcensmix = derive2 { name="pcensmix"; version="1.2-1"; sha256="1yrz4hdj52in8z65qyl18kh7frv75rb8ss5ljv3vbm6yhxi32jnd"; depends=[]; };
   pcev = derive2 { name="pcev"; version="2.2.2"; sha256="1l0afcdzkxzkhkc8ln2fzi50hc7nfq46lg6hhx6rrzkb41w82iqw"; depends=[corpcor RMTstat]; };
   pcg = derive2 { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; };
+  pcgen = derive2 { name="pcgen"; version="0.1.0.0"; sha256="151dhk1wnc5byrbvx2322bwy047ing3a9zw1q977w347r90h7arr"; depends=[ggm graph Hmisc lme4 MASS Matrix pcalg sommer]; };
   pch = derive2 { name="pch"; version="1.3"; sha256="13pfrvp539fz4hxp08yil93caw3cjdna7xnky5fqd0lhc84fwq76"; depends=[survival]; };
   pcnetmeta = derive2 { name="pcnetmeta"; version="2.6"; sha256="0rpd1bgg932xhj03fnskhbg7ni9nfd8qrvxvix8qmbgw8bwdsbgd"; depends=[coda rjags]; };
   pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; };
-  pcr = derive2 { name="pcr"; version="1.1.1"; sha256="1bm8c8ajb0imvnp8nwhskjkqdi4v9f11bsz2qdk45i5l2mq16kjc"; depends=[broom devtools dplyr ggplot2 magrittr purrr readr tidyr]; };
+  pcr = derive2 { name="pcr"; version="1.1.2"; sha256="0sms024irkhqyb001lcicrm3dwnnyr2kw9kx10q3v9j6p7rxzhz2"; depends=[devtools dplyr ggplot2 magrittr purrr readr tidyr]; };
   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]; };
-  pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.1"; sha256="0j68jmsm6c9pan195k0l0nm1ldbipl5ywlbwkz61dblspizh04iw"; depends=[ddalpha multitaper Rcpp RcppArmadillo]; };
+  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]; };
   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.1.1"; sha256="0k62j6ilv8rmmmasqyb3hklhjqg22jiyx0sxd7f8n0xmlfcjgfqi"; depends=[pdftools tibble]; };
+  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]; };
   pdftools = derive2 { name="pdftools"; version="1.8"; sha256="1yyhwr17bln59cr819igd7mxdy5mhqf5fwd68x8w3kgag0v0qyaz"; depends=[Rcpp]; };
   pdist = derive2 { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; };
   pdmod = derive2 { name="pdmod"; version="1.0.1"; sha256="04bk9gjg2c55hk6k1hy0m29927s8a5ig6mr4xb89npam68g0pcms"; depends=[mco]; };
-  pdp = derive2 { name="pdp"; version="0.6.0"; sha256="12x9j3lwnss45wlafd5kc4nw293vhffijmgyafahqwz9if829m10"; depends=[ggplot2 gridExtra lattice magrittr mgcv plyr viridis]; };
+  pdp = derive2 { name="pdp"; version="0.7.0"; sha256="0wcszaq4c14f9a2r1gd32mzhs035jlg2w8mkfklzigcj7fv9xmi8"; depends=[ggplot2 gridExtra lattice magrittr mgcv plyr viridis]; };
   pds3 = derive2 { name="pds3"; version="0.5.0"; sha256="1hipi4ygk30khrrslxq3m9qdichazhrl34k444shs7gi6wjx9ilr"; depends=[rly]; };
   peRiodiCS = derive2 { name="peRiodiCS"; version="0.5.0"; sha256="1366gmn6qfciwcjsfnbl3hfa16ffn11g00fm0kv74ilvm3nnawk3"; depends=[Hmisc rms]; };
   peacots = derive2 { name="peacots"; version="1.3"; sha256="128qpz06b0giz80lp9yq9l6pxcjglfr97yickg7z64vzzl2jilmq"; depends=[]; };
+  peakPantheR = derive2 { name="peakPantheR"; version="1.2.0"; sha256="1g9hj7z99cn0qgyxl4p6fln9mi95q87d25h8n32vlz7n1sv5jhiy"; depends=[doParallel foreach ggplot2 gridExtra minpack_lm MSnbase mzR scales stringr XML]; };
   peakPick = derive2 { name="peakPick"; version="0.11"; sha256="1zf7ff9arm4hkdxrfhb0p8p7npd51icy773g2raaqsfys825xwhm"; depends=[matrixStats]; };
   peakRAM = derive2 { name="peakRAM"; version="1.0.2"; sha256="0mj7f8jqkfky61xag2km0svbgvfmif3c1d8ccav6pv1963cg3cvv"; depends=[]; };
   pear = derive2 { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; };
   pearson7 = derive2 { name="pearson7"; version="1.0-2"; sha256="0x8bnlzgmfah8lzdg8skxs7bm8yq0nkrhqi7q43h902j4jl5b8jy"; depends=[]; };
-  pec = derive2 { name="pec"; version="2018.04.18"; sha256="0a6q37l42zbz566bz0qs5aszd71bb0kd9bz0zmb42q0ak0v4yijd"; depends=[foreach prodlim rms survival timereg]; };
+  pec = derive2 { name="pec"; version="2018.07.26"; sha256="07xr22klvmxpn2k72mjd775fs89f5hppb5xcy4sjy1njalmn3icm"; depends=[foreach prodlim rms survival timereg]; };
   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]; };
   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.10"; sha256="1qs2wxbgsraa6vqi7fh391hq2i4g1ysb06q4xqk0rkaymy5bp8ga"; depends=[adegenet ape]; };
+  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]; };
   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-50.1"; sha256="0lhibn0bzdrlvdsp4ni0989jniyfbxnixh32g7qm5qwxf5jbky18"; depends=[Rcpp RcppArmadillo survival]; };
+  penalized = derive2 { name="penalized"; version="0.9-51"; sha256="1zcrwa93mc27qj3g4ayc2k895r6g8q0g6qb2azmvj7wqk750va7a"; depends=[Rcpp RcppArmadillo survival]; };
   penalizedLDA = derive2 { name="penalizedLDA"; version="1.1"; sha256="1bw5wiixmmg1vr3v0d59vh67f0gy2rvr30bi58skvrkb25qcjq6l"; depends=[flsa]; };
-  penalizedSVM = derive2 { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; };
-  penaltyLearning = derive2 { name="penaltyLearning"; version="2017.12.08"; sha256="0pkd853dq7frp0f9aii99qpnx9mk4gzb73iykfa5q9bnp45z8qd0"; depends=[data_table geometry ggplot2]; };
-  pencopula = derive2 { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[fda lattice latticeExtra quadprog]; };
+  penalizedSVM = derive2 { name="penalizedSVM"; version="1.1.2"; sha256="03zw95bc6svbnzak9x72s3b8l9gh581mxn2di1fl89gxlh864amd"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; };
+  penaltyLearning = derive2 { name="penaltyLearning"; version="2018.09.04"; sha256="07ddsq6bwbz0c9pixlw8gj1km6zqhqsqn1a19pgmjrr5mq1iix9p"; depends=[data_table geometry ggplot2]; };
+  pencopula = derive2 { name="pencopula"; version="0.3.5.1"; sha256="1ivnqfq70gvnzc19brkvdlq0ks5dd954dj46j3pqpg6crvdrzh9r"; depends=[fda lattice latticeExtra quadprog]; };
   pencopulaCond = derive2 { name="pencopulaCond"; version="0.2"; sha256="18hjjxnd0l2ms20ddqkghfbd4as5kq2rgwqzpz4y38k6nw76x511"; depends=[doParallel fda foreach igraph lattice latticeExtra pacotest quadprog TSP]; };
   pense = derive2 { name="pense"; version="1.2.0"; sha256="0wilfjhkj5hrgm7mak1hvlk07wrr3f774w26vyvbwlm8xsxxsbzz"; depends=[Matrix Rcpp RcppArmadillo robustbase]; };
   pensim = derive2 { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[MASS penalized]; };
@@ -9550,7 +9958,7 @@ in with self; {
   pequod = derive2 { name="pequod"; version="0.0-5"; sha256="0mwrgyrxgiifpnpy15qxpdrdmd7dxqihccrnj5nh8fq9fvwymamg"; depends=[car ggplot2]; };
   perARMA = derive2 { name="perARMA"; version="1.6"; sha256="0k70lcqhiiffrwzvh51asnhx68qxpnjnxadarvgpgbc7kfy7lv9x"; depends=[corpcor gnm matlab Matrix signal]; };
   perccal = derive2 { name="perccal"; version="1.0"; sha256="1akak068d0g70amj5sbvnqbywzy21l4wz11mhp71b7cp4xmr9n12"; depends=[Rcpp RcppArmadillo RcppEigen]; };
-  perccalc = derive2 { name="perccalc"; version="1.0.1"; sha256="0dq5m7d6jdapbnkh65f5cizqiggpl1922nl4gc6damzvyym95qrj"; depends=[broom dplyr magrittr multcomp purrr tibble tidyr]; };
+  perccalc = derive2 { name="perccalc"; version="1.0.3"; sha256="0x895b75fjipzv7ff9mz7qpcabm9zys3bjsalk6h2q2350lwjmq1"; depends=[broom dplyr magrittr multcomp purrr tibble tidyr]; };
   performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; };
   pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; };
   perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; };
@@ -9558,32 +9966,33 @@ in with self; {
   permGPU = derive2 { name="permGPU"; version="0.14.9"; sha256="10r2qxbvzjxv3520lrn6cwi5akhhwgkhz7yaqxi5vh2f5l0s49wy"; depends=[Biobase foreach RUnit survival]; };
   permGS = derive2 { name="permGS"; version="0.2.5"; sha256="0d2kp3c1fmnjjmsvc2qwh6m66yqvy2vrrxgv1fj2i4clsbavfa0y"; depends=[coin survival]; };
   permPATH = derive2 { name="permPATH"; version="1.1"; sha256="06h1lqpmkg4ajjh4r837qp094h105n4mpvafnp2nsbv9yyayd4h8"; depends=[R2HTML xtable]; };
-  permubiome = derive2 { name="permubiome"; version="1.1"; sha256="02fg1g96pg6a87n8mhrls54xp0vnqqsgg39nnjirxr7hd74l71x9"; depends=[ggplot2]; };
+  permubiome = derive2 { name="permubiome"; version="1.2"; sha256="0np10qhj5rl2gjmq5sfnpaqymmr0wag2b8fwyzndjflvypfmcsyp"; depends=[ggplot2]; };
   permuco = derive2 { name="permuco"; version="1.0.1"; sha256="19spn5ra41v7s4ixdg5pbksfi8linhvhvfmllz72iw6wbzsw8m0m"; depends=[MASS Matrix permute]; };
   permutations = derive2 { name="permutations"; version="1.0-2"; sha256="04lak21x0z1cskgm5w4xdyq59kmyrz64bwfpf332vfka54aiv8lk"; depends=[magic numbers partitions]; };
   permute = derive2 { name="permute"; version="0.9-4"; sha256="1w8wzk1fg9q7wvisnfp2js70dg0m9wi12gkdhpyngpbdcgssahd5"; depends=[]; };
   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.1.5"; sha256="1id3ml5n7l7lgd029csn23ffrsqhm4g1id20hxqhqz4knknfxkkf"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly survival]; };
+  personalized = derive2 { name="personalized"; version="0.2.1"; sha256="0qdbnra2ghz3i5xl4gw8ivalci1mqw0qblxvw3mfp0sbj4hvsssy"; 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=[]; };
-  perturbR = derive2 { name="perturbR"; version="0.1.1"; sha256="13in5xjv1854ihalyj4427ix4scc17b95iw72rcb4yivha9jgplq"; depends=[dils ggplot2 igraph mcclust]; };
+  perturbR = derive2 { name="perturbR"; version="0.1.2"; sha256="0hb4bbcij5x9nbvmwr0j59x1hsnf9ddyhkixnbwvmbsha0nkcbww"; depends=[ggplot2 igraph]; };
   petitr = derive2 { name="petitr"; version="1.0"; sha256="0i13zhdrdka0ij0khdzj6ylvvcn4wxvplb8a368i1s64cpgak30c"; depends=[]; };
   petrinetR = derive2 { name="petrinetR"; version="0.2.0"; sha256="04alyjjnwgkbd4qigxki57v3hqa02vr1d5g7slp5njds1vk928ci"; depends=[DiagrammeR dplyr purrr visNetwork xml2]; };
-  petro_One = derive2 { name="petro.One"; version="0.1.3"; sha256="13bxd011lprimy5m3z08l4yng2fkp28b1ad1bqs0piffx5bxw13n"; depends=[cluster data_table dplyr ggplot2 graph magrittr RColorBrewer Rgraphviz rvest RWeka tibble tm urltools wordcloud xml2]; };
   pewdata = derive2 { name="pewdata"; version="0.2.0"; sha256="17j8fdn9x6hannr91zyccya523z3zm03gr517xfcyrd0m486xnqb"; depends=[httr magrittr purrr rvest]; };
   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.11"; sha256="1xfbpbxqynglw7j311pmx3qsi40r0416yflklh0qggr3pq0qf88k"; depends=[BayesTree]; };
+  pgbart = derive2 { name="pgbart"; version="0.6.12"; sha256="0ykxdrjwswh6kwrs5f83ifqyf23hgq6q73aidmsh1p9iwaxg429r"; 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]; };
   pglm = derive2 { name="pglm"; version="0.2-1"; sha256="14hnlidf62kzcf83jc7k17n4hjjaj82scdwh8a7qxd056vygkqx2"; depends=[maxLik plm statmod]; };
   pgmm = derive2 { name="pgmm"; version="1.2.2"; sha256="1z39148gvs5nndd54x2afpsqdyqd8apjgnxn0ndv2071aa8gyk1j"; depends=[]; };
   pgnorm = derive2 { name="pgnorm"; version="2.0"; sha256="1k9z7pvmranr8m62v7amc0pj6lwzh3wqi79gg3mflifn1mr6c057"; depends=[]; };
   pgraph = derive2 { name="pgraph"; version="0.8"; sha256="1r784snci5m81qljfh1r3w8qzszmy0476zvsd1alh43afzg9zpr5"; depends=[energy glasso glmnet SAM]; };
+  pgsc = derive2 { name="pgsc"; version="1.0.0"; sha256="1y4szqn1jhp3yn8q738dpbhnqcqk45vgbmczamai154w3wb0qai7"; depends=[nloptr Rcpp RcppArmadillo reshape2]; };
   ph2bayes = derive2 { name="ph2bayes"; version="0.0.2"; sha256="1xm7930gycxrz308dnfnp023yidqik52sbrli35f3773mnfcid2g"; depends=[Rcpp]; };
   ph2bye = derive2 { name="ph2bye"; version="0.1.4"; sha256="0h5d8d4bagkp6g0nb67cb225ki5p1amnclnfj6afgdcsli5clr67"; depends=[animation nleqslv Rcpp VGAM]; };
   ph2hetero = derive2 { name="ph2hetero"; version="1.0.2"; sha256="0aphkdb0ka8lk9q3r4ivkv4hrn7xz62rgqdbpkcwh9s455n38nyi"; depends=[clinfun mvtnorm]; };
@@ -9591,8 +10000,8 @@ in with self; {
   phangorn = derive2 { name="phangorn"; version="2.4.0"; sha256="0xc8k552nxczy19jr0xjjagrzc8x6lafasgk2c099ls8bc1yml1i"; depends=[ape fastmatch igraph magrittr Matrix quadprog Rcpp]; };
   phantom = derive2 { name="phantom"; version="0.1.3"; sha256="0kgw65jziw5s03isq5ywmqijhkbik5i84k30hx5gbi0zzgj8y0h1"; depends=[gplots MASS NMF qusage RColorBrewer Rcpp RcppArmadillo]; };
   phase1RMD = derive2 { name="phase1RMD"; version="1.0.8"; sha256="1wvlajsqb8y8f30asq1lyk87kmakh2risnky98g5gday765y90qa"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; };
-  phaseR = derive2 { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; };
-  phateR = derive2 { name="phateR"; version="0.2.8"; sha256="17wlfdcfb14wxv3j45pd5672g5b2w858b65z6x3ck4hi2v8kz19v"; depends=[ggplot2 Matrix reticulate]; };
+  phaseR = derive2 { name="phaseR"; version="2.0"; sha256="14shpsyrcz1j0bl60vh37cpcvmry48s76xlf4f9lmq4l5vynhrcn"; depends=[deSolve]; };
+  phateR = derive2 { name="phateR"; version="0.2.9"; sha256="0zsi047rm0vi5ap4aaiab0ll19xarbg31k4q3fs3dcmsnqg1nrj1"; depends=[ggplot2 Matrix reticulate]; };
   phcfM = derive2 { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; };
   pheatmap = derive2 { name="pheatmap"; version="1.0.10"; sha256="1jzxs5hwbz3r0z2pp09i7fd14sndxnrbm3zibaac3kny4nzydzf7"; depends=[gtable RColorBrewer scales]; };
   phenability = derive2 { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6jfg23cnwh7hhmwv6538wg2jla9w138la7rhpd1"; depends=[calibrate]; };
@@ -9601,8 +10010,8 @@ 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]; };
-  phenocamr = derive2 { name="phenocamr"; version="1.1.0"; sha256="10k7z82skkf9l15a2b77ygg5lkg0x68z7xbkw4p3mgs68dd9ah63"; depends=[changepoint curl daymetr DT jsonlite leaflet plotly shiny shinydashboard zoo]; };
-  phenology = derive2 { name="phenology"; version="7.0"; sha256="1glbjm7i2kyl04k0sam29zy1lpzfq2mpkgg44jpnby8c9vz8pkmi"; depends=[HelpersMG lmf numDeriv optimx]; };
+  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]; };
   phenopix = derive2 { name="phenopix"; version="2.3.1"; sha256="1yy163nh2b74m0v7f2gkgxaplvw4whs2h30bkw4chl0zyrcrci86"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster SDMTools sp stringr strucchange zoo]; };
   phiDelta = derive2 { name="phiDelta"; version="1.0.1"; sha256="0g1g5516p8i1gfpvsy75rdirib8sx1ki2mbf1cvgsnzh70h72gbv"; depends=[]; };
@@ -9611,10 +10020,10 @@ in with self; {
   phonR = derive2 { name="phonR"; version="1.0-7"; sha256="0al2cbynnbvmd90lk1w1g1ppslqq0ng8vbb6bl7m4kqwd2lgv056"; depends=[deldir plotrix splancs]; };
   phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; };
   phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; };
-  phonics = derive2 { name="phonics"; version="1.0.0"; sha256="02bkw589iijlzbw0cbg9qhq99jij2p92cqrxa77chkly4naqkqds"; depends=[BH Rcpp]; };
-  photobiology = derive2 { name="photobiology"; version="0.9.21"; sha256="02516yl2fgfnswyfrhq8s229bniv81ml5vkdq7ap17a2g4v92hvc"; depends=[caTools dplyr lubridate plyr polynom rlang splus2R tibble]; };
+  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.14"; sha256="1q0dd3szr06rm6zy2mkb37n4s37554x71jgkhmw88iiy58y2fkv5"; depends=[colorSpec dplyr hyperSpec lazyeval lubridate pavo photobiology readr readxl tibble tidyr]; };
+  photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.17-1"; sha256="1m2hjpjciqc1r53qflv7ci2n7jnng11aij8wz91nzi0y0ypics60"; 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]; };
@@ -9622,10 +10031,10 @@ in with self; {
   photobiologySun = derive2 { name="photobiologySun"; version="0.4.0"; sha256="0aczf1ki623pflsnn08z0nrsx7wwn67b8ql08ar08rpk1bj93nfy"; depends=[photobiology]; };
   photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.2"; sha256="0l1784xi9hzsxmiqipv0zkb4lq1xd9f890rzsgsjb0km6js5x3q7"; depends=[photobiology]; };
   phrasemachine = derive2 { name="phrasemachine"; version="1.1.2"; sha256="1145c8ymarhbza8253rw4ybnq0k5pcckqxpdcr8s2y23pj182r1p"; depends=[NLP openNLP stringr]; };
-  phreeqc = derive2 { name="phreeqc"; version="3.3.10"; sha256="0hcdjj1wgfknqf5yx50b9vz5f72siw4dslyvk2xbrfnwbzzz4qib"; depends=[]; };
+  phreeqc = derive2 { name="phreeqc"; version="3.4.9"; sha256="0g3xlpwzb6vxz129kh7krf2lbhx6bgwmyjxk09mrzxzh3r5lqd9y"; depends=[]; };
   phtt = derive2 { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; };
   phuassess = derive2 { name="phuassess"; version="1.1"; sha256="0jplj9gih32dllx2hw5aqvc9b94sbrbv66s3a5r8mdbpjh93rhng"; depends=[]; };
-  phuse = derive2 { name="phuse"; version="0.1.5"; sha256="0cl36yxxhadg5rwdz3pxzqly52bv5510rr5ijyzb0x24l7zx6pjk"; depends=[git2r RCurl rlist shiny yaml]; };
+  phuse = derive2 { name="phuse"; version="0.1.6"; sha256="1abfpnf5z88gg0cylfh7j4226yniw3sgx08asrr7xxq6ri0yxl4w"; depends=[git2r httr RCurl rlist shiny yaml]; };
   phybreak = derive2 { name="phybreak"; version="0.2.0"; sha256="0vapc0w308wv1cd72p2xbj3q7jfnxwp08g5g8855a38pcn3njbfg"; depends=[ape phangorn Rcpp stringr]; };
   phyclust = derive2 { name="phyclust"; version="0.1-22"; sha256="0c3w1vafhcshnh5lkb6bykk6w7w91qigz3sf215zqmrra1acri0d"; depends=[ape]; };
   phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; };
@@ -9639,31 +10048,34 @@ in with self; {
   phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
   phylolm = derive2 { name="phylolm"; version="2.6"; sha256="0vah8ibicldi57wab4sk1kx7gdq6h34bm6swmxzhq7kikxfwmmyj"; depends=[ape future_apply]; };
   phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; };
-  phylopath = derive2 { name="phylopath"; version="1.0.0"; sha256="1n6f7piygps3pwqapsvqpz764995kxhdqz1hc5n6znvl01ykdqx5"; depends=[ape dplyr ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble tidyr]; };
+  phylopath = derive2 { name="phylopath"; version="1.0.1"; sha256="135b0zhspjns8jdb2y5ajhziyglkr9f5x1618i71dr5848mfkpha"; depends=[ape dplyr ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble tidyr]; };
   phyloseqGraphTest = derive2 { name="phyloseqGraphTest"; version="0.0.2"; sha256="1xgv2kf7j3ia5vk10r7w9588rfv7asdaf8f3yxwp5q7aqn3krm6q"; depends=[ggnetwork ggplot2 igraph intergraph phyloseq]; };
   phylosignal = derive2 { name="phylosignal"; version="1.2"; sha256="0apsg4v1n58wn8y8wnl6x1ahl903i29hh8bs2dw6ky2jafkjj4jb"; depends=[adephylo ape boot DBI igraph phylobase Rcpp RcppArmadillo]; };
   phylosim = derive2 { name="phylosim"; version="3.0.2"; sha256="148zm43cgdhr264ffcabjx4abykks07jix6lypqysqy25fbmdngk"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; };
+  phylotaR = derive2 { name="phylotaR"; version="1.0.0"; sha256="0plxc3l9fxxj9mfnhnpp5wrxyvxm292fxrwx2g8xysasmjb301v9"; depends=[ggplot2 igraph R_utils rentrez sys treeman treemapify XML]; };
   phylotate = derive2 { name="phylotate"; version="1.2"; sha256="19nssrdax5w5a50159j39jgs7305s48k3h56ivyzs5di6l7x1yxj"; depends=[]; };
   phylotools = derive2 { name="phylotools"; version="0.2.2"; sha256="1dhk1ncp5zi4zl1xfnjz64v983dm7bq7iimfjin80j0bdcpps44w"; depends=[ape]; };
-  phyndr = derive2 { name="phyndr"; version="0.1.0"; sha256="03y3j4ik6flrksqm2dwh2cihn12hzfdik0fsak4zbxjdzaqn5gim"; depends=[ape]; };
   phyreg = derive2 { name="phyreg"; version="1.0.2"; sha256="0m1psq79zl7h8791pl8g6i0ybda7vgddza8r9mwqhg4sw1q4bzcp"; depends=[]; };
-  physiology = derive2 { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; };
-  phytools = derive2 { name="phytools"; version="0.6-44"; sha256="1y815pv1cksj244vcb7q4qr45gzr4cb1qwi166h65ryggywcj48w"; depends=[animation ape clusterGeneration coda combinat maps MASS mnormt msm nlme numDeriv phangorn plotrix scatterplot3d]; };
+  physiology = derive2 { name="physiology"; version="1.0.1"; sha256="01vza10gfcab8xxq5xszg7yxnsg3cg1x9yhz05jdy34xir7p1jvf"; 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.2.0"; sha256="1bclrv0g2frdw6bfqacjbbzn9vg3354i2bh5zn6hkix7r8rqymzg"; depends=[MASS Matrix]; };
+  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]; };
-  piecewiseSEM = derive2 { name="piecewiseSEM"; version="2.0.1"; sha256="1pi0jii0yhmvy0rqlchlijrhvdqa07i4wzj4cdd25bbjnfy97ayc"; depends=[car lme4 MASS nlme pbkrtest]; };
+  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]; };
-  pillar = derive2 { name="pillar"; version="1.2.3"; sha256="1rzhssprqgam1nq3s0f5rzxhxsq02azcghvxf6k8kmsmddf1n7f8"; depends=[cli crayon rlang utf8]; };
+  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.0.1"; sha256="1l50k34xrnhfwwnwa7ym97blhqi84nkgcf9y5yg6hcg75ajgi6zl"; depends=[Rcpp RcppEigen]; };
-  pinbasic = derive2 { name="pinbasic"; version="1.2.0"; sha256="1sn4q9g2pw8z6gyxi302bd7p578ldy1g6419w56z7jgv7m8n7g73"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; };
+  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]; };
   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=[]; };
   pinnacle_API = derive2 { name="pinnacle.API"; version="2.3.3"; sha256="1b6adns1xr3cgcj2mdjvl16cm2vjjgsj2l8m2c47plyc5jh05qmb"; depends=[data_table httr jsonlite magrittr openssl purrr rjson uuid]; };
   pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; };
-  pinp = derive2 { name="pinp"; version="0.0.5"; sha256="12wypniib0pacgd3lvk64r1xy01yangjk9k2b2pkj8il4ycvijk4"; depends=[knitr rmarkdown]; };
+  pinp = derive2 { name="pinp"; version="0.0.6"; sha256="1424syaxq8p0ldqa0ybn0qyizs4r00xgkf6h5p7frhavy4rf8f2v"; depends=[knitr rmarkdown]; };
+  pinyin = derive2 { name="pinyin"; version="1.1.4"; sha256="0qndd2mc95hbzkb0aqvmyhk2anwk7msd8xqy0rfiyrab94kxmgla"; depends=[data_table splitstackshape]; };
   pipe_design = derive2 { name="pipe.design"; version="0.5.1"; sha256="0r0szkdzifxmnnbr6675w8ij4zwqgxj3gwahc7a74mxr51f7qh8j"; depends=[ggplot2 gtools xtable]; };
   pipeGS = derive2 { name="pipeGS"; version="0.4"; sha256="0ki4i70r5f195b4jfv3hxlxz3zj57mhy2yf4984bwr11impilz5w"; depends=[]; };
   pipeR = derive2 { name="pipeR"; version="0.6.1.3"; sha256="16lj227x24pviqb4dcrj7a55l31p5mm0cbwsb6m3y3n6k5wcd2nh"; depends=[]; };
@@ -9674,18 +10086,20 @@ in with self; {
   piton = derive2 { name="piton"; version="0.1.1"; sha256="1265y4lv2m5nwrh25sahjkxwmivpxgh9shrdidlmaman7zs6cclr"; depends=[Rcpp]; };
   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="0.4.0"; sha256="1q7gmfrqx3sn32q9rrr0y3hywq0fvm5gs5d3jj6mqcbs53jqvzqc"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; };
+  pivottabler = derive2 { name="pivottabler"; version="1.0.0"; sha256="106q62bfnkmh328kdzshwz8v01pz2qiyxcgmfbn3rc0cd9ml6wyj"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; };
   pixels = derive2 { name="pixels"; version="0.1.0"; sha256="0lna0z2shs49kh48ipjnyigaa22wb9gm4mq970ldhh9msb7wcv55"; depends=[htmlwidgets miniUI shiny]; };
-  pixiedust = derive2 { name="pixiedust"; version="0.8.4"; sha256="0rq1q30x36p1135kv2s8nfshi8w73167dj14f4c5m3fczhljc7lr"; depends=[broom checkmate dplyr htmltools knitr labelVector magrittr scales tidyr]; };
+  pixiedust = derive2 { name="pixiedust"; version="0.8.5"; sha256="1b3i2l6vzqbpycp9fw439k4jzdy19kvsjj4j6klfvdbkqf911hfw"; depends=[broom checkmate dplyr htmltools knitr labelVector magrittr scales tidyr]; };
   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.0"; sha256="10iz8057mixl9j73pq2cbp4ib6dadfsgi3fcsjjm7l3wwb9issd9"; depends=[callr crayon desc R6 rprojroot withr]; };
-  pkgconfig = derive2 { name="pkgconfig"; version="2.0.1"; sha256="0h2sp93fqqjbfqgq82a3i94ybnndx6ghaal8pbf99firnsjb40mb"; depends=[]; };
+  pkgbuild = derive2 { name="pkgbuild"; version="1.0.2"; sha256="1i1rrax7x7r2bplig5cfc50lx85jc4n9a3qmvbdviaj22wr2lghs"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; };
+  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]; };
   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]; };
+  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]; };
   plRasch = derive2 { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; };
@@ -9694,7 +10108,7 @@ in with self; {
   placement = derive2 { name="placement"; version="0.1.1"; sha256="1narjb90sb5prvzfv2x30bz8y9aq8hqggza91ghwi47m99vm1dg6"; depends=[base64enc digest jsonlite RCurl stringi urltools]; };
   plan = derive2 { name="plan"; version="0.4-3"; sha256="0j3mvcy97r7adcs7q6z0w9ng74jcfwii1xp8kcl2cwbzs2fd425r"; depends=[]; };
   planar = derive2 { name="planar"; version="1.6"; sha256="0x5xdb2afpc1w8s217hy765mz938kg5b5j7vzqzhlsh2dzdjccpj"; depends=[cubature dielectric ggplot2 plyr Rcpp RcppArmadillo reshape2 statmod]; };
-  planor = derive2 { name="planor"; version="1.3-9"; sha256="0hivy4iqfw896d2zmcx5c3rmlfj8fkqg1qn2x8mdlial3dzm3mz6"; depends=[bit64 conf_design Rcpp RcppArmadillo]; };
+  planor = derive2 { name="planor"; version="1.4-1"; sha256="1ci4wp18jjc8pjdn89vsz0nfdjif7fz6l5f6x6blqh9cz4hkkrlf"; depends=[bit64 conf_design Rcpp RcppArmadillo]; };
   plantecophys = derive2 { name="plantecophys"; version="1.3-2"; sha256="1jj9rkhdmcnmp6fzbxmkfwmsdx2w7v923rv0xn5c5iv7wys7vwfm"; depends=[]; };
   plaqr = derive2 { name="plaqr"; version="2.0"; sha256="15pdb57123m3cahvcsyrrvxjwxvs2f389yxip91gjxn68jf6cx1l"; depends=[quantreg]; };
   plater = derive2 { name="plater"; version="1.0.1"; sha256="0v5b9r6iha18qvrjpbr1p8fy06nf31x63ch5cnb4axyqa0x5skpp"; depends=[dplyr]; };
@@ -9704,7 +10118,7 @@ in with self; {
   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]; };
   plfMA = derive2 { name="plfMA"; version="1.0.4"; sha256="0q6wiiknmgw812kcf9qq309zlizyry7ldn6m08lkw6xq6i4f4s85"; depends=[cairoDevice gWidgets gWidgetsRGtk2 limma RGtk2]; };
-  plfm = derive2 { name="plfm"; version="2.2.1"; sha256="00x6yyr32rhh6696z5aazj98nyd01i26ij9hs2sxf6j677fmppdr"; depends=[abind sfsmisc]; };
+  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]; };
   plm = derive2 { name="plm"; version="1.6-6"; sha256="1a14a8zbqzm2a6z44haa0c23ax9j1jk72dhrkca8q0abbd5lkx85"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme sandwich zoo]; };
@@ -9721,22 +10135,23 @@ in with self; {
   plotSEMM = derive2 { name="plotSEMM"; version="2.4"; sha256="0fircrayhz92zvkigkyb1zpn07bvssqs1ip15p926zj3rl77fqgy"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; };
   plotfunctions = derive2 { name="plotfunctions"; version="1.3"; sha256="0cnmwkfjg45187j490sf01gxijhajrpi6j13hfckli2ysn6xrgz3"; depends=[]; };
   plotluck = derive2 { name="plotluck"; version="1.1.0"; sha256="0arbvldg50lyn98vkrys1yjkkraz8jracwal4r2mlw991pnaikpp"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; };
-  plotly = derive2 { name="plotly"; version="4.7.1"; sha256="0wj9lw7w28z8w9ip9vadv6sydjhqyg65kfiai9m3bndzz50b1m3w"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr purrr RColorBrewer scales tibble tidyr viridisLite]; };
+  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.4.2"; sha256="19g3b0pjxzv1nd65q0aimgw16xyq451l8bgyfhvwxm30c4qyafd5"; depends=[plotrix TeachingDemos]; };
+  plotmo = derive2 { name="plotmo"; version="3.5.0"; sha256="14v703ky45sw34iwbqna7f8hylzbnlqm2gnml7avdp2i8ycli8wb"; 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-2"; sha256="0hx3xv94gzlyy7ny5k4mzs7w1798h1zka175m5bkzc524493cm88"; depends=[]; };
+  plotrix = derive2 { name="plotrix"; version="3.7-4"; sha256="1hs0zwaqs34559girinvysjfbvznyn8znp9cwvkqx6k2cqvcjinj"; depends=[]; };
   plotrr = derive2 { name="plotrr"; version="1.0.0"; sha256="07ilqpa3ypqb2gpnq23r9v4kkfxz06mcak9si9adr9sf6c7gqwxz"; depends=[dplyr ggplot2]; };
+  plotscale = derive2 { name="plotscale"; version="0.1.6"; sha256="0h2g0rv1lh70nqmqydgg5swwnwmy08wbjajxyb1c2a716rad765j"; depends=[]; };
   plotwidgets = derive2 { name="plotwidgets"; version="0.4"; sha256="1w7c9grw4pyyra230196yq32snr4wdg6xi8vh4dx5df2v500wz22"; depends=[]; };
-  pls = derive2 { name="pls"; version="2.6-0"; sha256="15j59p5x0rkdrk7iqzkipsy50rsyjl31w8zxc4w3v1j5gzxhi1rx"; depends=[]; };
-  plsRbeta = derive2 { name="plsRbeta"; version="0.2.2"; sha256="1ia3hngpzaav3gfcxajb1fxa2ljgbwd5xkrahc2bxi7wfdidngs5"; depends=[betareg boot Formula MASS mvtnorm plsdof plsRglm]; };
-  plsRcox = derive2 { name="plsRcox"; version="1.7.3"; sha256="17x79ihl9xpahva9ibbipyp1z9crvwm3y5g7ynxfjq7rjxwvw13y"; depends=[kernlab lars mixOmics pls plsRglm risksetROC rms survAUC survcomp survival]; };
+  pls = derive2 { name="pls"; version="2.7-0"; sha256="0xaqqgmdvfh7g7v1m4bcwjqzph68b9cq3bn4kjisfsadl54i5p2x"; depends=[]; };
+  plsRbeta = derive2 { name="plsRbeta"; version="0.2.3"; sha256="0yk2pirgszpdf33zk9ijh776aw4f238sjmga3w06xbvwf8q2vw8j"; depends=[betareg boot Formula MASS mvtnorm plsdof plsRglm]; };
+  plsRcox = derive2 { name="plsRcox"; version="1.7.3.1"; sha256="1ni1hx54qxk48nnypqd9j189vi4vph3lqg06r39mv7xa4ap8ypmv"; depends=[kernlab lars mixOmics pls plsRglm risksetROC rms survAUC survcomp survival]; };
   plsRglm = derive2 { name="plsRglm"; version="1.2.3"; sha256="0qf3nh3nw6psqr12zw9r5vagrlpwav3xiv3rh7xra13zx821kr4g"; depends=[bipartite boot car mvtnorm]; };
   plsVarSel = derive2 { name="plsVarSel"; version="0.9.4"; sha256="19xz7ds4jx5ql999mwn9zs983rlshf14y4nlah8cfy9gpi0vl1g1"; depends=[bdsmatrix genalg MASS mvtnorm pls progress]; };
   plsdepot = derive2 { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; };
-  plsdof = derive2 { name="plsdof"; version="0.2-7"; sha256="1z8z9m0nsnyy1fipzvm1srpxn3q6wjrlivmmki1f8plwkixkyc5y"; depends=[MASS]; };
-  plsgenomics = derive2 { name="plsgenomics"; version="1.5-1"; sha256="0d2k3h2cwwhcv7mbxqypd7g6yp1l6j32n3wslm348zmcx50j9pn4"; depends=[boot fields MASS plyr reshape2 RhpcBLASctl]; };
+  plsdof = derive2 { name="plsdof"; version="0.2-8"; sha256="00phvvb17s0y2f0xqwak7lp7bdx9lws3m5n5mbd9l8514pfdxcxc"; depends=[MASS]; };
+  plsgenomics = derive2 { name="plsgenomics"; version="1.5-2"; sha256="1pvb50nv6jc99bm2hsxpzazg26y49yi24wwwim5xcjj6j1szbip4"; depends=[boot fields MASS plyr reshape2 RhpcBLASctl]; };
   plspm = derive2 { name="plspm"; version="0.4.9"; sha256="03aj1ffq11hh931dbkxy9ba74xyvzmr1ylrj4fw1rbryrwqg89v6"; depends=[amap diagram shape tester turner]; };
   plspm_formula = derive2 { name="plspm.formula"; version="1.0.1"; sha256="1i2d1q8pz21js1ci8afnqzcky430hh1iwf5f6jr3j9yr9gs365k5"; depends=[plspm]; };
   plspolychaos = derive2 { name="plspolychaos"; version="1.1-1"; sha256="078arfv8z5nfrmsfi0n7hskmv394ysi6nhlskpy5cg37lqiwh0r1"; depends=[lhs MASS]; };
@@ -9747,13 +10162,14 @@ in with self; {
   plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
   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.3"; sha256="1k83ysgc4dwms0k5knh2rj99l3kfclw9a29h2ksphy0g4r1ig9k3"; depends=[dplyr glue purrr rlang tibble]; };
+  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]; };
-  pmhtutorial = derive2 { name="pmhtutorial"; version="1.2"; sha256="1dviqazdk3ggxwwyv20409w3qadka0gbcgviwyywssn2x4cg0vih"; depends=[mvtnorm Quandl]; };
-  pmml = derive2 { name="pmml"; version="1.5.4"; sha256="1acld1x0z5rgyxb5id071s3zvf2vbv4b9nngvxrb63ay3yyy124b"; depends=[stringr XML]; };
-  pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.1"; sha256="1cxmp3fgsf3z71v6qpd9l9ilgda5knan7vqifxpgm8m7a30sp3f3"; depends=[]; };
+  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=[]; };
+  pmpp = derive2 { name="pmpp"; version="0.1.0"; sha256="1vmv7aav0rvp7kd5f16ym422ygw1wpnwrhmmp2w1c2fl8i263zh9"; depends=[data_table dplyr ggplot2 magrittr MASS Matrix minqa moments plm pracma]; };
   pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
   pmultinom = derive2 { name="pmultinom"; version="1.0.0"; sha256="0p2amb3y4jl24r21fii1qpmdbn5pfgywrx8k7x1jxpg49rk7k0rp"; depends=[fftw]; };
   pmxTools = derive2 { name="pmxTools"; version="0.1.0"; sha256="1a242c85ywk026vb778s8bjc331ww11rb15pai02wbvpw9x4kpa0"; depends=[GGally ggplot2 magrittr MASS PKNCA plyr stringr XML xpose]; };
@@ -9769,40 +10185,45 @@ in with self; {
   pointdensityP = derive2 { name="pointdensityP"; version="0.3.4"; sha256="0vv8j1yz8n2vmmp6bg2i8w3dchdbybsdxn3sk5d1ync2knih8l2s"; depends=[data_table]; };
   poio = derive2 { name="poio"; version="0.0-3"; sha256="1smbnqjlicaqq2hswl910yiirzb9zikbk4pqxm9pwpixywj0nkys"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr R6 stringi tibble whoami]; };
   poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; };
+  poisFErobust = derive2 { name="poisFErobust"; version="1.0.1"; sha256="0qgwl5gb2rw043zb0h1rrv038ymsd72r8h9gqdr2xkfbi3mnr24r"; depends=[data_table glmmML]; };
   poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; };
   poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; };
   poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; };
+  poissonMT = derive2 { name="poissonMT"; version="0.3-5"; sha256="14qkc8qz3423b13gp6gsp8cbb1nv9wwjjfa4i9zc15qy5i99ha26"; depends=[checkmate MASS robcbi robustbase]; };
   poistweedie = derive2 { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; };
   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="1.2.0"; sha256="0vn9wdlh3bi24mcq0r4ani2b0hhlg1za1z6fw8ikz7952gpacqk8"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; };
-  politeness = derive2 { name="politeness"; version="0.2.4"; sha256="0r8wsghznbkdl3nn1rh7wi3l9zggdrvi2yjish7inkd8ygs4p8x1"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; };
-  pollen = derive2 { name="pollen"; version="0.70.0"; sha256="1hk9sjxzwglj98ryic3m80lajzv1klnq9dl6i97c8f0ihbf97zdq"; depends=[dplyr lubridate purrr]; };
+  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]; };
+  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]; };
   pollstR = derive2 { name="pollstR"; version="2.0.1"; sha256="13g5z1hix1bmsxznq5qx82yf445rvvyn67ch9bihxm1hr4cr4sbl"; depends=[httr lubridate purrr stringr]; };
-  polmineR = derive2 { name="polmineR"; version="0.7.8"; sha256="18dg0p74drc9awgiwsy3wkdc3z350kvsdsjhnm35047kqg67v2bc"; depends=[data_table DT jsonlite Matrix pbapply R6 RcppCWB slam stringi tm xml2]; };
+  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.6.1"; sha256="16nr83gmv6pnk89nqxh8ihzacb0y8l4lz05c8sp6whmr26ja9vnf"; depends=[sp]; };
-  polyPK = derive2 { name="polyPK"; version="3.0.0"; sha256="1vdfsad2b9habvm2ikjgn7ihnm851q9lqmgqjlsl737ka1vsgisf"; depends=[circlize corrplot gplots Hmisc impute imputeLCMD mixOmics pcaMethods pkr plyr ropls samr sqldf xlsx]; };
+  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]; };
   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=[]; };
   polyapost = derive2 { name="polyapost"; version="1.5"; sha256="0r2h51l2y0sj0xahdzfy1lyq4kh166crh2j02sk85q577q9d883y"; depends=[boot rcdd]; };
   polychaosbasics = derive2 { name="polychaosbasics"; version="1.1-1"; sha256="1kw5c4dmgpkbk2a30hh5n6xqpnbh6q2swxsdjkmcmhkwrzm4ylm2"; depends=[lhs MASS]; };
-  polyclip = derive2 { name="polyclip"; version="1.9-0"; sha256="0c4xf5m1amig0glnq3nczrl3fww0g57xwkgb6qnkyc7l7chin9ac"; depends=[]; };
+  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.16"; sha256="0j9zsgm4v78scsl4bblrf2rs691296p1sdimqqzs03d56cgaky04"; depends=[combinat doParallel foreach igraph knitr MDSMap]; };
+  polymapR = derive2 { name="polymapR"; version="1.0.17"; sha256="148mnkarrc9k15vy82f2wma6was8p41hg7wlv2kc50sn30v5gkwa"; 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]; };
   polywog = derive2 { name="polywog"; version="0.4-1"; sha256="02qk1cyvkd77mwlvhj1zzzi0bmy7qxz29j2v730wp7rz4w7h5x5n"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; };
   pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; };
-  pomp = derive2 { name="pomp"; version="1.17"; sha256="0f7706hgpa70b5l1p34yq57fqyk4w55z8d5rvsv03m2cxilngc9k"; depends=[coda deSolve digest mvtnorm nloptr subplex]; };
-  pompom = derive2 { name="pompom"; version="0.1.4"; sha256="0j37gq6lfccypclhrp7w3yfgsjbhfgqwg7x87r6rgywz6b3fnsgh"; depends=[ggplot2 lavaan qgraph reshape2]; };
+  pomp = derive2 { name="pomp"; version="1.18"; sha256="0x77vx09ps4p1ihcd6yb4halr8jsq67d8zc04hp6vqkk0s7ycvyx"; depends=[coda deSolve digest mvtnorm nloptr subplex]; };
+  pompom = derive2 { name="pompom"; version="0.2.0"; sha256="1alz3lrj7m16vhymsvvrcmf0kmgx88q2f3v4j6wiciqv77bnyai1"; depends=[ggplot2 lavaan qgraph reshape2]; };
   pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; };
   pool = derive2 { name="pool"; version="0.1.4.1"; sha256="1a8kyfwylr8gl2z2w2fmf6657yqvw0ylf1pxg00flddf8fnwbh0w"; depends=[DBI dbplyr dplyr later R6]; };
-  poolfstat = derive2 { name="poolfstat"; version="0.0.1"; sha256="1g6qx4518cr77wdlbicda68jm2yji24h14mjv5sq7zq241h4ailh"; depends=[]; };
+  poolVIM = derive2 { name="poolVIM"; version="1.0.0"; sha256="19yw6pp5l3jmla4wjbvpjq132f645yks49pzsdv123f3qfr8f0m6"; depends=[EmpiricalBrownsMethod Hmisc ranger]; };
+  poolfstat = derive2 { name="poolfstat"; version="1.0.0"; sha256="15s9zs13x9w5lxxibkpg40sg2hgaqfx1gbcpdq4yb0zpjpjlg9x1"; depends=[]; };
   pooling = derive2 { name="pooling"; version="1.1.1"; sha256="0011w80pxz01scj2sa69m1bcfq797hq3ihpw46fdlxsxavz8prwy"; depends=[cubature dplyr dvmisc ggplot2 ggrepel mvtnorm pracma]; };
   pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; };
   pop_wolf = derive2 { name="pop.wolf"; version="0.1"; sha256="19n00xv47v9j7slvm2ykzlksjfwjzimf88b3nk0y0192c29sdc9x"; depends=[abind]; };
@@ -9814,18 +10235,22 @@ in with self; {
   popdemo = derive2 { name="popdemo"; version="1.3-0"; sha256="0760ajqaq822m0j092gdqzhgw1mk413k09mmmwyzb0jzj6bd15q3"; depends=[expm MCMCpack]; };
   popkin = derive2 { name="popkin"; version="1.0.5"; sha256="147ic0d7cgs4x9vz4jm4wd6ckikn0s8a0q1mknmcrcfisq8zim75"; depends=[RColorBrewer Rcpp RcppEigen]; };
   poplite = derive2 { name="poplite"; version="0.99.19"; sha256="0y1l21clp9b5m50chqnqmvyd6rsk6xgn2bqf1877gx3h1qidh5fm"; depends=[DBI dbplyr dplyr igraph lazyeval RSQLite]; };
-  poppr = derive2 { name="poppr"; version="2.8.0"; sha256="132lfxcdqxhh3f09sdgwas4372yrqcflws936fqyp0isg59siyzx"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn polysat rlang shiny vegan]; };
+  poppr = derive2 { name="poppr"; version="2.8.1"; sha256="1pl6lqbcrqrzz28cs70ki8bp749af4b8a9dk1bcdwg290vxzqywp"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn polysat rlang shiny vegan]; };
   popprxl = derive2 { name="popprxl"; version="0.1.4"; sha256="076aia4qbq5yw2nxafq2ys5n5c7wv77i8k1nmzb3all193vjf203"; depends=[poppr readxl]; };
   popsom = derive2 { name="popsom"; version="4.2"; sha256="11d6z3qsq94k0557pnwa0h4pc718360lvg9jkblp8abnj52lcvvv"; depends=[class fields ggplot2 som]; };
   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.2"; sha256="00xfpfd1ly2cv82x5r9sy1h7gq2yhhw2gz0sw3z1cpk9vxzvr6d9"; depends=[devtools ggplot2 plyr roxygen2 shiny shinycssloaders]; };
-  portes = derive2 { name="portes"; version="2.1-4"; sha256="09liy2bia76h5dh21s8skq9pj8k4wpq5agwrmr1pnvlpgc8m2b60"; depends=[]; };
+  populationPDXdesign = derive2 { name="populationPDXdesign"; version="1.0.3"; sha256="0p73ddv3j1s1vs4j3axnsf39n626qjv0w1qlq9p7km4s6729bhgv"; depends=[devtools ggplot2 plyr roxygen2 shiny shinycssloaders]; };
+  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]; };
   portfolioSim = derive2 { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
+  portsort = derive2 { name="portsort"; version="0.1.0"; sha256="0swl39dn7lzwvps18bva4l64a441gkf6lbwcwrhlf93f1ardvxji"; depends=[xts zoo]; };
   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]; };
   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]; };
   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=[]; };
@@ -9836,39 +10261,39 @@ in with self; {
   powerMediation = derive2 { name="powerMediation"; version="0.2.9"; sha256="1rk8h8qn4b68ra5h5hiy9fvvbpskj9y806rwrvl1l7gs7xlmji7l"; depends=[]; };
   powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.1.0"; sha256="1xxicvw113mc2y889rklws3xml5z64sgjpn4wg95gbw6nadch7zz"; depends=[survival]; };
   powerbydesign = derive2 { name="powerbydesign"; version="1.0.4"; sha256="0xd4hylx7jl4ksycz5gfjcgy92mh5c9d4r34ap1g81ybmyk7yrsj"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; };
-  powerlmm = derive2 { name="powerlmm"; version="0.3.0"; sha256="1prg1dw0pzyz4vc7a936bgx56227ab34b3ipwxn1mm8n03xk1zqc"; depends=[lme4 MASS Matrix scales]; };
+  powerlmm = derive2 { name="powerlmm"; version="0.4.0"; sha256="0dpfvbp54lhz7ibzihqqrbl45s6dqxn6qyvv39mk2166hjcgi1h2"; depends=[lme4 MASS Matrix scales]; };
   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=[]; };
   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]; };
-  ppls = derive2 { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; };
+  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=[]; };
   ppsbm = derive2 { name="ppsbm"; version="0.2.2"; sha256="0y4whxv14jqx7mqxj7n427vpbxb5rkwj8xvx0mj4knnwy9v437z4"; depends=[clue gtools Rfast]; };
   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.4"; sha256="1ygm81i7mqvh229dp9935djjyb120p3bqvaf4k572sa4q63fzjhc"; depends=[]; };
+  pracma = derive2 { name="pracma"; version="2.1.8"; sha256="0m8ladhrfyxwybblkcdgg4xv1mk5kibmwarpj2k0c2y34zzcix4z"; depends=[]; };
   pragma = derive2 { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; };
-  prais = derive2 { name="prais"; version="0.1.1"; sha256="0vv6h12gsbipi0gnq0w6xh6qvnvc0ydn341g1gnn3zc2n7cx8zcn"; depends=[]; };
+  prais = derive2 { name="prais"; version="1.0.0"; sha256="176878dyfqfx9x2cd97c43qb0gn0rs04jn3268n9yksfsxmrr4wx"; depends=[]; };
   praise = derive2 { name="praise"; version="1.0.0"; sha256="1gfyypnvmih97p2r0php9qa39grzqpsdbq5g0fdsbpq5zms5w0sw"; depends=[]; };
   praktikum = derive2 { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; };
   praznik = derive2 { name="praznik"; version="5.0.0"; sha256="01xbhcgvq6mf89ryh2gif7aa9956kpka3j4mqaxlglxs53vdrfnk"; depends=[]; };
-  prc = derive2 { name="prc"; version="2018.1-31"; sha256="0xvf1f202qwpjb1kh469jk45l592q7bfzngyi8ifry94bi7mphp7"; depends=[kyotil nlme]; };
+  prc = derive2 { name="prc"; version="2018.8-17"; sha256="13w6nqid3dqmzr39g14g0kgx727qvimyb20x0i206lj37cl347i2"; depends=[kyotil nlme]; };
   prcbench = derive2 { name="prcbench"; version="0.7.3"; sha256="0xdmwjhxpcdaiqawhmlpr4ddlx22xk3rywa70jpm1vk5hc9pwivk"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; };
   prclust = derive2 { name="prclust"; version="1.3"; sha256="0p0sf8248aigs99py8mpzz743jnrf7n1nv5shag15arxz9yx7zn3"; depends=[Rcpp]; };
   prcr = derive2 { name="prcr"; version="0.1.5"; sha256="1hfr0jijnj5nd25rh16i81bsz8kwz0q9vmn7bqgy467cwvypg9k2"; depends=[class dplyr ggplot2 irr lpSolve purrr tibble tidyr]; };
-  pre = derive2 { name="pre"; version="0.5.0"; sha256="04dfn9nd0ikilz7cf7q0y7z5dn961jjg1gby7h46fixkwnf7fdfs"; depends=[earth Formula glmnet partykit rpart stringr]; };
+  pre = derive2 { name="pre"; version="0.6.0"; sha256="19dxm2khdw9cizxm06z41ywl2imrc9nw42ldcpjm30qfa0xqldjn"; depends=[earth Formula glmnet partykit rpart stringr survival]; };
   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]; };
-  predatory = derive2 { name="predatory"; version="1.2"; sha256="1qbkifx16ixzimshm8lsg3d1y7cj453ksn8cpwy03xql6b19r8x4"; depends=[readr stringr]; };
   prediction = derive2 { name="prediction"; version="0.3.6"; sha256="19d7312f5lkqfglfvlgssnvyw7gl161s0xradcry44r1i6qp05j1"; depends=[data_table]; };
   predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; };
-  predictmeans = derive2 { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme pbkrtest plyr]; };
+  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]; };
@@ -9884,20 +10309,20 @@ in with self; {
   presens = derive2 { name="presens"; version="2.1.0"; sha256="175nr9pqn3m6kh9bcc1gxqmqv05xdsqdw9lx385lmm1g947d2159"; depends=[marelac measurements]; };
   preseqR = derive2 { name="preseqR"; version="4.0.0"; sha256="1g2rnnmi45649vpy6z45v5i3wxm54s138ajqrzwi3a5r7x3xnhq1"; depends=[polynom]; };
   prettyGraphs = derive2 { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
-  prettyR = derive2 { name="prettyR"; version="2.2"; sha256="026cgbrqs799lg06qlwx1r9ramil790qxrb1cyl4w7mzf8sfpgn9"; depends=[]; };
-  prettycode = derive2 { name="prettycode"; version="1.0.1"; sha256="0iw38q5yx92m71wrbp52d14bl3nqwpjrd57l2w9chasmlrjnl2aw"; depends=[crayon withr]; };
+  prettyR = derive2 { name="prettyR"; version="2.2-2"; sha256="01p0g68c6k5hd4a80gmdsqd5sxy6n521ry5sh6iz06f0rbl3jlcf"; depends=[]; };
+  prettycode = derive2 { name="prettycode"; version="1.0.2"; sha256="0yz75qqpvrk4p9mypjnmrg1xwlrhh2iax2897f11cfk8rjj784jg"; depends=[crayon withr]; };
   prettydoc = derive2 { name="prettydoc"; version="0.2.1"; sha256="00amqn0izg2jrn96pmm5papqmp0chn25msjk94nim3avqg9x4x92"; depends=[rmarkdown]; };
   prettymapr = derive2 { name="prettymapr"; version="0.2.2"; sha256="151jp0l728krmxcyzwjh01mvd1zhqijq0nsgjaqsh0q8n3jmndi0"; depends=[digest httr plyr rjson]; };
   prettyunits = derive2 { name="prettyunits"; version="1.0.2"; sha256="0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m"; depends=[assertthat magrittr]; };
   prevR = derive2 { name="prevR"; version="3.3"; sha256="11syifnv0mgbybsphgaj3a2j29p2q0l4y4w008n2r9s359arjj8m"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; };
   prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; };
-  pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="0.3.2"; sha256="0hmqhsbpf8sbk5285mm8g0gi0s7s05dzbdci4fp3xyjn30659gdr"; depends=[]; };
+  pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="0.4.1"; sha256="1mk6i4rjcm938rpwd3b80y9x4vj45jsddzprzrig91dmmjp6b11i"; depends=[]; };
   prim = derive2 { name="prim"; version="1.0.16"; sha256="0i5jpk798qbvyv9adgjbzpg4dvf7x51bcgbdp38fzdnam6g88y5a"; depends=[misc3d rgl]; };
   primefactr = derive2 { name="primefactr"; version="0.1.1"; sha256="11hi75jwjxrl9p5m8yjwjb20pc9y9vkhi8sjrnisdq2hm53m483w"; depends=[]; };
   primer = derive2 { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; };
   primerTree = derive2 { name="primerTree"; version="1.0.3"; sha256="0k81h6ln9yjg3r4j8n5f8g8xlrq1pvrr5ywrw16s4mjjhx3r1ylg"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr scales stringr XML]; };
   primes = derive2 { name="primes"; version="0.1.0"; sha256="0hhkgpkadvai9xcivfalsvr5w0irsxygyz3p2zngwl3g5rvvh5g9"; depends=[Rcpp]; };
-  princurve = derive2 { name="princurve"; version="2.0.3"; sha256="1yc14nychxk2ddhqd2v7cfpx5hgdspxcrg42kvs5jvic54dbjjc2"; depends=[Rcpp]; };
+  princurve = derive2 { name="princurve"; version="2.1.3"; sha256="12ngs63n6qjx08ks99h8m2nyr3h8ygznq5j8ag6ic8p65pis5pdp"; depends=[Rcpp]; };
   prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
   printr = derive2 { name="printr"; version="0.1"; sha256="13yqqcwfqnbhvcxwrr6j45qhnbxng3qwn2ygkr809gibg9grw471"; depends=[knitr]; };
   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]; };
@@ -9907,22 +10332,25 @@ in with self; {
   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]; };
+  prob = derive2 { name="prob"; version="1.0-1"; sha256="05qcrsl790hn7p3ap4zj5i1b1sf674wvvrh42lyb7a0nsc09iq9n"; depends=[combinat fAsianOptions]; };
   probFDA = derive2 { name="probFDA"; version="1.0.1"; sha256="093k50kyady54rkrz0n9x9z98z5ws36phlj42j25yip7pzhfd6sv"; depends=[MASS]; };
   probemod = derive2 { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; };
   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.1.1"; sha256="1him2rdamg4q2kidc7a95pgihhcwfaz678cgdxgzz563dlgqkgac"; depends=[bupaR DiagrammeR DiagrammeRsvg dplyr htmlwidgets magrittr processmapR RColorBrewer rlang scales shiny shinycssloaders tidyr zoo]; };
+  processanimateR = derive2 { name="processanimateR"; version="0.3.0"; sha256="18bzn4x0aiv1z0ips2wkyb5pvdbq1fxh4mi430i44qn64z88wasi"; depends=[bupaR DiagrammeR dplyr htmlwidgets magrittr processmapR rlang scales 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.1.0"; sha256="0wjr3cqwvnjxbvln25szffmkns5w0xysivdjr6chxap4nh515b0i"; depends=[assertthat crayon R6 testthat]; };
+  processx = derive2 { name="processx"; version="3.2.0"; sha256="1pzx4ap4xa07gf9zkd6hacdsnb9sp3kb60a7v7ljl0ywrcpn1fn4"; depends=[assertthat crayon 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]; };
   productivity = derive2 { name="productivity"; version="1.1.0"; sha256="1g8b4vlyqq3xyzd4dki01glhc3g9j3ywgwpxylkmzp0ivqic53yc"; depends=[doParallel foreach iterators lpSolveAPI]; };
   productplots = derive2 { name="productplots"; version="0.1.1"; sha256="1igs6d0qwgsfk0z3vxabgv5kva9w2kpzi535gjfdrbx34j4pf3gx"; depends=[ggplot2 plyr]; };
   prof_tree = derive2 { name="prof.tree"; version="0.1.0"; sha256="0mjvxaacrgkzl0f1wn3fpgah4jh720safni66ri0dnriwcxis6rz"; depends=[data_tree]; };
+  profExtrema = derive2 { name="profExtrema"; version="0.2.0"; sha256="13fn32v4jryyw2sc6g76fmf2ivbwql0z39wqpl6ggmiwnj95sfm7"; depends=[DiceKriging KrigInv lhs MASS microbenchmark pGPx quantreg rcdd RColorBrewer]; };
   profdpm = derive2 { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; };
   profile = derive2 { name="profile"; version="1.0"; sha256="0m7fm490gqkbmnbdq3lac87zqb9qyx6546rlpa130rq1jnlgxfp6"; depends=[rlang tibble withr]; };
   profileModel = derive2 { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; };
@@ -9936,10 +10364,10 @@ in with self; {
   prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; };
   progress = derive2 { name="progress"; version="1.2.0"; sha256="1rhwm0bdw30z3rvl0bn56xprjl3zrdy7150w4gl4bkvn2d6h9fav"; depends=[crayon hms prettyunits R6]; };
   proj4 = derive2 { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; };
-  projections = derive2 { name="projections"; version="0.3.0"; sha256="1zhyylbp10g2syfj8mybr5cas68wf4h4fk3s7cca4iiihnglcfwz"; depends=[distcrete ggplot2 incidence]; };
+  projections = derive2 { name="projections"; version="0.3.1"; sha256="12vskql6x04jzik72a0vx83amfj01w9f7mxn052vsv7aaljbi124"; depends=[distcrete ggplot2 incidence]; };
   projector = derive2 { name="projector"; version="0.0.2"; sha256="15n5b2xgs0zj87pc3svlmnkjrxgkjkx941g8bs3ms90fg7nh2drc"; depends=[assertthat dbscan plotly RColorBrewer RcppAnnoy Rtsne shiny shinyjs shinythemes]; };
-  projmanr = derive2 { name="projmanr"; version="0.1.1"; sha256="0mmfmp5qf4r75q4hjbra2pxym77m16g28n94z5yj2qdzq46hgl4c"; depends=[ggplot2 igraph R6 tidyr]; };
-  projpred = derive2 { name="projpred"; version="0.8.0"; sha256="06wi8lc88xm45drqhb3mcq5l1g1zm2msgi1m0857vldg6828gjbq"; depends=[ggplot2 loo Rcpp RcppArmadillo rngtools rstan rstanarm]; };
+  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]; };
   prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.2"; sha256="10s52fkq7rv6v4gw1yd46f0fbg89ksim0qhgb5jbglzrqh585ny5"; depends=[rootSolve]; };
@@ -9948,7 +10376,7 @@ in with self; {
   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="3.5.1"; sha256="0wja6snr1hd1ms3wzg6scvs30zip5kbq0jx2j31dxrmy6fwd4h2j"; depends=[fastcluster ggplot2 igraph Rcpp]; };
+  propr = derive2 { name="propr"; version="4.0.0"; sha256="1bqprryww8qhivklla2jv0ygy49321racs2msmw4g5y6gpi29593"; 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]; };
@@ -9960,35 +10388,38 @@ 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-0"; sha256="1mi14hph6cqdsgjw4p00miaa4bh2axkwfcmxaiv7f7v4dk8i52y1"; depends=[]; };
+  protr = derive2 { name="protr"; version="1.5-1"; sha256="1hy10pd7lycnagjfbb8a6csprb1x0b30g5d0mwpp5jz2d1nadpgh"; 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.0"; sha256="1775dxxk506nwaigyjsvprf4fibmiamwp7p7cl01g3mbr4gyrm0z"; depends=[IsoplotR MASS]; };
+  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.3"; sha256="1686lfmzmzl1488xnppv95hfr83gf67xfzqsw49gdas0aba3plhh"; depends=[AhoCorasickTrie doParallel foreach Matrix plyr seqinr stringr]; };
+  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=[]; };
   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]; };
   pscore = derive2 { name="pscore"; version="0.1-2"; sha256="1sfkxs2kv8lq87j3q9ci7j38c7gzfkp2l36lwcdhiidr2nls2x0c"; depends=[ggplot2 lavaan reshape2]; };
   psd = derive2 { name="psd"; version="1.0-1"; sha256="1ssda4g98m0bk6gkrb7c6ylfsd2a84fq4yhp472n4k8wd73mkdn6"; depends=[RColorBrewer Rcpp RcppArmadillo signal zoo]; };
-  psda = derive2 { name="psda"; version="1.0.0"; sha256="0zsvm6rqcxv186xbi8nqd4ak93lhrm1hp7339cks140vdp8yl7ys"; depends=[ggplot2 plyr raster rgeos sp]; };
+  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.2.0"; sha256="17zr5q76l0y57n7am3c6zg3cwrhcvv2l8q561jcasacp16yg4gy3"; depends=[doBy Rcpp]; };
+  pseudorank = derive2 { name="pseudorank"; version="0.3.7"; sha256="1wrf91z75yw88wy1b42z05z7lnykvnfkf8mi9li8108m4k9b13rk"; 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]; };
-  psidR = derive2 { name="psidR"; version="1.5"; sha256="02cyy1dqgg6mcqyvb0py674lyhhk3h0zi9p02yqacbr81swsjpam"; depends=[data_table foreign httr openxlsx RCurl SAScii XML]; };
+  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=[]; };
   pspearman = derive2 { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; };
   pspline = derive2 { name="pspline"; version="1.0-18"; sha256="1iwsw52miil1v1yl99mzl28qi8gdjr56rlasmh8faqjlpn9z477p"; depends=[]; };
   pssm = derive2 { name="pssm"; version="1.1"; sha256="0r3d1mzc7bcz238lqq4y518400m2dqm5a1fb9gkfiari1ax099lv"; depends=[abind MASS MHadaptive numDeriv]; };
+  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]; };
-  psychmeta = derive2 { name="psychmeta"; version="2.1.1"; sha256="0sjsmzncbzqrhcmv221jliqvfhdd70ysrxax9dprsl8kyyvifvrl"; depends=[boot cli crayon data_table dplyr fungible ggplot2 knitr MASS metafor nor1mix progress purrr RCurl RefManageR reshape2 rlang rmarkdown stringi stringr tibble tidyr tmvtnorm xml2]; };
-  psycho = derive2 { name="psycho"; version="0.2.8"; sha256="0739y1svarfw6v4jrf3q6n0vnb6wfij9dnmvzvn87wg8rsp0bvrl"; depends=[BayesFactor broom coda DescTools dplyr emmeans ggcorrplot ggplot2 lavaan lmerTest loo MASS MuMIn nFactors pbkrtest ppcor psych purrr qgraph rstanarm rstantools scales stringr tibble tidyr]; };
+  psychReport = derive2 { name="psychReport"; version="0.2"; sha256="1pmxknfvrkwfsa1xw1a6nv9ms0ivrpm7pzzr7az8blj5hnpqm8d5"; depends=[cli crayon dplyr ez reshape2 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=[]; };
@@ -10001,10 +10432,11 @@ in with self; {
   ptw = derive2 { name="ptw"; version="1.9-13"; sha256="0iighsx6xn8nbw4qpzmwgi4czmr5m8yrr7fzm7mx7cvx2r5ffmbq"; depends=[nloptr]; };
   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]; };
-  pubh = derive2 { name="pubh"; version="0.2.2"; sha256="13byp5xha102h9y8dhka4fz9gdan4gshcy6bvkgvkj106h7zhy4q"; depends=[bookdown car descr effects Epi epiR epitools gee lattice latticeExtra lme4 lmtest MASS multcomp nlme nnet ordinal pander papeR rmdformats sandwich survival]; };
-  pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.12"; sha256="04zb5lbjdrhdpam4xmkcc947icsnias5pxbv2pwhvyhk7mz16nya"; depends=[boot R2HTML RCurl XML]; };
+  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]; };
+  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.3"; sha256="1lhc9cvxkxvjcl2hi2kivwqp4gddq32kysy1rhpi34i9w0y3gav6"; depends=[Matrix]; };
+  pulsar = derive2 { name="pulsar"; version="0.3.4"; sha256="076bakisgw2sv4mv9a21ky97zdz7wr733xylpdczmyyhhqi0n8yp"; depends=[Matrix]; };
   pumilioR = derive2 { name="pumilioR"; version="1.3.1"; sha256="1791r5lkr6hafd2rz9f9nfy5vc03c4833f292khvd2cg43sb0bfc"; depends=[RCurl XML]; };
   puniform = derive2 { name="puniform"; version="0.1.0"; sha256="16s5qk17wnag7fqgslxpayaq6nczaj2izgdkrkcssgjxfwnanzgm"; depends=[ADGofTest metafor Rcpp]; };
   purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; };
@@ -10015,11 +10447,10 @@ in with self; {
   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]; };
-  pweight = derive2 { name="pweight"; version="0.0.1"; sha256="0pxxfrap1bmnhbfbmkddfbqwkpw42hq37s0y26zmkxqlx4wblira"; depends=[qqman]; };
   pwr = derive2 { name="pwr"; version="1.2-2"; sha256="0r5g781lr677vp3zyhgmi7r68c87l8gd05l1s3ffnxgn5wf043sm"; depends=[]; };
   pwr2 = derive2 { name="pwr2"; version="1.0"; sha256="0zfv7z5yymw310r1sqm8ivsc2pv6dgk2k4b1axmm92gsaj53cn7p"; depends=[]; };
   pwrAB = derive2 { name="pwrAB"; version="0.1.0"; sha256="0ifyw40m9gsijw3vm9qb8qk4yydmdixfdpdp45x2hk93j8v61jm1"; depends=[]; };
-  pwrFDR = derive2 { name="pwrFDR"; version="1.90"; sha256="1lphq62k33wd1ay18gyl62yg6d57j2hhyk1pxz67qv5ywj73r34s"; depends=[]; };
+  pwrFDR = derive2 { name="pwrFDR"; version="1.95"; sha256="0xphr4zrn7cav66kw6g52nhc8vvxacvmflvzy32gqy5l7jc89f4q"; depends=[]; };
   pwrRasch = derive2 { name="pwrRasch"; version="0.1-2"; sha256="13fr4yfk8aky1vv36pllx673l4lg9q7i661vbyn2zabyizd2rw3b"; depends=[]; };
   pwt = derive2 { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; };
   pwt8 = derive2 { name="pwt8"; version="8.1-1"; sha256="1iig0x90ilzh3hdki0h33qgrra8r94rw4bk1x8y7i6c1may8y0v6"; depends=[]; };
@@ -10029,8 +10460,10 @@ in with self; {
   pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; };
   pyinit = derive2 { name="pyinit"; version="1.0.2"; sha256="148b8l5a8c636rgm8dwd8v6ggw9qmkafc5a40bciqc4rk09lfhl3"; depends=[robustbase]; };
   pyramid = derive2 { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; };
+  pysd2r = derive2 { name="pysd2r"; version="0.1.0"; sha256="1dqvgdxj6m683wkjyjhv685xnhl9328bm921zphm1i9p70fahs0n"; depends=[knitr reticulate tibble]; };
+  pzfx = derive2 { name="pzfx"; version="0.1.0"; sha256="1j4jrkn1qh6902xz0zmyj1y2nzpy2cbvv8qryb9gxm5jpk6zy97i"; depends=[xml2]; };
   qCBA = derive2 { name="qCBA"; version="0.3.1"; sha256="0lr97hig9c4l9k7vjalvgar4f1dic1lqf91li4q63j07lgdyvh4c"; depends=[arc arules rJava]; };
-  qGaussian = derive2 { name="qGaussian"; version="0.1.6"; sha256="0j8n4y4yzidkp52db73zv2snx0kwpg3aiz7vr82ybq3x9scy8c4n"; depends=[Rcpp robustbase zipfR]; };
+  qGaussian = derive2 { name="qGaussian"; version="0.1.8"; sha256="02xy35xg4swr1ldnsbywnz2h0ga1pbsivnj0aqmpll7kvwl9qz4c"; depends=[Rcpp robustbase zipfR]; };
   qLearn = derive2 { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; };
   qPCR_CT = derive2 { name="qPCR.CT"; version="1.1"; sha256="19j41fsd2m7p2nxi2h2mj43rjxx6sz2jpf4sk0bfvl1gyj0iz3hi"; depends=[RColorBrewer]; };
   qVarSel = derive2 { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp]; };
@@ -10052,19 +10485,20 @@ in with self; {
   qgtools = derive2 { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; };
   qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; };
   qicharts = derive2 { name="qicharts"; version="0.5.5"; sha256="0bl1f64b5n8q9jhzh3rqfyh9613qiy9mhcy2xsn16jyrj4hmj0jd"; depends=[ggplot2 lattice latticeExtra scales]; };
-  qicharts2 = derive2 { name="qicharts2"; version="0.4.0"; sha256="0dd7jn7g7b85yvq39ykl75jdixk3dpinscsizxqwcfcjyhpvszq6"; depends=[dplyr ggplot2 scales]; };
+  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]; };
   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]; };
-  qle = derive2 { name="qle"; version="0.17-1"; sha256="1zsvmnxdfd6avr14z5101i4kmks87yrsn15wiq5sx8gsfbxksjkj"; depends=[digest expm lhs mvtnorm nloptr]; };
+  qle = derive2 { name="qle"; version="0.18"; sha256="0b2g5sgx1p94bwc1fivbqy3avgn8f95vy1m1nzv3y67615pa251n"; depends=[digest expm lhs mvtnorm nloptr]; };
   qmap = derive2 { name="qmap"; version="1.0-4"; sha256="02xvq1mw83gln7phacbi3vhkvb100crggbldv13mhwq3wjnmg5k2"; depends=[fitdistrplus]; };
   qmethod = derive2 { name="qmethod"; version="1.5.4"; sha256="1c64b7jy9llz5dhfnk75yamjva043213gd08dsr27pyjkmbyqms1"; depends=[digest GPArotation knitr psych xtable]; };
   qmrparser = derive2 { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; };
+  qoma_smuggler = derive2 { name="qoma.smuggler"; version="0.0.1"; sha256="03p9i0kr6i3adpb9lcszcmdr9p26nfy7f8hw2sbydazglaw4hscr"; depends=[lubridate rhli tibble]; };
   qpcR = derive2 { name="qpcR"; version="1.4-1"; sha256="1r01q7jv3w59yx1gc0qw91rq7rvdhqsi8y57sqqkmwyqfw2x2vsv"; depends=[MASS Matrix minpack_lm rgl robustbase]; };
   qqman = derive2 { name="qqman"; version="0.1.4"; sha256="1v9s9ag1hfb47py87wb2nad4mbsfx35832hdmrh5kxrb2f11zl1s"; depends=[calibrate]; };
-  qqplotr = derive2 { name="qqplotr"; version="0.0.2"; sha256="1cfzs77labxsfqq3flqz40gihyaz4bsi9vhsx6qqgpl6v4iz0a2h"; depends=[dplyr ggplot2 knitr MASS robustbase]; };
+  qqplotr = derive2 { name="qqplotr"; version="0.0.3"; sha256="0qijdgma702ryi0q2ii2sa04jpz12i8c7xnh9a9zngi9n630a0f2"; depends=[dplyr ggplot2 knitr MASS purrr rmarkdown robustbase]; };
   qqtest = derive2 { name="qqtest"; version="1.1.1"; sha256="08vfpbrgvyhv1w0gqmys9zkhfxh85sk74ig5fn12ma2p87zv7r5l"; depends=[robust]; };
   qqvases = derive2 { name="qqvases"; version="1.0.0"; sha256="1fli4v1slmnwcmzmmfw84sa4mx3xzv3im1q0plb8811sbsgmwdvl"; depends=[shiny shinythemes]; };
   qrLMM = derive2 { name="qrLMM"; version="1.3"; sha256="1k85d09yvhx3pgmvqrsmhd14hqaah4pdr87vp4kg60dp9w5sydjz"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
@@ -10074,14 +10508,15 @@ in with self; {
   qrcmNP = derive2 { name="qrcmNP"; version="0.1.2"; sha256="0psgnz2fdj530wjj14pv5x2889yzphnlsg10lry9i6dvmxd8m47k"; depends=[qrcm survival]; };
   qrcode = derive2 { name="qrcode"; version="0.1.1"; sha256="12j0db8vidlgkp0dcjyrw5mhhvazl7v7gpn9wsf2m0qnz1rm4igq"; depends=[R_utils stringr]; };
   qrencoder = derive2 { name="qrencoder"; version="0.1.0"; sha256="1lg60lg2fiqdw0m228i8pln2p0kqp9f21qmrx6r6rwxifvwlfhv8"; depends=[base64enc png raster Rcpp]; };
-  qrjoint = derive2 { name="qrjoint"; version="1.0-0"; sha256="18jmxb5wv16gy4vf0cgp4x885s53i3z3qmc46bdr4md513mc980w"; depends=[coda kernlab Matrix quantreg]; };
+  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]; };
   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]; };
-  qsort = derive2 { name="qsort"; version="0.2.1"; sha256="046imyjdbsakhf6i6p63xafb9dx7fcixbdqnkm34wrzzvyjvxh15"; depends=[cowplot ggplot2 gridExtra purrr]; };
+  qsort = derive2 { name="qsort"; version="0.2.3"; sha256="1xvp29dijfa2207wyw3z09rmffn61fngfy0f00qjk284n1jnnvrg"; depends=[cowplot ggplot2 gridExtra purrr]; };
+  qsub = derive2 { name="qsub"; version="1.0.3"; sha256="1ri9bmvqakp0r26mypi8nfpf9fvxkkp3cans8ara3s7wscygycxr"; depends=[dplyr glue processx purrr random readr ssh stringr tidyr]; };
   qtbase = derive2 { name="qtbase"; version="1.0.14"; sha256="1pcgjycq61x9h52sqr6fz83qjnlpbawvpavnn9hyw2b7jlv3nwfd"; depends=[]; };
   qte = derive2 { name="qte"; version="1.2.2"; sha256="0h4kffavw2ii765c4bvwg19nlzk1si8sw09iklwmmb6gdm2v5m81"; depends=[BMisc formula_tools ggplot2 Hmisc pbapply quantreg texreg]; };
   qtl = derive2 { name="qtl"; version="1.42-8"; sha256="1l528dwvfpdlr05imrrm4rq32axp6hld9nqm6mm43kn5n7z2f5k6"; depends=[]; };
@@ -10094,6 +10529,7 @@ in with self; {
   qtlnet = derive2 { name="qtlnet"; version="1.4.4"; sha256="1r9r6wp71i36ffcdxiljvh2c8nva868x2dx6bkinbaq8cixww2cx"; depends=[graph igraph pcalg qtl sem]; };
   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]; };
   quadprog = derive2 { name="quadprog"; version="1.5-5"; sha256="0jg3r6abmhp8r9vkbhpx9ldjfw6vyl1m4c5vwlyjhk1mi03656fr"; depends=[]; };
   quadprogXT = derive2 { name="quadprogXT"; version="0.0.3"; sha256="1pa494xpmxanbqcpylhhhm4bnsd1vkrixnmi2rg2bdw21x77hlmb"; depends=[quadprog]; };
@@ -10101,34 +10537,35 @@ in with self; {
   qualCI = derive2 { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; };
   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]; };
-  qualtRics = derive2 { name="qualtRics"; version="3.0"; sha256="1cd49jvk04gx278v74yc93f4jni7k30v0anz95mz98x4y3xr45nd"; depends=[assertthat dplyr httr jsonlite readr rlang sjlabelled stringr yaml]; };
   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.0"; sha256="140xs8581l29p4zn26d9ijzpzcqpgf91l279vbagbpbsj3z8zqky"; 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.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]; };
   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]; };
   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]; };
   quantreg_nonpar = derive2 { name="quantreg.nonpar"; version="1.0"; sha256="1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k"; depends=[fda mnormt quantreg Rearrangement]; };
   quantregForest = derive2 { name="quantregForest"; version="1.3-7"; sha256="0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz"; depends=[randomForest RColorBrewer]; };
-  quantregGrowth = derive2 { name="quantregGrowth"; version="0.4-2"; sha256="0g8jlgxivsg788g73ji7vckc6hgncsjkpyc0l8awcpaxi7i3a98l"; depends=[quantreg]; };
+  quantregGrowth = derive2 { name="quantregGrowth"; version="0.4-3"; sha256="0q2yk51hcn7jnvh14nxa7szfj4pr9grh5rdfwazaziilbwqdmw4f"; depends=[quantreg]; };
   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.2"; sha256="0mjgwm6xm753r6bjlz79c9vp7xxkb69hiv3mlzrm50slh34x7jhx"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny]; };
-  queuecomputer = derive2 { name="queuecomputer"; version="0.8.2"; sha256="0zpyi4hqhsy2jlbf2ygfl25wh3m166ifp9yw4h4ycd1pga9bj43n"; depends=[dplyr Rcpp RcppArmadillo tidyr]; };
+  questionr = derive2 { name="questionr"; version="0.6.3"; sha256="1vak9wlhdgdc1vh8g87ha3gjcnx6kpl67wpsxnpvkgxai6qd8fb9"; 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.4"; sha256="13g86gdfidkvp70w4gscp81c4vzbhbl7b47a7knw4h7hswsb9a1p"; depends=[data_table fpCompare ggplot2 gridBase igraph raster RColorBrewer rgdal rgeos sp]; };
+  quickPlot = derive2 { name="quickPlot"; version="0.1.5"; sha256="0jqfshwb7ykrz5xi0gfp80fs81yv6mfc0vhbgkbzn7kcjfkcydac"; depends=[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.1.0"; sha256="15zv7znhq3rl5jkdy0jyxr0h2mkpxir04vvl2hw57c5mn79izcpr"; depends=[distances scclust]; };
+  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]; };
-  quickmatch = derive2 { name="quickmatch"; version="0.1.2"; sha256="03wnx6hifr4pmwm6fsxamcaf5ig59nfia9lyn6mzxplinfid71w6"; depends=[distances sandwich scclust]; };
+  quickmatch = derive2 { name="quickmatch"; version="0.2.1"; sha256="1qfslhjlbjpzigz8n6b7w41g8pwdiwri091ivd5igp1xy5pv8a3w"; depends=[distances sandwich scclust]; };
   quickpsy = derive2 { name="quickpsy"; version="0.1.5"; sha256="0r1xjcx02p0fsgfcd2h0dxcagzxxan405cjwh8sjdgi5p01jrym8"; depends=[DEoptim dplyr ggplot2 MPDiR]; };
   quickregression = derive2 { name="quickregression"; version="0.2"; sha256="1z0sspi8q7dvgxqbj5na56v458pv6jhxrssnm6j23156dchgw39h"; depends=[car]; };
-  quint = derive2 { name="quint"; version="1.2.1"; sha256="1d9dnrjnl9cg2yn5snr6x9qr6lf74639j3ymsxpw0wn5c4fm8z46"; depends=[Formula partykit rpart]; };
+  quint = derive2 { name="quint"; version="2.0.0"; sha256="10jcpabsk7bdw7cvq21z0hsrp4gnlbf35iypc2gprrbkk8sw4i8i"; depends=[Formula partykit rpart]; };
   quokar = derive2 { name="quokar"; version="0.1.0"; sha256="1qnl3x1aa665xpyb3ac07xrnnjdwbmj645p103144k5is5b8likc"; depends=[ald ALDqr bayesQR dplyr ggplot2 GIGrvg gridExtra knitr magrittr MCMCpack purrr quantreg robustbase tidyr]; };
   quotedargs = derive2 { name="quotedargs"; version="0.1.2"; sha256="034fhfmfq62yf7akx2i0bim70jq9azkk2h28k79lwax7ysydsjnj"; depends=[]; };
   qut = derive2 { name="qut"; version="2.1"; sha256="1wkk4c4f10a1whrspr5yalp7flcxckzxlx187ymmpnz7qcncz619"; depends=[flare glmnet lars Matrix]; };
@@ -10140,7 +10577,9 @@ in with self; {
   r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; };
   r2glmm = derive2 { name="r2glmm"; version="0.1.2"; sha256="0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; };
   r2stl = derive2 { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; };
+  r4lineups = derive2 { name="r4lineups"; version="0.1.1"; sha256="1p0dnrp21zx1l9lqx01jnq54d5ppb8siibv47i4gsp7c7db9ymxc"; depends=[boot dplyr ggplot2 ggrepel here magick magrittr pROC psych purrr]; };
   r4ss = derive2 { name="r4ss"; version="1.24.0"; sha256="1kifzfg2zx6lq2c8qqbhb096z1wgdayhg5qzx5hnkwpn05w5cma3"; depends=[coda corpcor gplots gtools maps pso truncnorm]; };
+  r511 = derive2 { name="r511"; version="0.1.1"; sha256="1njsnjf0746cv6x7fznq4cg556fczqcfawwb869r3w9zv0zj1iy9"; depends=[assertthat dplyr httr tibble xml2]; };
   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]; };
@@ -10166,12 +10605,13 @@ in with self; {
   rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; };
   rFSA = derive2 { name="rFSA"; version="0.9.1"; sha256="14qpxmzy4vy1fydn8yqh1001mqrgv1i67ai42w61dkk0d4m75z60"; depends=[hashmap tibble]; };
   rFTRLProximal = derive2 { name="rFTRLProximal"; version="1.0.0"; sha256="1458gqy2zbaa62vaimawdr1nk0lsgwz1j4pgw21fkw7bskcszz0f"; depends=[data_table FeatureHashing foreach magrittr Matrix Rcpp RcppArmadillo RcppProgress]; };
-  rFerns = derive2 { name="rFerns"; version="2.0.3"; sha256="02lq43mgcz8n21hwb0pjqi0aq5dacnaakpx336q1xzw1kwlvfkhv"; depends=[]; };
+  rFerns = derive2 { name="rFerns"; version="3.0.0"; sha256="0z12201y1b9d3rd02k4y64hpnlrgkg7pi1jpzsh1br4pchdf7rrm"; depends=[]; };
   rGammaGamma = derive2 { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; };
   rGoodData = derive2 { name="rGoodData"; version="0.1.1"; sha256="092sgy6y3dkyr32hrir4jvjwh7n6gfvv9z7i631fipg59255g0zy"; depends=[data_table httr jsonlite]; };
   rGroovy = derive2 { name="rGroovy"; version="1.3"; sha256="172vm4diygzi4ipmw8bl03k0x3aps0h1vkvwvw539kamy7xb5w98"; depends=[rJava]; };
   rHealthDataGov = derive2 { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; };
   rHpcc = derive2 { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; };
+  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]; };
   rJava = derive2 { name="rJava"; version="0.9-10"; sha256="0y7yg70i3zwbwl4g36js4dqpl51cmwss5ymrsk24d1z07bflp4y9"; depends=[]; };
@@ -10180,17 +10620,18 @@ in with self; {
   rLDCP = derive2 { name="rLDCP"; version="1.0.2"; sha256="0k7zc1xyqmcl7070hhpqw1d2k1ij6bd4wjym8cw263pds2n7nx21"; depends=[XML]; };
   rLTP = derive2 { name="rLTP"; version="0.1.4"; sha256="04w432m03xwh0szshsrfw5h7wy43q4lj8z0y07k8w6gsf27cy5bx"; depends=[RCurl]; };
   rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.11.4"; sha256="1fvln3r2zkzhsck53jppchg795qbjbzw0rd688h89if1lkiy51w6"; depends=[plyr]; };
+  rLandsat = derive2 { name="rLandsat"; version="0.1.0"; sha256="0j6p0ba76vhzg69frdf4ykiyc8vy0axd4jw26b72j8pl9rdwnn01"; depends=[dplyr httr jsonlite RCurl readr stringr svMisc]; };
   rLiDAR = derive2 { name="rLiDAR"; version="0.1.1"; sha256="1w0yi4ygw0l9ydbllqjylp30d401bsf7b6fng6qg3pssbi9v3kln"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; };
   rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
   rMEA = derive2 { name="rMEA"; version="1.0.0"; sha256="1cxcf2ji2f3kkjlj6lym7zfpmgbbjw7al67dldy2kn9dk2dn087z"; depends=[]; };
   rMR = derive2 { name="rMR"; version="1.1.0"; sha256="0da1hclfnnlkp9by6zf2p079643p8nimplr9p3ipbjdy739j344z"; depends=[biglm]; };
   rMouse = derive2 { name="rMouse"; version="0.1"; sha256="0pzxasap5kwxqq36mb4zi139jllsl4vk06dw2pv9xnwdxiszr3gp"; depends=[rJava]; };
   rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; };
-  rNOMADS = derive2 { name="rNOMADS"; version="2.3.9"; sha256="15l6150vsaa7y2wv896mhdbakxdsg87fx74bbj0rsn0757jss525"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; };
+  rNOMADS = derive2 { name="rNOMADS"; version="2.3.10"; sha256="1pbbrx91fq5gpjhf6rqyhl9isj3mz3prbh5g5sfg7y63hhn817z0"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr uuid XML xml2]; };
   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.0.8"; sha256="06f97sa43i0b4x8j48higgx5jyj5q73j6mf2730yfm4db6ahz94m"; depends=[dplyr dygraphs readr stringr]; };
+  rPraat = derive2 { name="rPraat"; version="1.1.2"; sha256="1fvawmpv3zxd1gjcal69j5biga1mcd956kr52x0azqprhqdk6r52"; depends=[dplyr dygraphs readr stringr]; };
   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]; };
@@ -10201,30 +10642,34 @@ in with self; {
   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=[]; };
+  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.2"; sha256="0w109l3hibl1w0g2qj2rqm59qfs9zbry5q8azii86mqpgwxk7zln"; depends=[gdistance lubridate Matrix raster]; };
-  rWishart = derive2 { name="rWishart"; version="0.1.0"; sha256="1kg2n8lyfdp76fw36m13rlb0qy1ffk8n701ffmf5dgkfp0x8nnn7"; depends=[lazyeval MASS Matrix]; };
+  rWind = derive2 { name="rWind"; version="1.0.3"; sha256="04b3yz0x07j2fvq0gzmvl071wwnkhzx4wfr7xpdss2nq8vjwxjaj"; 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]; };
   race = derive2 { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; };
   radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; };
   radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; };
-  radiant = derive2 { name="radiant"; version="0.9.5"; sha256="0a5dvmvnvn2jd53grvagbxw6lb4mp3l809911dlh2rr4b9z9nkyx"; depends=[AlgDesign psych r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate rstudioapi shiny]; };
-  radiant_basics = derive2 { name="radiant.basics"; version="0.9.5"; sha256="0xwsgi4nr9i7wi699cgmfdyb7nxf98af4vgl56i1bbnxl8k0bnxz"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data rstudioapi scales shiny tidyr]; };
-  radiant_data = derive2 { name="radiant.data"; version="0.9.5"; sha256="0mbxfqn79nphii4hb6kxl2wc0w0ra16y378rp2yw9a9926zdb7mb"; depends=[base64enc broom car curl dplyr DT ggplot2 glue gridExtra jsonlite knitr lubridate magrittr markdown plotly psych r_import readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce tibble tidyr writexl]; };
-  radiant_design = derive2 { name="radiant.design"; version="0.9.5"; sha256="1lqim49ifw019aqfrz2pqa81yn2kg5hixn3ywd5hfj670n5sd5hr"; depends=[AlgDesign dplyr mvtnorm polycor r_import radiant_data rstudioapi shiny]; };
-  radiant_model = derive2 { name="radiant.model"; version="0.9.5"; sha256="1r1gz8hlrihadzz4x73ccrxqkz744lbr8h29fa77ghkiy9y55abq"; depends=[car data_tree DiagrammeR dplyr e1071 ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet psych r_import radiant_basics radiant_data rlang rpart rstudioapi sandwich shiny stringr tidyr yaml]; };
-  radiant_multivariate = derive2 { name="radiant.multivariate"; version="0.9.5"; sha256="1rpk757r80l38y0y4w94h363xdmrv7mp6qpnwpcbrza20w9dhqvs"; depends=[car dplyr ggplot2 ggrepel Gmedian GPArotation gridExtra magrittr MASS psych r_import radiant_data radiant_model rlang rstudioapi scales shiny]; };
+  radiant = derive2 { name="radiant"; version="0.9.7"; sha256="0vmiypmabimnxdh692x4f2fbv32fmb8rhn5hvf60sk5qzzp0hla3"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; };
+  radiant_basics = derive2 { name="radiant.basics"; version="0.9.7"; sha256="1lyishpzy51yyi5wqcxxyl1vz16i28fkkg9828f5z6ak109y2mn8"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data scales shiny tidyr]; };
+  radiant_data = derive2 { name="radiant.data"; version="0.9.7"; sha256="1f98ahki0kyb27gl55a859zb0lsvk9gddd9f54y767xfs6h89cgk"; depends=[base64enc broom car curl dplyr DT ggplot2 glue gridExtra jsonlite knitr lubridate magrittr markdown plotly psych r_import readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles summarytools tibble tidyr writexl]; };
+  radiant_design = derive2 { name="radiant.design"; version="0.9.7"; sha256="1qfridr70s22agjaiv2522v24pnf4jrk4dad46ghdzzj79s3kqvj"; depends=[AlgDesign dplyr mvtnorm polycor r_import radiant_data shiny]; };
+  radiant_model = derive2 { name="radiant.model"; version="0.9.7"; sha256="18xrvgc3f58m26vng4m9ayn49vf7yb3r1p3nwbhszih5m9sfgxx2"; depends=[car data_tree DiagrammeR dplyr e1071 ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet psych r_import radiant_basics radiant_data rlang rpart sandwich shiny stringr tidyr yaml]; };
+  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]; };
+  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]; };
   rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; };
   rags2ridges = derive2 { name="rags2ridges"; version="2.2"; sha256="04f9gvwpgrx54dgbjjixlxa2056aqcz2kryn4jplwf5fc0vj1lyn"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape sfsmisc snowfall]; };
   ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.1"; sha256="0zjqrvy1k1lz4caakcj3c6l2j637wp6nxbzfj0gvcn2c4pjcrdyp"; depends=[abind expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; };
   ragtop = derive2 { name="ragtop"; version="0.5"; sha256="0h09h9ws9c2d9xc00w4hl000h0kbvq16lz4vgv1w93am8zmsp4wm"; depends=[futile_logger limSolve]; };
   railtrails = derive2 { name="railtrails"; version="0.1.1"; sha256="1hi55rcxmr7k3na3rpjqmd5fpgn51bymrp7yxmw45ff7mlzpa5h6"; depends=[tibble]; };
-  rainbow = derive2 { name="rainbow"; version="3.4"; sha256="09vxdb4j099grnlx10995b74r3h9g1vs8div3nywgnslaj8x7pay"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; };
+  rainbow = derive2 { name="rainbow"; version="3.5"; sha256="1gcaflb3haw9wpx4wl64vgi30jxn2nrzlm5125hhg647rw7ryp8k"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; };
   raincpc = derive2 { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; };
   rainfreq = derive2 { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; };
   rakeR = derive2 { name="rakeR"; version="0.2.1"; sha256="0cd89q6k0y9z1qk9k06iw56lhj4c52ckr0g4qv6q95lkyrbi3qg8"; depends=[ipfp wrswoR]; };
@@ -10241,7 +10686,7 @@ in with self; {
   random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-2"; sha256="1ybwfn3hdwisxjn85vqrib1zhk8dcddbarbwjdf1vn27ih3c4h2c"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
   randomForest = derive2 { name="randomForest"; version="4.6-14"; sha256="0kbmm0l42fc2d1rdq0l7k09d34kd87q4lx651ffsic4y84h8kf7l"; depends=[]; };
   randomForestExplainer = derive2 { name="randomForestExplainer"; version="0.9"; sha256="0gqqm3784krl6xdx7j6xvvyi2rjbyi6c8shm44yvq59is5i7fypc"; depends=[data_table dplyr DT dtplyr GGally ggplot2 ggrepel MASS randomForest reshape2 rmarkdown]; };
-  randomForestSRC = derive2 { name="randomForestSRC"; version="2.6.1"; sha256="0wmqy1m04iknqzfajhfcb6cjpl9h35x13ihsdx91l1d1yki7yq71"; depends=[]; };
+  randomForestSRC = derive2 { name="randomForestSRC"; version="2.7.0"; sha256="12wqjch4mddb9gqcacihcvlrdj697yr2sjr3pmrf7xm3yws2gjrb"; depends=[]; };
   randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; };
   randomLCA = derive2 { name="randomLCA"; version="1.0-15"; sha256="10rx2ah50dcjxz5y492c59d3pn0dvlgjaxfdf8sknkf6s4pmwkis"; depends=[boot fastGHQuad lattice Matrix]; };
   randomNames = derive2 { name="randomNames"; version="1.0-0.0"; sha256="12q5bs65qivddiaxbsp128j94h2vyrgjvmm80d52r36ffbaigl09"; depends=[data_table]; };
@@ -10250,7 +10695,7 @@ in with self; {
   randomizationInference = derive2 { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; };
   randomizeBE = derive2 { name="randomizeBE"; version="0.3-4"; sha256="1x1lh1rrw7ma2wls0dflz18lk9h0qdy9gb11af95hqpabqc85rd7"; depends=[]; };
   randomizeR = derive2 { name="randomizeR"; version="1.4.2"; sha256="0jv0mc40cy4w17jrsb2023l7k7cnzl9czdigl4shq9nx67mccdwx"; depends=[ggplot2 plotrix]; };
-  randomizr = derive2 { name="randomizr"; version="0.16.0"; sha256="0lsba2nzzx8vnkyj8fzf9lfnkq743qdzir9f15pk23xycjzlncfs"; depends=[]; };
+  randomizr = derive2 { name="randomizr"; version="0.16.1"; sha256="1jj04wvn7qrqpvag4ri9fqkw9815kyxhlcqn2f1m0bb94d5ngwzq"; depends=[]; };
   randomsearch = derive2 { name="randomsearch"; version="0.1.0"; sha256="176grqp6rv4hiyzr9fzx2zz360h5nkrw39gidclgmrp7ckn5qs4v"; depends=[checkmate fs parallelMap ParamHelpers smoof]; };
   randquotes = derive2 { name="randquotes"; version="0.1.0"; sha256="1rpcmxkpq8lgfzrjaipf5x573gm6rc31c9fafghiy99c0iphf46w"; depends=[curl jsonlite xml2]; };
   randstr = derive2 { name="randstr"; version="0.2.0"; sha256="17593lbk6r089yasafd21i3v90ya9n92rflpzl0qicd2kqqk2gdh"; depends=[random stringi truncnorm]; };
@@ -10258,59 +10703,64 @@ in with self; {
   randtoolbox = derive2 { name="randtoolbox"; version="1.17.1"; sha256="13akf13qi4yhj9gapym05074b1qzk03vgysy81qsd73pd8r107ls"; depends=[rngWELL]; };
   rangeBuilder = derive2 { name="rangeBuilder"; version="1.4"; sha256="1jjy1d3kljysm3mqgdszdi6incbmg2di63akxswfaiqcp1m68a6y"; depends=[alphahull cleangeo pbapply raster Rcpp rgdal rgeos sp stringi]; };
   rangeMapper = derive2 { name="rangeMapper"; version="0.3-4"; sha256="0qrcxbh8saflqjmaa18fcyk5cqk6h4rz92zhqckswyqynx6m0cps"; depends=[classInt data_table foreach ggplot2 gridExtra lattice magrittr maptools raster RColorBrewer rgdal rgeos RSQLite sp]; };
+  rangeModelMetadata = derive2 { name="rangeModelMetadata"; version="0.1.0"; sha256="0v0hn46s99hidfp0ln28hffyk3mzydxvqslkyif32zcdj0fxmc7l"; depends=[biomod2 dismo dplyr ecospat ENMeval googlesheets jsonlite MASS raster rgdal rgeos shiny sp spatstat spocc]; };
+  rangemodelR = derive2 { name="rangemodelR"; version="1.0.3"; sha256="16pzmiazmfw14xvrlg0k9j15zrmz034hya41zl5z411d8rn0mqva"; depends=[]; };
   ranger = derive2 { name="ranger"; version="0.10.1"; sha256="12z67xkgdmr5cflpd6cln0mn5xxajanqbfwlckv6cfma0gvf2z1j"; depends=[Matrix Rcpp RcppEigen]; };
   rankFD = derive2 { name="rankFD"; version="0.0.1"; sha256="1zb9gxvsmv46mpw5znskhfjxnwkr59hdixcly6i3r78yaqgca0dz"; depends=[coin lattice MASS Matrix]; };
   rankdist = derive2 { name="rankdist"; version="1.1.3"; sha256="1hdafy2zzn7hwl1lx5jksgi974zjn49dwih5s2zdyv4nnmmai003"; depends=[hash optimx permute Rcpp]; };
   rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; };
   rapiclient = derive2 { name="rapiclient"; version="0.1.2"; sha256="072rlr7z9rj4agkzmy12cz4axh4pajavfd83lpcx2b1lgxpj6ck4"; depends=[httr jsonlite]; };
-  rapidjsonr = derive2 { name="rapidjsonr"; version="1.0.0"; sha256="064xqvyv83vl188rk18kgi4iaqq299d2y6fr24dk9lndpc4509kc"; depends=[]; };
+  rapidjsonr = derive2 { name="rapidjsonr"; version="1.1"; sha256="0h4phjjhykbb45rg5b1xn48vqxdcvcngbm0416ds8in7j469wbwd"; depends=[]; };
   rapidraker = derive2 { name="rapidraker"; version="0.1.0"; sha256="17jzkzm5hvd8vcqql40bwl89sfgz8yicvi0753nzgkmbvanzjhjx"; depends=[openNLPdata rJava slowraker]; };
   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]; };
+  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.6-7"; sha256="009bwil3n9gaf11wzifwxyw9j6pl0pyjk3l5v7csd935si7q14gv"; depends=[Rcpp sp]; };
+  raster = derive2 { name="raster"; version="2.7-15"; sha256="1b0js80bypy2nh91y12pfxqwldwq8y09dhkrjqkgj9n89k5fj55s"; 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.3.9"; sha256="0w6i9czcbj8ipd9nn4w4h4pqk6xd8anh00cn60hss9hs18fcb21d"; depends=[assertthat]; };
+  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]; };
   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=[]; };
   rationalfun = derive2 { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; };
   ratios = derive2 { name="ratios"; version="1.2.0"; sha256="16q9v2lhgklvdp3hi9x3afdldznfpwg775p80m2g5074q2dzjpgg"; depends=[data_table stringr]; };
-  rattle = derive2 { name="rattle"; version="5.1.0"; sha256="0xxf2wpazsk29y2byyk010n59vmzmhm4phpsqvklmsr1v3m10pvp"; depends=[cairoDevice dplyr ggplot2 magrittr RGtk2 rpart_plot stringi stringr tidyr XML]; };
+  rattle = derive2 { name="rattle"; version="5.2.0"; sha256="099anyq4spb7dbikxb29aacqp4xswr66hxjgxiwcvhm9jjryb33v"; depends=[dplyr ggplot2 magrittr rpart_plot stringi stringr tidyr XML]; };
   rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; };
   raw = derive2 { name="raw"; version="0.1.6"; sha256="0hnqwa9pwj3k2y0bs6hxrvbwksjyq0q6m73c9hhlafg8g3lkyxnf"; depends=[]; };
+  rayshader = derive2 { name="rayshader"; version="0.5.1"; sha256="1qkv25p0n10zgs3r12i8kwgw6188c0k9a80wg9i12mjpy2pbrxmz"; depends=[doParallel foreach imager magrittr png progress raster Rcpp rgl scales]; };
   rbacon = derive2 { name="rbacon"; version="2.3.4"; sha256="1va1rap2n6mcjfzclqg5h58ggrs2kb4nlaam5ch984w9rzq59g2l"; depends=[coda Rcpp]; };
   rbamtools = derive2 { name="rbamtools"; version="2.16.11"; sha256="1pr1isq9yk5mpi41cnihg4zn5g9az7yr9m42759hibqqyb6nw78a"; depends=[refGenome]; };
-  rbcb = derive2 { name="rbcb"; version="0.1.5"; sha256="0w76jgl75i36xb150m5vlqbd6k0nhxx34fcl0vw9l1in5pwd6qgw"; depends=[httr jsonlite tibble xml2 xts]; };
   rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; };
   rbenchmark = derive2 { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; };
   rbgm = derive2 { name="rbgm"; version="0.0.5"; sha256="1gz9hxlwmj2ch1ds6mx1nlkwy4fm811jkz5fz3cl6675n11bjdpg"; depends=[dplyr geosphere raster readr rlang sp stringr tibble]; };
   rbhl = derive2 { name="rbhl"; version="0.8.0"; sha256="1avx36as99za19acjh7adb72ckdn69rmiwzcrrqxskzny56vxf0d"; depends=[crul jsonlite plyr tibble xml2]; };
   rbi = derive2 { name="rbi"; version="0.9.1"; sha256="0jfaakzl15dz6bsbcd6y2pnf3bdccs3bx90c6hzsjpvck7fcvxpi"; depends=[data_table ncdf4 reshape2]; };
   rbiouml = derive2 { name="rbiouml"; version="1.8"; sha256="0qvc896sf6idczbxix3klf56paxf0wpfbmga8qqlcyjasv1dsdql"; depends=[RCurl RJSONIO]; };
-  rbison = derive2 { name="rbison"; version="0.6.0"; sha256="09mbhk56ns1qldgcj8qard3dsvsfbnlrq4s4drc46lr1s8lqjd1h"; depends=[crul dplyr ggplot2 jsonlite mapproj plyr sp]; };
+  rbison = derive2 { name="rbison"; version="0.7.0"; sha256="0v9i45pdjdspc1xw1mm3zmmsdnq5s7s656mkkhssmhj603f3mswg"; depends=[crul data_table dplyr ggplot2 jsonlite mapproj plyr sp]; };
+  rbit = derive2 { name="rbit"; version="1.0.0"; sha256="09ywr711gv0vgfims2vfcxk3rnd0iadzlksil0q9159yarapfc59"; depends=[R6]; };
   rbitcoinchartsapi = derive2 { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; };
   rbmn = derive2 { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; };
   rbokeh = derive2 { name="rbokeh"; version="0.5.0"; sha256="1lpbph6bhh9rf5rs0ivp8dchx8i8ylz5nr7xc2xv9bnwlwj35729"; depends=[digest ggplot2 gistr hexbin htmlwidgets jsonlite lazyeval magrittr maps pryr scales]; };
   rbounds = derive2 { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; };
   rbraries = derive2 { name="rbraries"; version="0.1.0"; sha256="12vdci4rzjvd419nxh99hpkhjlx86nsmrbjca0am5q0rkc68dgmj"; depends=[crul data_table fauxpas jsonlite tibble]; };
+  rbtc = derive2 { name="rbtc"; version="0.1-5"; sha256="1yw5b8qgvznchqx0zndvkhcrl9ww4sn92x7khzwc9hlbr32j14ls"; depends=[gmp httr openssl rjson]; };
   rbtt = derive2 { name="rbtt"; version="0.1.0"; sha256="1gbsb0vmqxcl28c5nn0rz95bxrvl7i0b17lq90cj5ahbk6x9jblz"; depends=[data_table]; };
   rbugs = derive2 { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
   rbundler = derive2 { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; };
   rbvs = derive2 { name="rbvs"; version="1.0.2"; sha256="1wzxz2ca8f1phhbqr9p7c8sk09cyrdq5jc45g4ddrqvi2q29k28y"; depends=[]; };
   rcane = derive2 { name="rcane"; version="1.0"; sha256="0p2mgkq6fh0n289n2h19c52lnqxl05wvpmd6nwvgnjqwa4wwpa7r"; depends=[]; };
   rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; };
-  rcarbon = derive2 { name="rcarbon"; version="1.1.3"; sha256="08gg72gakns9akcsi5j79jxsx8cngbzf3sg0qvpj22xsrp7amxr2"; depends=[doParallel foreach knitr sp]; };
+  rcarbon = derive2 { name="rcarbon"; version="1.2.0"; sha256="0dd7x7i8d592gnn9c3dk706drd3irhi1k4iivlngfm44ck3wlpzn"; depends=[doParallel foreach knitr sp]; };
   rcartocolor = derive2 { name="rcartocolor"; version="0.0.22"; sha256="1dh1n01v70sfmymg1w0f272j6nwnrzawqx5x4ljgh46pzqprx56r"; depends=[ggplot2 scales]; };
   rcbalance = derive2 { name="rcbalance"; version="1.8.5"; sha256="15qlk3cqwsvixl17l1fxcajrabmz4y7q5gz0a1pd66f6i1xskcqq"; depends=[MASS plyr]; };
   rcbsubset = derive2 { name="rcbsubset"; version="1.1.4"; sha256="0sfsmnxs4c8blzg0bb2ffb2xcsjv7pp39arnda988f7b2aas59wj"; depends=[MASS plyr]; };
@@ -10318,25 +10768,28 @@ in with self; {
   rccdates = derive2 { name="rccdates"; version="1.0.0"; sha256="1f87qlw62am2qy1zzrz91vmsn8axhld44gak61xa7046675hm98s"; depends=[rccmisc]; };
   rccmisc = derive2 { name="rccmisc"; version="0.3.7"; sha256="171s2ll759xjdnx0z24ih5ix2vcp4qnmf1nf107gij6wv8k450ab"; depends=[dplyr]; };
   rcdd = derive2 { name="rcdd"; version="1.2"; sha256="1s7idrfvl0hhyckrfiakszqw6fk34f9iiyxspzya3rqyhih014ay"; depends=[]; };
-  rcdk = derive2 { name="rcdk"; version="3.4.7"; sha256="1r7cqr9adcbvw5zcnh0vpfahi5ywcjk8axhpj1pqrv24lb208c6j"; depends=[fingerprint iterators itertools png rcdklibs rJava]; };
+  rcdk = derive2 { name="rcdk"; version="3.4.7.1"; sha256="1d08ajji631792b7fyfwzvcaswh8jlanfsxrj6c1wx7xh3qqpigg"; depends=[fingerprint iterators itertools png rcdklibs rJava]; };
   rcdklibs = derive2 { name="rcdklibs"; version="2.0"; sha256="05g0y00bw1bqykfbwn4q42krwcfl50jcavaw7yyw9a5m34hvw0l8"; depends=[rJava]; };
   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]; };
   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]; };
   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.2.1"; sha256="04gh0drvkikn91i5zmpixhrhyjnsyxwz8k8bx4kgwwrmh1dc7f2s"; depends=[callr clisymbols crayon digest withr]; };
-  rcompanion = derive2 { name="rcompanion"; version="1.13.2"; sha256="0kpr0pxfi8al6zdx0imp9nf9m98h8srimij7gf018ik4v6kjyjiv"; depends=[boot BSDA coin DescTools EMT hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; };
+  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]; };
   rcongresso = derive2 { name="rcongresso"; version="0.4.6"; sha256="1xd07vlbcp3msmwvg2nk7acdx513v2wfbq64na0045rsv2v96m44"; depends=[dplyr httr jsonlite magrittr stringr tibble tidyr]; };
-  rcoreoa = derive2 { name="rcoreoa"; version="0.1.0"; sha256="13nfziqxxljnczn3idq3zlc9xkklalfnxbakvhs5bw19jmbd11ba"; depends=[crul jsonlite pdftools]; };
-  rcorpora = derive2 { name="rcorpora"; version="1.2.0"; sha256="0nxd2arzz2617xxcngvcrrrsky9f1b9zdmpv81zr89y08b3xh9f1"; depends=[jsonlite]; };
+  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]; };
   rcreds = derive2 { name="rcreds"; version="0.6.6"; sha256="1sdrdgn53kgcdnxfjs8jh0h538vb3b9ixz74lbnp54yp09jpqsri"; depends=[collectArgs digest jsonlite magrittr]; };
-  rcrossref = derive2 { name="rcrossref"; version="0.8.0"; sha256="01k3jpd6awan8r4kc5wjw0did30i2bafzjr8mwaaqv87gni2yiyf"; depends=[bibtex crul dplyr jsonlite miniUI plyr R6 shiny stringr xml2]; };
+  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=[]; };
-  rcube = derive2 { name="rcube"; version="0.2"; sha256="1vfh0bg0awynbv0kafsn7sqj7sc2rjaap9rmy717qv9p0n6gkypr"; depends=[magrittr]; };
+  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]; };
-  rda = derive2 { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
+  rda = derive2 { name="rda"; version="1.0.2-2.1"; sha256="1y4fawslr3i6crjaxhsdb47kfsqkyszdx6avq3r5far5a4pvc639"; depends=[]; };
   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=[]; };
@@ -10345,7 +10798,7 @@ in with self; {
   rddensity = derive2 { name="rddensity"; version="0.2.2"; sha256="10530il8fxpgcads6yvj09jwanldlpvjgjqcknl2wly4gmwcwjq9"; depends=[ggplot2 lpdensity]; };
   rddtools = derive2 { name="rddtools"; version="0.4.0"; sha256="1z9sl9fwsq8zs1ygmnjnh3p6h9hjkikbm4z7cdkxw66y0hxgn96s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd sandwich]; };
   rde = derive2 { name="rde"; version="0.1.0"; sha256="1zw9gdh90hl0wc5c0xwl5x7566r611wk73sbqdmpzpswjyyl9aqm"; depends=[clipr]; };
-  rdefra = derive2 { name="rdefra"; version="0.3.4"; sha256="05fskap0vvrq08m4gql9gczy04lc3dgxgjcsb57dgp3nng358sf6"; depends=[dplyr httr lubridate rgdal sp tibble xml2]; };
+  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]; };
   rdfp = derive2 { name="rdfp"; version="0.1.2"; sha256="1kznr5p5mhplgpgmc0f4vrs1fwpivwjy52hwfc8k0q0vx53h3fs2"; depends=[curl dplyr httr lubridate plyr purrr readr XML xml2]; };
@@ -10354,23 +10807,23 @@ in with self; {
   rdist = derive2 { name="rdist"; version="0.0.3"; sha256="1jp3s4293h973dpz0waq9abpd8ibp4gxdyk3bwn7a32zfpk4kjza"; depends=[Rcpp RcppArmadillo]; };
   rdiversity = derive2 { name="rdiversity"; version="1.2.1"; sha256="0j67b9mnq2xfbi2hrn1x9vgdv63779d0rcbzndljh37b1x5zlr22"; depends=[ape ggplot2 ggthemes phangorn phytools plyr reshape2 tibble tidyr]; };
   rdlocrand = derive2 { name="rdlocrand"; version="0.3"; sha256="1cv69iy5sx9kdplpk9hnriqzgrm5mjbmhax4cybszhsyaly6r78d"; depends=[AER sandwich]; };
-  rdmulti = derive2 { name="rdmulti"; version="0.1"; sha256="0a2nppb59054ns0ya3igva7xjaivnsj023fd30pzwca99zsmnx6s"; depends=[rdrobust]; };
-  rdnb = derive2 { name="rdnb"; version="0.1-1"; sha256="1mg40jad79mk95ndnljvfvyh9rhbxkw7inpg2vbsixf1ywdljri3"; depends=[brew httr xml2]; };
+  rdmulti = derive2 { name="rdmulti"; version="0.2"; sha256="1sl677kaq5qr2m9nzxfslwzai7h07mdfqjjzrak2xbpgqa44288z"; depends=[rdrobust]; };
+  rdnb = derive2 { name="rdnb"; version="0.1-2"; sha256="1phb86jv2caayr4p95p68jrksai9w922rl3y5hjkw3gkc3jxn09f"; depends=[brew httr xml2]; };
   rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; };
   rdpla = derive2 { name="rdpla"; version="0.2.0"; sha256="0d32bp68z1agymcmjwnds4fkblhjrcx8i2q6f5b7sl4kdfdbjchf"; depends=[crul data_table hoardr jsonlite tibble]; };
-  rdpower = derive2 { name="rdpower"; version="0.1"; sha256="1pi0g980zgy0h3kyiksnbpi59fksm17g9lxinqjf7xiam7pgw99n"; depends=[rdrobust]; };
-  rdrobust = derive2 { name="rdrobust"; version="0.99.1"; sha256="18hq4nmyf8327qdbh7m8y0av6f21pcxaxfqs0qrc07yf6sdcj6ri"; depends=[]; };
+  rdpower = derive2 { name="rdpower"; version="0.3"; sha256="1jdr18xrnws07iczi1f52l3py9fhxgvpina230jyr713hz99hzm3"; depends=[rdrobust]; };
+  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]; };
   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.4"; sha256="0333r1rv9nshxmg7x2s5pdf7mk7pmpxdzfk617pmjkvf7qbfqfpa"; depends=[BB dplyr ggplot2 MASS nleqslv plyr purrr SQUAREM survival tidyr]; };
-  reactR = derive2 { name="reactR"; version="0.2.0"; sha256="17jdcby95fxfa3imalllnqsp16py5vqqj4y0za4wli91vd37555q"; depends=[htmltools]; };
+  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]; };
   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.2.3"; sha256="0qqzplyhpyhf24111y12r0h299wz86scjymfrym2ycxm04116vw5"; depends=[stringr]; };
+  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]; };
@@ -10380,7 +10833,8 @@ in with self; {
   readbulk = derive2 { name="readbulk"; version="1.1.0"; sha256="0m02isvja0ihvy1fscjdl5f9gfdlmfmabgvpirgd2m9j3lz6mi8s"; depends=[plyr]; };
   reader = derive2 { name="reader"; version="1.0.6"; sha256="1x489q3ljap4zpny68mx83mgxaqiwlkglcy57whwhnh33dd7qp4h"; depends=[NCmisc]; };
   readit = derive2 { name="readit"; version="1.0.0"; sha256="1sq2spjgdc9rq8cr5i9qjmqd4vcf7cknpx5dndwjdqrv112y8bk9"; depends=[crayon haven jsonlite readr readxl]; };
-  readobj = derive2 { name="readobj"; version="0.3"; sha256="0hwxfk27azay8hjz702b10cg395is06wnypqdw4788gm25d0i041"; depends=[Rcpp]; };
+  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]; };
   readroper = derive2 { name="readroper"; version="0.9.1"; sha256="153iy144c4yxcs2cwr73czy69b4fj4q1g77rb8qmvp6blfwdcd71"; depends=[readr]; };
   readstata13 = derive2 { name="readstata13"; version="0.9.2"; sha256="02mqwpzn7n3pqjxivnd1vlfc47xkyiywfz594x0f6vd2dym8rdwd"; depends=[Rcpp]; };
@@ -10388,8 +10842,8 @@ in with self; {
   readxl = derive2 { name="readxl"; version="1.1.0"; sha256="05ii8knrg4jji6h7bv6bfpn279b6x52yrskdx5rv7b0hcpy22gdn"; depends=[cellranger Rcpp tibble]; };
   realestateDK = derive2 { name="realestateDK"; version="0.1.0"; sha256="02y3c2zww9jakh9a0jqxkgcwshjz1hd5mw63603hyic7q4a07iv3"; depends=[statsDK]; };
   reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
-  rebird = derive2 { name="rebird"; version="0.4.0"; sha256="1awwjr0gsd7hksh84fz5p17qwd857zn03fc2q0kzncy6q6iiw481"; depends=[dplyr httr jsonlite]; };
-  rebmix = derive2 { name="rebmix"; version="2.10.2"; sha256="1m6h85kxp7lirx0pqhlibkd6f2wvgyhbmndrw308imkmzyqhgjz3"; depends=[mvtnorm]; };
+  rebird = derive2 { name="rebird"; version="1.0.0"; sha256="0gp8afj6y3vss2b11v0fqyc3ai67kilicr4fnk5zghljfvbxsxm8"; depends=[assertthat dplyr httr jsonlite]; };
+  rebmix = derive2 { name="rebmix"; version="2.10.3"; sha256="0yhazicibq8h2d7ldv59isapc6f68psawa3vrs1fdzwkrraj6893"; depends=[mvtnorm]; };
   rebus = derive2 { name="rebus"; version="0.1-3"; sha256="0ms3dm6g0fq3jycpgjl7q7kyljxc97cczy2jj0lyviwmipdgjg9d"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; };
   rebus_base = derive2 { name="rebus.base"; version="0.0-3"; sha256="1n2khszcya9k6379bdkq47xi2nw9jngiwj7z8a14wfswqydczv6y"; depends=[]; };
   rebus_datetimes = derive2 { name="rebus.datetimes"; version="0.0-1"; sha256="09lv41mywm13avxb0xp8x1a2xz50zxazh3lpg27m16d4cgijmhm5"; depends=[rebus_base]; };
@@ -10398,24 +10852,24 @@ in with self; {
   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]; };
-  reclin = derive2 { name="reclin"; version="0.1.0"; sha256="1r88rk1yb19lhd1y69h016s26390cg5gnmxjjh143lynm3pbh0sv"; depends=[dplyr ldat lpSolve lvec Rcpp stringdist]; };
+  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="0.5.33"; sha256="0znmsd7s25i2ildb4ysan10ih8s37rb8f794b6kp6cvy3zm81cbp"; depends=[GA Rcpp sp]; };
+  recmap = derive2 { name="recmap"; version="1.0.0"; sha256="09aa6480lsrcqwh82rp9sijf720pkbihb5rrc3a74wr5svry7rd2"; depends=[GA Rcpp sp]; };
   recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; };
   recombinator = derive2 { name="recombinator"; version="1.0.0"; sha256="0amcpicsk270l9h7qgv764wp09phsffdpi4adcxrsrwiwm274ibw"; depends=[crayon]; };
   recommenderlab = derive2 { name="recommenderlab"; version="0.2-3"; sha256="0lgfcwxy97cvi893k1dia3nng3yvclnmv95fszzmkcrf4qi9yy7q"; depends=[arules irlba Matrix proxy registry]; };
   recommenderlabBX = derive2 { name="recommenderlabBX"; version="0.1-1"; sha256="042yh0h8qxj7n9hysrfdxnpb3g0zb6s5b683s7hn5mjc55q7nn4g"; depends=[recommenderlab]; };
   recommenderlabJester = derive2 { name="recommenderlabJester"; version="0.1-2"; sha256="0kr9xc2gih2myn1a8h8dxxmdhibv1sjwjsvlrj9d5hvd1mgfhks5"; depends=[recommenderlab]; };
-  reconstructr = derive2 { name="reconstructr"; version="2.0.0"; sha256="1pa6b8zns9495f1bdifvx19hsy5808hqbxb2bn1srwnr4s3ma1zi"; depends=[openssl Rcpp]; };
+  reconstructr = derive2 { name="reconstructr"; version="2.0.2"; sha256="0pzpd2l1b6y1b1lnd95lpc5s8niz7p56vkmxgyi6g6b25vh9c2vi"; depends=[openssl Rcpp]; };
   recosystem = derive2 { name="recosystem"; version="0.4.2"; sha256="1bn6l23gqmfpr6w60ph7zgv53vy3vnq9zdy5x0a8n1yp6b0lw48x"; depends=[Rcpp RcppProgress]; };
   recurse = derive2 { name="recurse"; version="1.1.0"; sha256="1zgzzhbvdzqgmgzj43yvpyc7ahbkn96l5wyr1iqpnn3ha78fy0p3"; depends=[Rcpp]; };
   red = derive2 { name="red"; version="1.4.0"; sha256="1z8ja8qbwgpbmy4ira9q6x482nw5rm4bksm82y0vc4gwpdxls5z3"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; };
-  redR = derive2 { name="redR"; version="1.0.0"; sha256="01safawd9ai34fqxjpc161yzpsk31hfyl8ybcfvdj7a9vdbvcb5i"; depends=[imager]; };
+  redR = derive2 { name="redR"; version="1.0.1"; sha256="0bd1jzjip6p449m9ysi4kybxqljh2wj8z9mrgyk1cy08bjivd1cd"; depends=[imager]; };
   reda = derive2 { name="reda"; version="0.4.1"; sha256="0aq6c2h694kdmjis12g4nxq5hdlzsi42nbnpzq7wic305l5r7nxl"; depends=[ggplot2 Rcpp RcppArmadillo splines2]; };
-  redcapAPI = derive2 { name="redcapAPI"; version="2.1"; sha256="1xdhjr970cg7sr014rviznwg27d2rahc9nfj44b3fghv8jzfc272"; depends=[checkmate chron DBI httr labelVector lubridate stringr tidyr]; };
+  redcapAPI = derive2 { name="redcapAPI"; version="2.2"; sha256="0bszw9px7ddcwnc1p3zpd8426mwym5369hglz3qm5x92va1j4036"; depends=[checkmate chron DBI httr labelVector lubridate readr stringr tidyr]; };
   reddPrec = derive2 { name="reddPrec"; version="0.4.0"; sha256="0zmkaiivvjq8mcaz310zgjjc7y0wgsqv29bf8nhli5qawaczvb9a"; depends=[fields snowfall]; };
-  redist = derive2 { name="redist"; version="1.3-1"; sha256="0rivfi3jpjvhd36rkhlazx4vr7wsig9lf3im1masjmzd4s00zrd8"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; };
-  redland = derive2 { name="redland"; version="1.0.17-9"; sha256="01jx6r7zznb6cpi2bx36fpsgig3bkc1nv9afz5s2nfqisxiq48w5"; depends=[roxygen2]; };
+  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]; };
   redux = derive2 { name="redux"; version="1.1.0"; sha256="0a551w7fph338mqzxda6y21lsad19dway7w18jw9cv1rgvcp9nvc"; depends=[R6 storr]; };
   refGenome = derive2 { name="refGenome"; version="1.7.3"; sha256="15p0ra2p1pwhy5ixbhsz1g79c5sc2aap4i4c8kil0m2syg9y45sn"; depends=[DBI doBy RSQLite]; };
@@ -10424,7 +10878,7 @@ in with self; {
   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.1.1"; sha256="1l9zbhx93f3ib978hlfvkczpy7c88g7ymwiq8grkycfzz52bfz0b"; depends=[dplyr httr jsonlite tibble]; };
+  refuge = derive2 { name="refuge"; version="0.2.0"; sha256="15c1052dp13wcwxi15bnh3x700biw0jcy6b7532rqbgdkv67kqxn"; 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]; };
@@ -10432,21 +10886,22 @@ in with self; {
   regclass = derive2 { name="regclass"; version="1.5"; sha256="0kha9b5ki55ggwh8cmlphg1alf1dq8if5dknisfbvd3f2x4dqf02"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; };
   regexPipes = derive2 { name="regexPipes"; version="0.0.1"; sha256="1hk0rhvmgzcyf5cyl8hjznl3ll25kpasqikfr6nxd6ian2slvmmb"; depends=[]; };
   regexSelect = derive2 { name="regexSelect"; version="1.0.0"; sha256="0xnb9qa8l63ang4r40ky4qhlrs5mbzvmj98dgij26j3mq1ys1pa7"; depends=[shiny shinyjs]; };
-  reghelper = derive2 { name="reghelper"; version="0.3.3"; sha256="0lsdsxi3nawqdzs7k1xma95mmywl86k517cihiv8q2s4maihsja3"; depends=[ggplot2 lme4 nlme]; };
+  reghelper = derive2 { name="reghelper"; version="0.3.4"; sha256="03ddpa8dhvdsqv0fnbaai4rvblqcr8x6r9z42ljm166pnx5h0spk"; depends=[ggplot2 lme4 nlme]; };
   registry = derive2 { name="registry"; version="0.5"; sha256="1yqfl1g6vsl28zn8brzc39659k8lqsmfms7900j7p64ilydyb2sx"; depends=[]; };
-  reglogit = derive2 { name="reglogit"; version="1.2-5"; sha256="123l9n3m2v16skhj0rf77swlhy0ii6ridz13pp68hrxb72sr243c"; depends=[boot Matrix mvtnorm]; };
+  reglogit = derive2 { name="reglogit"; version="1.2-6"; sha256="1nnn8n5sqhbd3nzmwnpmcsmaxxxaqwbna7xm7q9vk4cqz9cm9b9s"; depends=[boot Matrix mvtnorm]; };
   regnet = derive2 { name="regnet"; version="0.3.0"; sha256="1jqy3zkxn3jms9fm950h1bvhvassbfa5yrl7222z3wa0w66kxpp0"; depends=[glmnet Rcpp RcppArmadillo]; };
-  regplot = derive2 { name="regplot"; version="0.1"; sha256="1jw93pplg6qdrfv9jhnifkhclxzrhg84zs8gkfl0nb40jxb6pc34"; depends=[beanplot sm survival vioplot]; };
+  regplot = derive2 { name="regplot"; version="0.2"; sha256="0j2mra5fqcixyl4wqwpzfng98rdh4xnl79ka7ilfi0jvz2jix84x"; depends=[beanplot sm survival vioplot]; };
   regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; };
   regress = derive2 { name="regress"; version="1.3-15"; sha256="1cgr0r49cmr8nzs2lr2cm8lli1i8azyas0lbnf1681kyab15c0r7"; depends=[]; };
   regsel = derive2 { name="regsel"; version="0.2"; sha256="0wwwpawqsqimaldy0zxnqsy23nwp30ypa5dnrnndwhbs4qz99c9w"; depends=[elasticnet glmnet]; };
-  regsem = derive2 { name="regsem"; version="1.1.2"; sha256="0d843h1kv78hsn48ibci6w7y69yqd3q32bidgsqs5dxk980kxcsk"; depends=[lavaan Rcpp RcppArmadillo]; };
+  regsem = derive2 { name="regsem"; version="1.2.0"; sha256="156jvnxf885c42xpbd2ddakgxkbjmzanc240dzdc5z89a78vcy74"; depends=[lavaan Rcpp RcppArmadillo Rsolnp]; };
   regspec = derive2 { name="regspec"; version="2.4"; sha256="18i6k2wqaddrc0dz7v8x3s9205dcfwanqhpnxa9hkpyqzbb17pd3"; depends=[]; };
   regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
   regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; };
   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]; };
   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]; };
@@ -10465,135 +10920,144 @@ 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.1-2"; sha256="0hcvp1n8cvcnpqhwi1gcj3krzsarsk73ivwi75bvsvr3dpgxnwrm"; depends=[date survival]; };
-  rem = derive2 { name="rem"; version="1.2.8"; sha256="1w0lkxjhyssl9343z6lw7dn0cazz9firglvcf74nls4ngkgv0bbd"; depends=[doParallel foreach Rcpp]; };
+  relsurv = derive2 { name="relsurv"; version="2.2-2"; sha256="1r8gmqq4jnn697d4a6m48lf4kzkk6cq160ici60zfd7vb1b1y4vf"; 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]; };
   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="1.1.1"; sha256="07sxlwd09jzlfn7xakw9hwkr9k970lw2mnl0l3rpb5w71968km98"; depends=[]; };
+  remotes = derive2 { name="remotes"; version="2.0.1"; sha256="1xkzlciv68jyf4j8hads0i47nxbgsy1kv7258c6zzyq66z0amhss"; 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]; };
+  repec = derive2 { name="repec"; version="0.1.0"; sha256="0alr9fbmfxmnnnn1qymy65crcycynwz435jj0vangbb4p0qhv8pm"; depends=[jsonlite]; };
   repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; };
   repijson = derive2 { name="repijson"; version="0.1.0"; sha256="16iypvsmh5r9pk2k6npp17ya5dgkxihsj29pppd3zvdpm3vvd8k1"; depends=[geojsonio ggplot2 jsonlite OutbreakTools plyr sp]; };
   replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-2"; sha256="0nskwkqm9z2aphpim6pvykhc3fphlsbap3r49nghkwjpngd0qzj8"; depends=[spatstat spatstat_utils]; };
   replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; };
-  replyr = derive2 { name="replyr"; version="0.9.6"; sha256="1ffx8ziiiqpixabypk4lwnzvnrrylfl40rrjq4c3ys83gnbjm5n2"; depends=[DBI dplyr rlang wrapr]; };
+  replyr = derive2 { name="replyr"; version="0.9.8"; sha256="086ck4vgjamifx621pkc9lyw96brvwhr1gfg4j5amg7r8llfws7r"; depends=[DBI dplyr rlang wrapr]; };
   repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; };
   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.0"; sha256="0jq3y1mia7nsnab14axyrvafw2b64g2zq25n42zplvm4pyfh1czr"; depends=[pROC]; };
+  reportROC = derive2 { name="reportROC"; version="3.2"; sha256="1fskkligymxxfxbimd1sg1lhrd3pj62nkc41wpxfwacfr1zx57qb"; depends=[pROC]; };
   reportReg = derive2 { name="reportReg"; version="0.2.0"; sha256="063z2szsainld9yb0hmpw23ij4d52qs6zjvdfdzj9h48qd50h38d"; 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.2.2"; sha256="1fl4hy4ck4aapy152vn9gjd7w5vgvh2gz2ky6p0wwahah7m9b255"; depends=[ore]; };
+  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]; };
   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.0"; sha256="1l44pxjiz3g0jkk3v6rg5jps3llihfiah0qyv40s0bxvxa6gm8v9"; depends=[callr clipr rlang rmarkdown whisker withr]; };
+  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.0"; sha256="0qaf9sx270hv73vggkschfwqvg39bmjvnz8wywvia722l3bjkh34"; depends=[archivist 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]; };
+  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]; };
   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]; };
   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.0"; sha256="04q2g9pn34cvvzf790s6wlxd3v2qhwi7yx57cmm3h1ak9b4a6ics"; depends=[dummies Rcpp RcppArmadillo RcppZiggurat]; };
+  rerf = derive2 { name="rerf"; version="1.1.3"; sha256="0mc55rwqbqxr655m6rgn5i63yg0pyn225yrmrd46b9h76j5hz3aj"; depends=[dummies Rcpp RcppArmadillo RcppZiggurat]; };
   resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; };
-  resampledata = derive2 { name="resampledata"; version="0.2.0"; sha256="1s683jhrpkhcn7cxjx5cipgkrbmhk5jr7hxniwc8ka7cbq3y22wl"; 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]; };
   reservoir = derive2 { name="reservoir"; version="1.1.5"; sha256="1qvjq8j2gxp6b8m3k3822f9na8a1kbwzzsmq70m763dcq293rgiz"; depends=[gtools]; };
-  reshape = derive2 { name="reshape"; version="0.8.7"; sha256="14ir3w4bb3bsz8jsak27nj7kpn227pdgr9653gjq5wc93rywi9ig"; depends=[plyr]; };
+  reshape = derive2 { name="reshape"; version="0.8.8"; sha256="0s6i0sqxg1vldxs6miv8mi0zydxbqzgpmzfiwkj8y7jix3yrfmad"; depends=[plyr]; };
   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.6.0"; sha256="0dglmf3m8wpqs3jlza6lj8hamb1j1h8b85a4bfrcwkyap7pggcc5"; depends=[birk lubridate marelac measurements seacarb]; };
+  respirometry = derive2 { name="respirometry"; version="0.7.0"; sha256="1anmi0pc54gbrbwcpx7sn8p2cqpyf7d5bf3v9zp4mzy4g7nx7vvj"; depends=[birk lubridate marelac measurements seacarb segmented]; };
   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.711"; sha256="10kbfr7gzah119xm4cnx7br9i9fcga38kymjajw7m2571f4jsji9"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; };
+  restriktor = derive2 { name="restriktor"; version="0.1-80.811"; sha256="0yyaiv5777apf2hwf7kyhya9pxkqvsj94shn310dl7gfxks5bvqd"; 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.8"; sha256="0zwb4ikf021nw7axdn7qlr6bq4xkph3anfy314idkspy1iil4nmr"; depends=[jsonlite Matrix Rcpp]; };
+  reticulate = derive2 { name="reticulate"; version="1.10"; sha256="0bz3lxbisjwn6cv23090zivpy0bxcncr82g5qja13l37i8xnvqsq"; depends=[jsonlite Matrix Rcpp]; };
   retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
   retistruct = derive2 { name="retistruct"; version="0.5.12"; sha256="11m4i29i3zqh9chyjgdhzqj4yqlslfm8y4q0x14xxc2r9lqbkj9l"; depends=[foreign geometry png R_matlab rgl RImageJROI RTriangle sp ttutils]; };
   reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; };
   reval = derive2 { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; };
   revdbayes = derive2 { name="revdbayes"; version="1.3.2"; sha256="09xxy3yk2fwd0113dgsz0kd2k1k1ghjv9ay2n03b5cnxqaksa99s"; depends=[bayesplot Rcpp RcppArmadillo rust zoo]; };
+  revealedPrefs = derive2 { name="revealedPrefs"; version="0.4"; sha256="1xd1bvji99mgnz772naz95i0xnrvqdkwxjj7mjblk2qdym95s1d0"; depends=[pso Rcpp RcppArmadillo]; };
   revealjs = derive2 { name="revealjs"; version="0.9"; sha256="0h4csxrcl1rzmj3g01nf0mr990zc8swrf4jvmxwqsyzx9v2cqbnc"; depends=[rmarkdown]; };
-  revengc = derive2 { name="revengc"; version="1.0.0"; sha256="0ccbw61xqjf9y15ghhzx57q3l48xpw9pq2nb11nrqapp5w3f9vzy"; depends=[stringr]; };
+  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]; };
   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.3"; sha256="0af9h7p4gx627iin3l8hbwhkf7yfdrr900a1rq8ib9p4ip7inxmd"; depends=[Rcpp]; };
-  rfPermute = derive2 { name="rfPermute"; version="2.1.5"; sha256="0c7yi395j640mvnr1qlm9hy1w6vva33fa2lqb3amzkafy4j1cs63"; depends=[abind ggplot2 gridExtra randomForest reshape2 swfscMisc]; };
+  rexpokit = derive2 { name="rexpokit"; version="0.26.6"; sha256="06h2k1jzn9rvbgyhhgnshwdajl9psks1sx09108appyf7sqlb9bp"; depends=[Rcpp]; };
+  rfPermute = derive2 { name="rfPermute"; version="2.1.6"; sha256="198vvf8jdcjiv55hmlzd4f9jwr55yxk8m3s6dr9lkcq5r4h6xmrk"; depends=[abind dplyr ggplot2 gridExtra magrittr plyr randomForest reshape2 rlang scales swfscMisc tibble tidyr viridis]; };
   rfUtilities = derive2 { name="rfUtilities"; version="2.1-3"; sha256="0vnhvdkqqqn894abznw97j07gwdvvmvk8vsf4aaxx9yzk44cnk5g"; depends=[cluster randomForest]; };
+  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]; };
   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="1.1.1"; sha256="1rglqmbhnasc3ciypms3qqgfaj19202cnqdimsi69lvig2rnkca5"; depends=[httr]; };
+  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]; };
   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.0.0"; sha256="1bjapaxp84rm8p7qp3w814b80h2s2m9zpnah85xyg27ba26jixnz"; depends=[crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai tibble whisker wicket xml2]; };
+  rgbif = derive2 { name="rgbif"; version="1.1.0"; sha256="1rn4gpl5paf8qmk535y1gg81xdnlglm70spvw2y72kvdl5jyrzhl"; depends=[crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai tibble whisker wicket xml2]; };
   rgcvpack = derive2 { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
-  rgdal = derive2 { name="rgdal"; version="1.3-3"; sha256="06dvybwz6rgnqhkc05jgi1j9j0bc8hnwrsz5gs1p3xkbxk9fvr0z"; depends=[sp]; };
+  rgdal = derive2 { name="rgdal"; version="1.3-6"; sha256="07yq2bcgjr8my9120v451r567wkxqzh2fqhxmy5iy91aik5bhhxm"; depends=[sp]; };
   rgdax = derive2 { name="rgdax"; version="0.6.0"; sha256="0kls1v9i3fhiyfns41nqqyz4spf5449hc624vwdw86sgbc1w30w8"; depends=[digest httr jsonlite RCurl]; };
   rgen = derive2 { name="rgen"; version="0.0.1"; sha256="0gl82v09q1ha58wd1014s46wzkx1yf348bc7jkl6s4qdc6c4vsb8"; depends=[]; };
   rgenoud = derive2 { name="rgenoud"; version="5.8-2.0"; sha256="0ffjw8kqmi0zkbskyw3h38a8iapv7hdi9819x5w9a5gmdmm4yv0h"; depends=[]; };
   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.5"; sha256="1zdjnbdxj6yfmb5dl4ajlcklgh0iw17ji3arl0wf9j61pw45kk17"; depends=[readr sf stringr]; };
-  rgeos = derive2 { name="rgeos"; version="0.3-28"; sha256="1dfbphf5g4ggd109j7qh4cycxgslppnja8d4ibwajkfgd3f6iq0q"; depends=[sp]; };
+  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]; };
   rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
-  rggobi = derive2 { name="rggobi"; version="2.1.21"; sha256="0zi4rhggngm0y8dsjxqlr2mmfc5wzi7l1qcp5gin4bjlbyf8yb3z"; depends=[RGtk2]; };
+  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]; };
   rgl = derive2 { name="rgl"; version="0.99.16"; sha256="0q8sg8fr0140ilssqhscaxkjc29w1rpp6f4k50amw3zzs9g58ak9"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; };
   rglobi = derive2 { name="rglobi"; version="0.2.14"; sha256="09f4v98m68ssnf1n0ijsrzawpri3jhv4bz7gzzzpijb75mkb0zwz"; depends=[RCurl rjson]; };
   rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; };
+  rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.1"; sha256="06i1ljrib0ap87bxlbpnvx5fr05pwzcmza48gbicvg7fwhz9hs05"; depends=[assertthat httr jsonlite R6]; };
   rgr = derive2 { name="rgr"; version="1.1.15"; sha256="1mrnmbh2crhkwdi37q59hx76afvkhgzgaacg3688q7jp23d58z6x"; depends=[fastICA MASS]; };
-  rgrass7 = derive2 { name="rgrass7"; version="0.1-10"; sha256="0w5vy8163xlfmdrpyp00x25wwq4jnaspzggpvj160azigndsc1kr"; depends=[sp XML]; };
+  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]; };
+  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=[]; };
   rhmmer = derive2 { name="rhmmer"; version="0.1.0"; sha256="0875b29i8rl9iypxp7vw514avq0ac4abdlfq3861cdd3kgycw8jh"; depends=[dplyr magrittr readr rlang tidyr]; };
   rhnerm = derive2 { name="rhnerm"; version="1.1"; sha256="1fkh2pr4kzvqvagdyjlyab7p591s913104gyq05q170gmvlpmiww"; depends=[]; };
-  rhoR = derive2 { name="rhoR"; version="1.1.0.0"; sha256="00djh16s144a9cl2z8zm3za1bsnpzd3i5b9nyqad10xlkgll36li"; depends=[]; };
-  rhosp = derive2 { name="rhosp"; version="1.07"; sha256="09wq96micv9wpr3sx8ir7frkanpy3zi3mwn6rbixw2kxvn5wkkfn"; depends=[]; };
+  rhoR = derive2 { name="rhoR"; version="1.2.0.0"; sha256="04v4cb811d1px7k0afa1x4ixkj8q8syr1rhqgf6j801nqn0dvq8v"; depends=[]; };
+  rhosp = derive2 { name="rhosp"; version="1.10"; sha256="1k0rb4fchjlzinky6ysdvyk0xjsx5986aqwn3yc6s7m3v7y9wb9m"; depends=[]; };
   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.2"; sha256="01yldzzlqg0xqha31l3py62lyq7fw5xfsbmz6ifzff24gqsf029x"; depends=[]; };
+  ridge = derive2 { name="ridge"; version="2.3"; sha256="15m9klxcxj33s8wkxyamc4awzarg2ncahgaz5cg5m926g8haz9c8"; depends=[]; };
   ridigbio = derive2 { name="ridigbio"; version="0.3.5"; sha256="0526nscxynl3857zybpms1wr3230qby29kxglm919pcdvpjb5kz5"; depends=[httr jsonlite plyr]; };
   ridittools = derive2 { name="ridittools"; version="0.1"; sha256="1m9xbwxb277l4cd85qxmpw66gyavpwamgwr8kyf8vqarzfbwiilr"; depends=[]; };
   riem = derive2 { name="riem"; version="0.1.1"; sha256="0lwhsxb4pm26kb65hs8pa63bsbrgy0zchqm4i6pq9f2r9h8vsm1m"; depends=[httr jsonlite lubridate tibble]; };
   rif = derive2 { name="rif"; version="0.2.0"; sha256="0vk3dmg3qzw3i27wbpfih66rx8sdxq033l7h59h3hy960av4hawh"; depends=[crul data_table jsonlite tibble]; };
+  rifle = derive2 { name="rifle"; version="1.0"; sha256="1r0cfj3vzndgiarl9sb38zmpnpm4p8v9l5cm9c1m6g2q9kvpgpbs"; depends=[MASS]; };
   riingo = derive2 { name="riingo"; version="0.1.0"; sha256="1lkg0xmy3mhx99ywbvkmnkj6i61r5x75g4fnnwj6vdyslvwf3s5x"; depends=[crayon glue httr jsonlite purrr rlang tibble]; };
   rijkspalette = derive2 { name="rijkspalette"; version="1.0.0"; sha256="15yn4sp4p4gcm94clyrijp5mxiz2xcslsq2a8x5x2la1l91kf70i"; depends=[crayon curl imager jsonlite]; };
   rinat = derive2 { name="rinat"; version="0.1.5"; sha256="14ql90f8wrxz9nlykbzfpar1yfwh7p71vks7vhhn8ys09wvj30zk"; depends=[ggplot2 httr jsonlite maps plyr]; };
-  rindex = derive2 { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
+  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]; };
   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]; };
   riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; };
-  riskRegression = derive2 { name="riskRegression"; version="2018.04.21"; sha256="0jyk5pdgr8wqyfxzwbmanqp7ff0fkw3nlz7dx19rqxji1lnj74qa"; depends=[abind cmprsk data_table doParallel foreach ggplot2 lava plotrix prodlim Rcpp RcppArmadillo rms survival timereg]; };
+  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]; };
   risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; };
   riskyr = derive2 { name="riskyr"; version="0.1.0"; sha256="1s6yrij5d1vhvzc7nnajjnjmxnhrs0r1psppcvwb0qg3ff181y22"; depends=[diagram vcd]; };
-  rite = derive2 { name="rite"; version="0.3.4"; sha256="196ashcfj5p52qpnpnrkg7vxq87v7vhf1d7z40mk134gmxk2784j"; depends=[knitr markdown RCurl tcltk2]; };
   ritis = derive2 { name="ritis"; version="0.7.2"; sha256="1bn7nfgg9f2y19fp747k96r9kmnrfsqib81a9rzbwv4b97ymg31s"; depends=[crul data_table jsonlite solrium tibble]; };
   riv = derive2 { name="riv"; version="2.0-5"; sha256="0n19jlrs12iysq45xyi3zvghkircg0ww5vbsfpnqkw5b22zsv30s"; depends=[MASS quantreg rrcov]; };
   riverdist = derive2 { name="riverdist"; version="0.15.0"; sha256="145mvqnhv12dcvss54wdycgb3wwk95phl4kx5z0jnh3kmm1zsdl4"; depends=[rgdal sp]; };
@@ -10602,10 +11066,10 @@ in with self; {
   rivervis = derive2 { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; };
   rivr = derive2 { name="rivr"; version="1.2"; sha256="0ankpfixggwdv17ba8i5iln0zzmngqrhvh3dg8lis9kqg6wa89yr"; depends=[Rcpp]; };
   rjade = derive2 { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; };
-  rjags = derive2 { name="rjags"; version="4-6"; sha256="1bc9bzq31liawg3nzwfczf75vgg56fnqjw0997xvlic4ghgbn96g"; depends=[coda]; };
+  rjags = derive2 { name="rjags"; version="4-8"; sha256="17xmjksj69f9wk4x71jxk4cgiqhaf2fj6bjm0mgzp4qln5x84a8m"; depends=[coda]; };
   rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; };
   rje = derive2 { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
-  rjmcmc = derive2 { name="rjmcmc"; version="0.4.1"; sha256="0ww94zdrxdyznpsfxy5fr65w1qjxxr5zignj4bw4291694vfazw1"; depends=[coda madness mvtnorm]; };
+  rjmcmc = derive2 { name="rjmcmc"; version="0.4.3"; sha256="0y2bcfkczlmfnkwmpxa8b65jmfp4pv071wsijv7x4pis28v3mvlr"; depends=[coda madness mvtnorm]; };
   rjson = derive2 { name="rjson"; version="0.2.20"; sha256="0v1zvdd3svnavklh7y5xbwrrkbvx6053r4c5hgnk7hz7bqg7qa1s"; depends=[]; };
   rjsonapi = derive2 { name="rjsonapi"; version="0.1.0"; sha256="0qshll0y8b6lbfrqmp69w9kc9hgfrz94dk68nddshk9ilg14lx4d"; depends=[crul jsonlite plumber R6]; };
   rjstat = derive2 { name="rjstat"; version="0.3.0"; sha256="0r772p0a0x6g96k6r26vb6vjxa68mzjslwg71r0wysa9kqhvypm4"; depends=[checkmate jsonlite]; };
@@ -10614,47 +11078,51 @@ in with self; {
   rknn = derive2 { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; };
   rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; };
   rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; };
-  rlang = derive2 { name="rlang"; version="0.2.1"; sha256="0ghg66vyri8nck4p6kl1nh47qdppbmxvjiyms69nhvipphk4ifpj"; depends=[]; };
-  rlas = derive2 { name="rlas"; version="1.2.4"; sha256="12siq75a4dwyfypyrz8550wj6xjjwfs99kxaglx39c8wc0z64wmy"; depends=[data_table Rcpp uuid]; };
+  rlang = derive2 { name="rlang"; version="0.3.0.1"; sha256="0j7kp6h25wbkvpzr7dpc0zgdpjiwsjjlgprj3mv7bgfalfq1si99"; depends=[]; };
+  rlas = derive2 { name="rlas"; version="1.2.9"; sha256="025hh6fv2kpgi7jvgmjdmh26smhpfaxisj1gq5jcc6xl02jxhpp0"; depends=[BH data_table Rcpp rgeos sf sp uuid]; };
   rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; };
   rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; };
   rlecuyer = derive2 { name="rlecuyer"; version="0.3-4"; sha256="0d5mcdzn6f5nhwzs165a24z36d0b8gd0cyfyzffvr6p96h8qydy7"; depends=[]; };
   rlfsm = derive2 { name="rlfsm"; version="0.2.0"; sha256="08fdllzk5q77fz6ii83vbmz8dnfwwr3ixs11ia2l1vrm1gdj9gf7"; depends=[doParallel elliptic foreach ggplot2 plyr Rdpack reshape2 stabledist]; };
   rlist = derive2 { name="rlist"; version="0.4.6.1"; sha256="08awy2p7rykc272wvvya4ddszbr7b7s7qv4wr3hs8ylr4jqlh0dv"; depends=[data_table jsonlite XML yaml]; };
   rlm = derive2 { name="rlm"; version="1.2"; sha256="18y735z05k9pms6iv1739qg3q12w099qhs42icxhqs5gcdhz92fm"; depends=[]; };
+  rlmDataDriven = derive2 { name="rlmDataDriven"; version="0.1.0"; sha256="1nfa7ivvrmvw91n77dhx128xxhgv031dzvc8cqb7mzz48lwa225n"; depends=[MASS]; };
   rlme = derive2 { name="rlme"; version="0.5"; sha256="0p26mw4g12l279lh80vqcjs3pvjr759ap2m622490k1i2ralxzif"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; };
   rlo = derive2 { name="rlo"; version="0.3.2"; sha256="0abq42dhapzmh6hvmildbn8zya29c6p1aqbv8avc03g014dwbrd0"; depends=[PythonInR]; };
-  rly = derive2 { name="rly"; version="1.6.1"; sha256="13l1ya0f8mbpwainzs1rbl9zjhf3wxrcfkf0xnj9wybs34k9qzxj"; depends=[futile_logger R6]; };
+  rly = derive2 { name="rly"; version="1.6.2"; sha256="1bb55g3rip524dccaxvahjxsi2cimxqvzc897pxplv3bb10pm0r2"; depends=[futile_logger R6]; };
   rma_exact = derive2 { name="rma.exact"; version="0.1.0"; sha256="1igs92la79akyqj84ah23lpcay7i33k7zgzcwm7sii782fhirivx"; depends=[abind metafor]; };
   rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
-  rmake = derive2 { name="rmake"; version="1.0.0"; sha256="1qvbyd68p37nsqrm77w18znsa6m629qzyd7sl8w98p654pqmjhdw"; depends=[assertthat pryr rmarkdown]; };
-  rmapshaper = derive2 { name="rmapshaper"; version="0.4.0"; sha256="0a911f6q9czni6zpijp63rngnil7jkbcy9f7jz55jr225fgm6g6z"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; };
-  rmapzen = derive2 { name="rmapzen"; version="0.3.5"; sha256="0n549y6j056cl7c7pdcn9pixhvs8vpwqg50m380pchbxhxnfjvbq"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; };
+  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]; };
   rmatio = derive2 { name="rmatio"; version="0.12.0"; sha256="1cw7j44rgjgbw2xln7lh29ln53lwfadr8rx0sffkjwc7lbh1r6wa"; depends=[Matrix]; };
-  rmcfs = derive2 { name="rmcfs"; version="1.2.11"; sha256="0pzkxhgn4qcynv0rqbisld7hkpmx8aarxwc165bpipw2z11krdqj"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; };
+  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]; };
   rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; };
-  rmda = derive2 { name="rmda"; version="1.5"; sha256="13119x23xi912s7wl2p2a24msbczgv75x37p2jsr5w0n4l2k01wi"; depends=[caret MASS pander reshape]; };
+  rmda = derive2 { name="rmda"; version="1.6"; sha256="1m7j79jwii9la47w34ka3yl1n7nql8pfn32if0aycn4yw5sy8dmc"; depends=[caret MASS pander reshape]; };
   rmdformats = derive2 { name="rmdformats"; version="0.3.3"; sha256="06nyrdhy26mvgfb1bnlbd8hslybpc01a30a40wwlc3ay7yp0nzrj"; depends=[bookdown htmltools knitr questionr rmarkdown]; };
   rmdshower = derive2 { name="rmdshower"; version="2.1.1"; sha256="1sjpi5ils31adii51gaa8ly7x93l9ganp6in8rsln6si4jc2ppg9"; depends=[rmarkdown]; };
   rmeta = derive2 { name="rmeta"; version="3.0"; sha256="0vkbnxp579v8zmcv1isdbzj5swpr6fq17zwparxcvzswjc2x9ydr"; depends=[]; };
+  rmetalog = derive2 { name="rmetalog"; version="1.0.0"; sha256="1ndw8drzhf74sjx31zfhhx9q1l6pdn4yx2i8l7klp38d5bsc27xm"; depends=[ggplot2 lpSolve]; };
   rmetasim = derive2 { name="rmetasim"; version="3.1.7"; sha256="0sz4mdprdi6sgkfwfdvh2hr9nxiwq17sw0vggq3cvs7lzb0i6m9r"; depends=[ade4 adegenet gtools pegas]; };
-  rmgarch = derive2 { name="rmgarch"; version="1.3-0"; sha256="0brqjhplvzl0bgsi6x057rb2cg5x372i746dhddr013p1mx0rlcx"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
+  rmgarch = derive2 { name="rmgarch"; version="1.3-5"; sha256="1c9rbd56ssa8msw8s181bn3sjyxchai8q63vchdw5g8kqi5v4l0z"; depends=[Bessel corpcor ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
+  rmi = derive2 { name="rmi"; version="0.1.1"; sha256="1y0395l9lhskdrk3x9ps2dmv0sznsba0n6a9fmma33dc9dhywgf9"; depends=[BH Rcpp RcppArmadillo]; };
   rminer = derive2 { name="rminer"; version="1.4.2"; sha256="1hjgcawjrwsf0nv2hlznr1cvpm445yyxc6cq28k2yzyivk74si34"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; };
   rmonad = derive2 { name="rmonad"; version="0.5.0"; sha256="0m7hhmn87rfh49hxrjlcxcq6q36niyxlh3w2frld68jkbks71jn5"; depends=[digest glue igraph magrittr pryr]; };
-  rmpw = derive2 { name="rmpw"; version="0.0.3"; sha256="1iidiq0pz88wgh155hfy8mw0cwwwcl77zshcjrbw11zpx6p8qy94"; depends=[gtools MASS]; };
+  rmpw = derive2 { name="rmpw"; version="0.0.4"; sha256="1a49rvdwvmccv4gfir48fw0b9jyrpc2q9zfyk5j9b7nxsx6x7abl"; depends=[gtools MASS]; };
   rms = derive2 { name="rms"; version="5.1-2"; sha256="01wjxlqfz6l1bdsvxqq0lsbps0k86hx3ayb6fl2n2hxccvsfxkzi"; depends=[ggplot2 Hmisc htmlTable htmltools lattice multcomp nlme polspline quantreg rpart SparseM survival]; };
   rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
   rmsfact = derive2 { name="rmsfact"; version="0.0.3"; sha256="05s23rfs9prr2ia3h4h9y614xhv91lbgppgf3mrrssxkwz220kd5"; depends=[]; };
   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.1"; sha256="0p9fdvkdyicbyngsg53vf56fbc3q7yxs2m7iisd1hpaz09gazqlm"; depends=[dplyr ggplot2 lubridate magrittr pdp purrr ranger stringr strucchange testthat tibble viridis]; };
+  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]; };
   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]; };
-  rncl = derive2 { name="rncl"; version="0.8.2"; sha256="17inkk6ajdn1x6g253k2yjyivcryjwn903cd369h1bxlr80amqc0"; depends=[progress Rcpp]; };
+  rncl = derive2 { name="rncl"; version="0.8.3"; sha256="03c8sizm32rdilbvf67gsw81w7i623pajn9blrrkq8rq8j3zdbns"; depends=[progress Rcpp]; };
   rneos = derive2 { name="rneos"; version="0.3-2"; sha256="0m5mmhwnrk9ifv91s5ngmlvqqd7bw1n7glzkgk5i72cw0siiwmh0"; depends=[RCurl XML]; };
   rnetcarto = derive2 { name="rnetcarto"; version="0.2.4"; sha256="0fk5rym6zp049bl1f7bkl2231mjh3pgnxn0nhvmzpsah08rh4rr6"; depends=[]; };
   rngSetSeed = derive2 { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; };
@@ -10666,17 +11134,18 @@ in with self; {
   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]; };
-  roadoi = derive2 { name="roadoi"; version="0.5.1"; sha256="139i0nhvmkx66f1k3vg5b59m0b12zd6abq38ggx15vshzs5q1f5w"; depends=[dplyr httr jsonlite miniUI plyr purrr shiny tibble tidyr]; };
-  roahd = derive2 { name="roahd"; version="1.4"; sha256="1snbda40lxb0hyk87alljxclwv3lsjy8qm39ynq8299f1ra1l1lh"; depends=[dplyr magrittr robustbase scales]; };
+  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]; };
   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-2"; sha256="049j24hxg7jy80xz615lj7l2mqiybm9zkmwznqpbzrz10s38dj3y"; 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.1.1"; sha256="1716vzci0lmim4n28bc2pjky1shjxqrclgllj3hc4dzf8j22dxbz"; depends=[boot ggplot2]; };
-  robotstxt = derive2 { name="robotstxt"; version="0.6.0"; sha256="1xia7xivqnqj0xis6i4qzm3v414ga1m7lmv1piz1b431faq9s1ai"; depends=[future httr magrittr spiderbar stringr]; };
+  robmed = derive2 { name="robmed"; version="0.2.0"; sha256="1xrdlmyawzzglv9s41nm470yc6dn21cqqalsnk77vk72dhib7p3k"; depends=[boot ggplot2 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]; };
   robumeta = derive2 { name="robumeta"; version="2.0"; sha256="1ynlfxlzh442jd1cf02j0f948m16d536a30gb4bf7208baqri1vg"; depends=[]; };
   robust = derive2 { name="robust"; version="0.4-18"; sha256="1b7qh1aff500nd6dh4y2ipmjgdiq8991shflb63pc39vpc0ny6g4"; depends=[fit_models lattice MASS robustbase rrcov]; };
@@ -10686,12 +11155,12 @@ in with self; {
   robustHD = derive2 { name="robustHD"; version="0.5.1"; sha256="14v6l0appy206zx1jcv7m14r2z9g12dpkm6zxzv756rca2yj8fp5"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; };
   robustX = derive2 { name="robustX"; version="1.2-2"; sha256="0pgfq78qd8s40ciqval01bwajy6zfdjms1lbh0b5g0rww6920s6f"; depends=[robustbase]; };
   robustarima = derive2 { name="robustarima"; version="0.2.5"; sha256="0mqlp4xmma74rgwb6rihbzs5nillcnddl6smlxmm8lq1wba27jdj"; depends=[splusTimeDate splusTimeSeries]; };
-  robustbase = derive2 { name="robustbase"; version="0.93-1"; sha256="10fsc50vqngi2a26fgi99bacq4rb05jg8kqw38r4n4khssw06rk4"; depends=[DEoptimR]; };
+  robustbase = derive2 { name="robustbase"; version="0.93-3"; sha256="1nqh1qg1qd1qrxl1w585dqx7ql55qzjny1r4f9hqxpwd7lml07cc"; depends=[DEoptimR]; };
   robustfa = derive2 { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; };
   robustgam = derive2 { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; };
   robustlmm = derive2 { name="robustlmm"; version="2.2-1"; sha256="0xh77jrhjybrbcfzvfzywj8nanqyfgn93rhd1bixw4snz7l1n97x"; depends=[cubature fastGHQuad ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen robustbase xtable]; };
   robustloggamma = derive2 { name="robustloggamma"; version="1.0-2"; sha256="1cifyasrik010zs8jsz0kzzmwm3qmc0y7h2dahg2ibpwxfcqfcpq"; depends=[numDeriv RobustAFT robustbase survival]; };
-  robustrank = derive2 { name="robustrank"; version="2017.12-2"; sha256="0lcjn77lsdfbcby89hfcz2h049v2fndw7rankdcdgnl6lw2bdpvr"; depends=[kyotil]; };
+  robustrank = derive2 { name="robustrank"; version="2018.10-1"; sha256="0fggn4kv56rvjb84lf18q140flcc6n90bqj59g5zpf8q9l7pqy9z"; depends=[kyotil]; };
   robustrao = derive2 { name="robustrao"; version="1.0-3"; sha256="0gcxxizsg380blrv55vl9f3az8gnr274c6idi0pimhh5c26h7ma6"; depends=[doParallel foreach gmp igraph iterpc quadprog]; };
   robustreg = derive2 { name="robustreg"; version="0.1-10"; sha256="1zwfgmla6wna48vq5hbz7c7fvmb29y949790w2j6x8pkjzr781sz"; depends=[Matrix Rcpp RcppArmadillo]; };
   robustsae = derive2 { name="robustsae"; version="0.1.0"; sha256="0fi1fpqnfj6vkmidlr90kqbn1bxxxqb5qpqqrz9rrimlsvrc4ddl"; depends=[coda lattice MCMCpack mvtnorm pscl]; };
@@ -10699,16 +11168,19 @@ 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.111"; sha256="0x82mmsvy41cw1chbrxwjj35fwimb3iv9lrlhxsslgix62xlskvx"; depends=[car lme4 MASS]; };
-  rococo = derive2 { name="rococo"; version="1.1.5"; sha256="062pj62haf0xw74p6c1dd20ipcxka8nn0mxsq490d22kqwm4vf5a"; depends=[Rcpp]; };
+  rockchalk = derive2 { name="rockchalk"; version="1.8.117"; sha256="0xy665iypp6c3whzk5qj3n3f69mm23z08cxdgxnvyrnwp5zznqg8"; depends=[carData 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]; };
   rodeo = derive2 { name="rodeo"; version="0.7.4"; sha256="16yzj12m9wvcrqxc33rpbyzbq019swi5jxnbda9crfwjdvafaa0d"; depends=[deSolve R6]; };
   rodham = derive2 { name="rodham"; version="0.1.1"; sha256="15mrlx7azvwkwjgfplvs5fhk2nwlg9pay2l99q327p8hx87jr8ra"; depends=[jsonlite plyr splitstackshape stringr tibble]; };
-  roll = derive2 { name="roll"; version="1.0.7"; sha256="059n1pl7692grzv4pmnj8s6cs2zi98lr1s5zi9pxg5vpw7r6h2v9"; depends=[Rcpp RcppArmadillo RcppParallel]; };
-  rollRegres = derive2 { name="rollRegres"; version="0.1.0"; sha256="09vb06j8yyxw7k7dmni8s90wnvdk5l5x09gr76cvp4rjkx8jjlpj"; depends=[checkmate Rcpp RcppArmadillo]; };
+  roll = derive2 { name="roll"; version="1.1.1"; sha256="146x0sfalwxykrj0m08kmrjhihdfnss97hk6x76zd46ji305zk9v"; depends=[Rcpp RcppArmadillo RcppParallel]; };
+  rollRegres = derive2 { name="rollRegres"; version="0.1.1"; sha256="1mbwx1rpb5sj6kzsagf3mg7kz11naqqn5fpvnpdvmv7mcp92wj7x"; depends=[checkmate Rcpp RcppArmadillo]; };
   rollbar = derive2 { name="rollbar"; version="0.1.0"; sha256="1q2ym0vkgbdnibxmwx0bp9c20g3bm8fzwwgs3j4bxg1ydg3gnkj4"; depends=[httr]; };
   rollmatch = derive2 { name="rollmatch"; version="1.0.1"; sha256="1bxd31s30jji97m93z4w4hdxdrfyp947dyzhjwmm13zc59mpfnvs"; depends=[dplyr magrittr]; };
   rollply = derive2 { name="rollply"; version="0.5.0"; sha256="01rh4x9352ixdhrqdysapqx5ynksknyf8n230b340pxwaz2d7xhc"; depends=[plyr Rcpp stringr]; };
+  roloc = derive2 { name="roloc"; version="0.1-1"; sha256="0xynj12gp010c23f6ll9p343vwgxwa22s771p1w2pi65cj2ixhas"; depends=[colorspace]; };
+  rolocISCCNBS = derive2 { name="rolocISCCNBS"; version="0.1"; sha256="100jh5m2c1zp5wg3wd4y2i47dzx1j0g6lfwyqmwk4bz99yzzz5am"; depends=[colorspace roloc]; };
   rolr = derive2 { name="rolr"; version="1.0.0"; sha256="04nm4q0mlr4w6jb0frykzlyknfn3gn02ysqr5ll5jch6wawichy2"; depends=[survival]; };
   rolypoly = derive2 { name="rolypoly"; version="0.1.0"; sha256="11nf7in6n03675l11ynl4rp20rlzy7jli3m518s4sqqxdm8f8ci7"; depends=[data_table dplyr foreach ggplot2 glmnet MASS Matrix matrixcalc]; };
   rootSolve = derive2 { name="rootSolve"; version="1.7"; sha256="08ic6ggcc5dw4nv9xsqkm3vnvswmxyhnqnv1rdjv1h2gy1ivpcq8"; depends=[]; };
@@ -10717,8 +11189,10 @@ in with self; {
   rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; };
   ropenaq = derive2 { name="ropenaq"; version="0.2.6"; sha256="065p4c8l4bqxy00clbjhad8hqw4gg2h2c00b06n2fa5n70z0akgq"; depends=[crul dplyr jsonlite lazyeval lubridate tidyr]; };
   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.0"; sha256="0g9jg9j91v705kygs4yx1y6s0cx5krr6kbg3jlgcsda9ldjmj7fy"; depends=[CodeDepends fastdigest igraph]; };
+  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]; };
   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]; };
@@ -10727,22 +11201,23 @@ in with self; {
   rosqp = derive2 { name="rosqp"; version="0.1.0"; sha256="0975g7p75bq238g7lr200svsqm9i11z7l331r0igm5ycahljrlsm"; depends=[Matrix R6 Rcpp]; };
   rotationForest = derive2 { name="rotationForest"; version="0.1.3"; sha256="1z2wk3mcs5hrahsxralidbc0dd8gxdbwjpr2f71g4g3isfx1ic8d"; depends=[rpart]; };
   rotations = derive2 { name="rotations"; version="1.5"; sha256="1zksh6hyxdkm0lvvrld6dgkmhszn6wsjrjzr2xbn3af3gsvsydaa"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; };
-  rotl = derive2 { name="rotl"; version="3.0.4"; sha256="1zc4418gxpd65n60lspsdm15v7apkv6wkf9jqqs152z079ppdrhx"; depends=[ape assertthat httr jsonlite rentrez rncl]; };
+  rotl = derive2 { name="rotl"; version="3.0.5"; sha256="18iq91r7g79nv6qmkb6kp5vlc3jkymfsdzs83il5rd63cvj6gp46"; depends=[ape assertthat httr jsonlite rentrez rncl]; };
   roughrf = derive2 { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; };
+  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.0.1"; sha256="0xpzziminf225kjwhyl51kgkzhplyzhk5farhf5s822krl2xqbfj"; depends=[brew commonmark desc digest R6 Rcpp stringi stringr xml2]; };
+  roxygen2 = derive2 { name="roxygen2"; version="6.1.0"; sha256="0ji9k4s1bvfbl8wimfqj1lqr33h1claaz30vb5pgksxyg77j5xaa"; depends=[brew commonmark desc digest pkgload purrr R6 Rcpp stringi stringr xml2]; };
   royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; };
   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="2.2.0"; sha256="1sh45ixd22nl7lxry82h74k4d5y2yvrs9g2ydqqv5jwkk7hmki11"; depends=[rpart]; };
+  rpart_plot = derive2 { name="rpart.plot"; version="3.0.4"; sha256="0b4y1adn0gnx9igi0nghjp2bf5pa2d5fqz00ra505ljdwj8d0lgx"; 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.3"; sha256="150kd9pvfr7msrh55vsqcj8lv994izlvhxf4g5n1qbzdcaqsdjzp"; depends=[checkr]; };
+  rpdo = derive2 { name="rpdo"; version="0.2.4"; sha256="153xj2fw6ddqxcdriq825nigf6zdakgx5ik2yr4w4bayam1qa5fq"; depends=[checkr]; };
   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=[]; };
@@ -10750,13 +11225,13 @@ in with self; {
   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]; };
-  rplos = derive2 { name="rplos"; version="0.8.0"; sha256="0l38zllzklsy6q2l2r0v2x8wcsldnxjhilcsq5ykl1k35gbva19y"; depends=[crul dplyr ggplot2 jsonlite lubridate plyr reshape2 solrium whisker]; };
-  rplotengine = derive2 { name="rplotengine"; version="1.0-6"; sha256="1x9lf5h6cmjyi5xyvmk2ii2dwkwmjqbg0m1fhfabay0flqc7qdm0"; depends=[xtable]; };
+  rplos = derive2 { name="rplos"; version="0.8.4"; sha256="1hx1r9ag62a2mv8zqag0i1f10k5rfdygjhqinql4cgzgrdi7y3h7"; depends=[crul dplyr ggplot2 jsonlite lubridate plyr reshape2 solrium whisker]; };
+  rplotengine = derive2 { name="rplotengine"; version="1.0-7"; sha256="1bbciq84l0h6g4qajlcqg3v66g2rspflv6k7x5h5qzwlcb4p4dps"; depends=[xtable]; };
   rpms = derive2 { name="rpms"; version="0.3.0"; sha256="0kdxjn2aij83ax0g1ipdb7qrvpqn67vhs3z54ihj1kbx4i8pzs9g"; depends=[Rcpp RcppArmadillo]; };
   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.0"; sha256="0rgi7ax2n2fln12501zshwaz23nns9qk4vy1ylnaqb4bg0x30gn4"; depends=[DBI raster rgeos RPostgreSQL sp]; };
+  rpostgis = derive2 { name="rpostgis"; version="1.4.1"; sha256="15s5k5grg2va5dkszpbrk0kgbmrq5xhg7jm37q90m3ydbgln2ys2"; 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]; };
@@ -10764,14 +11239,14 @@ in with self; {
   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]; };
   rprojroot = derive2 { name="rprojroot"; version="1.3-2"; sha256="12r3fdxmi2pmwn6ic3rhg0b20ll5z420m0d8fziv1n21961namnz"; depends=[backports]; };
-  rpsftm = derive2 { name="rpsftm"; version="1.2.2"; sha256="0xfw2rc8k9nnwzmzf803w5aarhm09hvi8ry5gi21d9n8fxsj1q97"; depends=[ggplot2 rootSolve survival]; };
+  rpsftm = derive2 { name="rpsftm"; version="1.2.3"; sha256="1l0674jsi5ngazmbl13wm73xwxyqy4z6k7p0j46j6wcv84ljj7ss"; depends=[ggplot2 rootSolve survival]; };
   rpst = derive2 { name="rpst"; version="1.0.0"; sha256="10cbgj67lqgh5bawwa0nwj9kfl3jg4vdm121kc61q199v8dw7nrz"; depends=[plotrix survival]; };
   rpsychi = derive2 { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; };
   rptR = derive2 { name="rptR"; version="0.9.21"; sha256="0wqh9d372s2222qm5w0wx77l2sj7zvdnl7zvxcn5wfs3cz84fj15"; depends=[lme4 pbapply]; };
   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="0.1.1"; sha256="14m0sfl46kkzwv4pmgl8wc4sxb9b14lbx3m3c7r6d3iv6jjmaaj2"; depends=[data_table rquery wrapr]; };
-  rquery = derive2 { name="rquery"; version="0.5.0"; sha256="1ssf7mxj8dy78v9a9bmaxppp2cygpcqndir40vavl6fm9v34s0nq"; depends=[wrapr]; };
+  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]; };
   rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; };
   rrBLUP = derive2 { name="rrBLUP"; version="4.6"; sha256="1bw4pjj9hm9ik5bvvklnlkykhlqm6k7pbkma1iwc3kbg8shpbd18"; depends=[]; };
   rrBlupMethod6 = derive2 { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; };
@@ -10782,7 +11257,7 @@ in with self; {
   rrd = derive2 { name="rrd"; version="0.2.1"; sha256="1n4590h3xzja7j8fzay4b8rp98wnilg2znnkbw4ffk9fdac2wr5l"; depends=[assertthat tibble]; };
   rrecsys = derive2 { name="rrecsys"; version="0.9.7.3"; sha256="034p7ncnzlkniicl5nd58m9wjy7mc00f027zpg5das226svhfywf"; depends=[ggplot2 knitr MASS Rcpp registry]; };
   rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; };
-  rredlist = derive2 { name="rredlist"; version="0.4.0"; sha256="0j2hab26zs9dyg9fggza7yffbvwvnmrk5frbfs2ys8h3hg2x6ncy"; depends=[crul jsonlite]; };
+  rredlist = derive2 { name="rredlist"; version="0.5.0"; sha256="12dqilcwyxad5yjz8gh29ycwj2rbm1g0hxfsqkl7zsjaz5lbcka0"; depends=[crul jsonlite]; };
   rrefine = derive2 { name="rrefine"; version="1.0"; sha256="1lh3vddrp5k9bhz5spv93w0qm9z5lskpdgxfksys0l3275hzx1lm"; depends=[httr readr rlist]; };
   rreg = derive2 { name="rreg"; version="0.2.1"; sha256="05c2yj58zn43zkmqp4iyblsixsq76hsjkchffl5rkqynvgxi0qzi"; depends=[directlabels ggplot2]; };
   rrepast = derive2 { name="rrepast"; version="0.7.0"; sha256="1s596sk993aam5rsb4as2y3n5wcgjlnb25b29l59z0xks1v04mnc"; depends=[digest doParallel foreach ggplot2 gridExtra lhs rJava sensitivity xlsx]; };
@@ -10792,44 +11267,45 @@ in with self; {
   rroad = derive2 { name="rroad"; version="0.0.5"; sha256="09q5r9wq3vm5wy5aigx9wffv7m0njlp3sma1djm6cp7hhwgss0nj"; depends=[]; };
   rrpack = derive2 { name="rrpack"; version="0.1-7"; sha256="0svrw2ik59hjyfb0kag4nv8ilcaz7irmkp7ndbxxn0jg7dacb411"; depends=[ggplot2 glmnet lassoshooting MASS Rcpp RcppArmadillo]; };
   rrr = derive2 { name="rrr"; version="1.0.0"; sha256="0sv6k70mv325yjm8yjy4dw8cqc0xc071iiv94fk1l1yfz0n67prz"; depends=[dplyr GGally ggplot2 magrittr MASS plotly Rcpp]; };
-  rsMove = derive2 { name="rsMove"; version="0.2.4"; sha256="01iag63vskm68zjgq5qmgiimhmxcmp0mq6qarzsr3jlgmxix6kqs"; depends=[caret gdalUtils ggplot2 igraph lattice lubridate pryr randomForest raster RCurl rgdal sp spatialEco]; };
+  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]; };
   rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; };
-  rscala = derive2 { name="rscala"; version="3.0.2"; sha256="0gbi2q63pbl8izyq8wjrjn9d0746ylak8fp7zsjzw56gjpak79q3"; depends=[]; };
+  rscala = derive2 { name="rscala"; version="3.2.3"; sha256="11p626ys62xgvs0pd5hsnywnhvgm5m082s6laqg823az8ybs9wyp"; 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.5.11"; sha256="1h0lj68znfy1jc2b7qbxj0cq8y2blhwz2p82cfn321yhca0s818c"; depends=[dplyr httr plyr tidyr]; };
-  rscorecard = derive2 { name="rscorecard"; version="0.7.1"; sha256="1j7v383gcb13bi6d1v59pkx6d9g4yichyyh5ads9w82qq6v31xnw"; depends=[dplyr httr jsonlite lazyeval magrittr]; };
+  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]; };
   rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
-  rsdmx = derive2 { name="rsdmx"; version="0.5-12"; sha256="0qzbn3d6vkvn8qnjymmjbqgcffglnl5qm2zm4v6694xwcc1msvwx"; depends=[plyr RCurl XML]; };
+  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]; };
   rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; };
   rsem = derive2 { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; };
   rsgcc = derive2 { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; };
   rsggm = derive2 { name="rsggm"; version="0.3"; sha256="17yzvd5vs2avp0nzk7x9bi4d7p6n9nv7675qpgfpwkfqp25lax73"; depends=[glasso MASS Matrix QUIC]; };
   rsimsum = derive2 { name="rsimsum"; version="0.3.3"; sha256="0h08klkdn84y32xlaafig1jj5ni79j4yx2pp3pg2qfmpimxcm44w"; depends=[checkmate ggplot2]; };
-  rsinaica = derive2 { name="rsinaica"; version="0.5.0"; sha256="12jzbay7vm1ziqdjx8i7wkb3f354q95qfayasr3prl16sz80kpp7"; depends=[dplyr httr jsonlite lubridate stringr]; };
+  rsinaica = derive2 { name="rsinaica"; version="0.6.0"; sha256="0ygr2mpvmqnv6a71cm93xss8g3pnmb5ax0fb88cjzax993m2l48v"; depends=[dplyr httr jsonlite lubridate stringr]; };
   rslp = derive2 { name="rslp"; version="0.1.0"; sha256="06glpdsd309058kxww114j9sshvj6gw9g5sdm4zkmzq3cl91fa6h"; depends=[magrittr plyr stringi stringr]; };
   rslurm = derive2 { name="rslurm"; version="0.4.0"; sha256="1ck4ky5d0pf8hnxz1ijbjk0nfyj1hfnhf9la5qrqw2spa09z82ki"; depends=[whisker]; };
-  rsm = derive2 { name="rsm"; version="2.9"; sha256="1rj2qdlv44hbv1ipv7hdpssn90ypp6bfc7nqdaf9dak0bd6khwni"; depends=[estimability]; };
-  rsnps = derive2 { name="rsnps"; version="0.2.0"; sha256="10g1b2i2mp0b4p78iiy83sz2jwz73xfjkhc6ih4ag2wmbdmwf9pb"; depends=[httr jsonlite plyr stringr XML]; };
+  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]; };
-  rsolr = derive2 { name="rsolr"; version="0.0.8"; sha256="1swhg7hnkdphnw0d9jrzn18nk2v5a6ny7n652fh8d0k88a27xx4d"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; };
-  rspa = derive2 { name="rspa"; version="0.2.1"; sha256="0m3h25jxfccdqy4gf3cls4wcdpw580yfmb3lvw4ndfva8lj2q6sy"; depends=[lintools validate]; };
-  rsparkling = derive2 { name="rsparkling"; version="0.2.4"; sha256="0ykk8lvigi3hb5iz7rxsi3brf4ydg2kxmaks4vk0vrkanyifs7xp"; depends=[h2o sparklyr]; };
-  rsq = derive2 { name="rsq"; version="1.0.1"; sha256="1c7604g48rcsbfk66xfwia1jaxlqsjiw19zx9pg51n8d6c0l17zb"; depends=[MASS]; };
+  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]; };
+  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.17.3"; sha256="10fdasqbdwlisnm7hjmgl5f027ypfhni86d1c5fykb09g1pvkjz3"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; };
-  rstanarm = derive2 { name="rstanarm"; version="2.17.4"; sha256="1azggccxj6k8nrz8xlmsv42h0rvwmqfih8xxqn45v7fy9la006p0"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders survival]; };
+  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]; };
   rstansim = derive2 { name="rstansim"; version="0.1.1"; sha256="09hg4ishzp6q90nrl94h21al0ad0jn7fr8brp8f0xa9cvkwlzjpg"; depends=[doRNG doSNOW foreach loo Rcpp rstan]; };
-  rstantools = derive2 { name="rstantools"; version="1.5.0"; sha256="19rzcfiirw539hxs98j33gccwigdpwf3nj1w5jwwzank217wmgg4"; depends=[]; };
+  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]; };
   rstream = derive2 { name="rstream"; version="1.3.5"; sha256="1wprsnwl63cc4a6j5h18r09wlh32bq5z6hj6r5klp7rkpjchsplp"; depends=[]; };
-  rstudioapi = derive2 { name="rstudioapi"; version="0.7"; sha256="133s75q2hr6jg28m1wvs96qrbc9c4vw87migwhkjqb88xxvbqhd5"; 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]; };
@@ -10837,40 +11313,43 @@ in with self; {
   rsvd = derive2 { name="rsvd"; version="0.9"; sha256="1d71y4r27gpwsaq195yys301va8wdc2bvwxjk6501f7ma2yhl7y9"; depends=[]; };
   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=[]; };
   rt3 = derive2 { name="rt3"; version="0.1.2"; sha256="1fqbymkz4csavkxrs26glzrh0kw3qy9x5smgddgda9a1dxh9ljkm"; depends=[]; };
-  rtable = derive2 { name="rtable"; version="0.1.5"; sha256="1a9x0qcbp96wg86nbvx25yh5viwvf5sqb41z3cvr5i7br2ji8n5i"; depends=[knitr ReporteRs shiny tidyr xtable]; };
   rtape = derive2 { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; };
-  rtdists = derive2 { name="rtdists"; version="0.8-3"; sha256="1p8j50snlfc4rs7fvzd2ny1i47vy3d6xmik4rhyppvv4kr47nwhm"; depends=[evd gsl msm Rcpp]; };
+  rtdists = derive2 { name="rtdists"; version="0.9-0"; sha256="14ccpn67xdsx5fhwiw32z55gldzdcpaparqb1zpls2r233wg0v99"; depends=[evd gsl msm Rcpp]; };
   rtematres = derive2 { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[gdata plyr RCurl XML]; };
   rtext = derive2 { name="rtext"; version="0.1.20"; sha256="0455rwfxmpgb4qb925ildqr4km4ndgqjxgvk90x2dhfivgmmn60k"; depends=[digest hellno magrittr R6 Rcpp RSQLite stringb]; };
   rtf = derive2 { name="rtf"; version="0.4-13"; sha256="1gwvw98lnym305z9awjaximrmkl4kkki59blbwqs2js42iqcx2m3"; depends=[R_methodsS3 R_oo]; };
   rtfbs = derive2 { name="rtfbs"; version="0.3.9"; sha256="02irj6c7nfgp42yb5zdmhbr5pi09xgx0z76d1ccfczjf0r1cyvfz"; depends=[rphast]; };
-  rticles = derive2 { name="rticles"; version="0.4.1"; sha256="1f2a60jmlsiga377ihhy8sm9amqn7fd91sd4vx682b97hfh3zn39"; depends=[knitr rmarkdown yaml]; };
-  rtide = derive2 { name="rtide"; version="0.0.4"; sha256="0i3mf3818s62mmn315brv2axpwiiz646k5hv8z26z7s4ahxavrc0"; depends=[abind datacheckr lubridate magrittr plyr stringr tibble tidyr]; };
+  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="0.1.8"; sha256="1lkcrs3cdfcgy86vbvjfxqs2jxw4imz16s6c3pxhdl8r0byjdndk"; depends=[curl rappdirs sys]; };
+  rtika = derive2 { name="rtika"; version="1.1.19"; sha256="0qh6qq3hxhsa2nb3bn468h87k54xjq8f0jj5rixcp95p4krr6wn7"; 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]; };
-  rtkore = derive2 { name="rtkore"; version="1.5.1"; sha256="03vmgrsil5yrrs3ndgqvfcwv9plcawc8v2y2x9nwcashxg40djn6"; 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]; };
   rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; };
-  rtrim = derive2 { name="rtrim"; version="2.0.4"; sha256="1xl3xai768idnfc30hp20cnpq3a07049p7vpkqpdrpla6a8zhvqk"; depends=[]; };
-  rts = derive2 { name="rts"; version="1.0-45"; sha256="11gvgj5bqiacsf51sg4dj7jpsjgdj6j26vqc8by15325a4c804ml"; depends=[raster RCurl sp xts zoo]; };
+  rtrim = derive2 { name="rtrim"; version="2.0.6"; sha256="18fvi8zbf9dqwi5x0sgy2aay5565ldvqpispqqb5gx2lwb9qra2r"; depends=[]; };
+  rts = derive2 { name="rts"; version="1.0-47"; sha256="0xlwg6c49clb1zyfw8s8qhwdbyl0rwx7ljy8j2rq7hjh07541hdx"; depends=[raster RCurl sp xts zoo]; };
+  rtsdata = derive2 { name="rtsdata"; version="0.1.1"; sha256="1xh5wsc330x49zcid8hpv9jarbp64dgq10k6lbjjsx1n7dg9qm3z"; depends=[alfred anytime curl data_table mongolite Quandl quantmod xts zoo]; };
   rtson = derive2 { name="rtson"; version="1.3"; sha256="1gwvk7nmq9bz90jy1zh7lhr735iw804pmwxykdpaigcsnxk7zx03"; depends=[R6]; };
-  rtsplot = derive2 { name="rtsplot"; version="0.1.0"; sha256="1iz7m1r46d1b84fbbkby42ry8plp226gh38krrdgzshfcf2a6856"; depends=[quantmod RColorBrewer TTR xts zoo]; };
-  rtweet = derive2 { name="rtweet"; version="0.6.7"; sha256="0blyggy559cginfavmwzli1ibjbh1lbipyyi4bs2h9mvx9iwkl2l"; depends=[httr jsonlite magrittr tibble]; };
+  rtsplot = derive2 { name="rtsplot"; version="0.1.1"; sha256="0dkv8pl2937zfpcwyy9ms1ak29nv9mxyb8w6bh2ns8figjp11zmp"; depends=[quantmod RColorBrewer xts zoo]; };
+  rtweet = derive2 { name="rtweet"; version="0.6.8"; sha256="0r2lyiy3wa7v7wq72fvckw3bbff9sjy5bqpag766pl1rwfsbphjm"; depends=[httr jsonlite magrittr tibble]; };
   rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; };
-  rtypeform = derive2 { name="rtypeform"; version="0.3.3"; sha256="13nqlgi4wwby8ka014ggilnh2m4qr940zbsks27zfd7q56ng7sbq"; depends=[httr jsonlite purrr tibble]; };
+  rtypeform = derive2 { name="rtypeform"; version="2.0.0"; sha256="00as49l9plncc25bn93x36hpxnxachsh382ivhq6k9d9gi8424c0"; depends=[dplyr glue httr jsonlite lubridate purrr tibble tidyr]; };
   rubias = derive2 { name="rubias"; version="0.1.0"; sha256="0k8f1aaj3zpxqkhzjfl7iyyx7pjssp5lldajjsghw110j75qksh4"; depends=[dplyr ggplot2 gtools magrittr Rcpp readr rlang stringr tibble tidyr]; };
   rucm = derive2 { name="rucm"; version="0.6"; sha256="1n6axmxss08f2jf5impvyamyhpbha13lvrk7pplxl0mrrrl5g0n8"; depends=[KFAS]; };
   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]; };
   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]; };
   rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; };
   rusk = derive2 { name="rusk"; version="0.1.1"; sha256="0a6vbcnfzlfq9fmibiy0cwcfix65qhxq4f7wc7d53riga82s00lk"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; };
   rust = derive2 { name="rust"; version="1.3.5"; sha256="16jrf1nfn3wnkrbzp5bjkqi0q0vpy82ra6f0vs1pyk5hw5jhshg9"; depends=[Rcpp RcppArmadillo spatstat]; };
@@ -10879,15 +11358,17 @@ 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.0"; sha256="0b3vw1r4aglciwmjqm8dvlizydydwcgnpwkzib2g9k69a355iyi0"; depends=[]; };
+  rvcheck = derive2 { name="rvcheck"; version="0.1.1"; sha256="116cs1ih5m55jyp0f5whjvnbn4gpi4550qkbwzw0mq254x2r8vdg"; 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]; };
   rvg = derive2 { name="rvg"; version="0.1.9"; sha256="0r2amwygazq1sff8fl0k618fxs2d5pxp5ryz7kqyjkcnxfghgnxf"; depends=[gdtools officer Rcpp xml2]; };
   rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
-  rvinecopulib = derive2 { name="rvinecopulib"; version="0.2.8.1.0"; sha256="0n92822pgspq17wy52zmvch2ag9fc577y64myzg5b7hz7fqd96mq"; depends=[assertthat BH cctools kde1d lattice Rcpp RcppEigen RcppThread]; };
-  rwalkr = derive2 { name="rwalkr"; version="0.3.3"; sha256="03kpv4hvlajm09cqrlihia62pcj1skakx28ci4mgbfgpjy6l4jsl"; depends=[dplyr httr tibble tidyr]; };
+  rviewgraph = derive2 { name="rviewgraph"; version="1.2"; sha256="0qw1fdfwg2763a1k1qmryblw5rpagsi5p70rs7fj256zfcjvwrz8"; depends=[rJava]; };
+  rvinecopulib = derive2 { name="rvinecopulib"; version="0.3.0.1.1"; sha256="09zs1ckc5c0z4xg6h348v8nig37b400mkwsa0z4hn7rrhjf5i3gf"; depends=[assertthat BH cctools kde1d lattice Rcpp RcppEigen RcppThread wdm]; };
+  rwalkr = derive2 { name="rwalkr"; version="0.3.4"; sha256="1zx58l92finzkrivp214hbldkcbpdjgx0k6bwz22spp0lgnzi9mp"; depends=[dplyr httr tibble tidyr]; };
   rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; };
+  rwavelet = derive2 { name="rwavelet"; version="0.1.0"; sha256="15shy8v659r3qnx32hrq6zn5fwinwg6aiys71f45k0s9jhj973ki"; depends=[dplyr signal]; };
   rwc = derive2 { name="rwc"; version="1.11"; sha256="1qhgkbkp4nz0wq5c4x8232xiszpiyzcdklfgvpnx4cbp3bbfdi4g"; depends=[MASS Matrix mvtnorm raster]; };
   rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; };
   rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; };
@@ -10897,9 +11378,11 @@ in with self; {
   rwunderground = derive2 { name="rwunderground"; version="0.1.8"; sha256="02p26gkicd5v511kb04p1h3wxj57r7j5vr97n3ibywc6ivz7nqxa"; depends=[countrycode dplyr httr lubridate tibble]; };
   rxSeq = derive2 { name="rxSeq"; version="0.99.3"; sha256="0g0n2pzbssz61psghjp1vrlspgph4s39x1k1zhcz7ivdn5pjb2nx"; depends=[MASS numDeriv VGAM]; };
   rxylib = derive2 { name="rxylib"; version="0.2.1"; sha256="0qfdd7z9as6igc82i8dbvjz03jk8scxz599jw8xm69y5qs5zf104"; depends=[BH Rcpp]; };
+  rym = derive2 { name="rym"; version="0.4.0"; sha256="1vxc6nk0d90ggwymdyfwaxzsd91zmd3bspz0chj7iaki8cjbbjdw"; depends=[httr stringr]; };
   ryouready = derive2 { name="ryouready"; version="0.4"; sha256="1d9z3paxcrkwsgn5g83x57jwz2iqarks30x0bwg48i5ispw6xbr3"; depends=[car ggplot2 stringr]; };
   rysgran = derive2 { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; };
-  rzmq = derive2 { name="rzmq"; version="0.9.3"; sha256="04rb54gr1wr0nczxnhk5jbk9ar65yn2vs8bsa41i1hfhzjhnsvxb"; depends=[]; };
+  rzeit2 = derive2 { name="rzeit2"; version="0.2.0"; sha256="0r74i14bnpw1dp8vzcx8kf87a8v4g3r4wbs4c87s9s4ingvsbl64"; depends=[anytime httr jsonlite openssl rvest stringr xml2]; };
+  rzmq = derive2 { name="rzmq"; version="0.9.4"; sha256="1bbkgxqpjmy3ma76cc9kjxhhwi632di4mfarlgxi2g42dmsxmyq3"; depends=[]; };
   s2 = derive2 { name="s2"; version="0.4-0"; sha256="1mpivllq3r3kn7msb7qn9h8fr31jl5cvfg1pdq1wi69k4bznd8y0"; depends=[Rcpp]; };
   s20x = derive2 { name="s20x"; version="3.1-27"; sha256="021f9l34svx42mnzi080rr44sxz9zjvcnxljakcag02r4hl52pcp"; depends=[]; };
   s2dverification = derive2 { name="s2dverification"; version="2.8.0"; sha256="13cjzxrjwahjhdw5q8lpbwgywgswqrcnj7rkff9kraan9lj83bkk"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; };
@@ -10915,9 +11398,9 @@ in with self; {
   sRDA = derive2 { name="sRDA"; version="1.0.0"; sha256="0g11smn4adm3b79m9w7wzcragxggkf8rrrsgj2yzdhm1d7zzjwbk"; depends=[doParallel elasticnet foreach Matrix mvtnorm]; };
   sROC = derive2 { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
   sSDR = derive2 { name="sSDR"; version="1.2.0"; sha256="1fqsglqzsbzdvcdnwwf7mg6x20zfpw66x63r6avac3w1pz3n7kvx"; depends=[MASS Matrix]; };
-  sValues = derive2 { name="sValues"; version="0.1.5"; sha256="0y234nci9pnc10xyiwxllvb5b48ajga2y0k5fv9izlwkbc5wpiaw"; depends=[caTools ggplot2 reshape2]; };
+  sValues = derive2 { name="sValues"; version="0.1.6"; sha256="0830f4w6jgpiysk0vz0bxaxwa8m3k94fgj9l3qb42r3jjf9cdn29"; depends=[ggplot2 reshape2]; };
   saasCNV = derive2 { name="saasCNV"; version="0.3.4"; sha256="12h5vrl55sb4wmx0hzib5iax8p0q2qzk19h15r0asfkh9l7qz94l"; depends=[DNAcopy RANN]; };
-  sabre = derive2 { name="sabre"; version="0.2.0"; sha256="1mcjchw1hw1ry5vkl50jrz4bm82b4fqzhgn2xp2kdzwsgvq61dbm"; depends=[dplyr entropy rlang sf tibble tidyr]; };
+  sabre = derive2 { name="sabre"; version="0.2.1"; sha256="0zfw3mb21p48xjjwvz7p5q5ckh1sk17rymkkhln97jjfy5q1zwz8"; depends=[dplyr entropy rlang sf tibble tidyr]; };
   sac = derive2 { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; };
   saccades = derive2 { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; };
   sadists = derive2 { name="sadists"; version="0.2.3"; sha256="17jlzx5h5l1w7riz0rs99w31n6lxnnxwzbzqn2z5r292j2nxvmkw"; depends=[hypergeo orthopolynom PDQutils]; };
@@ -10926,33 +11409,36 @@ in with self; {
   sae2 = derive2 { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; };
   saeRobust = derive2 { name="saeRobust"; version="0.2.0"; sha256="1bdfrsm59xwkga0kxl3r5n83mhhkyzj7gplrgx26gyflashyd1zc"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules pbapply Rcpp RcppArmadillo spdep]; };
   saeSim = derive2 { name="saeSim"; version="0.9.0"; sha256="19l41qpwspccphmgxi20p7f473lxxh8d86b0wyy5jq24phhd8awx"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; };
+  saemix = derive2 { name="saemix"; version="2.2"; sha256="1gp9xww9q3cq9dr6nifp4wlyg9gmamab845py1ag07vnr2gfwx5c"; depends=[]; };
   saery = derive2 { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; };
   safeBinaryRegression = derive2 { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; };
-  safer = derive2 { name="safer"; version="0.2.0"; sha256="0659xn8jzd5md2mm71p4036ljrfvlhkfshsgidx7l2k9ig532059"; depends=[assertthat base64enc sodium]; };
+  safer = derive2 { name="safer"; version="0.2.1"; sha256="1lmhaj9y0hi4ybxfkllxl99vsagcg73sy4kkcmlvn3bs69jky1r9"; depends=[assertthat base64enc sodium]; };
   salesforcer = derive2 { name="salesforcer"; version="0.1.2"; sha256="02a4xzwphy5zfkd0qza6cm2n7dpf71bmc6r78gj17w4amrp3k5y5"; depends=[dplyr httr jsonlite lubridate purrr readr XML xml2]; };
+  salty = derive2 { name="salty"; version="0.1.0"; sha256="1dxq62yrkv416fy09l03slc7ci6mnwiyvjlsxhbqnj8yjy3kbhr6"; depends=[assertthat purrr stringr]; };
   sambia = derive2 { name="sambia"; version="0.1.0"; sha256="15yz5lrjav5bs8m52crg3l43xmi4gf7wydji76p181ssyg43z2ln"; depends=[dplyr e1071 FNN mvtnorm pROC ranger smotefamily]; };
   samon = derive2 { name="samon"; version="4.0.0"; sha256="0pvv93ahh0i69ncc3sic9481wd5rv5dfxysxyzkl61ds3yvrr09v"; depends=[]; };
   sampSurf = derive2 { name="sampSurf"; version="0.7-4"; sha256="0azs8d1d4cp5vzrlzpn2lbqmbha6rxq109apg6hr2hf7i81g19d7"; depends=[boot lattice latticeExtra raster rasterVis sp]; };
   sampleSelection = derive2 { name="sampleSelection"; version="1.2-0"; sha256="1s3p5fvvxkjkm6vjpxi3rw8ncbmyvqpfb0gghcvf2sspdyzam1s2"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; };
-  sampler = derive2 { name="sampler"; version="0.2.0"; sha256="00c5blf8gfsj8ksf3jwksg3pkh7m39mk23r8v9lkqcp1y91z5p0i"; depends=[dplyr reshape splitstackshape tidyr]; };
+  sampler = derive2 { name="sampler"; version="0.2.2"; sha256="02dk16hywmdrhaqf18dis7canq433wm7pn0haq10h49qav16kj55"; depends=[dplyr purrr reshape tidyr]; };
   samplesize = derive2 { name="samplesize"; version="0.2-4"; sha256="0n6z7jmf665lbj3g1mjy87a9fh53z85546bhrkmkgsysb0r9q6iq"; depends=[]; };
-  samplesize4surveys = derive2 { name="samplesize4surveys"; version="3.1.2.400"; sha256="16q8pird6ic7001i3gkwqb2rlak9l853bf2m1y9njmdprsjs82yl"; depends=[TeachingSampling timeDate]; };
+  samplesize4surveys = derive2 { name="samplesize4surveys"; version="3.6.1.0"; sha256="0qkzhqr67x5rkahbyr5j2nksf0l0jwxsdl19p5gfx7j5kqzlifwq"; depends=[TeachingSampling timeDate]; };
   samplesizeCMH = derive2 { name="samplesizeCMH"; version="0.0.0"; sha256="0gdywqmylid4fkz5syzf1wgcan71whhm9gjylmsg4p05hlwvpv1d"; depends=[]; };
   samplesizelogisticcasecontrol = derive2 { name="samplesizelogisticcasecontrol"; version="0.0.6"; sha256="1xznql86r6snkkmk9g05jhdam06pr0qmg40mdzasl291nc50v5aa"; depends=[mvtnorm]; };
   sampling = derive2 { name="sampling"; version="2.8"; sha256="06pj7dan0mknpsblmlnk7am78qrnwgnql5vvx7vmbfvib7rj6s9m"; depends=[lpSolve MASS]; };
   samplingDataCRT = derive2 { name="samplingDataCRT"; version="1.0"; sha256="0ah3fi2sn642c8nicikhjhl1hdsjzshrf1j02swq0jaqggcqjdvk"; depends=[mvtnorm]; };
   samplingEstimates = derive2 { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; };
-  samplingVarEst = derive2 { name="samplingVarEst"; version="1.1"; sha256="1ffdw7s3jf5xfcbiqbrk4f3d0ym1s690wlc24yvhp5fvh5rghjn3"; depends=[]; };
+  samplingVarEst = derive2 { name="samplingVarEst"; version="1.3"; sha256="031iwgiw7dcncw1smxidn3kyvl0n06j5ag4pbhnicfqpj0pnx3l3"; depends=[]; };
   samplingbook = derive2 { name="samplingbook"; version="1.2.2"; sha256="1szx9bdlxxn2yhy9i362fcscn5cydvrkw9kggr7yqb715k5n1j6n"; depends=[pps sampling survey]; };
-  samr = derive2 { name="samr"; version="2.0"; sha256="0rsfca07pvmhfn7b49yk2ycw00wsq6dmrpv9haxz8q0xv7n5n2q9"; depends=[impute matrixStats]; };
+  samr = derive2 { name="samr"; version="3.0"; sha256="01km0f7qgm73x19vbvsxl083hs1dq4dj8qm5h64cxbf20b08my15"; depends=[GSA impute matrixStats openxlsx shiny shinyFiles]; };
   sand = derive2 { name="sand"; version="1.0.3"; sha256="0h7djria9v75gqcygjcfznpchqgxjqc6b43arvq9ni1xjrq8sszf"; depends=[igraph igraphdata]; };
-  sandwich = derive2 { name="sandwich"; version="2.4-0"; sha256="1h6c12cfv2x42laxf6ifxfk9hqzagvvvimzak88fv8vnxnf5nc9l"; depends=[zoo]; };
+  sandwich = derive2 { name="sandwich"; version="2.5-0"; sha256="168kq5kk34xbhfsxsanard9zriyp6cw0s09ralzb57kk42pl9hbc"; depends=[zoo]; };
   sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; };
   sankey = derive2 { name="sankey"; version="1.0.2"; sha256="0jvcr2bn69aklfbgj4hbsrc047mymrx0jmsg26m0g6w7n1igqvcw"; depends=[simplegraph]; };
   sanon = derive2 { name="sanon"; version="1.5"; sha256="1iikm7ivlz87kbq0ax9r1dz29zdq1kmhxd2imzc4hkvr1rwgciv6"; depends=[]; };
   santaR = derive2 { name="santaR"; version="1.0"; sha256="10g4z951mpxw9d21s5f6zwfch5xs9vx812fb0wyrbw9s8drmlbkh"; depends=[doParallel foreach ggplot2 gridExtra iterators pcaMethods plyr reshape2 shiny shinythemes]; };
   sapa = derive2 { name="sapa"; version="2.0-2"; sha256="056xlh14dnzq4x7sbp7ff2k61jxy7110a742b502vz549qfrr5ds"; depends=[ifultools splus2R]; };
-  sarima = derive2 { name="sarima"; version="0.5-2"; sha256="00xlfd8hrplxn66k2nfc7ivyacrr6rqgsv9ylsjynibpidvkkn17"; depends=[FitAR FitARMA lagged ltsa PolynomF portes Rdpack]; };
+  sarima = derive2 { name="sarima"; version="0.7.6"; sha256="1x0qxvq2sax8c2x3max4ghhdrxcyji92vdz4bg5jkpakrn4ilm8a"; depends=[FitAR FitARMA Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; };
+  sars = derive2 { name="sars"; version="1.0.0"; sha256="055h2sldx0yiqipk5rpxpskh7hz2d5qjvylv72rwq7s76jbnyqnn"; depends=[cli crayon dplyr nortest numDeriv]; };
   sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; };
   sasMap = derive2 { name="sasMap"; version="1.0.0"; sha256="11vhhxhakqm1gsb3p4s4966sapmrqfyw79zfppbx5lnqi3xr0ngn"; depends=[readr stringi stringr]; };
   satellite = derive2 { name="satellite"; version="1.0.1"; sha256="1g8zzlsdvb56l2jph7i5wjgbpyx5dkwa3nv8mzmg0qyh3zd9pyi0"; depends=[plyr raster Rcpp]; };
@@ -10960,31 +11446,36 @@ in with self; {
   saturnin = derive2 { name="saturnin"; version="1.1.1"; sha256="0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36"; depends=[Rcpp RcppEigen]; };
   saves = derive2 { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; };
   saws = derive2 { name="saws"; version="0.9-6.1"; sha256="0w40j6xczqs74z1z3na4510w06px7yn55s2mw9mddd6736l56fv1"; depends=[gee]; };
+  sazedR = derive2 { name="sazedR"; version="1.0.0"; sha256="1cpc27rla0wn19fjxr0rflmmd4f1rh5phprny39abwx81nqx8s2p"; depends=[bspec fftwtools forecast pracma signal zoo]; };
   sbart = derive2 { name="sbart"; version="0.1.1"; sha256="0552dbdj7rm1h7dbl34m4r4disra6x3p919d9c4719ks88i78255"; depends=[LaplacesDemon msm Rcpp]; };
   sbfc = derive2 { name="sbfc"; version="1.0.1"; sha256="1xz8h1m5d5ahrz4wsy55amd5mxh3acjs5qmcn7gl6yh3pn0c8phf"; depends=[DiagrammeR discretization Matrix Rcpp RcppArmadillo]; };
   sbgcop = derive2 { name="sbgcop"; version="0.980"; sha256="0vmg8b4462qghlyx6hq0raf9xqvygzgwi5y0cbqcljhmbmqjrwxs"; depends=[]; };
   sbioPN = derive2 { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; };
+  sbl = derive2 { name="sbl"; version="0.1.0"; sha256="1wxzscii0kp55sngmjccrqvc8zm1zamfh406r12irrz2wbxwqnkw"; depends=[]; };
   sbmSDP = derive2 { name="sbmSDP"; version="0.2"; sha256="1sl46lqi6w0s7ghv4bywhic56cm2vib3kawprga760m6igargx4y"; depends=[Rcpp RcppArmadillo]; };
+  sboost = derive2 { name="sboost"; version="0.1.0"; sha256="1pnl64yyppffi730rp230cfhwfnpzn7s8dcii3k0m9in3z31j002"; depends=[dplyr Rcpp rlang]; };
   sbpiper = derive2 { name="sbpiper"; version="1.9.0"; sha256="0pjq88ixk494wlz4nh5anbsn59mmh9wg564qh3vzwwqgxf1k61cg"; depends=[colorRamps data_table factoextra FactoMineR ggplot2 Hmisc reshape2 scales stringr]; };
   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]; };
   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]; };
   scaleboot = derive2 { name="scaleboot"; version="0.3-4"; sha256="16shdj4b8pbdbphqzw7r5xzx6k2qfkr729inv21gkp9qcp4h0vrm"; depends=[mvtnorm pvclust]; };
-  scales = derive2 { name="scales"; version="0.5.0"; sha256="0zg9wfzmsdjxpbld0nzv7hcpq5r0wazqxmn7grvvif2agj0w1z6v"; depends=[dichromat labeling munsell plyr R6 RColorBrewer Rcpp viridisLite]; };
-  scalpel = derive2 { name="scalpel"; version="1.0.0"; sha256="0zk81q2f49vrbprlvjq3q4s2ak7rrlpj55rrfkqr8nq1vvi6nxd2"; depends=[gam igraph Matrix protoclust R_matlab SDMTools]; };
+  scales = derive2 { name="scales"; version="1.0.0"; sha256="0353dkh3d7x78463c6ds80hcml59lrqwr8rlv82a8dnkxla4l7qc"; depends=[labeling munsell R6 RColorBrewer Rcpp viridisLite]; };
+  scalpel = derive2 { name="scalpel"; version="1.0.1"; sha256="18mapg96xl9a1g85h5xhqsz1333hkc28z0ivfjaff933p1kc6sng"; depends=[gam igraph Matrix protoclust R_matlab SDMTools]; };
   scalreg = derive2 { name="scalreg"; version="1.0"; sha256="06iqij1cyiw55ijzk2byrwh3m5iwsra7clx8l4v69rc236q8zbdi"; depends=[lars MASS]; };
-  scam = derive2 { name="scam"; version="1.2-2"; sha256="04w0y2l4h3xddb6mzyhf0mcx6kbphrmjyfc59cqw9z88sssfrmm7"; depends=[Matrix mgcv]; };
+  scam = derive2 { name="scam"; version="1.2-3"; sha256="0ray17cbfd25x61kvpbg1kplpgz1dak4kp3p6lalffgjh94qry27"; depends=[Matrix mgcv]; };
   scan = derive2 { name="scan"; version="0.20"; sha256="1xyng9dlfmp7n2h91n4xy9lx3jm205gjiizdqk1yj1qw8mmahvqc"; depends=[nlme]; };
   scanstatistics = derive2 { name="scanstatistics"; version="1.0.1"; sha256="147fhq34vqkq50bw0g3a112048s5jaxxcwm3iv5wykp8zl45msmz"; depends=[dplyr emdbook ismev magrittr plyr purrr Rcpp RcppArmadillo reliaR sets tibble tidyr]; };
   scape = derive2 { name="scape"; version="2.3-2"; sha256="1i3k37r7lisrj1pblni5xn76kf6py52s4yd51fm78c3286yfaasf"; depends=[coda Hmisc lattice]; };
   scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; };
   scatr = derive2 { name="scatr"; version="1.0.1"; sha256="1c2z722i7d7qflh4mzb8kkix5i22wph98kwz2p98x2mhaml8802d"; depends=[cowplot ggplot2 ggridges ggstance jmvcore R6]; };
   scatterD3 = derive2 { name="scatterD3"; version="0.8.2"; sha256="1cfh060ffwxy33b1f7n8mba1sbbwgx28mqn08im16dqbphkcmx1z"; depends=[digest ellipse htmlwidgets]; };
-  scatterpie = derive2 { name="scatterpie"; version="0.1.0"; sha256="0ssfvnwwfyavzxxrbimb623pc0y72qvbis16sdr6fxvyfif4qmm5"; depends=[ggforce ggplot2 rlang tidyr]; };
+  scatterpie = derive2 { name="scatterpie"; version="0.1.2"; sha256="0r3m3781jvzxr0ry7rhd085c0xl5620sf5zcq9nnfl613imwxj2b"; depends=[ggforce ggplot2 rlang rvcheck tidyr]; };
   scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-41"; sha256="152xqz9c70qab86mpgng049gxsg5f4fpf1m8dh93fb9v1avjd0sc"; depends=[]; };
-  scclust = derive2 { name="scclust"; version="0.1.1"; sha256="1bml4qyyspwaqxzwjhqy8i450614p3f3dj0s0qdkv6psa60h0w5z"; depends=[distances]; };
+  scclust = derive2 { name="scclust"; version="0.2.0"; sha256="11jnjij62vcnvbd9m27xjdmyjib35isviqb07435yas93bn01vz4"; depends=[distances]; };
   scdensity = derive2 { name="scdensity"; version="1.0.2"; sha256="173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9"; depends=[lpSolve quadprog]; };
   scdhlm = derive2 { name="scdhlm"; version="0.3.1"; sha256="1b5x4kqvmkpb8wbgfhnwqakisw6hfnvama2bsnd8kvw4alfanxhm"; depends=[nlme]; };
   scenario = derive2 { name="scenario"; version="1.0"; sha256="0v1b00kiny21yx4qkk2x51cy1zqibdnd68z76qia7h5py28yhxsi"; depends=[]; };
@@ -11001,13 +11492,14 @@ in with self; {
   sciplot = derive2 { name="sciplot"; version="1.1-1"; sha256="1ydwx9kh778z3x7s3i6gqinqi6bmsf6bslaf0mgszj0nrgcmj6y3"; depends=[]; };
   sclero = derive2 { name="sclero"; version="0.2"; sha256="1vqysby822s958msnwcqmz78193vrgmpf6si1jnfb9cj90hh7wgg"; depends=[plyr RImageJROI spatstat]; };
   scmamp = derive2 { name="scmamp"; version="0.2.55"; sha256="17qhj9l1akxachaimy9d5rls8adph8aalj3qr6ckip29a8ma9gf7"; depends=[ggplot2 graph reshape2 Rgraphviz]; };
+  scoper = derive2 { name="scoper"; version="0.1.0"; sha256="1a170x1h2wglsmqp0fjga2q29yfnfdbgjcm62412n575j9d4xp5n"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators lazyeval shazam stringi]; };
   scopr = derive2 { name="scopr"; version="0.3.2"; sha256="0wssxfhkgpqzw5gbqbidawj7wizwcbra8inrxvnmsjxq0fhhzazy"; depends=[behavr data_table memoise readr RSQLite stringr]; };
   score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; };
-  scorecard = derive2 { name="scorecard"; version="0.1.8"; sha256="04zjlpchdbbm40n12am5094ha36bdiycbq5vzbh0vc3kmc6xhjp1"; depends=[data_table doParallel foreach ggplot2 gridExtra]; };
+  scorecard = derive2 { name="scorecard"; version="0.1.9"; sha256="1786j57kg6v8yl88p5zhyi3g7vp5j4j8bci7bill134x9z63nacq"; depends=[data_table doParallel foreach ggplot2 gridExtra]; };
   scorecardModelUtils = derive2 { name="scorecardModelUtils"; version="0.0.0.9"; sha256="1hnz9dgx5fxbhh54psalrr50n22vc250v2xxxl49j09q26xh37kl"; depends=[car e1071 gbm ggplot2 partykit randomForest reshape2 sqldf stringr]; };
   scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; };
   scoring = derive2 { name="scoring"; version="0.6"; sha256="114jlpbnm15fdan5lr40adxdzwajy3yhdw6dm4kvkvky6qhcx7q5"; depends=[]; };
-  scoringRules = derive2 { name="scoringRules"; version="0.9.4"; sha256="0m8050qqb3j0miwfbadp6lmd2q5vicsqn4waw4jszz52fhb8mv27"; depends=[MASS Rcpp RcppArmadillo]; };
+  scoringRules = derive2 { name="scoringRules"; version="0.9.5"; sha256="0aby9il4jd6ky8py0qk651al8c0ffqnmfnnzphy6pvndc0q0m085"; depends=[knitr MASS Rcpp RcppArmadillo]; };
   scout = derive2 { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; };
   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]; };
@@ -11015,42 +11507,43 @@ in with self; {
   scrime = derive2 { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; 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.1"; sha256="09gaccqadb51ia66xk9vi3p9472s82bg6v8i6ba390g04yipbipi"; 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]; };
   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]; };
   scuba = derive2 { name="scuba"; version="1.9-1"; sha256="1b92b6p9dn54rmcaw2ng41pvvvkmrzgg12d6zcr3yh8qgi89pvdi"; depends=[]; };
-  sdPrior = derive2 { name="sdPrior"; version="0.5"; sha256="1l086a4ghx36fi951z968mpqdjpd64ilqvim6hcm05pl8dj7xcva"; depends=[BayesX caTools doParallel GB2 MASS mgcv mvtnorm pscl rsvd]; };
+  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]; };
   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.23"; sha256="00zh55zpi6y5mrhyzxj1r9f2r1axikgy0dimxv7978sasxsm3hnm"; depends=[data_table data_tree knitr lpSolveAPI Rcpp Rglpk rlang slam stringr]; };
+  sdcTable = derive2 { name="sdcTable"; version="0.24"; sha256="10qwfa64fji7l24znrhl15ich2bmsq2y219y0pbr6q4xy02vp515"; 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]; };
   sdef = derive2 { name="sdef"; version="1.7"; sha256="0x2b8shp02ik0dd11wi3jcrl9h9m963fnkfy47fwwhav9x6jg0jf"; depends=[]; };
   sdm = derive2 { name="sdm"; version="1.0-46"; sha256="14z8336yxja1j7mx8xszqqi6s24nk6r5bycmw8h01wvq4rqgxi4g"; depends=[raster sp]; };
-  sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.6"; sha256="1kbgv5x5ilzccafl20x86fi9f7jqxnccvb8k7dy8q41s9n36qwfs"; depends=[R_utils raster rgdal]; };
+  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]; };
   sdprisk = derive2 { name="sdprisk"; version="1.1-5"; sha256="1c6mipq8sh8347i7m7dh47f69fr21xkrsk8yjgsdvcy41h8zijmf"; depends=[numDeriv PolynomF rootSolve]; };
-  sdpt3r = derive2 { name="sdpt3r"; version="0.1"; sha256="06mw1h6c8gkhi3vhal17h7px3bb277xz15k2ryqjwc7agzwhmv8c"; depends=[Matrix]; };
+  sdpt3r = derive2 { name="sdpt3r"; version="0.2"; sha256="0q97gxmf2vka566dm6jry5q2scqnm88fq0v5kqkphihsi52kya23"; depends=[Matrix]; };
   sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
   sdwd = derive2 { name="sdwd"; version="1.0.2"; sha256="0l0w4jn2p9b7acp8gmlv4w8n662l397kbrm4glslik0vnmjv151w"; depends=[Matrix]; };
   seaaroundus = derive2 { name="seaaroundus"; version="1.2.0"; sha256="09nyypzylb0y04ssd9ak2cw8wpy6a3nmabg9p7jrc8qz54wl6z4q"; depends=[crul ggplot2 jsonlite maps rgdal scales sp wicket]; };
-  seacarb = derive2 { name="seacarb"; version="3.2.8"; sha256="02l10jgjw79vf31c8qfzfpyrfhlc0j2dibs4pkk5y7visggzr47p"; depends=[gsw oce]; };
+  seacarb = derive2 { name="seacarb"; version="3.2.10"; sha256="0l3df69744bsibml6lq3a8cbx846095vgv0icnmrp6rz07x74g7p"; depends=[gsw oce]; };
   sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
   sealr = derive2 { name="sealr"; version="0.1.1"; sha256="1y31k4y3v1mvjagsbr4647hdn8rk4nfdyixidl3myq0qhnaf0x6w"; depends=[clipr clisymbols digest dplyr glue magrittr purrr rlang rstudioapi styler tibble tidyr]; };
   searchConsoleR = derive2 { name="searchConsoleR"; version="0.3.0"; sha256="1z8bdlxq2sk8bcg164wy0yrmsx0inf0aj5ya2pybvadss8wr0qlr"; depends=[googleAuthR stringr]; };
   searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
   searcher = derive2 { name="searcher"; version="0.0.3"; sha256="004k757hn5y80k7kim3049n3mjrsimqpzdz5fis2ggxbdwwf1bs1"; depends=[]; };
   seas = derive2 { name="seas"; version="0.5-2"; sha256="0hn4d5dc01zyycd7l3vj1sx6bq668n7fzffw9ypaa5l20fizs0ay"; depends=[MASS]; };
-  season = derive2 { name="season"; version="0.3.6"; sha256="1q0xih4vj0pv1xcgdi2d6vl56gd1gmzfbyc0aklpjz9iaxmxgb8f"; depends=[coda ggplot2 MASS mgcv survival]; };
+  season = derive2 { name="season"; version="0.3.8"; sha256="0kw3gvy7rv0rms0zj1rvqlfdn3yxr9r9ldm21zl2xrpx9cy04d2d"; depends=[ggplot2 MASS survival]; };
   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.6"; sha256="0mf0p7asx2shf630j5xd7ym21f76a0af536wzs9rdbhq0xychv6z"; depends=[abind MASS mgcv nlme raster sp stringr]; };
+  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]; };
   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]; };
@@ -11060,7 +11553,7 @@ in with self; {
   seedCCA = derive2 { name="seedCCA"; version="1.0"; sha256="1grs6ykiyp8p5gh93hgb4niggppbh2wzwl6yx0l1qs9fkcz5zvy7"; depends=[CCA corpcor]; };
   seedy = derive2 { name="seedy"; version="1.3"; sha256="1a21sl8i7z12cjaqj08lkq3viazxlgxv82vaarm58fgbpsvdi0m0"; depends=[]; };
   seewave = derive2 { name="seewave"; version="2.1.0"; sha256="0i0zhvgl64fwpabnwvfdxndmw5whhh2fd4lhpg399w4rzrwzv92y"; depends=[tuneR]; };
-  seg = derive2 { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; };
+  seg = derive2 { name="seg"; version="0.5-5"; sha256="0q1k3zh29pkxx2sq28dw1vn4nmdv7pa8pw48vmywfcm4vmqnx7xg"; depends=[sp splancs]; };
   segclust2d = derive2 { name="segclust2d"; version="0.1.0"; sha256="0kymw36cvakx84c96npkbnsvv0a1s82773ib5c802ybvkb2r1k9p"; depends=[dplyr ggplot2 magrittr plyr RColorBrewer Rcpp RcppArmadillo reshape2 scales zoo]; };
   segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; };
   segmented = derive2 { name="segmented"; version="0.5-3.0"; sha256="0nrik5fyq59hwiwjcpbi4p5yfavgfjq6wyrynhkrbm4k6v1g1wlq"; depends=[]; };
@@ -11082,20 +11575,20 @@ in with self; {
   semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; };
   semPlot = derive2 { name="semPlot"; version="1.1"; sha256="0fzz580an7mmq6vycxbcvfdqbii0qz0nghlidb6in05j8dppsnsn"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph rockchalk sem semTools XML]; };
   semPower = derive2 { name="semPower"; version="1.0.0"; sha256="0wciz5qrd40q4mxq96pibnya11ac42n37c9xhjd4zfhznhjz06bb"; depends=[]; };
-  semTools = derive2 { name="semTools"; version="0.5-0"; sha256="0akan511aj8qkn37aiw200nvyxwdqrz022ll16av2n7qsp9xdynh"; depends=[lavaan]; };
+  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-4"; sha256="14x6xqv15fgsxhsyxw77i3slpdaax8kcq9sx7ipwp1b83fmmqv1z"; depends=[minpack_lm pracma]; };
+  semds = derive2 { name="semds"; version="0.9-5"; sha256="16zla94jzqrm2gji4sgiz44fw15f2kf4i8s76s1cnjai6saqcf9f"; 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.0"; sha256="0f8k1v2g82axhaw5a370f95h9q07qar1by795wfc3yil7pn94xmy"; depends=[]; };
+  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]; };
   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]; };
   sensR = derive2 { name="sensR"; version="1.5-1"; sha256="0hqnk6gvlkl9harz7rh5ikbp0s0vjwi63gxixqjfhkyk02ilaa3z"; depends=[MASS multcomp numDeriv]; };
-  sensiPhy = derive2 { name="sensiPhy"; version="0.8.2"; sha256="19sbcl3873r2jayxpr83n8w36br12c6p31y830gzi7a4q0cxaxxq"; depends=[ape caper geiger ggplot2 phylolm phytools]; };
-  sensitivity = derive2 { name="sensitivity"; version="1.15.0"; sha256="02vqs1pqzivxpg2ql3wi0530cshdkz7hxvablpd1dzhvjnindknm"; depends=[boot]; };
+  sensiPhy = derive2 { name="sensiPhy"; version="0.8.3"; sha256="03qrxal0wvgiyr5vnnzc8n95h4460p11idnmr6vnr73c5f8q905h"; depends=[ape caper geiger ggplot2 phylolm phytools]; };
+  sensitivity = derive2 { name="sensitivity"; version="1.15.2"; sha256="0ilb79bbplnv5qlismp21jrzfxr1is59vww3s1p99ax303614w7m"; depends=[boot]; };
   sensitivity2x2xk = derive2 { name="sensitivity2x2xk"; version="1.01"; sha256="1r829k939zzmi0j4chdaniajchcflmmjrl3a9hwnkg0wkfnjbvdl"; depends=[BiasedUrn mvtnorm]; };
   sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; };
   sensitivityfull = derive2 { name="sensitivityfull"; version="1.5.6"; sha256="0g2gc4rms6gd34d23kxj50pjh0yq1h6yiybj4dxwyf6i2652irhq"; depends=[]; };
@@ -11105,10 +11598,10 @@ in with self; {
   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.3.2"; sha256="14f5zac5ywz864fbcia05kdlxx4bgvasc1l1abcrk34i2jvh8zwl"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; };
-  sentometrics = derive2 { name="sentometrics"; version="0.4"; sha256="0mr064qb1wr0bpbrx1bl3imxy95ybxlx4bxpy25qcz07v5nynk5l"; depends=[abind caret data_table doParallel foreach ggplot2 ggthemes glmnet ISOweek MCS quanteda Rcpp RcppArmadillo RcppRoll stringi zoo]; };
+  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]; };
   separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; };
-  seplyr = derive2 { name="seplyr"; version="0.5.8"; sha256="0ca9mg2fx3jdgybbiq2a22q5p6613awxwysrpgdbs5lrqdm1ywim"; depends=[dplyr rlang tidyr wrapr]; };
+  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]; };
@@ -11116,86 +11609,90 @@ in with self; {
   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.0"; sha256="057j1l6dip35l1aivilapl2zv9db677b3di2pb3sfgq2sxg0ps3l"; depends=[]; };
+  seqminer = derive2 { name="seqminer"; version="6.1"; sha256="15yhg4vfc7jg1jnqb3371j00pgbmbyc9l1xx63hq1l3p34lazq2l"; depends=[]; };
   seqmon = derive2 { name="seqmon"; version="2.1"; sha256="0p7vbrx0l59wyxhg59a8nnnk1z46inys30rpchj0v5ggadaazjkx"; 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.0.2"; sha256="1pn282s40ssprjrfh5drjr123ldlp84z3kviv6mmavrwhkp5lq5g"; depends=[plyr]; };
+  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=[]; };
   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.1.0"; sha256="09mg8x738q7p16z95rrfj9fzmsrl34fvx9nsz1ndkp4h6cwf679l"; depends=[gplots shiny]; };
+  serieslcb = derive2 { name="serieslcb"; version="0.2.0"; sha256="1af7mvfiv40hwjlf6f53grw48c343rnmzxiyw4yx95mf8rk46bsd"; depends=[gplots shiny]; };
   seroincidence = derive2 { name="seroincidence"; version="2.0.0"; sha256="0sam4y7w6prswz0izkm1a9v2k5rv7z22g1ajy15n9xix9aml5ms4"; depends=[]; };
   serrsBayes = derive2 { name="serrsBayes"; version="0.3-13"; sha256="1s38mva66l684i0wrk65r3gdafjlih7bglsmi9fr44yk0wavygrm"; depends=[MASS Matrix Rcpp RcppEigen truncnorm]; };
-  servr = derive2 { name="servr"; version="0.10"; sha256="0yz3igqsiyqnjj1ngh199zicg3spx4kbmvl0wc8i8xahk6l9g06v"; depends=[httpuv jsonlite mime xfun]; };
+  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.0.0"; sha256="00g3lbvk1cjjzckl70fn5n3579qb301im4lbm3cip5c2v8k283dk"; depends=[clisymbols withr]; };
+  sessioninfo = derive2 { name="sessioninfo"; version="1.1.0"; sha256="01c0m8yzadpwd825hky6as0f8ka4xyz7zfy0ih2iy7qqw11w6qn5"; 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]; };
   settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; };
   severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
-  sf = derive2 { name="sf"; version="0.6-3"; sha256="0c6ayyclhlna2jnpwi6glafw7ip7ar0ycsmms79x451mdqb5xvja"; depends=[classInt DBI magrittr Rcpp units]; };
+  sf = derive2 { name="sf"; version="0.7-1"; sha256="0xpgv1fyha61s5sa2msgsznl23yi2rpki6jnjv7xg1a26bl0il89"; depends=[classInt DBI magrittr Rcpp units]; };
   sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
   sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; };
   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=[]; };
-  sft = derive2 { name="sft"; version="2.2-0"; sha256="0d1yiimc899i09yyrv1x40ixqss87xjpy08ab16h9faxd4bsk3y2"; depends=[fda SuppDists]; };
+  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=[]; };
   sgee = derive2 { name="sgee"; version="0.6-0"; sha256="055iydainzywb1s5id5rl9i94dj5arr9b6qz15p8wps49vm2mlp3"; depends=[copula mvtnorm]; };
   sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; };
+  sglOptim = derive2 { name="sglOptim"; version="1.3.7"; sha256="19rwich72xzdlwkp6cpqdjxa6hcfd4ys1ia66gzpvkyqs05m3561"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo RcppProgress]; };
   sglasso = derive2 { name="sglasso"; version="1.2.3"; sha256="1xf4jni7gybk66wp542p92jxrp4lf63ypbwsnb3av5db04bis7ll"; depends=[igraph Matrix]; };
   sglg = derive2 { name="sglg"; version="0.1.3"; sha256="17w9mfb53ll8aqasl4ysnb0b7sk6cgp7s1cfvn07rg5win2swqrj"; depends=[Formula robustloggamma ssym survival]; };
   sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
-  sgmcmc = derive2 { name="sgmcmc"; version="0.2.2"; sha256="1ga3dynhldkl98fd7fzbbhb4bryf6nyijwvxsj8i1szy4jsv8q3q"; depends=[tensorflow]; };
+  sgmcmc = derive2 { name="sgmcmc"; version="0.2.3"; sha256="08n2m1aksa5frasmc4xa7c9b444icnzj0ycixvnq3d13v803ham4"; depends=[reticulate tensorflow]; };
+  sgmodel = derive2 { name="sgmodel"; version="0.1.0"; sha256="03s9z7n7w3pys5dp1z5x91bszgv3q1sax5z591dz9rvmn5glp2lj"; depends=[ggplot2 ramify Rtauchen tidyverse]; };
   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.3"; sha256="036jh63y3i42yfjm96yp0xp3p77v1mzj77q0vl9msjhd246l5gm8"; depends=[plyr raster rgeos sp]; };
-  shadowtext = derive2 { name="shadowtext"; version="0.0.2"; sha256="17ccylxnl6837cf81fwkgywjmqizmcm6mhqak10sl5apnqm5n1nl"; depends=[ggplot2]; };
+  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]; };
   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]; };
-  shapes = derive2 { name="shapes"; version="1.2.3"; sha256="1fzwpqa0paql4n652diqsqylz5r5crblfip6g6c0vszrvy7avi4q"; depends=[MASS rgl scatterplot3d]; };
+  shapes = derive2 { name="shapes"; version="1.2.4"; sha256="1zqykhx8rz1k2ahi2lmmzll1c8k0as6vw4gbd3rpfb5fvpni3ni0"; depends=[MASS minpack_lm rgl scatterplot3d]; };
   sharpeRratio = derive2 { name="sharpeRratio"; version="1.1"; sha256="0rgsad8idhjyjgwlzk358jlqkqf6sk7g6vl3fchkamjzxnhbb8p9"; depends=[ghyp Rcpp]; };
   sharpr2 = derive2 { name="sharpr2"; version="1.1.1.0"; sha256="1r7anfr296l5sbhgry6rb15hlca6mpcm24qssdzz9bckavyfvqgi"; depends=[Matrix mvtnorm]; };
   sharpshootR = derive2 { name="sharpshootR"; version="1.0"; sha256="1x9cava7b9lg8qpmjqlbkqmpc9a2dn8k4kl71s4himr4wzp9z4y3"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; };
   sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; };
-  shazam = derive2 { name="shazam"; version="0.1.9"; sha256="1dm553l1qwqajy5p13x3ms6x45ax33zh7b79iw6xx1chbrpalhmk"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress scales SDMTools seqinr stringi tidyr]; };
+  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_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.1"; sha256="1hqgszbiv99dibhwr21v21ll4s2hjn3ccqdicsm0z3gk77bh8iyb"; depends=[jsonlite 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]; };
-  shinyFeedback = derive2 { name="shinyFeedback"; version="0.0.4"; sha256="14lvr99nfldlr101ysmpwz0zw0bjvr6b7lfm0msx57ymh6gjzg3n"; depends=[digest shiny]; };
-  shinyFiles = derive2 { name="shinyFiles"; version="0.7.0"; sha256="1bs1dj84scg4gkrdlw1jvmnwckcjcdpzc8drwmr8h6cxk3yklijc"; depends=[htmltools jsonlite shiny]; };
+  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]; };
   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]; };
   shinyRGL = derive2 { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; };
   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.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[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]; };
   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.1.0"; sha256="0vbzfcw4d0fvmpdn2pjbsl3najikhm6p60w5vxc0d3x7d8sfq57z"; depends=[shiny]; };
+  shinyanimate = derive2 { name="shinyanimate"; version="0.2.0"; sha256="04knbwv8ls23ibwj0gnnpmvnich9nbakx4pjfawghwlm75z9bpdk"; depends=[shiny]; };
   shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
   shinycssloaders = derive2 { name="shinycssloaders"; version="0.2.0"; sha256="1bpzsm7m7c366sjl1qndp4m5dg2vlm68rjgdy9n1ija9xbp0r2g4"; depends=[digest glue shiny]; };
   shinycustomloader = derive2 { name="shinycustomloader"; version="0.9.0"; sha256="1klx71vr26g0gjf6hbiia1qidqii5d467i1sdjvlrg1hxdcggqff"; depends=[glue shiny]; };
-  shinydashboard = derive2 { name="shinydashboard"; version="0.7.0"; sha256="10yqcqqcxgfqwkmscqwvvgr710im583qsqnsqkfpisjvkqp10yqb"; depends=[htmltools shiny]; };
-  shinydashboardPlus = derive2 { name="shinydashboardPlus"; version="0.5.0"; sha256="0wj388lys7jlh45il6vvln0bpjg1rr91xyypzz55hp46r8z31vl2"; depends=[htmltools shiny shinydashboard]; };
-  shinyhelper = derive2 { name="shinyhelper"; version="0.3.0"; sha256="1ypd9wc0h9yfh4awjmjn952g2cfsgcyrm25zk575b17jrkjl5skj"; depends=[markdown shiny]; };
-  shinyjqui = derive2 { name="shinyjqui"; version="0.3.0"; sha256="0x7pyb897apmdfpys2kc7bkaa8i4a9rlmdlmlps1n8cxj8kx3dal"; depends=[htmltools htmlwidgets jsonlite shiny]; };
+  shinydashboard = derive2 { name="shinydashboard"; version="0.7.1"; sha256="0khac8b27q3swdw07kl609hm0fjfjsjv591b388q99mqqr2rk92i"; depends=[htmltools promises shiny]; };
+  shinydashboardPlus = derive2 { name="shinydashboardPlus"; version="0.6.0"; sha256="01yfijdh6ynxzd45bidywvdk0rlx7fzfzq5pbapbvknb7sbasi0y"; depends=[htmltools shiny shinydashboard]; };
+  shinyhelper = derive2 { name="shinyhelper"; version="0.3.1"; sha256="1z3wb3vdpz9pcn6rfmpbxky05cf8bxldhpwzldrmhn03spz3n987"; depends=[markdown shiny]; };
+  shinyjqui = derive2 { name="shinyjqui"; version="0.3.2"; sha256="1a73vsq1wc3xf14y64hkgnk5jgxj98b8aj3g0fs7mgayar3an5g0"; depends=[htmltools htmlwidgets jsonlite shiny]; };
   shinyjs = derive2 { name="shinyjs"; version="1.0"; sha256="113zpijri0l80rlgrvqn6bxk0sdqgl79h7yhja2p76f9dc9i2sr8"; depends=[digest htmltools jsonlite shiny]; };
   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]; };
@@ -11208,7 +11705,7 @@ in with self; {
   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]; };
-  shp2graph = derive2 { name="shp2graph"; version="0-4"; sha256="13hpj2yjai3yf8q6dnhpdqzsw4nkdpi06fxxdgn82ycx0sp7zk4v"; depends=[igraph maptools sp]; };
+  shp2graph = derive2 { name="shp2graph"; version="0-5"; sha256="1l9mg98hkb0bvr5dzd2p26g8mw5hqjxrym2gmbm10kyapvccfk56"; depends=[igraph maptools sp]; };
   shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; };
   shuffle = derive2 { name="shuffle"; version="1.0.1"; sha256="0aqb11h340picx7z2jg3k46l3pr6fkknlpyzc0z89hhrc90pss48"; depends=[]; };
   shuffleCI = derive2 { name="shuffleCI"; version="0.1.0"; sha256="1n9k28m1fcnw1my9a7v0gy9waygd48lab45vj9k2wwijbc325zai"; depends=[plotrix]; };
@@ -11216,25 +11713,26 @@ in with self; {
   siar = derive2 { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[bayesm coda hdrcde MASS mnormt spatstat]; };
   sicegar = derive2 { name="sicegar"; version="0.2.2"; sha256="0fnr0wv8zbhs2i5y1kqyvhm0kzisc68ys3iy0wxwbdj3bnfgzj70"; depends=[dplyr fBasics ggplot2 minpack_lm]; };
   sideChannelAttack = derive2 { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; };
-  sidier = derive2 { name="sidier"; version="4.0.2"; sha256="1zzlgd20aw2asbsb3g9m5gvlmmgkai3bqrxyn48mphc2ncl4y7w0"; depends=[ape ggmap ggplot2 gridBase igraph network]; };
+  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]; };
   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.20"; sha256="1s0z5pd8183q1v5pn07zwxckafhq0rhh7fzzny7xpjs79r50l9ii"; depends=[biclust circlize class cluster ComplexHeatmap fmsb gplots gridGraphics GSVA KernSmooth lattice MASS mclust moments nnet RankProd]; };
+  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]; };
   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]; };
   signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
-  sigora = derive2 { name="sigora"; version="2.0.1"; sha256="1sgjafr2f7carwnvp0vsvp80jn2bzwlkay38ch63qk9gapsh4imh"; depends=[]; };
-  sigr = derive2 { name="sigr"; version="0.2.7"; sha256="0fdqlwblinb2dqlmcr7p679ppjh73aykgsmjffyaz0liiyk0zsc7"; depends=[wrapr]; };
+  sigora = derive2 { name="sigora"; version="3.0.1"; sha256="1pz9jibxjvvbc0wmd7sj2fss6hd8h1fvcg8vg72qwqvfy3f9jdry"; depends=[]; };
+  sigr = derive2 { name="sigr"; version="1.0.2"; sha256="1477xc3ba4zm0z73aqyrqd47x84184vp4v0zkzfxjw4y7rkw1anh"; 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]; };
   simFrame = derive2 { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; };
   simIReff = derive2 { name="simIReff"; version="1.0"; sha256="0yi43splda8chnh4bq5x6chbrl5c0y9sv1k2m31763da0czayall"; depends=[bde extraDistr ks MASS np rvinecopulib truncnorm]; };
-  simLife = derive2 { name="simLife"; version="0.3"; sha256="0bqhixr4zg7mwgxdsjk0h5a82dyfkhiv9xafw43w2bpnmyxywdia"; depends=[splancs unfoldr]; };
+  simLife = derive2 { name="simLife"; version="0.5.1"; sha256="16idgxvc06m10k67y86agcdsv79ndi1d05zrajlnd5fap7n1w3d5"; depends=[splancs]; };
   simMP = derive2 { name="simMP"; version="0.17.3"; sha256="1pzg79dd08ds3pfzxnk9h95gaibicv00mnm0jb4i8v5is4gzrdhr"; depends=[Biostrings BSgenome doParallel foreach GenomeInfoDb GenomicRanges IRanges XVector]; };
   simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; };
   simPATHy = derive2 { name="simPATHy"; version="0.2"; sha256="0ai5wmjz8k0glbwkclgg3m3ncsjghja4iys2mn1psn3r8gxk79yc"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; };
@@ -11244,18 +11742,18 @@ in with self; {
   simTool = derive2 { name="simTool"; version="1.1.0"; sha256="121nv0s14jzxgcmj2fsj1k0msziknwbix2a49f7igic2l8yv869p"; depends=[dplyr plyr purrr reshape tibble tidyr]; };
   simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; };
   simboot = derive2 { name="simboot"; version="0.2-6"; sha256="0bgibrqb9j62p1chldi1lvdsgc6sgsr7afyq4lvyrc2h861f3j9d"; depends=[boot mvtnorm]; };
-  simcausal = derive2 { name="simcausal"; version="0.5.4"; sha256="19mqabxqz2mvfhslbln5vsnlrnmgcfmgp7ypf5k2yd03755b0k4b"; depends=[assertthat data_table igraph Matrix R6 stringr]; };
   simctest = derive2 { name="simctest"; version="2.5"; sha256="038ipxww0n09sh8al5isbm1fikr8kazwxn9cj2d0wgm6cdpy681n"; depends=[]; };
   simdistr = derive2 { name="simdistr"; version="1.0.0"; sha256="0r7qfrq4vcjqrzajc6xmn0rrkinqwbr8cqghgp4iklbhsjbk2xfl"; depends=[]; };
   simecol = derive2 { name="simecol"; version="0.8-12"; sha256="06zw9xhj8jwhmqwxxbj8hgz9cxrw1b4syy6z79aawv9cg1bnwfhf"; depends=[deSolve minqa]; };
   simest = derive2 { name="simest"; version="0.4"; sha256="1wp08dkbshn5parq69d7iizp4g16qzpdim37kcg09pgsc3aghwaj"; depends=[cobs nnls]; };
   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.0"; sha256="1p29v8y3ahdkid35ky9sbj5227cvj0nn0ljzjpliyqwbkmxpncmj"; depends=[broom dplyr Matrix purrr rlang]; };
-  simmer = derive2 { name="simmer"; version="3.8.0"; sha256="0d1m93ffnajvkf3wiqvbim5l1i10k30pr702wyazrg6b0c2kybkf"; depends=[BH codetools magrittr R6 Rcpp]; };
-  simmer_bricks = derive2 { name="simmer.bricks"; version="0.1.0"; sha256="1sb1ayh56sbgs4p0r3frjjfn4vcdr43xm85lvb9aqk3wmj2lddqy"; depends=[simmer]; };
-  simmer_plot = derive2 { name="simmer.plot"; version="0.1.13"; sha256="0afp4il95dmdgw815rk0c3cyf56gli237v4i716l4agag5l1rp60"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; };
+  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]; };
+  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]; };
+  simode = derive2 { name="simode"; version="1.1.1"; sha256="1v72ja8jf33biljqc64s35iv2q8igk62z852y5fxwssckm1nhcdd"; depends=[deSolve pracma quadprog]; };
   simpleCache = derive2 { name="simpleCache"; version="0.3.1"; sha256="14jrsfxcrndfgi7yl5frfsyixxkhagc7cfav8h6mf6apfxx0v1ls"; depends=[]; };
   simpleNeural = derive2 { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; };
   simpleRCache = derive2 { name="simpleRCache"; version="0.3.2"; sha256="0ldmxa5rw1kcb24swnk8s471ww11jfbscynaahnnsi0zzqmhwirk"; depends=[digest]; };
@@ -11268,43 +11766,45 @@ 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]; };
-  simstudy = derive2 { name="simstudy"; version="0.1.9"; sha256="0lix46xi02sfkd3nslqgcbnyfpgqhdz8kj5hh85b6ajly4hgw103"; depends=[data_table mvnfast Rcpp]; };
+  simstandard = derive2 { name="simstandard"; version="0.1.0"; sha256="09jggrcfjjyr248rjr3nfrwmpr843z8h379cyxkl302s9g1qz57s"; depends=[lavaan mvtnorm 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=[]; };
-  simukde = derive2 { name="simukde"; version="1.0.0"; sha256="1v4shnyba05mh0qaylivcjby6niz2yc4zb67qfbycifbj0cl14vh"; depends=[ks mvtnorm]; };
+  simukde = derive2 { name="simukde"; version="1.1.0"; sha256="0g4qb57q1g9ixl70zwiw8y934gcr421xmz4dl515lxzfzk0605fc"; depends=[ks MASS mvtnorm]; };
   simulator = derive2 { name="simulator"; version="0.2.0"; sha256="18x0c9bf9anbykq9f46fxnnx7g36bh01s4cdmrn7mdygs6ac9c8z"; depends=[magrittr]; };
   simule = derive2 { name="simule"; version="1.3.0"; sha256="0jzyk1r2jfs7qivmy9x44c5bagy55jpy3hf0xpl9xnk409c3y2wd"; depends=[igraph lpSolve pcaPP]; };
   sinaplot = derive2 { name="sinaplot"; version="1.1.0"; sha256="0zfq6l8wjvdj7rndsfyh0a2xjlxmn2ij1q50hg3xjfpwrjxcsck8"; depends=[plyr]; };
-  sinew = derive2 { name="sinew"; version="0.3.5.1"; sha256="0fp5afjnkah3ig1c1fy23zlfxkfg590jai8iqf5s8wl8r4s0ywgm"; depends=[miniUI rstudioapi shiny sos stringi yaml]; };
+  sindyr = derive2 { name="sindyr"; version="0.2.1"; sha256="0977qb9f2247y6bzlsp9lqfbmncq2prqr57myrgd6f60jc09n3mj"; depends=[arrangements crqa igraph matrixStats pracma]; };
+  sinew = derive2 { name="sinew"; version="0.3.8"; sha256="1ggx7wgmgnsv69nnc55mg9g7rzjv5m23sygz7x8q68pybmjr7fc1"; depends=[cli crayon miniUI rematch2 rstudioapi shiny sos stringi yaml]; };
   sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; };
-  siplab = derive2 { name="siplab"; version="1.2"; sha256="0r7gk9qsmbc3ln67cb8p87bq3s2rx6fbavlly1fpzqqv2isf5pq9"; depends=[spatstat]; };
+  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.6-9"; sha256="06iz4dxlsxdfgmn52pyiyng0bbxffc5b7sszwbzq5i64ad1j0d48"; depends=[CDM coda lavaan lavaan_survey MASS mirt mvtnorm Rcpp RcppArmadillo sfsmisc survey TAM]; };
+  sirt = derive2 { name="sirt"; version="2.7-50"; sha256="1l1y65qr1ziapszm4n309q8gahcf55jfi7i2jj5v8wrg2b3g660w"; 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]; };
   sitar = derive2 { name="sitar"; version="1.1.0"; sha256="1a2x6igzq0i1vac54xyiq14vzx0m20431nv7aw0anv0lss7xy6r8"; depends=[dplyr nlme quantreg rlang tibble]; };
   sitmo = derive2 { name="sitmo"; version="2.0.0"; sha256="11mzkdh01cfazxqxxlhm0ifbiggpw54k5n9qpz3vxbq10v9720h9"; depends=[Rcpp]; };
   sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
-  sitree = derive2 { name="sitree"; version="0.1-3"; sha256="1rs109sxvmsbx8w75iifbc14z685k9brk7fgfy0mjgkcxszafjwk"; depends=[data_table lattice latticeExtra]; };
+  sitree = derive2 { name="sitree"; version="0.1-4"; sha256="0ypn9y1kighvh17yj1v83dkj973vqgzbr5lmkl761lam3m1fglq0"; depends=[data_table lattice latticeExtra]; };
   sitreeE = derive2 { name="sitreeE"; version="0.0-2"; sha256="0w4gbdjphanfy614jv4zp70kl901zz5hblk35lyv7rjxifq5bpx0"; depends=[sitree]; };
   sivipm = derive2 { name="sivipm"; version="1.1-3"; sha256="1l0j1bi38s09ax4kwikk615lyd074gzg1aa1j2jfmhr3igannm3z"; depends=[seqinr]; };
-  sizeMat = derive2 { name="sizeMat"; version="0.3.0"; sha256="0766wxcc1980ivlib2saagl20y9dm0ar7i43qcqk2jpdbbaky33z"; depends=[MASS matrixStats mcmc MCMCpack]; };
-  sjPlot = derive2 { name="sjPlot"; version="2.4.1"; sha256="0aazxrqsbp5jsd5yfm6hrx17rmlqbh5vs314xms7g620aj383zrh"; depends=[arm broom dplyr effects forcats ggeffects ggplot2 glmmTMB knitr lme4 magrittr MASS merTools modelr nlme psych purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr tidyselect]; };
+  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.11"; sha256="1bkjv36v7vwvwfal9qwfyvirnv72r080cq333q161bnq6vcp648y"; depends=[broom dplyr haven magrittr prediction purrr rlang snakecase tibble tidyselect]; };
-  sjmisc = derive2 { name="sjmisc"; version="2.7.3"; sha256="1d588cpgnyhxyclchiv5fx0vi155mkh7ac252swg5fp4752skff7"; depends=[broom crayon dplyr haven magrittr pillar purrr rlang sjlabelled stringdist stringr tibble tidyr tidyselect]; };
-  sjstats = derive2 { name="sjstats"; version="0.15.0"; sha256="1gy37k3ziyxlf336b9s5j2shp9qapwnr8ya8sfjyrs56naai411b"; depends=[bayesplot broom coin crayon dplyr emmeans glmmTMB lme4 lmtest magrittr MASS Matrix modelr nlme prediction purrr pwr rlang sandwich sjlabelled sjmisc tibble tidyr tidyselect]; };
+  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]; };
   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=[]; };
   skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; };
   skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; };
   skimr = derive2 { name="skimr"; version="1.0.3"; sha256="1c6szryq4w6gipmz7s5nn5936dbwly013czlcl6fky2yrhhjf25v"; depends=[cli dplyr knitr magrittr pander purrr rlang stringr tibble tidyr tidyselect]; };
-  sklarsomega = derive2 { name="sklarsomega"; version="1.0"; sha256="0zyaycsbi4nnqx80lvipa43zphc032gw8bmxrx4blqb67xlfhp98"; depends=[hash LaplacesDemon Matrix numDeriv spam]; };
+  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.49.1"; sha256="0qsqa9lbrch5vs0hfp6k8vcrh0xgcjm23lpi5prrdh3h93lqjhxf"; depends=[doParallel doRNG foreach iterators kableExtra knitr lme4 nlme Rcpp RcppEigen rintrojs shiny shinythemes survival]; };
+  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]; };
   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]; };
@@ -11315,22 +11815,24 @@ in with self; {
   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]; };
+  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]; };
-  sm = derive2 { name="sm"; version="2.2-5.5"; sha256="1rw2mxygxsmk8mn4wag1ppjgzk0rlvh6zd8q02qrhjrn9jhi5qj3"; depends=[]; };
+  sm = derive2 { name="sm"; version="2.2-5.6"; sha256="0c4whcx879gb4lwvqnzxl5n9xgpcqh2c54ip9ami3mwfprzcv45q"; depends=[]; };
   smaa = derive2 { name="smaa"; version="0.3-0"; sha256="0y7j4q147fdk7fffyinc803mfzzsmcdfx8bp695w3wkq1wwy9kyl"; depends=[]; };
   smac = derive2 { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; };
   smacof = derive2 { name="smacof"; version="1.10-8"; sha256="1q3xpfpcgsm98gzavkpsmsidch7sdxwr6iyqpz7cm8qiki8jgjzb"; depends=[candisc colorspace ellipse Hmisc MASS nnls plotrix polynom weights wordcloud]; };
   smacpod = derive2 { name="smacpod"; version="2.0.4"; sha256="0dh8n3rxrffr09a8q7vdlin9hq5f2v0hjjjqsmzgwf7ln1b9wcr1"; depends=[abind pbapply plotrix sp spatstat]; };
   smallarea = derive2 { name="smallarea"; version="0.1"; sha256="0jcv0xbh8v4g6zxxs4yyd0divwzk9d2w7g01r4s65khxvy3av7yx"; depends=[MASS]; };
-  smam = derive2 { name="smam"; version="0.3-0"; sha256="1sdr0ki2y9smiwfglgh97kj6y0n1z3blyyxk823xp3467byk1rnb"; depends=[Matrix numDeriv Rcpp]; };
-  smapr = derive2 { name="smapr"; version="0.1.2"; sha256="0j4ddlj5km0hmz9q61l93rm6gc7x6iyfgq1fbkjajmij0099mscr"; depends=[httr rappdirs raster rhdf5 rvest xml2]; };
+  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]; };
+  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=[]; };
-  smbinning = derive2 { name="smbinning"; version="0.6"; sha256="13izdq2pl7hi8ppzmpmiiz4pmc43m63ixjrbj9lwa371vx60ndmh"; depends=[Formula gsubfn partykit sqldf]; };
+  smbinning = derive2 { name="smbinning"; version="0.7"; sha256="1pf74ys0jgm160zrwf8kv5j5bgb4i9z8cayirfxhwjdw9rc0w61p"; depends=[Formula gsubfn partykit sqldf]; };
   smcUtils = derive2 { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; };
-  smcfcs = derive2 { name="smcfcs"; version="1.3.0"; sha256="1860qzhfpdr78a8ha8537izbkm0dx9j63l9fv6mswcs5sjl25i09"; depends=[MASS survival VGAM]; };
+  smcfcs = derive2 { name="smcfcs"; version="1.3.1"; sha256="0f3sd4pz46wjpyw932qrxw4hr3fmdbjrhcrgfmvm89hp0r09vz74"; depends=[MASS survival VGAM]; };
   smco = derive2 { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; };
   smcure = derive2 { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; };
   smdata = derive2 { name="smdata"; version="1.2"; sha256="1p26b46kg4hmhs2fl9h9vchar00llqv58ylx438bjgzz4f229qvr"; depends=[]; };
@@ -11338,15 +11840,15 @@ in with self; {
   smds = derive2 { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; };
   sme = derive2 { name="sme"; version="1.0.2"; sha256="0gszpy1sx2qsypps3iza79sab475wcrscl7wnbbrv97a3ry0ybp6"; depends=[lattice]; };
   smerc = derive2 { name="smerc"; version="0.4.5"; sha256="1455fjfihznzivz80jad7pyfjms8yyvmsz6wqdvqv3n6dsyr8fvb"; depends=[fields maps matrixStats smacpod sp SpatialTools spdep]; };
-  smfsb = derive2 { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; };
-  smicd = derive2 { name="smicd"; version="1.0.1"; sha256="05v1lwl2jacrzd4fcp7d386gd70q1kcrr96pnq39zdsniq2j7dn9"; depends=[formula_tools ineq laeken lme4 MuMIn mvtnorm spatstat truncnorm weights]; };
+  smfsb = derive2 { name="smfsb"; version="1.3"; sha256="1328w7zpwd3nam6ha4bh14g919jjl87v323ijmbp1j71gc64nn2i"; depends=[abind]; };
+  smicd = derive2 { name="smicd"; version="1.0.2"; sha256="1hylmii2nd0v2k8zksrd0bh882mqj16vdrxmal2lv79x3fb7jpkb"; depends=[formula_tools ineq laeken lme4 MuMIn mvtnorm spatstat truncnorm weights]; };
   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.5"; sha256="0yp7ziikd1w0j091c49zqbfwypp49rfxpn410kbh09bay2fb58x1"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; };
+  smooth = derive2 { name="smooth"; version="2.4.6"; sha256="1fcfhf7vzhvfa977a8wwgg4j1pb763a0yr4jzjkk1ah350h49vc4"; 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]; };
-  smoothSurv = derive2 { name="smoothSurv"; version="2.0"; sha256="0ypgmqf7mj0x0ibid9qx6cbqn4cpig8333g095b64297bf0syvjc"; depends=[survival]; };
+  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=[]; };
   smoothmest = derive2 { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; };
@@ -11359,16 +11861,16 @@ in with self; {
   smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; };
   sn = derive2 { name="sn"; version="1.5-2"; sha256="16gwr68zzj5v83bqfmzxnzwig3dnjrkxdhs6clri1caqkvrq6aig"; depends=[mnormt numDeriv]; };
   sna = derive2 { name="sna"; version="2.4"; sha256="1ks8819qvpdfansfqj9p32s1rhvl26frvbi78m4rx1wd1qcv74i2"; depends=[network statnet_common]; };
-  snakecase = derive2 { name="snakecase"; version="0.9.1"; sha256="02462vd08asm4ah2brrc3z2s1lqcya80shrd6w743cylv3h3hpyv"; depends=[stringi stringr]; };
+  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=[]; };
   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=[]; };
   snnR = derive2 { name="snnR"; version="1.0"; sha256="0qrl5ivpmipibszx8k9fvd8g462zzdcmzbjj1hb8apv4z79gzima"; depends=[]; };
-  snow = derive2 { name="snow"; version="0.4-2"; sha256="1mxbrkpnmq32x4wd0194d541661yvfrrjlr3lsf7qq53ms3h21zf"; depends=[]; };
+  snow = derive2 { name="snow"; version="0.4-3"; sha256="1n3n8pva9s34fvlw32yng0x416lmbv7q1fsd0ywa4kikmxym64l5"; depends=[]; };
   snowFT = derive2 { name="snowFT"; version="1.6-0"; sha256="00rq2xibzhx7441v9jg138a4fkmx28hifs4yyj3pwi8najf0df4n"; depends=[rlecuyer snow]; };
-  snowboot = derive2 { name="snowboot"; version="0.5.2"; sha256="07mly89x9mj5cvpmi45xmlr4d1l1d2fdcagmniviqqqhmllc50pi"; depends=[igraph Rcpp VGAM]; };
+  snowboot = derive2 { name="snowboot"; version="1.0.0"; sha256="1fqvij959699bfyzc2b2dmgkm3nm119b2zg0jh29mpka3v5qqy3n"; depends=[igraph Rcpp Rdpack VGAM]; };
   snowfall = derive2 { name="snowfall"; version="1.84-6.1"; sha256="13941rlw1jsdjsndp1plzj1cq5aqravizkrqn6l25r9im7rnsi2w"; depends=[snow]; };
   snowflakes = derive2 { name="snowflakes"; version="1.0.0"; sha256="0adna9jfs0wv4dhyjczxhq7c0ldjfai07p1q9119avxyilv9x0vi"; depends=[]; };
   snp_plotter = derive2 { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; };
@@ -11381,7 +11883,7 @@ in with self; {
   sns = derive2 { name="sns"; version="1.1.2"; sha256="132zd57xb2y0nshw4lakf49r2mvvkv7j32f7l7hqrh91mw7wyqpr"; depends=[coda mvtnorm numDeriv]; };
   soc_ca = derive2 { name="soc.ca"; version="0.7.3"; sha256="0z3phmvgwd3s6swfaywq851my12a2n48i6k26vhggc6pf9d28phl"; depends=[ellipse ggplot2 ggrepel gridExtra reshape2 shiny]; };
   social = derive2 { name="social"; version="1.0"; sha256="0ny81bhj80rlwwa6cgbkdz2rxz6bp0f3nvjr1sqxr4s8l8rnf4ic"; depends=[Rcpp]; };
-  socialmixr = derive2 { name="socialmixr"; version="0.1.2"; sha256="0cj8l1gl7c9hk3hpznfqhblmh79qvi9866713sry538f3kkv897c"; depends=[countrycode curl data_table httr jsonlite oai stringr wpp2015 XML]; };
+  socialmixr = derive2 { name="socialmixr"; version="0.1.3"; sha256="16z0ykbji9vh2j0d02x6vcrxwwqpzjckfxr1wjkvfc86mqpgpqmd"; depends=[countrycode curl data_table httr jsonlite oai stringr wpp2015 XML]; };
   sodavis = derive2 { name="sodavis"; version="1.2"; sha256="1jf5sml51qxlpgv5b1rvyig4dm4ijw2hpnk85zf790jp22xm64jw"; depends=[MASS mvtnorm nnet]; };
   sodium = derive2 { name="sodium"; version="1.1"; sha256="1zxzi8xvxnhgcd5qrylf08nz1cdq3aslrswjas440qg63ypmbf6w"; depends=[]; };
   sofa = derive2 { name="sofa"; version="0.3.0"; sha256="10f01a23bq6a30f95cilfan588dg0bg36y7g14q46rmcz15cqbrx"; depends=[crul jsonlite mime R6]; };
@@ -11393,7 +11895,7 @@ in with self; {
   soilDB = derive2 { name="soilDB"; version="2.0-1"; sha256="0nzi0fss77x0bjdzslhy0flwvhap0i0cq3xw82x7sggnbmc3ya72"; 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.4.6"; sha256="1ak8vp6y2cb04118bw5inmwwgjvbxmzpbarr6ga7r1w5i16c7nk7"; depends=[MASS sp]; };
+  soiltexture = derive2 { name="soiltexture"; version="1.5.1"; sha256="1l9npvk910488qzd45ibc7ss557hnkb78lx1p6fs3nhl8sacgyxh"; depends=[MASS sp]; };
   soilwater = derive2 { name="soilwater"; version="1.0.5"; sha256="11gal7hj73j82qx65krmzpmf0gpm41ph8hw70df46dbf4w23vvjn"; depends=[]; };
   sokoban = derive2 { name="sokoban"; version="0.1.0"; sha256="07r2zv9rynvw06fpncrz3rsmkdy6z2pcvmm559bhs428kmnq2xib"; depends=[]; };
   solaR = derive2 { name="solaR"; version="0.44"; sha256="1waxi2zfns4dh1vpsl3khbgaw07icp4f1ax9l0pry9qipmk0nk3k"; depends=[lattice latticeExtra RColorBrewer zoo]; };
@@ -11401,14 +11903,14 @@ in with self; {
   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=[]; };
   solrium = derive2 { name="solrium"; version="1.0.0"; sha256="1rlf60kynqb8pvzllfdkiabxgnqx60hwm8vy86y9f2bh7d7jsdhf"; depends=[crul dplyr jsonlite plyr R6 tibble xml2]; };
-  solvebio = derive2 { name="solvebio"; version="2.5.0"; sha256="1053pmmm1bl5kfrgmlbfnb6xywvv4nwrd6mwn9kyj2p63akvwq1s"; depends=[dplyr httr jsonlite mime]; };
+  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=[]; };
   som_nn = derive2 { name="som.nn"; version="1.1.0"; sha256="0mw2c2lqvdq9bhndpjyawjy43l4x7clcsx2350j45g7fnchhy602"; depends=[class hexbin kohonen som]; };
   soma = derive2 { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; };
   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.5"; sha256="1qsg822y3fsqs7knc8vwlhnnh51d8f8rn7yzvmxiqd8qnrkkmbix"; depends=[data_table lattice MASS Matrix]; };
+  sommer = derive2 { name="sommer"; version="3.6"; sha256="1znp5svj2l2632ivnilc0060x8k8mbiv55ppgfcmnj5d22vlb06q"; depends=[data_table lattice MASS Matrix]; };
   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=[]; };
@@ -11424,7 +11926,7 @@ in with self; {
   sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; };
   sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; };
   soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; };
-  soundgen = derive2 { name="soundgen"; version="1.2.0"; sha256="1k6my6lcwy36fa25glyd8vfr3b57fwx7nz4s24bkf40vp0vkpsc2"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny tuneR zoo]; };
+  soundgen = derive2 { name="soundgen"; version="1.3.1"; sha256="0hsd00bmm6szvx0pjlprqg4749pwr39hippwvl5fkwm8fqb482p5"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny tuneR zoo]; };
   source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
   sourceR = derive2 { name="sourceR"; version="1.0.1"; sha256="01qxa44s9szaxl0rdcx4p0wn4vby17hdzdjzpsbls3prsnr0jaad"; depends=[assertthat cluster dplyr gplots gtools hashmap R6 reshape2 SPIn tensorA]; };
   sourcetools = derive2 { name="sourcetools"; version="0.1.7"; sha256="1jnjir0q2dj724f1mjm6p5h77yzyx6xcqy9r2g7gmcxkxw349627"; depends=[]; };
@@ -11433,46 +11935,48 @@ 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]; };
-  spData = derive2 { name="spData"; version="0.2.9.0"; sha256="1yzgfbihpx9xj2vw6amm5sqib9d8xs4p964hlqbvypp4hfphnpwc"; depends=[]; };
+  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=[]; };
   spFSR = derive2 { name="spFSR"; version="1.0.0"; sha256="0094plnjlyhnnjqw3i4an5q95bw6hjy1gzc7zr6wy77faivqsbms"; depends=[class ggplot2 mlbench mlr parallelMap tictoc]; };
-  spGARCH = derive2 { name="spGARCH"; version="0.1.5"; sha256="14r8b2hj211r3bqk44l5y4zvlqbk6h8pa5i25rn0d9fqr37cks1f"; depends=[Matrix Rcpp RcppEigen Rsolnp spdep truncnorm]; };
+  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=[]; };
   spMaps = derive2 { name="spMaps"; version="0.3"; sha256="0w4rrzbybaf9zgb09zg0zkf2hgvfrwx57yzbxm4px1ygdfxyi4cm"; depends=[raster rgeos sp]; };
   spNNGP = derive2 { name="spNNGP"; version="0.1.1"; sha256="0b55arvy5xr592bs2082djyzaa48jbv0y85h7nnj479f8c31grqp"; depends=[coda Formula RANN]; };
   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.1"; sha256="1b3d8z8bb8jagr4vcxwqfcq2y37hb975v75ggmpc02jvy228xs1z"; depends=[coda extraDistr sp spacetime]; };
+  spTimer = derive2 { name="spTimer"; version="3.2"; sha256="1hw40jb8n9amg3i1lyjlc26gpafxd0jjf3yw5r24pqlh0d11n0i7"; depends=[coda extraDistr sp spacetime]; };
   spa = derive2 { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; };
-  spaMM = derive2 { name="spaMM"; version="2.4.35"; sha256="1b013kyrhld2y4wr69v4bkii4qjp38hrp1srmmj5ldb68zw3vadz"; depends=[MASS Matrix nlme nloptr pbapply proxy Rcpp RcppEigen]; };
+  spaMM = derive2 { name="spaMM"; version="2.5.0"; sha256="00y2n0k9qq54qa1vz72q7g6m3nq62n6wm3vxx2c540k404kil8p3"; 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.0-4"; sha256="0bifagywaksn27cdfsln52f5nwsaj347xilp812shmcma29b08ig"; depends=[]; };
-  spacetime = derive2 { name="spacetime"; version="1.2-1"; sha256="1i6yrmyr9vc5lr99w7qhr0jqdx97ckjqay5g0lqdrk98sygpfl4g"; depends=[intervals lattice sp xts zoo]; };
+  spacesRGB = derive2 { name="spacesRGB"; version="1.1-1"; sha256="1298dxzli8f4bpv8114y7d9r7d2i80qvbmc9n67znpg5wdib79b7"; depends=[]; };
+  spacesXYZ = derive2 { name="spacesXYZ"; version="1.0-1"; sha256="1v6ancnd0k6rpf5b4bh4ndk9d8rlvlqd17snnlq53mr1pm9a2hp8"; 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]; };
-  spacyr = derive2 { name="spacyr"; version="0.9.9"; sha256="1zdn57k5iacy73xmac32mslqzidpn3d38qyrnbzkzv2slysqwgkw"; depends=[data_table reticulate]; };
-  spaero = derive2 { name="spaero"; version="0.2.0"; sha256="0srkah89z23j30y2smlnyhf97mm123apma8vgmgfarbx188bkwpn"; depends=[]; };
-  spagmix = derive2 { name="spagmix"; version="0.2-0"; sha256="16yzkq1z5qj21milyw98a5bk7gvi6k3mbwgvnw7s8ckr40pbp48l"; depends=[abind MCMCpack mvtnorm sparr spatstat]; };
+  spacyr = derive2 { name="spacyr"; version="0.9.91"; sha256="03dpp26lq4a5x0p5l3l8d2gs9v2pc13c14ir8vf7ws46970f6var"; depends=[data_table reticulate]; };
+  spaero = derive2 { name="spaero"; version="0.3.0"; sha256="1l6h6mri78b49mw6b1d9dirygfj57pdyqx6822llnj3wkdn2x87v"; depends=[]; };
+  spagmix = derive2 { name="spagmix"; version="0.3-1"; sha256="0xfrm4i28sy490g5324bc43dxlrgcnzxg27gsd5b81mqi03sry9j"; depends=[abind mvtnorm RandomFields sparr spatstat]; };
   spam = derive2 { name="spam"; version="2.2-0"; sha256="02v78dmf263drmz3y099gbakbcvaxkb18900s7sw440cjfv691d1"; depends=[dotCall64]; };
   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.10.0"; sha256="0kvxaaqij2wnjchp4zrqkwnsp6g767mx840xvyb8lq01a9k7jjyn"; depends=[abind complexplus foreach magrittr matrixcalc minpack_lm nnls plyr pracma readr signal smoother stringr svd tibble tkrplot]; };
+  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]; };
   sparc = derive2 { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; };
-  sparcl = derive2 { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; 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 = derive2 { name="spark"; version="2.0.0"; sha256="062i9qah9zws6p555pk1b42qmd04l8sx22h71skpx76vgb0lsn83"; depends=[clisymbols]; };
   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]; };
+  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.8.4"; sha256="1gmzg8464wqygx8r0rh1d67a2h9zpm98y6jwi3ay4adw7bnffhvx"; depends=[assertthat base64enc broom config DBI dbplyr digest dplyr httr jsonlite lazyeval openssl rappdirs readr rlang rprojroot rstudioapi shiny tidyr withr xml2]; };
+  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]; };
   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-11"; sha256="01li60cybv9kg54zkc9rh4ra6danzbnap9rx59pgfj7zkhs2phmn"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; };
+  sparr = derive2 { name="sparr"; version="2.2-13"; sha256="1cn8bzlfairfrxfwwdap0pnaa97rn9h13jz54il8cn9zacnzb8yc"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; };
   sparseBC = derive2 { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[fields glasso]; };
   sparseEigen = derive2 { name="sparseEigen"; version="0.1.0"; sha256="0vqcy61rarmp3liz8fr3vs3y40hkb3wfw89b5xsj1byaiap4772s"; depends=[]; };
   sparseFLMM = derive2 { name="sparseFLMM"; version="0.2.2"; sha256="12143qij3p8vry9i02i52nj00m1ckkwg2rq99dq00dq43axcpvgw"; depends=[data_table MASS Matrix mgcv refund]; };
@@ -11485,17 +11989,16 @@ in with self; {
   sparseSVM = derive2 { name="sparseSVM"; version="1.1-6"; sha256="0b0qiikjyyh9qfd4jl69zqnlp7adxq63mwsxvgwvyc0pv5ccg8i0"; depends=[]; };
   sparsebn = derive2 { name="sparsebn"; version="0.0.5"; sha256="19315nzj9pz98498amlhas6ii3vwvn3qxz5a6136nh2xfwfg2bhc"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; };
   sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.6"; sha256="02a75ldvxfn0awn2aaws3fgd4zzk1jjfry4nxjf3y1grdbbz396y"; depends=[Matrix nnet]; };
-  sparsediscrim = derive2 { name="sparsediscrim"; version="0.2.4"; sha256="1sa3yssncbpx8yid5wrnxdq7jl3hy5rskyh60v5x592ijcb2mif0"; depends=[bdsmatrix corpcor dplyr ggplot2 mvtnorm]; };
-  sparseinv = derive2 { name="sparseinv"; version="0.1.2"; sha256="1lf0lbk8dslasd6m1rq4wzpxa1v427j5i9j0rrw5xjx80z1gc206"; depends=[Matrix spam]; };
+  sparseinv = derive2 { name="sparseinv"; version="0.1.3"; sha256="06inzix9m7b5g7c97lyvyl2g7fdr4iz60791hl2w9mah7nd6bfja"; depends=[Matrix Rcpp spam]; };
   sparsepca = derive2 { name="sparsepca"; version="0.1.2"; sha256="0wk2nm37p15gb8i4s45izzzdmwywr56kv4g0j3jd5s3slm224vv4"; depends=[rsvd]; };
-  sparsepp = derive2 { name="sparsepp"; version="0.2.0"; sha256="0ibadyv7lchxw3y1dspjnbhc4pin4dxwqj9rdrdxfbvlx0i3jgxr"; depends=[]; };
+  sparsepp = derive2 { name="sparsepp"; version="1.22"; sha256="0wa1585pkbn3y11apyim4z1ixn300c1yyv9bf2qldb6cjfiv7699"; depends=[]; };
   sparsereg = derive2 { name="sparsereg"; version="1.2"; sha256="1ipsang2fppmjx4h5ljgzx3c44z3lggc376ghrqqgmxb5ql8bcp3"; depends=[coda ggplot2 GIGrvg glmnet gridExtra MASS MCMCpack msm Rcpp RcppArmadillo VGAM]; };
   sparsestep = derive2 { name="sparsestep"; version="1.0.0"; sha256="0f3wrwiyn990sn3x9r50zgs8cr76nmyisdc7qismgx1nn5yx5z0g"; depends=[Matrix]; };
   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]; };
-  spass = derive2 { name="spass"; version="1.1"; sha256="1kr2ixyvsm82h2brdm51bzll69632mkj9f88a2ny0pcyqrbggg83"; depends=[geepack MASS multcomp mvtnorm Rcpp]; };
+  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]; };
   spatial = derive2 { name="spatial"; version="7.3-11"; sha256="04aw8j533sn63ybyrf4hyhrqm4058vfcb7yhjy07kq92mk94hi32"; depends=[]; };
@@ -11509,12 +12012,14 @@ in with self; {
   spatialkernel = derive2 { name="spatialkernel"; version="0.4-23"; sha256="0kvhirh7afk2gfy21pa6117yk6kzbaf2dxfkr1ax3b554rnrv4p0"; depends=[spatstat]; };
   spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; };
   spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; };
+  spatialrisk = derive2 { name="spatialrisk"; version="0.4.1"; sha256="0r65y3ch53gbfb0di0svlb2zr39b5v0gbgjh713jgnw44g2g43r3"; depends=[Rcpp RcppProgress]; };
   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]; };
-  spatstat = derive2 { name="spatstat"; version="1.56-0"; sha256="0gigb7vpgpwg4hrwsl9wncknrl2c7i4iv9aab2qskbc5z7xxjs4v"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; };
-  spatstat_data = derive2 { name="spatstat.data"; version="1.3-1"; sha256="13wb9c1r7g2lrrjv7a2qmkyz27yjmcasl9qrzgk09akqgikkbbf3"; depends=[spatstat_utils]; };
+  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_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.8-2"; sha256="1wjvwhhyqh8f4cm3xw7vhrnj5qr9vlwkcxkj1l6s4sbjbcli2y2p"; depends=[]; };
+  spatstat_utils = derive2 { name="spatstat.utils"; version="1.10-0"; sha256="1wmakkc9b8vzyjdjwgr15hf676lrx11kxgmg3mbl0r9i72lflnvs"; 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=[]; };
@@ -11524,7 +12029,7 @@ 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-7"; sha256="0wrlximy4w5y5aszy3pacmf3ag224chl12q4rj4r7ky6zw2sn1ns"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp spData]; };
+  spdep = derive2 { name="spdep"; version="0.7-9"; sha256="17sx6zkrnmbhhqqjb9qgp9mmykszqqr2hw3npk8q74k567mgxgcm"; 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]; };
@@ -11541,12 +12046,12 @@ in with self; {
   spectral_methods = derive2 { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[abind DistributionUtils foreach JBTools ncdf_tools nnet raster RColorBrewer RNetCDF Rssa]; };
   spectralAnalysis = derive2 { name="spectralAnalysis"; version="3.12.0"; sha256="0mz01hx86qi65k6vzz9k1j9q7gi10dh14cqvrlfy93f3kmi52q0x"; depends=[baseline BiocGenerics data_table ggplot2 hNMF jsonlite magrittr NMF nnls plotly plyr RColorBrewer signal viridis]; };
   spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; };
-  spectrolab = derive2 { name="spectrolab"; version="0.0.6"; sha256="0pzisyi64f9wm79qxw22rmgm6lsgn6jqavxh688yrm94nnn1qv5h"; depends=[devtools prospectr RColorBrewer shiny shinyjs]; };
+  spectrolab = derive2 { name="spectrolab"; version="0.0.8"; sha256="1hjvi9na94f7n7yr64p0bvh0mzckwmfh36d6zxisrxr08zxwyxzz"; depends=[devtools prospectr RColorBrewer shiny shinyjs usethis]; };
   speedglm = derive2 { name="speedglm"; version="0.3-2"; sha256="1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz"; depends=[MASS Matrix]; };
-  spef = derive2 { name="spef"; version="1.0-7"; sha256="006qp0qsqrlbbbv4b86ikqz1ig0php0cahqz4c9n3js1kxwsdi7d"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; };
+  spef = derive2 { name="spef"; version="1.0.8"; sha256="1c4hpm19zqh869z8qbixkfbidnygc3fy91d0m2l4bp2s6bq1wdnz"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; };
   speff2trial = derive2 { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; };
   spellcheckr = derive2 { name="spellcheckr"; version="0.1.2"; sha256="09snc1ymzr4njnr3w502b84dqwjjd414higjxqi48jvh27br5k1l"; depends=[data_table dplyr stringr]; };
-  spelling = derive2 { name="spelling"; version="1.1"; sha256="10zhzbpyjw5lkg4iyjwgs5xp2c8bgwyzjg146fcml6cjs6xhl8ni"; depends=[commonmark hunspell knitr xml2]; };
+  spelling = derive2 { name="spelling"; version="1.2"; sha256="1gdxxwz0n2z05d8xqk0kcvv2zffa810hda57i23zsysbrpn751s4"; depends=[commonmark hunspell knitr xml2]; };
   spemd = derive2 { name="spemd"; version="0.1-1"; sha256="1aw8dg2fm8qd95bgim2kjwp7ax4b2g78521llsxv7fhdj9hl7rgw"; depends=[MBA sp spdep]; };
   sperich = derive2 { name="sperich"; version="1.5-7"; sha256="1apgq5nsl6nw674dy7bc7r7z962wcmqsia5n67a8n6c5lcgcif3f"; depends=[foreach rgdal SDMTools sp]; };
   sperrorest = derive2 { name="sperrorest"; version="2.1.5"; sha256="126vwk3bxs27gblakc5nplj0k90a21gks9d0kbyanlxc2ihsy243"; depends=[doFuture foreach future future_apply gdata glue magrittr pbapply pbmcapply purrr ROCR rpart stringr]; };
@@ -11563,35 +12068,37 @@ in with self; {
   spider = derive2 { name="spider"; version="1.5.0"; sha256="1y034v42jxjl3vj87iz5kaizq7fwppmn56z7yyvrrmk5ps4nqr1j"; depends=[ape pegas]; };
   spiderbar = derive2 { name="spiderbar"; version="0.2.1"; sha256="1mm9g58riyjxpfwjj28shlw9zlycsgcxl6xw8im0gm815v2plyhv"; depends=[Rcpp]; };
   spiders = derive2 { name="spiders"; version="1.2"; sha256="1qklm178bgkgpvrjf024jphsdh9can8300sf0702l4h0rk2daqbq"; depends=[plyr]; };
-  spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-11"; sha256="1f16jvdj6kbiiypnbbj10nj7l88kkrxasrribqpjv7ai62dlximn"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; };
+  spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-14"; sha256="1ha2ngs5jkrcd3ay26vynrd31fqf9pva5r0p954dyfbpbinizxgf"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; };
   spikes = derive2 { name="spikes"; version="1.1"; sha256="080sna0sgii61kai5sirs6cijnvk1012djwfw705di9y2lvk1hqk"; depends=[emdbook]; };
   spikeslab = derive2 { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; };
-  spind = derive2 { name="spind"; version="2.1.3"; sha256="173jpyq13vdhcwbxwx188fp7jg8l67yh6kxlai13z8lqnlpl1xqh"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje splancs stringr waveslim]; };
+  spind = derive2 { name="spind"; version="2.2.0"; sha256="1qswvj8hcjds3mjffzlxq87g79gijsk3mw26lfr81vyf5zmwm4w4"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje rlang splancs stringr waveslim]; };
   spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; };
   splancs = derive2 { name="splancs"; version="2.01-40"; sha256="0qs3lwyllrkahnvqbm8bzrf03bm9zk4s7p1n19s638y4xf0l6x3r"; depends=[sp]; };
   splashr = derive2 { name="splashr"; version="0.4.1"; sha256="1gydnl6qdkqxvgzy3j6n8y4nan4wz6p7wybcgnm5p37n7q6m2rhk"; depends=[curl docker formatR HARtools httr jsonlite lubridate magick openssl purrr scales stringi xml2]; };
   splines2 = derive2 { name="splines2"; version="0.2.8"; sha256="0ygzqq0swhcss5v8bn7qg98fpvp3wibbnbzkbpw4nvfd8bg51m1v"; depends=[]; };
+  splinetree = derive2 { name="splinetree"; version="0.1.0"; sha256="14bqdad538nm4vps43gpyq3c9lv5hl28064mq9vyldgvvbdr40w2"; depends=[ggplot2 mclust mosaic nlme rpart treeClust]; };
   splitFeas = derive2 { name="splitFeas"; version="0.1.0"; sha256="1cfiis32h5kkp8r1mndmj4xss9gw96vdzk7q68q3jhbwqiaxp9rp"; depends=[corpcor matrixStats]; };
   splitfngr = derive2 { name="splitfngr"; version="0.1.1"; sha256="0gz65acnkil9xjspl2kzpzyhj7lslga9g3p0k79xh25ia6qal5ws"; depends=[lbfgs]; };
   splithalf = derive2 { name="splithalf"; version="0.3.1"; sha256="01ip3brnlyxlxr1hmnmc2w6jg4vm5gjk8fwavclmv7m7hr2bb4xh"; depends=[dplyr tidyr]; };
-  splitstackshape = derive2 { name="splitstackshape"; version="1.4.4"; sha256="0vhgb4pysp7hbph7kq8b38m4gqhal40j4p7gij2wrc2rajspzhkq"; depends=[data_table]; };
-  splm = derive2 { name="splm"; version="1.4-10"; sha256="0zz28mfs84nqyvl1l0ba7yrhgcxxzw1v0542jc39h4pr537yz1nc"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; };
+  splitstackshape = derive2 { name="splitstackshape"; version="1.4.6"; sha256="03w6h64ga4zqilffdway4l38l5cbman4yrspkzhbigds12aqz25r"; depends=[data_table]; };
+  splm = derive2 { name="splm"; version="1.4-11"; sha256="15app94mxs6xlmqqhpa0q041skc4n4l2wfi6pmmhwinrgcqgncln"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; };
   splot = derive2 { name="splot"; version="0.4.0"; sha256="1g6n10pjjfhxa8sycr1iamwfdhjhp6g2zn5dkynfhg9j7v0dxnyf"; depends=[]; };
   spls = derive2 { name="spls"; version="2.2-2"; sha256="11xp6wnxizc8g91ci9fd7lbjc8pin84c9ak8lr8yg2jyd2l351j9"; depends=[MASS nnet pls]; };
   splus2R = derive2 { name="splus2R"; version="1.2-2"; sha256="0xrbj8vxy0pc6hl7m8abv71d3hjw47cl51s7j7priadyqczkq6sz"; depends=[]; };
   splusTimeDate = derive2 { name="splusTimeDate"; version="2.5.0-141"; sha256="1z29djg6az8dl47w0b9fpfwhng74xnbh5bq1asv55i8kdm1a4v1s"; depends=[]; };
   splusTimeSeries = derive2 { name="splusTimeSeries"; version="1.5.0-75"; sha256="14bg0yzwk3v0b1qrlfaxv48dpk380ha6wb2w4k02c9vmb51ysmw0"; depends=[splusTimeDate]; };
-  spm = derive2 { name="spm"; version="1.1.0"; sha256="0xx1g6ir0sanj2p6xgsdghymx1iy2bzsany2j87q49y5hah7349j"; depends=[biomod2 gbm gstat psy randomForest ranger sp]; };
-  spm12r = derive2 { name="spm12r"; version="2.7.4"; sha256="0v0zmsbzk6446n1yipz3w99n0n4yya6idff3gfyj7fgq10pcalgz"; depends=[git2r matlabr neurobase oro_nifti R_utils]; };
-  spmoran = derive2 { name="spmoran"; version="0.1.4"; sha256="0b58c2v57qj14icd577mpsgxwa84lyib4v9qxcbl26im4dhikmfm"; depends=[doParallel fields foreach ggplot2 Matrix vegan]; };
+  spm = derive2 { name="spm"; version="1.1.1"; sha256="0yz1fmh25yv5rdh5ny9xm3k177650ll03bp6pd1d2p8dgqyimv15"; depends=[biomod2 gbm gstat psy randomForest ranger sp]; };
+  spm12r = derive2 { name="spm12r"; version="2.8.0"; sha256="1f18f4z017j98kihixjsi9lngxp4fz2bnslfb0xqjzy7wq8d3y6x"; depends=[git2r matlabr neurobase oro_nifti R_utils]; };
+  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]; };
   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=[]; };
-  spotGUI = derive2 { name="spotGUI"; version="0.2.0"; sha256="05x8i1295qjdzyr1ri5c85lgcmj3sahamdwgzknf87dsc9r4hjcz"; depends=[gridExtra httpuv plotly rclipboard rhandsontable shiny shinyBS shinydashboard shinyjs smoof SPOT XML]; };
+  sport = derive2 { name="sport"; version="0.1.1"; sha256="0sqlnapmfdmpsxs5gapcw8k4dbc5jfc48qa6lirvfqz85yg2xzxs"; depends=[data_table ggplot2 Rcpp]; };
+  spotGUI = derive2 { name="spotGUI"; version="0.2.1"; sha256="1z664ricdsn8c29ks6hslm89f0qq6ls94pz4k256427cs95pk3ay"; depends=[gridExtra httpuv plotly rclipboard rhandsontable shiny shinyBS shinydashboard shinyjs smoof SPOT XML]; };
   spotifyr = derive2 { name="spotifyr"; version="1.0.0"; sha256="1f7sv6qc8bim8vkcsma96zdzd1ci73dpag2dp27mqjcbh716xfy0"; depends=[dplyr httr lubridate purrr tidyr]; };
-  spp = derive2 { name="spp"; version="1.15.4"; sha256="0gjg0g30y9w445mimrd29s44ryla1bmh1mdwj4hb85s1yi1l4h25"; depends=[BH caTools Rcpp Rsamtools]; };
+  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]; };
   sprex = derive2 { name="sprex"; version="1.4.1"; sha256="14idml4mipd4wyza7hqf49ww4dparmwaps35hxm8jg5h0w1pgh7j"; depends=[swfscMisc]; };
@@ -11603,7 +12110,7 @@ in with self; {
   spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; };
   spsurvey = derive2 { name="spsurvey"; version="3.4"; sha256="0bi2d5jfqbnhhfhs79wid7ksg77vh8r5r8q2g4zbzpjgc9c67lj4"; depends=[deldir foreign Hmisc MASS rgeos sp]; };
   spt = derive2 { name="spt"; version="2.5.1"; sha256="04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn"; depends=[]; };
-  sptemExp = derive2 { name="sptemExp"; version="0.1.1"; sha256="0a4y355j24sll8jmm17lh4j13k21b3nlalsxzpzx2gp5xw1x7jr6"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; };
+  sptemExp = derive2 { name="sptemExp"; version="0.1.3"; sha256="1j5c63mywv92c2zyqaa1rp22s5dmsj0as1f3q93455wjvvr42sz6"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; };
   sptm = derive2 { name="sptm"; version="17.12-7"; sha256="1l5in0jkqg44rr2id3h25jrfbn7x855p31z338hnmdpfwkpm2b1a"; depends=[kyotil survey survival]; };
   spuRs = derive2 { name="spuRs"; version="2.0.2"; sha256="00c0hnyrcbkbj269czxbfgmgi88y0vxzm79sxclllkzr9rdd1p53"; depends=[lattice MASS]; };
   spup = derive2 { name="spup"; version="1.3-1"; sha256="0xq9z9iy3bwqhzq783qydgmczxvh7knkk9vdvwnbpbk0rbjgq3kn"; depends=[gstat magrittr mvtnorm purrr raster whisker]; };
@@ -11614,7 +12121,7 @@ in with self; {
   squash = derive2 { name="squash"; version="1.0.8"; sha256="1x1rw0ny2kas0x8y5vv9czyqmwml7s5d2c8a33vqap0x8q52r4z6"; depends=[]; };
   squid = derive2 { name="squid"; version="0.1.1"; sha256="0qv9lazgiqazhq096ybmllalm2l2h794ry4p1r93c10msxg37sdp"; depends=[arm data_table ggplot2 lme4 MASS shiny]; };
   sra = derive2 { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; };
-  srp = derive2 { name="srp"; version="1.0.0"; sha256="10mpyy8q419dw0zd96l0z8lkxpcyn1l5fvnyvr3n0lyl6jmf91sy"; depends=[fda mgcv]; };
+  srp = derive2 { name="srp"; version="1.1.0"; sha256="1655p3f7y50qjprm03gp5vffgnkin0c7ahzcrj6s8qfrd6gh2vsp"; depends=[fda mgcv]; };
   srvyr = derive2 { name="srvyr"; version="0.3.3"; sha256="0xarb92xhsb3c6g45lqq9kgp5yy0y9psi7yrn7yvv1a130lwzs40"; depends=[dplyr magrittr rlang survey tibble]; };
   ss3sim = derive2 { name="ss3sim"; version="0.9.5"; sha256="0rdb49bfxvyh0jrqycrv1hxvh7y4kvw81jccjg5ma734x44q0vm5"; depends=[bbmle dplyr foreach ggplot2 gtools lubridate magrittr plyr r4ss]; };
   ssa = derive2 { name="ssa"; version="1.2.1"; sha256="10x58c57pa9x6svm4h4xrss72ikin9lpf3ihjwmnkgnaicvsd0bx"; depends=[iterators]; };
@@ -11622,19 +12129,19 @@ 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]; };
   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.4"; sha256="1k1ignb6gsjwwsqlkxjlr3pm6avzf9z3aj069f6y0hglz3g74qv0"; depends=[BDgraph igraph Matrix]; };
-  ssh = derive2 { name="ssh"; version="0.2"; sha256="12v5yfkaqlbixifw6sfdbjw88fc604sryg4ygml7k383nr8rpklf"; depends=[getPass]; };
+  ssgraph = derive2 { name="ssgraph"; version="1.5"; sha256="0d8zfk6q3q2krjyhkpb7h08cmgx7hsw4q7qhpzsbb3pjma0pkad7"; 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]; };
-  sskm = derive2 { name="sskm"; version="1.0.0"; sha256="1qji34v66qj4k9axy5i2lf3j5zps8sjhwk3h3mqfln3pi9z6gmv8"; depends=[fpc sparcl]; };
   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]; };
   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.5-5"; sha256="07656miqrv9g5nn3ahyfj7wb010cwkr3qjhysbsih0p43dwczq0y"; depends=[coda]; };
+  sspse = derive2 { name="sspse"; version="0.6"; sha256="1296893wgg0s6z5bv9a3k39gbxazvljl4dxiv4ma1s73nhz0xan9"; depends=[coda RDS scam]; };
   ssrm_logmer = derive2 { name="ssrm.logmer"; version="0.1"; sha256="1i9rrsixl3swd04w1gf9gf1r2wb9nkvwhc8ld4bx4zxzm1031f67"; depends=[sfsmisc statmod]; };
   sss = derive2 { name="sss"; version="0.1-0"; sha256="1qg56g60h8c52l8lpxihxsdgnqkxiag1mzh3p388r9hhff7g3g0k"; depends=[assertthat xml2]; };
   sssc = derive2 { name="sssc"; version="1.0.0"; sha256="00m5zfd3jnbxa8x76v4pfyl4qdfq90n8rqx4hngany0ka1z5g7m6"; depends=[changepoint e1071 ggplot2 VGAM]; };
@@ -11643,17 +12150,18 @@ in with self; {
   ssym = derive2 { name="ssym"; version="1.5.7"; sha256="0l5d921vlhd4qwddllrgcxpq3bhivvy5ikh3ixdy3s140rzpgwrv"; depends=[Formula GIGrvg normalp numDeriv sandwich survival]; };
   st = derive2 { name="st"; version="1.2.5"; sha256="0dnyfjcz37gjjv87nrabb11gw2dlkqhq3mrxdpkzahx0w0g0q0pb"; depends=[corpcor fdrtool sda]; };
   stR = derive2 { name="stR"; version="0.4"; sha256="120k8k1l8cfy8x746808jym7lnaplgh4s3lycgyq2wia2c35r0rc"; depends=[foreach forecast Matrix quantreg rgl SparseM]; };
-  stUPscales = derive2 { name="stUPscales"; version="1.0.3.1"; sha256="0qs8lj50jrkyh4dmiinpg6dxfs68x6zlp0knr2ckpgik3v51r52z"; depends=[data_table doParallel EmiStatR foreach ggplot2 hydroGOF lattice lmom mAr moments msm xts zoo]; };
+  stUPscales = derive2 { name="stUPscales"; version="1.0.3.3"; sha256="1hby7z9j23pd0z2hvyvprjl4gglb2rg9rh5fpkqy26x24nwkgk3h"; depends=[data_table doParallel EmiStatR foreach ggplot2 hydroGOF lattice lmom mAr moments msm xts zoo]; };
   staRdom = derive2 { name="staRdom"; version="1.0.8"; sha256="15khv32jbhjq73kr60al39ppf4pps7n48220jhp7sc04fcbi8fwd"; depends=[data_table doParallel dplyr drc eemR foreach GGally ggplot2 matrixStats multiway plotly pracma readr stringr tibble tidyr zoo]; };
   staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; };
-  stability = derive2 { name="stability"; version="0.2.0"; sha256="154dp26aghznibnp9h7j86hi30caylvyxp87jkf2p7cb4l3qn5r4"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; };
+  stability = derive2 { name="stability"; version="0.5.0"; sha256="0mz7ikfhpfbdcp72klq7fi4zfmx2w18gz46yhwywcc4dyi277m11"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; };
   stable = derive2 { name="stable"; version="1.1.3"; sha256="1fbyba91qi536mbb7hs6bvi1zgwdjvnv6ih7ykyyhkxk85cmfmq3"; depends=[rmutil stabledist]; };
   stabledist = derive2 { name="stabledist"; version="0.7-1"; sha256="0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86"; depends=[]; };
+  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=[]; };
-  stacomiR = derive2 { name="stacomiR"; version="0.5.3.1"; sha256="1d05k8s8239d615vqjs6r6rx7r3vqc5gmms8iqds6lhr59bxv83g"; 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.2"; sha256="1a33yy594699b05lb32zwx6yhmvxzwly6vvf8xzqg6lac64p26r5"; depends=[RODBC xtable]; };
+  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]; };
   stam = derive2 { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; };
   stampr = derive2 { name="stampr"; version="0.2"; sha256="10mc71kgnw5712q2gvzd4bmjaw1879r7s599hfsjap21idqb2k2m"; depends=[deldir maptools raster rgdal rgeos sp spdep]; };
@@ -11663,21 +12171,22 @@ in with self; {
   stargazer = derive2 { name="stargazer"; version="5.2.2"; sha256="1pij76r60hkjlvxw6zw1v7gkib81smiqmjq7mwszn6xclq9lmsvh"; depends=[]; };
   starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; };
   starmie = derive2 { name="starmie"; version="0.1.2"; sha256="06cvl8gk78c55kcf4rd27d4gfzh2lcg7ldynvx4hclvbw7ak9zdq"; depends=[combinat data_table ggdendro ggplot2 ggrepel gridExtra iterpc label_switching MCL MCMCpack proxy purrr readr stringr tidyr]; };
+  stars = derive2 { name="stars"; version="0.2-0"; sha256="0fsl88bg0mxqvijyj7q7a05p1r48lwamhz9vwdj7icv8alz0higr"; depends=[abind classInt ncdf4 ncmeta rlang sf units]; };
   startR = derive2 { name="startR"; version="0.0.1"; sha256="12y57n3yip5rz4rln41896a15zv5b4c67k164282fh1p6ww9gr3r"; depends=[abind bigmemory future]; };
-  startup = derive2 { name="startup"; version="0.10.0"; sha256="1j9vb1008sg6wwbz8ilxqnqzy7b18cscxiyaijszzx4ygxmcq39j"; depends=[]; };
-  startupmsg = derive2 { name="startupmsg"; version="0.9.4"; sha256="1r9dqrfznsrj7s11m56hkzgfnw3qcgzh07pqipl007zr2av9xwqw"; depends=[]; };
+  startup = derive2 { name="startup"; version="0.11.0"; sha256="1ibplrnzqv0z7mm8c3py5prlp4wg95xhk1jxv5i3z1w9ndqimbfv"; depends=[]; };
+  startupmsg = derive2 { name="startupmsg"; version="0.9.5"; sha256="1dn7yr957qa47c0hxdq2c27qvdpg9iy5i0lwz4kijz9yph2daahh"; depends=[]; };
   statGraph = derive2 { name="statGraph"; version="0.1.0"; sha256="13wfylb92lzw08fn3p000v87abs7ij2rb82np1rkgsl8w2kica73"; depends=[igraph MASS]; };
   statar = derive2 { name="statar"; version="0.6.5"; sha256="0vmdrdq6db16vfl0rb39x8yfnbdzpcrvywfgp4lss6jby3nvjwd9"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr]; };
   statcheck = derive2 { name="statcheck"; version="1.3.0"; sha256="0ivybdcrymlsfv6pg6p5bv70qdvgxf2vgp0kf4r0pf2fcvav1mcp"; depends=[ggplot2 plyr rmarkdown]; };
   statebins = derive2 { name="statebins"; version="1.2.2"; sha256="0qfs796dk5x983qah32w3npv9mxzljp3g7kffdd0ansn3z7i1zbb"; depends=[ggplot2 gridExtra RColorBrewer scales]; };
   states = derive2 { name="states"; version="0.2.1"; sha256="1f0cwv1jkl4nw0p31p147g71nira5f4hwq8lhjnmns28xq04by24"; depends=[dplyr lubridate]; };
   statesRcontiguous = derive2 { name="statesRcontiguous"; version="0.1.0"; sha256="0yzi6ycfj4cc4q0zzzckdz65wp9m4yx6fi7kp9nssj9pj6a8xlrp"; depends=[dplyr magrittr sf]; };
-  stationaRy = derive2 { name="stationaRy"; version="0.4.1"; sha256="1iyzg40vi1l4s68kh50in1p97pcb28z6n932cgrx5k1rv3api13g"; depends=[downloader dplyr leaflet lubridate plyr progress readr stringr]; };
-  statip = derive2 { name="statip"; version="0.1.5"; sha256="1gyn86kg96yrs9drc23xabf4s8ii32hgjla310sy6pd7c97bwqgf"; depends=[bazar dplyr]; };
+  stationery = derive2 { name="stationery"; version="0.98.5.5"; sha256="0c7v9nhbcmdi4c2i185j3fbckqcjr6f0x1pw5dchsp4cw59nr1mc"; depends=[knitr kutils rmarkdown]; };
+  statip = derive2 { name="statip"; version="0.2.0"; sha256="012caxqa04qv3z49cz09qzh9crfbdc4il2d2b96l5d3qnqv9xbh9"; depends=[bazar clue rpart]; };
   statmod = derive2 { name="statmod"; version="1.4.30"; sha256="07v4x8af60alcw6vbiwf5fp25bhra61kvxz9kqx64lszm0i1fb4x"; depends=[]; };
-  statnet = derive2 { name="statnet"; version="2016.9"; sha256="1j5z7awvac3sb66ma1lrc9j23m6hmzqfnqxc0znsm36h324y3y6s"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm]; };
+  statnet = derive2 { name="statnet"; version="2018.10"; sha256="1v0l8bjnqzz9b0b32b31kqmasw0aw4hnlwidlr3xfhbd9clyhyiq"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm tsna]; };
   statnet_common = derive2 { name="statnet.common"; version="4.1.4"; sha256="14dydm4c4dzc4v6ldxpn04q551nczzfablwibrd8lzgja8x9ksic"; depends=[coda]; };
-  statnetWeb = derive2 { name="statnetWeb"; version="0.4.0"; sha256="0gqvvpz9435wakpgf5jsznwgd3fix1vyabh87bnnfsm3pfs7rf2x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; };
+  statnetWeb = derive2 { name="statnetWeb"; version="0.5.0"; sha256="02344i8rhjxy8ainfvf5vn39g1nk2n448l76cg74cyxv6zv4f55w"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; };
   statprograms = derive2 { name="statprograms"; version="0.2.0"; sha256="0m7px7fmpz2zzlfdi7rbllcjvcjp8iy94f6fa1w4xinh7vz3y6vq"; depends=[]; };
   statquotes = derive2 { name="statquotes"; version="0.2.2"; sha256="1xzc3ndddjrlyld0p4zcwwxkj7i3m3adj7c78x9l4lhlw9mxbbqg"; depends=[stringr tidytext wordcloud]; };
   statsDK = derive2 { name="statsDK"; version="0.1.1"; sha256="0insx4sivac0nfxaa11iz9dd7374g51fcndsgljj3f14zw1xyq66"; depends=[dplyr ggplot2 httr jsonlite lubridate readr stringr tibble tidyr]; };
@@ -11687,43 +12196,45 @@ in with self; {
   stddiff = derive2 { name="stddiff"; version="2.0"; sha256="0mik01a8agcdpjq4r7lcdf3w2jcy6s9gx9zl7plzvnl2r3s5xw5b"; depends=[]; };
   stdvectors = derive2 { name="stdvectors"; version="0.0.5"; sha256="0gxylknr146qyg9aj22md076cdhrsz75dg25a1hx8525cm71nwd6"; depends=[Rcpp]; };
   steadyICA = derive2 { name="steadyICA"; version="1.0"; sha256="0mcalbsgajdpk45k9vpyavn079063hw4ihkw72n9wcy5nb0da14g"; depends=[clue combinat MASS Rcpp]; };
-  steemr = derive2 { name="steemr"; version="0.0.4"; sha256="10x90l00mq1aq7xf69vl7lpax0gl9grq182ixp3iwn3pa1wifmpm"; depends=[lattice openair RCurl rlist tm VennDiagram wordcloud XML zoo]; };
+  steemr = derive2 { name="steemr"; version="0.0.5"; sha256="012kiglvdpkwd701m5brhb87bljrkvw3j3v95ga5irjlddrgww34"; depends=[RCurl XML]; };
   steepness = derive2 { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; };
   stellaR = derive2 { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; };
-  stellaRbase = derive2 { name="stellaRbase"; version="0.1.0"; sha256="1jwhh14wk57z8acg8vjd7m3nwq0vq4w0x9ml8zhk3gnl4czq8m04"; depends=[data_table httr RJSONIO]; };
   stemmatology = derive2 { name="stemmatology"; version="0.3.1"; sha256="1ln5cvn4yldr8xdgadlfzkgxbv6im39mdsdz597zailqnfsr576g"; depends=[cluster igraph xml2]; };
+  stepPenal = derive2 { name="stepPenal"; version="0.2"; sha256="08gizl6c606ibbv7x2rdvfw37rghkrprwszha79yngkzpajw8gql"; depends=[caret dfoptim glmnet mvtnorm pROC]; };
   stepPlr = derive2 { name="stepPlr"; version="0.93"; sha256="1i54nyz8z5vq3mzfh6h2vd1q0hsdazc4mhrj9ad0zdvn0qnz61lv"; depends=[]; };
   stepR = derive2 { name="stepR"; version="2.0-2"; sha256="0inxlgihyivfr0l4gk8zq0043l9s5w4r3x3hwjlzfwbqjkwy1rjs"; depends=[digest R_cache Rcpp]; };
-  stepp = derive2 { name="stepp"; version="3.0-11"; sha256="0jrwfvcgh3sjm3zag93kjyny2qqsyiw988vnx6jw7s31bv9g0d6s"; depends=[car survival]; };
+  stepp = derive2 { name="stepp"; version="3.2.0.0"; sha256="0fnjqbncadscv6ryvqyqf8qqgpfzh2hka5ld2zvw39mjqzy5gadi"; depends=[car survival]; };
   stepwise = derive2 { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; };
   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.2.0"; sha256="1b9z64g1v5764h3y75xk1zkcv3imskvd44nqjp5m2dzmsw33nzji"; depends=[fields]; };
-  stinepack = derive2 { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6w62z1nnkqmhkifz2w0bi341jh0ybmak4fq"; depends=[]; };
+  stilt = derive2 { name="stilt"; version="1.3.0"; sha256="0b1bs849hw2wcvaldybxk8h8wgwl6p7x4i7winncvngmhplgrvx4"; depends=[fields]; };
+  stima = derive2 { name="stima"; version="1.2"; sha256="1784807cdscjy441f41bbqq7fx7c59c4mwwnhg1nnizybnwa993r"; depends=[rpart]; };
+  stinepack = derive2 { name="stinepack"; version="1.4"; sha256="0crl77gr4x2bz2zp0a0lqiw5iqlrcx7vj67igkbzg64d1fxai85d"; depends=[]; };
   stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; };
   stm = derive2 { name="stm"; version="1.3.3"; sha256="1b1i4r161i92f5q63zjfghzg39bw9d2rqdxx0y6zjd8n2p0ni3wv"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; };
   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.0"; sha256="0s4gnb3cb5vb4x4vmwa2dz7l7m8d0mqhrc8lmaa912s16y05y63z"; depends=[dplyr ggplot2 ggraph ggrepel huge igraph purrr scales shiny shinyBS shinydashboard shinyjs stm stringr tibble tidygraph]; };
+  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]; };
   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]; };
   stochvol = derive2 { name="stochvol"; version="1.3.3"; sha256="0cg61djjfw4jmq71g8kddrihdy9n2vlpzlf7kl2f3p8njc1f8kk2"; depends=[coda Rcpp RcppArmadillo]; };
   stockR = derive2 { name="stockR"; version="1.0.68"; sha256="0pgyxh19csv21vgji1sjpqaaqb1wwz62mnsf85a97ba9aph9lxwb"; depends=[gtools]; };
-  stocks = derive2 { name="stocks"; version="1.1.3"; sha256="0zpmx32dxv672ifk1m725ww286g4r09dvxvnk146vpwlk4mk11d0"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp zoo]; };
+  stocks = derive2 { name="stocks"; version="1.1.4"; sha256="0b6rl7pfkgzbpwnv7zzkr36hs5f1zb60d16ijslf7g9m25vvcyg6"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp TTR zoo]; };
   stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
   stopwords = derive2 { name="stopwords"; version="0.9.0"; sha256="050v3hq1wd3w83zrp76nv6n67qsf5fss2cbihb6waijancm7zfzh"; depends=[ISOcodes]; };
-  stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.0"; sha256="1pxkb0ijx04c4bk6szxhj8lxq6x76m8pyhxpf8xq63h4gh57fxh3"; depends=[dplyr ggplot2 lubridate maps plyr stringr tidyr weathermetrics]; };
-  storr = derive2 { name="storr"; version="1.2.0"; sha256="0rsj84yfvy3y02cv0s25fq6ji4rfh7nnrpacbka0lhrxf698h5ga"; depends=[digest R6]; };
+  stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.1"; sha256="16w6si2icpsyhkn0d3l6sh64nj6ynyymp7jxfwa792ds2wrz2mkm"; depends=[dplyr ggplot2 lubridate maps plyr stringr tidyr weathermetrics]; };
+  storr = derive2 { name="storr"; version="1.2.1"; sha256="0409gb6wji3cjxkdcd0wc3jvsx61h3rxd8a3nr018y8rh1rpsaj6"; depends=[digest R6]; };
   stosim = derive2 { name="stosim"; version="0.0.14"; sha256="10k8j7manskjsrjc1l44yhy682b1qh0k2jx3cs5k69j2z42mnhmk"; depends=[Rcpp]; };
-  stplanr = derive2 { name="stplanr"; version="0.2.5"; sha256="0r386bvsmglap6cxs6k3mn8bdahlbxb3qv2k4iqg2fr2r62dalf7"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos rlang sf sp stringi stringr]; };
-  stpm = derive2 { name="stpm"; version="1.6.9"; sha256="1pj8lxych7fgrimi5c237f4vi6yc51ya3zwcq0qk3py96nixcpxn"; depends=[knitcitations nloptr Rcpp RcppArmadillo sas7bdat survival]; };
+  stplanr = derive2 { name="stplanr"; version="0.2.6"; sha256="1v8x8gql4y6avxkpnjg4wb31hwim3admshwp4wcvfingxvzplxb2"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos rlang sf sp stringi stringr]; };
+  stpm = derive2 { name="stpm"; version="1.7.7"; sha256="1l40zb9qwshg7saqmgi7c49a3jd93ycrbvmysgzs0q8pl94vgcfs"; depends=[knitcitations MASS nloptr Rcpp RcppArmadillo sas7bdat survival]; };
   stpp = derive2 { name="stpp"; version="2.0-3"; sha256="18icnfrlrcibrpw7vqkrhzfx880ak24xk6llwgiqw18r929mq1hw"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; };
   strandCet = derive2 { name="strandCet"; version="1.0"; sha256="019cacj0g9f6i8v03rq7qyph7f14d8n0qw0axvczijvnk99q602a"; depends=[boot corpcor MASS minpack_lm mvtnorm numDeriv]; };
   stranger = derive2 { name="stranger"; version="0.3.3"; sha256="0p0ssba5q192g7pviv1shmh1lpcdjmzdim3rp1qs3hrd1d3pn4vq"; depends=[assertthat data_table dplyr ggplot2 tidyr]; };
   strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; };
   strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; };
+  stratEst = derive2 { name="stratEst"; version="0.1.0"; sha256="06xddfgddrcd0fjc2hiqmxh9i7szrvay5phhd7k5y1bdmjav7q2c"; depends=[Rcpp RcppArmadillo]; };
   strataG = derive2 { name="strataG"; version="2.0.2"; sha256="1rf1xf07yb0dzasgig9sfm4i9ggdkjgy5iiysqgdapk3sxs26c8r"; depends=[adegenet ape apex copula data_table DT ggplot2 gridExtra Hmisc pegas phangorn RColorBrewer Rcpp shiny shinyFiles survival swfscMisc]; };
   stratbr = derive2 { name="stratbr"; version="1.2"; sha256="15vkymmc61yz9szhfhc5663hfyqvh499ahwhr9mv1lhv5bikk0kb"; depends=[Rglpk snowfall stratification]; };
   strategicplayers = derive2 { name="strategicplayers"; version="1.0"; sha256="19vijrlzawd701vvk9ig7yhzbirh39dxxcwfz8ywwvxxiaky5x55"; depends=[sna]; };
@@ -11732,28 +12243,31 @@ 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.3"; sha256="174iliizvr050mm3z9gz44f264xp1kclbvq1amynqal2kv8k7yj1"; depends=[ndjson RCurl rjson]; };
+  streamR = derive2 { name="streamR"; version="0.4.4"; sha256="0xb0bzp3axflwrbxc6zsscmq8bn7qhlsk00l10qlxm4h1mh8xnlb"; 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]; };
   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.3"; sha256="1sgg4krw03qkz1n4dwiya0djggk7giwd0w21qlp0pfjqi0rxq6qx"; depends=[]; };
+  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.1"; sha256="18pz6ix6d661fvg1k1yyyiiwa1gdixynmpxl725ffd9lpykmfqbw"; depends=[rlist]; };
+  strip = derive2 { name="strip"; version="0.1.7"; sha256="1nzl5513s0gfd3mhnp9xzmhaj8q46lmdpv7j5jni8f50pnm3niay"; 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]; };
   structSSI = derive2 { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[ggplot2 igraph multtest reshape2 rjson]; };
   structree = derive2 { name="structree"; version="1.1.5"; sha256="0m14jzhmkfn8dpxjzj8xh9zf6cggqj3awnfz7zh1xlkkka91jz8d"; depends=[lme4 mgcv penalized]; };
   strum = derive2 { name="strum"; version="0.6.2"; sha256="0f5cb7cfvqhmnv4sjfr58lns4fclmr8iyka595zddy9f6dv5rqp1"; depends=[graph MASS Matrix pedigree Rcpp RcppArmadillo Rgraphviz]; };
-  strvalidator = derive2 { name="strvalidator"; version="2.0.0"; sha256="03f7clhs1hda3lkard7lbx4pfyqvhwm35r3d9sz2yksp5s78wbjk"; depends=[data_table ggplot2 gridExtra gtable gWidgets2 gWidgets2RGtk2 MASS plyr RGtk2 scales]; };
+  strvalidator = derive2 { name="strvalidator"; version="2.1.0"; sha256="15qpdbqr740bn2zimfyspj6arzigc39hdf73yy9lbk6vhiq43yyq"; depends=[data_table ggplot2 gridExtra gtable gWidgets2 gWidgets2RGtk2 MASS plyr RGtk2 scales]; };
   stsm = derive2 { name="stsm"; version="1.9"; sha256="18ypmkd7l7m7qkahb0nqf8f1m8g4irxlw48v2ms0dq1bsnhbzx7j"; depends=[KFKSDS]; };
   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]; };
-  stylo = derive2 { name="stylo"; version="0.6.7"; sha256="0l5msnv6sk90p3l7ma2q31yn93y1zj86y5hzzg2fws4r0pi09p19"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
+  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=[]; };
   subcopem2D = derive2 { name="subcopem2D"; version="1.2"; sha256="1yrjqg3y6i5m6k0zljq1p1pciicmc1vig3qd0wxaicz708rbp3yq"; depends=[]; };
   subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; };
@@ -11763,7 +12277,7 @@ in with self; {
   submax = derive2 { name="submax"; version="1.1.1"; sha256="0b9x55gqzw20smr3hx9izvyr0i8zv0h03hadn4c7ks7w8ga5i0kj"; depends=[mvtnorm sensitivityfull]; };
   subniche = derive2 { name="subniche"; version="0.9.7"; sha256="1jsdcaf6d38j7c0ppjyilj0jd2dbpdldw6w4prmsbmx8mh7lplww"; depends=[ade4]; };
   subplex = derive2 { name="subplex"; version="1.5-4"; sha256="10cbgbx1bgsax5z7gz6716g360xpq4mvq19cf4qqrxv02mmwz57z"; depends=[]; };
-  subprocess = derive2 { name="subprocess"; version="0.8.2"; sha256="1qyl8726vq94vqd6iyh9kca6wwxi3g7yv4b784wn2ifrm4waixxd"; depends=[]; };
+  subprocess = derive2 { name="subprocess"; version="0.8.3"; sha256="00720hj685449vhjqm9q6rrsn5jyxnxwq3pgxpbsnrhmwa697w89"; depends=[]; };
   subrank = derive2 { name="subrank"; version="0.9.9.1"; sha256="19lgw7248jq6b34i17c7vw208wsvmppni7njswd02i9xdgyjn95z"; depends=[]; };
   subsamp = derive2 { name="subsamp"; version="0.1.0"; sha256="1bfz2z2qy1war3id8qr1asygwvwxgf2hhlh075hr6bjdkxz0j0nd"; depends=[]; };
   subscore = derive2 { name="subscore"; version="2.0"; sha256="1vscmzw6ama2kc7ic6b2rfbbczcpyhp0m4dd5khg9vkyihww5b5h"; depends=[CTT irtoys]; };
@@ -11775,14 +12289,14 @@ 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.1.2"; sha256="0l9v2wqb8wsp002gc802xcawwyv56rn765ipp6d1mzds3sp438h7"; depends=[dplyr ggplot2 lubridate purrr readr rlang tidyr timeDate tsibble]; };
+  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]; };
   summariser = derive2 { name="summariser"; version="0.1.0"; sha256="0a6wyb0r1i0cynld002q96ylr58jz76n5jqjz8gm6a3csjn9qss7"; depends=[dplyr ggplot2 lazyeval plotrix]; };
-  summarytools = derive2 { name="summarytools"; version="0.8.5"; sha256="0455csyz3hd9armpw18r1lgbzbyr6i43wyampp4n0s0lr95flp46"; depends=[htmltools lubridate matrixStats pander pryr rapportools RCurl]; };
-  sunburstR = derive2 { name="sunburstR"; version="2.0.0"; sha256="1gkrgm90ps5i1k5cqdw6sbvd4jgbk4yq82gwd5m1z1jhv1shfsf4"; depends=[d3r dplyr htmltools htmlwidgets]; };
+  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]; };
   suncalc = derive2 { name="suncalc"; version="0.4"; sha256="190bnh26bl26piq6512ijrx2hygzdscryjsjyz8y4ara8bf646r3"; depends=[V8]; };
-  sundialr = derive2 { name="sundialr"; version="0.1.0"; sha256="0r6nijpj6vbz9ssrdhxn01frhahnqg4n1bsfg6d43c1smj563y6m"; depends=[Rcpp]; };
-  supc = derive2 { name="supc"; version="0.1"; sha256="1cq0lr04m409xr3i1hphww4ldr8z3kqq2gmp7hm3yp0iz2gy3m9a"; depends=[BH Rcpp]; };
+  sundialr = derive2 { name="sundialr"; version="0.1.1"; sha256="1f56hqh9ah5chwwr4ak39hc4q49hpzz398spifkv6zyd0sy8kc8s"; depends=[Rcpp]; };
+  supc = derive2 { name="supc"; version="0.2.1"; sha256="121dy7ymvxvq3ksf17hg0df74ycd2nag2z2ggnw4p2rwzj99vgc5"; depends=[BH Rcpp]; };
   supclust = derive2 { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[class rpart]; };
   supcluster = derive2 { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[gtools mvtnorm]; };
   superMDS = derive2 { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; };
@@ -11792,22 +12306,21 @@ in with self; {
   supernova = derive2 { name="supernova"; version="1.1"; sha256="0n34fkscml6ldbcr6kk8c6n4f5z4j398qn1vsp06h3b0h6sl5rrb"; depends=[]; };
   superpc = derive2 { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; };
   supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; };
-  support = derive2 { name="support"; version="0.1.1"; sha256="0031dqkjwsi7s7bmvidjnivqxlh43q0ak2jnqnzm8h7sp0kfwjwf"; depends=[BH doParallel matrixStats MHadaptive nloptr randtoolbox Rcpp RcppArmadillo]; };
+  support = derive2 { name="support"; version="0.1.2"; sha256="1ih32hhgkbrdmjprqqf1sqlijgibzsrzh37i8jfmfb8n0d6h4x5a"; depends=[BH doParallel matrixStats MHadaptive nloptr randtoolbox Rcpp RcppArmadillo]; };
   support_BWS = derive2 { name="support.BWS"; version="0.2-0"; sha256="1yfjpr9v9zsbkysm3r6zk9r0a072g038lmj9wk4014a3rk9kmm80"; depends=[]; };
   support_BWS2 = derive2 { name="support.BWS2"; version="0.1-2"; sha256="069n7kxl74v42rjxb153yk1p81izkbvi7k6r8zd5d78jx54w7igb"; depends=[]; };
   support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; };
   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]; };
-  surrosurv = derive2 { name="surrosurv"; version="1.1.24"; sha256="0c18pjkqgp5nm927jvcbgpfa4knrhnsq0492d1ysfr1li8sf9n7q"; depends=[copula eha lme4 MASS Matrix msm mvmeta optextras optimx parfm SurvCorr survival]; };
+  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]; };
   survAWKMT2 = derive2 { name="survAWKMT2"; version="1.0.0"; sha256="1cv39rf1ia4nwrri9d9izy6lxndnfwqy2vzrb9rrxga2qplxl79k"; depends=[survival]; };
   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]; };
-  survClip = derive2 { name="survClip"; version="0.2.3"; sha256="1s82z8cld6qlg6dv0l4j4vyg58ji9qp7xkg6sxd9s88fpcjdnz3g"; depends=[checkmate clipper corpcor elasticnet FactoMineR graph qpgraph rrcov survival]; };
-  survHE = derive2 { name="survHE"; version="1.0.6"; sha256="128pjnm1m12qqhnz2izwmir64m99389qjr73vcqr19dgbkbgv28c"; depends=[BH flexsurv Rcpp RcppEigen rms rstan StanHeaders xlsx]; };
+  survHE = derive2 { name="survHE"; version="1.0.64"; sha256="1vqfvmr2dza8hw61b5q0wl22b7gpca7llpq5swdclnll1narff5i"; 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=[]; };
@@ -11816,9 +12329,9 @@ in with self; {
   survRM2 = derive2 { name="survRM2"; version="1.0-2"; sha256="0pvp65c1kkbkcci4l3cvq4a5krmv58jwb9abz5225ql6jyawzlsw"; depends=[survival]; };
   survRM2adapt = derive2 { name="survRM2adapt"; version="1.0-1"; sha256="1r3jvjbc2sb7b00s95b3sdx4d99rmrnd573fx1n4914ydiggi9nn"; depends=[survival]; };
   survSNP = derive2 { name="survSNP"; version="0.24"; sha256="0mzwcp8zfqvsiapa446si9qb6wyymnw5zj6acj6f2cfjpyi76k4w"; depends=[foreach lattice Rcpp survival xtable]; };
-  surveillance = derive2 { name="surveillance"; version="1.16.1"; sha256="0pr6fy0n684ncl9hf0bp6jfahmihziyyfj2zwnqigkc4bcl091h3"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; };
+  surveillance = derive2 { name="surveillance"; version="1.16.2"; sha256="1k6wpzsagsq2ixpdhx6b4zzb5wv2j95nsmxyfwvlxkxafahx986h"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; };
   survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; };
-  survey = derive2 { name="survey"; version="3.33-2"; sha256="1c4q0005663b0y87ckmf1ra7gm2i5hnlw955pgb11bywh60hg9hl"; depends=[lattice Matrix 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]; };
   surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; };
@@ -11826,14 +12339,17 @@ in with self; {
   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-4"; sha256="0gnv6r6qrapw867gb9napa8f00dm15aw97lgn6556mn9i9k6d0k7"; depends=[Matrix]; };
+  survival = derive2 { name="survival"; version="2.42-6"; sha256="1bsxc2fir9pbvdzy9n474fkl7har606h9zhspp0z67wnjpp48g73"; 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=[]; };
   survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; };
-  survminer = derive2 { name="survminer"; version="0.4.2"; sha256="15npx3q7xf7sl7pbb1476khgfpqrvidqcb101iim3iym125sl54r"; depends=[broom cmprsk dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; };
+  survminer = derive2 { name="survminer"; version="0.4.3"; sha256="0bsjvs7q2ydxvvjka28zsgcpwabqqpvwvb8m5fhhx4rgwlwimfbf"; depends=[broom cmprsk dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; };
   survsim = derive2 { name="survsim"; version="1.1.5"; sha256="0194w1h3v4p546wibp3xyhy2r84w3p9r6ggzhlf11v8467mjy0l9"; depends=[eha statmod]; };
+  survsup = derive2 { name="survsup"; version="0.0.1"; sha256="16j7ip9qr7q3drb8jzb7ha1ni1m8mr56686blnvlcwih5yqmfkb5"; depends=[broom colorspace dplyr ggplot2 gridExtra survival]; };
   survtmle = derive2 { name="survtmle"; version="1.1.0"; sha256="0q1ym4a13xqy3lqjwg40wp28xlp1iqybwq7dd0gp6fnmx3n6373g"; depends=[dplyr ggplot2 ggsci Matrix plyr speedglm stringr SuperLearner tidyr]; };
-  survutils = derive2 { name="survutils"; version="1.0.1"; sha256="09844i5nfyn0fm5i8ca96xz8dza21shh2f89w41zh17xaxvidjsw"; depends=[broom dplyr ggplot2 glue lazyeval magrittr purrr survC1 survival]; };
+  survutils = derive2 { name="survutils"; version="1.0.2"; sha256="1ws4r5chz0cbf6vjmlj2xv9hmr968xyw8dc5g3j937xpbz40i75h"; depends=[broom dplyr ggplot2 glue lazyeval magrittr purrr survC1 survival]; };
+  survxai = derive2 { name="survxai"; version="0.2.0"; sha256="09sk7i0bsk5ql8dibqyykyv95i945bf43xpr4gv22w73zwc0n8hh"; depends=[breakDown ggplot2 pec prodlim scales survival survminer]; };
   sutteForecastR = derive2 { name="sutteForecastR"; version="0.1"; sha256="13dd0v3l3s7xb1wnpf6qvnvclzab87831z8bsxsq53vpb26xcw1b"; depends=[forecast forecastHybrid fracdiff robets]; };
   svDialogs = derive2 { name="svDialogs"; version="1.0.0"; sha256="0xqppydfawnwk84kb5qiybwbcmv38vn4imgz01mz2pnq4xb80p97"; depends=[rstudioapi svGUI]; };
   svDialogstcltk = derive2 { name="svDialogstcltk"; version="0.9-4"; sha256="16166f8i6nsg7palqmnlp5b9s91d6ja9n0zm6rcvd2fwnw2ljkr4"; depends=[svDialogs svGUI]; };
@@ -11848,10 +12364,9 @@ 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.0"; sha256="06kg9z5clsgg65gjrcb456ppdwk8cja2cmzfwlwmnz5yf3m6lk8k"; depends=[clue copula DEoptim expm ggplot2 pbapply reshape2 steadyICA tsDyn vars zoo]; };
+  svars = derive2 { name="svars"; version="1.2.1"; sha256="1kdnrwwrb903a53qr8ppwyw7p0nhgxwgpj2yyd0w248nwswfwhfz"; 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=[]; };
-  svdvis = derive2 { name="svdvis"; version="0.1"; sha256="1z3z86izl2gpxllpx56vn6kkdg9cjjikfd90hdjnfi4bmmpx50dn"; depends=[GGally ggplot2 gridExtra RColorBrewer reshape2 scales]; };
   svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; };
   svenssonm = derive2 { name="svenssonm"; version="0.1.0"; sha256="0pvay9vfrcafaq270pq6glp2b74zdfgldksl13cwdb0wk7qx7731"; depends=[]; };
   svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.3"; sha256="09gfa2943bvmjpnhnc2nr85wddkv662k30pxsqvvvq1va64rzpkc"; depends=[htmlwidgets]; };
@@ -11869,47 +12384,51 @@ in with self; {
   swamp = derive2 { name="swamp"; version="1.4.1"; sha256="01w44d7rqh6q9wpapd3g7rzllhbm2brwilmna9vk2dwqx57jyim6"; depends=[amap gplots impute MASS]; };
   swapClass = derive2 { name="swapClass"; version="1.0.1"; sha256="0wg6km261xdywakxi64dw4wwprbrkw217q4c6622z0mgm9sjgpym"; depends=[inline]; };
   swatches = derive2 { name="swatches"; version="0.5.0"; sha256="1kivscgka8gn44rjj0s5sjan1s04znnyn0nd37a74zaik0hm8zs0"; depends=[colorspace httr pack stringr xml2]; };
-  sweep = derive2 { name="sweep"; version="0.2.1"; sha256="0v6166p1h14klf1avqvry8jj3as498qnydksy0da8q1bp1sy007f"; depends=[broom devtools dplyr forecast lazyeval lubridate tibble tidyr timetk]; };
+  swdft = derive2 { name="swdft"; version="0.0.1"; sha256="0971iyyw537n24wsm7wh126zgb7b3p9161sc2ny293qzbsb7hm1g"; depends=[]; };
+  sweep = derive2 { name="sweep"; version="0.2.1.1"; sha256="0hfvgvzr5mh9niwpsr9jcly426dz457afrg4q5w13ahsasx7c9jg"; depends=[broom devtools dplyr forecast lazyeval lubridate tibble tidyr timetk]; };
   sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; };
   swfscMisc = derive2 { name="swfscMisc"; version="1.2"; sha256="08p2crsx8zi6qprs14mhdyq9x5sjlp3a46c1zzvp6741an4fy640"; depends=[ggplot2 mapdata maps reshape2 spatstat]; };
-  swgee = derive2 { name="swgee"; version="1.2"; sha256="1blfxhvcpfbc0k25xlkw8bxqdmgz3c9ksd9ww2p8k0dy5jd2z64r"; depends=[gee geepack mvtnorm]; };
+  swgee = derive2 { name="swgee"; version="1.3"; sha256="0shacrrj72c2yhnbrrryy98yvxb16882zawvfhy1hpf39gspld7n"; depends=[gee geepack mvtnorm]; };
   swirl = derive2 { name="swirl"; version="2.4.3"; sha256="1l7gwisk3sjslh6zh4cq3vxf5y84af2fr078cp4i86rw1w2j9d44"; depends=[digest httr RCurl stringr testthat yaml]; };
   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.12.7"; sha256="1ymvghjvbrbsgn49mp8f9n4kv81626pa4pv05hrx813ly8h30mmq"; depends=[RCurl RJSONIO]; };
+  switchr = derive2 { name="switchr"; version="0.13.0"; sha256="1ij97gz31gxbmd0fwsw950vhgyd1py3xr4vlh7q98ba1ldzw8dg1"; depends=[RCurl RJSONIO]; };
   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.1"; sha256="1hgxlwpb5libvv126vh01ngxqs8hlvll8xjgxw5xxhfbgsadfp1m"; depends=[lattice Matrix]; };
+  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]; };
   sybilccFBA = derive2 { name="sybilccFBA"; version="2.0.0"; sha256="0x0is1a56jyahaba6dk9inj5v248m8n46f70ynqyqp1xpiax1fkr"; depends=[Matrix sybil]; };
   sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.0"; sha256="0p3w7ipyrqrh7nf52h8qmr4fikyinm8an7npmcb7kwjd59rcy554"; depends=[MASS Matrix sybil]; };
   sylcount = derive2 { name="sylcount"; version="0.1-0"; sha256="1dxbqbjyvkg7cx234icby9fjdjz1z4l4crqd7kv8m05fv69pg224"; depends=[]; };
-  sylly = derive2 { name="sylly"; version="0.1-4"; sha256="14lw5sxrdvidk0465a7x0jz74cvqjbqv0wlqdy78qzbq4ilcmcaa"; depends=[]; };
+  syllabifyr = derive2 { name="syllabifyr"; version="0.1.0"; sha256="1pd5zjgcmpxg7xqhcljxck80pjs84ihhkr5bl4i8h2mc6xqmy1kf"; depends=[dplyr purrr stringr tibble tidyr]; };
+  sylly = derive2 { name="sylly"; version="0.1-5"; sha256="01c7mpsk32kcsjyzzv52bn8bj28lqbmyhhfa1cwhphva5c5nkqwx"; depends=[]; };
   sylly_en = derive2 { name="sylly.en"; version="0.1-3"; sha256="0jw48qin172vv7skcpvcpi9wzgav5l9afzb09hhgcxvivbz6dl93"; depends=[sylly]; };
-  symDMatrix = derive2 { name="symDMatrix"; version="1.0.0"; sha256="0xss7f7hkrf2afchccfavymylfybnp9nxawqxd2vdjni95kbd595"; depends=[]; };
+  sym_arma = derive2 { name="sym.arma"; version="1.0"; sha256="13fhmgzd50mwlnz9m6nnn4arr4jdqf5h7dgli5lk08da9wx6cy69"; depends=[]; };
+  symDMatrix = derive2 { name="symDMatrix"; version="2.0.2"; sha256="1lf0yhid47107c2vnr4g7xz4hrjb2cgr5zpgik4xf5gypli6xh6x"; depends=[bit ff LinkedMatrix]; };
   symbolicDA = derive2 { name="symbolicDA"; version="0.5-3"; sha256="1zbr8b19m3fnzx0bdajl86s6aijiycjdibf9q83wd6mgpq66jb85"; depends=[ade4 cluster clusterSim e1071 rgl shapes XML]; };
   symbols = derive2 { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; };
   symmoments = derive2 { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[combinat cubature multipol mvtnorm]; };
   synRNASeqNet = derive2 { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[GenKern igraph KernSmooth parmigene]; };
   synbreed = derive2 { name="synbreed"; version="0.12-9"; sha256="0h85z9bhzgsr783qx3zjqyi461a0q52wbqifwm3gc1kapl5irxhd"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS qtl regress]; };
   synbreedData = derive2 { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n8726qv0jlizmkvnrqwjj1q4xaxvfmj9611rm47vckx"; depends=[]; };
-  synchronicity = derive2 { name="synchronicity"; version="1.3.4"; sha256="1km5hx82gy71m5nc6pkcksv0dn32fylhg2axpdsnarrxva14mgdg"; depends=[BH bigmemory_sri Rcpp uuid]; };
+  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]; };
-  synthACS = derive2 { name="synthACS"; version="1.4.2"; sha256="069cqmp9whal7z490jh6my8fqmmc4d2mm693xi4lsci2afc5plzc"; depends=[acs data_table Rcpp]; };
-  synthpop = derive2 { name="synthpop"; version="1.4-4"; sha256="1q3vmsagdaha97182cf3ak51rjx018h8c72zv9v6slf7h71a0d53"; depends=[classInt foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; };
-  sys = derive2 { name="sys"; version="1.5"; sha256="0yskm5mzps4435yvld9nfp6i5lqdy5ckpdwydvvbyjznz5yv01x2"; depends=[]; };
-  sysfonts = derive2 { name="sysfonts"; version="0.7.2"; sha256="1jl66pyw9khi117523zanjjzdpnpgqdqx190w829xc4ljxzi8n55"; depends=[]; };
+  synoptReg = derive2 { name="synoptReg"; version="0.1.0"; sha256="1d1341b2al6qjhdx2s2ww9lfr3pz7hxc9gv41vgvh4bw8pxcd48d"; 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=[]; };
+  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]; };
   systemicrisk = derive2 { name="systemicrisk"; version="0.4.1"; sha256="1zimkyj58lk3iq5x4g6a76dain65j36s8c8jhx25sqjr5z2zmfsr"; depends=[lpSolve Rcpp]; };
+  syt = derive2 { name="syt"; version="0.1.0"; sha256="1qagd67wznyc6sfvs22lw2lwnwap1hlpf92i0ck5aif514ysi886"; depends=[Matrix partitions]; };
   syuzhet = derive2 { name="syuzhet"; version="1.0.4"; sha256="0wf4rls7v7h7zkq2k550d16aqvaij27iim85cwif7dkbinajfngi"; depends=[dplyr dtt NLP textshape tidyr zoo]; };
   tRophicPosition = derive2 { name="tRophicPosition"; version="0.7.5"; sha256="0qmkdsl0b2aw485vpbdqxdlfwg5a3i5bj4l67xv6h51fnbyfqfiz"; depends=[ArgumentCheck coda data_table ggplot2 gridExtra hdrcde MCMCglmm plyr rjags]; };
-  taRifx = derive2 { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[plyr reshape2]; };
+  taRifx = derive2 { name="taRifx"; version="1.0.6.1"; sha256="1qnp2562irhb516jfapmpg4260172ckc8jc3vxfkjsj7dnr35j6l"; depends=[plyr reshape2]; };
   tab = derive2 { name="tab"; version="3.1.2"; sha256="1vc5swfy9p3bsv5bqqgk4w81apzk6d0m1xz0cbhii7rpn7x6zh1h"; depends=[gee survey survival xtable]; };
   taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; };
   tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.2"; sha256="1q7ap1dmymf3aj5g860794jfn9zrn3qiwwcdzl95lsbpkhgyspmz"; depends=[openxlsx]; };
-  table1 = derive2 { name="table1"; version="1.0"; sha256="06cidli3k8cxzvnj1n6vysamkd3qsim2i6ly9fl7rwiyj4g64rw8"; depends=[Formula]; };
+  table1 = derive2 { name="table1"; version="1.1"; sha256="01r6zlhv3d0ggniv6aaszmzqbappy9zycayiwwlknbwrgiwkp58z"; depends=[Formula htmltools knitr]; };
   table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; };
   tableHTML = derive2 { name="tableHTML"; version="1.1.0"; sha256="0j2dk11h0dvibppyxjix4pxr6i9ji9ipzaizsr1fadrpk5xzawd5"; depends=[htmltools magrittr shiny]; };
   tableMatrix = derive2 { name="tableMatrix"; version="0.82.0"; sha256="1sskijhbqakamrk2rv7v5zpjsdi8jw0jl2z96l0vhsvsiq0cz1c8"; depends=[data_table]; };
@@ -11929,84 +12448,93 @@ in with self; {
   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]; };
   tailr = derive2 { name="tailr"; version="0.1.2"; sha256="1z47akvm2y05ih8q5ci03jm29xzp4m52shvbm4d9h2bipnq5crys"; depends=[glue rlang]; };
+  taipan = derive2 { name="taipan"; version="0.1.2"; sha256="192sy5pgq74vs31p7jfn6svdzf9mk9ybppzhp1rlki1bagmm5f1r"; depends=[shiny]; };
+  takos = derive2 { name="takos"; version="0.1.0"; sha256="0a26jmxccpyk36sah9nz7pqpkc1rd9kbwrvwh0r0zp7lwvxbjb8w"; depends=[baseline broom colorRamps data_table devEMF MASS minpack_lm pracma segmented sfsmisc smoother]; };
   tangram = derive2 { name="tangram"; version="0.4"; sha256="1yj5vwc8jkiic4zjag9k7w3j6dibqw5zsi78q6gssshsi9z0zbgy"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; };
+  tatest = derive2 { name="tatest"; version="1.0"; sha256="1yd9pdpdhxwpllnj5wxa7ly29qiw8qywx9lx0w3nizczlx35fgjy"; depends=[]; };
   tatoo = derive2 { name="tatoo"; version="1.1.0"; sha256="1dsycdp3vln1m1w3nhhrr60x8raw6gbihjpav0d4ad8qla2fq8nh"; depends=[assertthat colt crayon data_table magrittr openxlsx purrr rlang stringi withr]; };
   tau = derive2 { name="tau"; version="0.0-20"; sha256="1inpqc2cz1vvjkmp8h3jpjvnvj0y5cwbbj92jlq0322w5w45vip9"; depends=[]; };
-  tauturri = derive2 { name="tauturri"; version="0.1.1"; sha256="0v0p1avrx9vgnrli4zp6figm3s9265k9yny0acblbjlmz3z8smai"; depends=[httr magrittr plyr purrr tibble]; };
+  tauturri = derive2 { name="tauturri"; version="0.3.0"; sha256="014301f5mzy6vblqzb61bxjv46kdynmmrxjpxyvk01w1k8wkwfcn"; depends=[httr magrittr plyr purrr tibble]; };
   tawny = derive2 { name="tawny"; version="2.1.7"; sha256="1b2v0cgkmhzxy36dcdn6hnbqk6l5ac5c3myvwryf7wlp19xi786d"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; };
   tawny_types = derive2 { name="tawny.types"; version="1.1.5"; sha256="1vg0hv91dif6cfqfzrf7m1qbk57fp8v97fp88whwmvs83yd521hq"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; };
-  taxa = derive2 { name="taxa"; version="0.2.1"; sha256="0jh3isjlh6bx9mdhavg1c43aayq1zl5jqx3x4690lwgvphnzl1dn"; depends=[crayon dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr taxize tibble tidyr]; };
-  taxize = derive2 { name="taxize"; version="0.9.3"; sha256="05llhgv6a440va80fs45r8q6865q45gi4z28b1ldcln0dmx77r7c"; depends=[ape bold crul data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble wikitaxa worrms xml2 zoo]; };
+  taxa = derive2 { name="taxa"; version="0.3.1"; sha256="19bfgcibryvvqsqyjw3jgiw4raraas82w1dhkmnv9j7jny3v2677"; depends=[crayon dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr taxize tibble tidyr]; };
+  taxize = derive2 { name="taxize"; version="0.9.4"; sha256="1p5rlc93q62rk2z3qcq02xfrs4pz699qdakk05pz6g9rlbqj342m"; depends=[ape bold crul data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble wikitaxa worrms xml2 zoo]; };
   taxizedb = derive2 { name="taxizedb"; version="0.1.4"; sha256="15gj9i18ysd83v9fidrrvw938dah04i10ahi3wh5dgjs5fd5ch2s"; depends=[curl DBI dbplyr dplyr hoardr magrittr RMySQL RPostgreSQL RSQLite]; };
   taxlist = derive2 { name="taxlist"; version="0.1.5"; sha256="17b7sdjjzragi8k08304idic0p8cj095h4p9vlpfidn8k6csrkv8"; depends=[foreign stringdist taxize vegdata]; };
-  taxonomizr = derive2 { name="taxonomizr"; version="0.2.2"; sha256="0drzsbr23kr3da6bawjrz8rl976mai0vcz19fr5aypsliqz32b41"; depends=[data_table R_utils RSQLite]; };
+  taxonomizr = derive2 { name="taxonomizr"; version="0.5.1"; sha256="0a8knjyjs9w9nk9xmbny2hh5yfgmwmrj0d9wa58i28x6a7x54aq9"; depends=[data_table R_utils RSQLite]; };
+  taxotools = derive2 { name="taxotools"; version="0.0.4"; sha256="0jvzyr476s21q1n9vylrpsahwqlyx1qalpaprf8kncv8407c1lwl"; depends=[taxize wikitaxa]; };
   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]; };
-  tcR = derive2 { name="tcR"; version="2.2.1.11"; sha256="1wyxjwyba08m80g2c40sdg3d5brs3qmq8azb6vzwh2wmgqlb5400"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; };
+  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]; };
   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]; };
   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]; };
   tdthap = derive2 { name="tdthap"; version="1.1-9"; sha256="0y01x0hcf0rw06cpn4pk17b0shf4v2c9was7vfs0zhsbq8qcwx7r"; depends=[]; };
   tea = derive2 { name="tea"; version="1.0"; sha256="03wxhbgx17hl9bbzbfjmfa30q4fqszhs5y9imbp768fmzwbppn24"; depends=[eva]; };
   teachingApps = derive2 { name="teachingApps"; version="1.0.4"; sha256="0wi25wdpkz7kh8r1s42wa9kiky8ilmcg8kgw0j1caygwg0bml2fa"; depends=[actuar BH d3heatmap data_table devtools diagram DiagrammeR dplyr DT dygraphs ggplot2 knitr leaflet magrittr markdown metricsgraphics miniUI networkD3 pacman plotly radarchart Rcpp RcppEigen RcppNumerical rprojroot scales shiny shinyAce shinydashboard shinythemes threejs tidyr visNetwork yaml]; };
   teamcolors = derive2 { name="teamcolors"; version="0.0.1"; sha256="07mqsbhrsy23qc4j1w1wji36cbh6dijkp6p7g3598nlzhw7ln3aj"; depends=[]; };
   teda = derive2 { name="teda"; version="0.1.1"; sha256="0yx469jbkw9cgx73zi5mkykrdn16kn01zh524x9411314aa32avx"; depends=[]; };
   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]; };
   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.1"; sha256="0q2x09cyy4zacbgmnwd43h1rwv2g3f2rk9cbg2phsvgxqx9vfm24"; depends=[AICcmodavg broom dplyr minpack_lm nlme numDeriv rootSolve tidyr]; };
   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"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; 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.8"; sha256="1ixli2m7lbkp5pv7a8waxvhi04l41dcrrplzgdyzqi3ifaarr2sk"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; };
+  tensorflow = derive2 { name="tensorflow"; version="1.9"; sha256="0g346xzjkq7bsbdchcp6k5lzx7242vamf1zj0clgmpidqz4afhf3"; 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.0"; sha256="05gclhljflkz98hgiq5bgbqjz8icxbdq6b84bn2995cx7v0x85ds"; depends=[]; };
-  tergm = derive2 { name="tergm"; version="3.4.1"; sha256="10sanqbnqdyqafjjcwm99zfnpgrv18z4y2rgaq5wqq7nni184hfm"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; };
-  tesseract = derive2 { name="tesseract"; version="2.1"; sha256="11v4z79sdrms5in5qvg5c6bvf2lynibwzpi7ficf7w240nq23d15"; depends=[curl digest pdftools rappdirs Rcpp tibble]; };
+  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]; };
+  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=[]; };
-  testthat = derive2 { name="testthat"; version="2.0.0"; sha256="155l53kb69jga5d8c5nvdwqlvlgfmk4vzyyl4d0108j53jnlgh1v"; depends=[cli crayon digest magrittr praise R6 rlang withr]; };
-  testthis = derive2 { name="testthis"; version="1.0.3"; sha256="1q42nhp4nsazn31lxymb3zfj928ygbiv6jy7f0j4m3p02w2hqz5n"; depends=[assertthat devtools magrittr rprojroot stringi testthat usethis]; };
+  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]; };
-  texPreview = derive2 { name="texPreview"; version="1.1.4"; sha256="1xix13vh3haganyb67rrmrsy2nsk053wq83y9ky99wk5gmxpjmxf"; depends=[base64enc htmltools magick rstudioapi svgPanZoom xml2]; };
-  texmex = derive2 { name="texmex"; version="2.4"; sha256="0s3x681f1qnbgmzi5iwqpmkfzpx9gsccd3q1vz1dppzq8fbid3c2"; depends=[ggplot2 mvtnorm]; };
+  texPreview = derive2 { name="texPreview"; version="1.2.3"; sha256="0yl8y94jc6b23nmby2ff52yzgx95xma4bzd3w46az7b6pg7a2bxb"; depends=[base64enc htmltools magick rematch2 rstudioapi svgPanZoom whisker xml2]; };
+  texmex = derive2 { name="texmex"; version="2.4.2"; sha256="01qx4f5f0gf0xz85lzxxv79fp7syd7x484iw711rbnv0nw3aqwa2"; depends=[ggplot2 mvtnorm Rcpp]; };
   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.1"; sha256="0i35mfvrqz524089zysd1dyhfk6ndr1azxps01vls9rvgyw9452i"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; };
+  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]; };
-  textclean = derive2 { name="textclean"; version="0.9.2"; sha256="1xf5krbc8nr0yk63mcdlzbn3r58m4l4wgxhp54bahvn0ff8cwsjb"; depends=[data_table english glue lexicon mgsub qdapRegex stringi textshape]; };
+  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]; };
   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.2"; sha256="1lhk4ix8h138vrn2l1ivcwgv2d9i7xgccn7c6h6gxxc5dpzwdsyk"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RSpectra SnowballC stringr text2vec tm topicmodels]; };
+  textmineR = derive2 { name="textmineR"; version="2.1.3"; sha256="120zhg63q09m1fs08kivw15scvy2dc66xc9f1vrd4vgx8wlgn70b"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RSpectra SnowballC stringr text2vec tm]; };
   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]; };
-  textreadr = derive2 { name="textreadr"; version="0.7.0"; sha256="081lqqclx2dlrv341178dagd5zajndf27lbrkrv78668cdfk58xr"; depends=[antiword curl data_table pdftools readxl rvest striprtf textshape xml2]; };
-  textreg = derive2 { name="textreg"; version="0.1.4"; sha256="0k7hpvvhacz29d3mvnygg6rqmh9f3ghkcp7kjmvv9jnr2ipw2j21"; depends=[NLP Rcpp tm]; };
+  textreadr = derive2 { name="textreadr"; version="0.9.0"; sha256="04nyjrfxgwq8g3bdj12nnkia2xn2zngk1rprlkpyicrisgq36agk"; depends=[antiword curl data_table pdftools readxl rvest striprtf textshape xml2]; };
+  textreg = derive2 { name="textreg"; version="0.1.5"; sha256="0h44z5hyndnvzd9axix7gpmhbdx347dfgxw9r8w38kyw6dklbjy6"; depends=[NLP Rcpp tm]; };
   textreuse = derive2 { name="textreuse"; version="0.1.4"; sha256="0qfp7ffzb5p3k3wiw8i1zjskni8f38rzkjnss97j9f3vhhb8j4r7"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; };
   textshape = derive2 { name="textshape"; version="1.6.0"; sha256="1pl85wjq5rl25gdlh4cp0l14hn76rrmpl7l1fn7kq9lwj9yfpcs8"; depends=[data_table slam stringi]; };
   textstem = derive2 { name="textstem"; version="0.1.4"; sha256="1pbhi5ia3w16vsix2x3if51zd2v9bcv0j4lj9hfikgq1yz9zxmw2"; depends=[dplyr hunspell koRpus koRpus_lang_en lexicon quanteda SnowballC stringi textclean textshape]; };
-  textutils = derive2 { name="textutils"; version="0.1-6"; sha256="0xvsd6pfg4kv40l14xcvmirqiq8rmky4s8v8diagzri3a7i45nqn"; depends=[]; };
-  tfdatasets = derive2 { name="tfdatasets"; version="1.5"; sha256="1ik6rzfnjmm54m7s2rvp1bq5jk0k2vl631bz3db3dk639jndiz6a"; depends=[magrittr reticulate rlang tensorflow tidyselect]; };
+  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.5"; sha256="069j6d5i19yc3nhxrrzwzassv4fv3bdhygxvqqc49nndyf5vwwbj"; depends=[magrittr progress purrr reticulate rlang tensorflow tfruns tibble tidyr tidyselect]; };
+  tfestimators = derive2 { name="tfestimators"; version="1.9.0"; sha256="0yfnwiszxypzinzl2qzbl317lm1xfshg4228c7h6z8im5da59x9p"; depends=[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.3"; sha256="02ib3k3jsmskk5cdxl2nyvnvpn7nlkgjb353z7qlwal0fgrssaln"; depends=[base64enc config jsonlite magrittr reticulate rlang rstudioapi tidyselect whisker yaml]; };
+  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=[]; };
   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]; };
@@ -12018,34 +12546,40 @@ in with self; {
   thgenetics = derive2 { name="thgenetics"; version="0.4-2"; sha256="1314gry3xs9v4jy13g08q16qy4ax3s0bc7d74gi0wbpkgdrk3lql"; depends=[]; };
   thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; };
   thinkr = derive2 { name="thinkr"; version="0.13"; sha256="1j43mjznriq8d5ki50rb41vgmzj2gq8sahvhj11742ggxd0bzvdb"; depends=[assertthat devtools dplyr ggplot2 lazyeval lubridate magrittr officer rvg stringi stringr tidyr]; };
+  thor = derive2 { name="thor"; version="1.0.1"; sha256="02yyn8sp2s8qhxhwhc4f4921014c5q70b5x2r00jbqlwg069szj2"; depends=[R6 storr]; };
   threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
   threejs = derive2 { name="threejs"; version="0.3.1"; sha256="1s3rdlzy7man6177ycayg6xsh6k8y1r9rdj9yzn3b93j2rs0nxbi"; depends=[base64enc crosstalk htmlwidgets igraph]; };
   threewords = derive2 { name="threewords"; version="0.1.0"; sha256="083y5i4qyl1wj017wy5ywl2yx9wvrpjl9g9k9clvnrbwzbycx2cg"; depends=[httr]; };
   threg = derive2 { name="threg"; version="1.0.3"; sha256="1ja0w4hhdkw3b1cipbpw8ym27k5lh2m7gibd74mj6gij7rpixrnb"; depends=[Formula survival]; };
   thregI = derive2 { name="thregI"; version="1.0.4"; sha256="0zddd32fnfi98zwq08akkvhkg3c66sj3jii6ap8p1m9a0wg2k2k3"; depends=[Formula survival]; };
   threshr = derive2 { name="threshr"; version="1.0.0"; sha256="1zrhmqpz3k2gyddrzg96yyyc1jffj3aic2dmbidxxc97b9g5hi53"; depends=[revdbayes rust]; };
+  thriftr = derive2 { name="thriftr"; version="1.0.3"; sha256="08d9xi0czy8ci0aci75prjvfhpkmdw23qvcviap9kz2hr9x23183"; depends=[R6 rly stringi]; };
   thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; };
   tibble = derive2 { name="tibble"; version="1.4.2"; sha256="05svbjkm1xqv56ybjgsqqg2pp8nn6hams1yxcr8aanbhzx9h6rqi"; depends=[cli crayon pillar rlang]; };
   tibbletime = derive2 { name="tibbletime"; version="0.1.1"; sha256="15rp66p4pgiv7fd0rx1pzqlpsg4i4j5j368cwqm1mf1m4xknz6yy"; depends=[assertthat dplyr glue hms lubridate purrr Rcpp rlang tibble zoo]; };
   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.1.3"; sha256="1yk9abn21ycfdr1h43shjaymga5j9z862mp1zbwj2wbxxv6m5pp7"; depends=[dplyr forcats ggplot2 magrittr mclust purrr readr rlang stringr tibble tidyr]; };
-  tidyRSS = derive2 { name="tidyRSS"; version="1.2.4"; sha256="0dvpaawwm6jbwxiilxllzmifjwx9spbl57jmi8lkcq948abn84vg"; depends=[dplyr httr jsonlite lubridate magrittr purrr sf stringr testthat tibble xml2]; };
+  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]; };
+  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.4.6"; sha256="1czfdwm5bn0xpqm43mvb5bd30m5kdxikaq21gxkj41r78z69qncl"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; };
+  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]; };
-  tidyhydat = derive2 { name="tidyhydat"; version="0.3.4"; sha256="03kjcvh6g6xwd72fm8yyflyy72zm6fd8d0rlb6wabzq7hbzhfpp0"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite 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]; };
   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.1"; sha256="0485f19mkkglc4bv57y6bm6l9rfgd878hsz2xdg1nwgbqchjhgix"; depends=[dplyr glue magrittr purrr Rcpp rlang stringi tibble tidyselect]; };
-  tidyselect = derive2 { name="tidyselect"; version="0.2.4"; sha256="1592dbzawhd1hpsp9919l4sifyiaaj6xr7lnhsbwa6jwmmb0xcsw"; depends=[glue purrr Rcpp rlang]; };
+  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]; };
-  tidytext = derive2 { name="tidytext"; version="0.1.9"; sha256="1hkxg23cc44496w8nvrm1zsbk05fhk423k12ss6ay2da3n8khi0f"; depends=[broom dplyr hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; };
+  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]; };
   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]; };
@@ -12053,7 +12587,7 @@ in with self; {
   tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; };
   tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; };
   tigerstats = derive2 { name="tigerstats"; version="0.3"; sha256="12wrghipgypkhwwkmaxb6n0qx9fgxk82dc6wlh56rblsvciv2hj0"; depends=[abd ggplot2 lattice manipulate MASS mosaic mosaicData]; };
-  tigger = derive2 { name="tigger"; version="0.2.11"; sha256="1kbqlfr3lsiiv0l7dzahna706zb4mx0gfx91220n2ckfc81pyrv5"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators lazyeval tidyr]; };
+  tigger = derive2 { name="tigger"; version="0.3.1"; sha256="1ay8al764adpzabwsinxg97y2mz28k6y1m8ckfxhi9h11az23hid"; depends=[alakazam doParallel dplyr foreach ggplot2 gridExtra gtools iterators lazyeval rlang shazam stringi tidyr]; };
   tightClust = derive2 { name="tightClust"; version="1.1"; sha256="0vqkp2g6z8y3b6dhzglmacjhf2qi1sg80kb941mwfafin2k40zbm"; depends=[]; };
   tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.5"; sha256="0izgx1khci6qc6pz85dxj75kzxvpr30l0vhcv9476jrcbwqs4k8m"; depends=[DBI RSQLite]; };
   tigris = derive2 { name="tigris"; version="0.7"; sha256="0azfp8ahf63a10862669wsamf0270rcyrmknc331vjs52b3qlrvl"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; };
@@ -12074,8 +12608,8 @@ in with self; {
   timeordered = derive2 { name="timeordered"; version="0.9.9"; sha256="0rfga5i6kckmlz2dzqb1pp634dl93wxp7v3kisxlbjl7mgnbck3k"; depends=[igraph plyr]; };
   timereg = derive2 { name="timereg"; version="1.9.2"; sha256="0ddckk8vrfkk4kwlrjms6niry6g6c8dz0yf96z2kq03jgs06kfdh"; depends=[lava numDeriv survival]; };
   timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
-  timeseriesdb = derive2 { name="timeseriesdb"; version="0.2.1"; sha256="0150zs8c8184jzry33aki21prmpnxp3rclp84q6igwxi4grdhlr0"; depends=[DBI reshape2 RJSONIO RPostgreSQL shiny xts zoo]; };
-  timetk = derive2 { name="timetk"; version="0.1.1"; sha256="0m8l9ivww5aykdfab6bk9khy7jqkd3yrzbz2r78xnsfzipa9bzmk"; depends=[devtools dplyr forecast lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; };
+  timeseriesdb = derive2 { name="timeseriesdb"; version="0.4.1"; sha256="1ghb3lg63fs9zx34l5qczv39mdccnmqzlc74l1zhb8qmsg8sm1g2"; depends=[data_table DBI jsonlite openxlsx RPostgreSQL shiny xtable xts zoo]; };
+  timetk = derive2 { name="timetk"; version="0.1.1.1"; sha256="0ca6xnsidc98yjb52gbafvfgxzdgszj8l9hvc77mwgc33g0ydvs1"; depends=[devtools dplyr forecast lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; };
   timetools = derive2 { name="timetools"; version="1.14"; sha256="13jchgd9fc8hxj74wm1kg4rwcng4yxblkq04i33djsqghgb5f9mj"; depends=[]; };
   timetree = derive2 { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; };
   timevis = derive2 { name="timevis"; version="0.4"; sha256="08caa5gilh1c0z41lm3ghf6cpnlsdjfm1v7ha73jxv1655kznmpx"; depends=[htmltools htmlwidgets jsonlite magrittr rmarkdown shiny]; };
@@ -12084,46 +12618,48 @@ in with self; {
   tinsel = derive2 { name="tinsel"; version="0.0.1"; sha256="0n1x0cf4x6cq1yks0444nxd9snga4m6inc5lfvb7k96fzjb3xgbp"; depends=[]; };
   tint = derive2 { name="tint"; version="0.1.0"; sha256="1hczc2nrm8xgvw3igkfnlqyz73686l447kigsrd6m796v8ny1gbf"; depends=[htmltools knitr rmarkdown]; };
   tinyProject = derive2 { name="tinyProject"; version="0.5"; sha256="10sllhjcla4pfgp5n1y5vi318q9bcy82j88rx3k1sgzmbq1nc1c2"; depends=[brew devtools]; };
-  tinytex = derive2 { name="tinytex"; version="0.5"; sha256="1pg4jfyvandjwz3lmr38pbqi9d045iwkk3xklhsfhhxq6aviq9p7"; depends=[]; };
-  tiobeindexr = derive2 { name="tiobeindexr"; version="0.1.0"; sha256="045b0c0mn3qlasclpzc2k3x1xlmcdvg2ixc2n9m6gjmhp2fdm499"; depends=[rvest xml2]; };
+  tinytex = derive2 { name="tinytex"; version="0.9"; sha256="08w5hyq3ysh631d5whgcfv1bb007cdc0bjhb83vwmhazs6rgvyjy"; depends=[xfun]; };
+  tiobeindexr = derive2 { name="tiobeindexr"; version="0.1.1"; sha256="09vw83hkf7lgd3xyhbmqkyv57g3dz856230xkf8630jiicfvcg3b"; depends=[rvest xml2]; };
   tipom = derive2 { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; };
   tippy = derive2 { name="tippy"; version="0.0.1"; sha256="0kkyi4s4ffpyjyfl89cd5y788ab1p253rx179k422y3y1z6w1md7"; depends=[htmltools htmlwidgets jsonlite shiny]; };
   tipr = derive2 { name="tipr"; version="0.1.1"; sha256="138xmkfad0xjrmr9v3ladbwsyknyad27wxcav03n6f72plhxmxb6"; depends=[broom purrr tibble]; };
   tis = derive2 { name="tis"; version="1.34"; sha256="01bpl8q2n49wpr2gghkcv1zf16b3375xa71mv0q7wwn0da3n7m0n"; depends=[]; };
   titan = derive2 { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[boot lattice MASS]; };
   titanic = derive2 { name="titanic"; version="0.1.0"; sha256="0mdmh0ciwfig00847bmvp50cyvj8pra6q4i4vdg7md19z5rjlx3j"; depends=[]; };
+  titeIR = derive2 { name="titeIR"; version="0.1.0"; sha256="047vidn3zydbjijwgz6qm2d9j2ny8ng2sv5jzm8zb300y7k2426c"; depends=[Iso]; };
   titrationCurves = derive2 { name="titrationCurves"; version="0.1.0"; sha256="0z127sihd262mdik46sq9vcf05s7jsqmkpm3p4d779viw74bl768"; depends=[]; };
   tkRplotR = derive2 { name="tkRplotR"; version="0.1.1"; sha256="0fr30c2xjgpjh0pkqv0m7g413wkzzffbak7ak26k7bsi2ls341qa"; depends=[]; };
   tkrgl = derive2 { name="tkrgl"; version="0.8"; sha256="1c5jiahqpf3nfybkzmks785dlkchjdisvknxkb0biv3xj9nzgz14"; depends=[rgl]; };
-  tkrplot = derive2 { name="tkrplot"; version="0.0-23"; sha256="1cnyszn3rmr1kwvi5a178dr3074skdijfixf5ln8av5wwcy35947"; depends=[]; };
+  tkrplot = derive2 { name="tkrplot"; version="0.0-24"; sha256="04gk48vm8ilj1n3b3ir66pcfv504ra4rlgc0ll4ixbnp6w566wr8"; depends=[]; };
   tlemix = derive2 { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; };
   tlm = derive2 { name="tlm"; version="0.1.5"; sha256="1iw08pa70nb25fnv64834s5c8vl456a2rcng7x6v9vs5q37610g6"; depends=[boot]; };
   tlmec = derive2 { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; };
-  tm = derive2 { name="tm"; version="0.7-4"; sha256="1vvc0arl1w5g8r8bp5w95w79d7hnyfvkhsw5nq2qxql1sjsq69ya"; depends=[BH NLP Rcpp slam xml2]; };
+  tls = derive2 { name="tls"; version="0.1.0"; sha256="183b5m70s2whlgp9s1gb4xnylhlp4hnh3lw6b8f2vx4kahaid763"; depends=[]; };
+  tm = derive2 { name="tm"; version="0.7-5"; sha256="05x3kj6dxffcfyn42q2fw9bby5f4wdmslc3ww1dl0r09pz950cax"; depends=[BH NLP Rcpp slam xml2]; };
   tm_plugin_alceste = derive2 { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; };
   tm_plugin_dc = derive2 { name="tm.plugin.dc"; version="0.2-8"; sha256="0z843i2wlmx75748p95jz3j45d9bzmlmqa3awgya24k7bdhpd6kd"; depends=[DSL NLP slam tm]; };
   tm_plugin_europresse = derive2 { name="tm.plugin.europresse"; version="1.4"; sha256="03qi9rkfwgjvir4cjpi9imc8zaldvan42v9lqfr5d6zhr0ajy6wx"; depends=[NLP tm XML]; };
   tm_plugin_factiva = derive2 { name="tm.plugin.factiva"; version="1.7"; sha256="1zcddarjd083p3sly49wvsnbn6bmpx5wd1bqm3acgydxk8y84nif"; depends=[NLP rvest tm xml2]; };
   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.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; };
+  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]; };
-  tmap = derive2 { name="tmap"; version="1.11-2"; sha256="1cinbsfhi8pngidxp3brmba1willknavlrpjzywm85wp7973y045"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer rgdal rgeos sp spdep tmaptools]; };
-  tmaptools = derive2 { name="tmaptools"; version="1.2-4"; sha256="1dymngn3hrpky5v767lghijlbagmz57dqrkw57r0gy8a9k06bsx8"; depends=[classInt dichromat geosphere KernSmooth magrittr osmar raster RColorBrewer rgdal rgeos rmapshaper sp spdep XML]; };
+  tm1r = derive2 { name="tm1r"; version="1.1.0"; sha256="0vzl1w5x1gpbfkxkqhf6lafvnqzh7z4ahhd38g9a7miw27c60a5a"; 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]; };
   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]; };
-  tmlenet = derive2 { name="tmlenet"; version="0.1.0"; sha256="1pg9w7yci9j0m1cxi0nwdpp6jwap0b7ql4xkh25kjbq3w5r8w8pr"; depends=[assertthat data_table Matrix R6 Rcpp simcausal speedglm stringr]; };
   tmod = derive2 { name="tmod"; version="0.36"; sha256="054kg3rwcmrn1y1x1ba8wflb6m76nmf69g4yj3x1vw0qjjs421nh"; 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=[]; };
   tmvtnorm = derive2 { name="tmvtnorm"; version="1.4-10"; sha256="1w3kmpx25l7rb80vpclqq4pbbv12qgysyqxjq3lp55l9nklkb7qs"; depends=[gmm Matrix mvtnorm]; };
   tnam = derive2 { name="tnam"; version="1.6.5"; sha256="0jbwnsnn6875yprmh6y2i0bvr875hfsg7wfsj6ydmjpr5cpqqk56"; depends=[igraph lme4 network Rcpp sna vegan xergm_common]; };
   tnet = derive2 { name="tnet"; version="3.0.14"; sha256="05cc6jrkjbwxzmgzq30h63xzhlgq8f0l3wx2q54vrv0wpvlvfphn"; depends=[igraph survival]; };
   toOrdinal = derive2 { name="toOrdinal"; version="1.0-0.0"; sha256="1y46rcm6v2c5n71hdf5rgsgvy913wiazmml60mlxqb70dvz42649"; depends=[crayon testthat]; };
-  toaster = derive2 { name="toaster"; version="0.5.5"; sha256="0ga4l3zp422scrgvz701rjznn013vhsbp4gh7v1inqp7kpxafky9"; depends=[foreach GGally ggmap ggplot2 ggthemes memoise network plyr RColorBrewer reshape2 RODBC scales slam wordcloud]; };
-  togglr = derive2 { name="togglr"; version="0.1.3"; sha256="033d4mcl2w7nbjmaa5bc28skd63x34k4k4ib94nf11iwdj7bipkw"; depends=[assertthat dplyr getPass glue httr jsonlite keyring lubridate magrittr prettyunits purrr rstudioapi]; };
+  togglr = derive2 { name="togglr"; version="0.1.33"; sha256="105c9vxa67bqccj31ksk5myfd0v7v0wbz6qqjhxqndlg7v6ggfzc"; depends=[assertthat dplyr getPass glue httr jsonlite keyring lubridate magrittr parsedate prettyunits purrr rstudioapi]; };
   tokenizers = derive2 { name="tokenizers"; version="0.2.1"; sha256="006xf1vdrmp9skhpss9ldhmk4cwqk512cjp1pxm2gxfybpf7qq98"; depends=[Rcpp SnowballC stringi]; };
   tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; };
   tolerance = derive2 { name="tolerance"; version="1.3.0"; sha256="17qh4ad1f3fbcpwlxxqh8qr9bnwjcl4yxk0l3fkbr6b2l4rc5p86"; depends=[rgl]; };
@@ -12132,9 +12668,11 @@ in with self; {
   topmodel = derive2 { name="topmodel"; version="0.7.3"; sha256="15w9id90d6l0i0ji3ln3sxnpispb6pgabk4waysqn0nh6y4lfdgb"; depends=[]; };
   topologyGSA = derive2 { name="topologyGSA"; version="1.4.6"; sha256="0vas7qab5a86jb277ql63qjvfvx7iqqbcrwky7iyr0s8p8p794ia"; depends=[fields graph gRbase qpgraph]; };
   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.3.0"; sha256="0i7srsfhskfcq7fdc3sq2rq2p6x508pwgbig86l92zki3ljm7qgs"; depends=[data_table magrittr purrr stringr]; };
-  touch = derive2 { name="touch"; version="0.1-3"; sha256="1zzc4h6y0xmr3p7jl0vlvn4yswxz5akgvz8laxgmjgqzk926g9jl"; depends=[stringr]; };
+  totalcensus = derive2 { name="totalcensus"; version="0.5.0"; sha256="0qmx1vmkvywkdl837vvyx8wl2ldab80m9gks2dfcqfancl8ijkm8"; 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]; };
@@ -12146,23 +12684,25 @@ in with self; {
   tracer = derive2 { name="tracer"; version="1.0.0"; sha256="1jdh4ljcz7d0w2y5miggqkvv397jdx7fn108hbjw93af2gnh698q"; depends=[clisymbols crayon prettycode]; };
   tracheideR = derive2 { name="tracheideR"; version="0.1.1"; sha256="1x1jwzgs2aqb3k17mm9mhfhnbwcmilhkjaz9rl40rcg84xjqdrpl"; depends=[tgram]; };
   track = derive2 { name="track"; version="1.1.9"; sha256="1d0hab7xyayyhyyrbv8nvpka1kzry4yx10fg8aqwkca3nm7n2q3c"; depends=[]; };
-  trackdem = derive2 { name="trackdem"; version="0.4.1"; sha256="0r33ph7vk5i4nl3bw4642cpy743arly9xmn3n5jk2961q80m0kq5"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools shiny]; };
-  trackeR = derive2 { name="trackeR"; version="1.0.0"; sha256="0z200jlkgcdxwss0ckbh3vqcfw56fi7pivr9vzf4rkwyf2n6v25s"; depends=[fda ggmap ggplot2 gridExtra gtable jsonlite leaflet raster RSQLite scam XML zoo]; };
-  trackr = derive2 { name="trackr"; version="0.7.5"; sha256="1achrnkqnpdjp2vr1s7xsl8fdfdyifgv5vr00b3xq9pkr4jggj6z"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools knitr lattice miniUI RJSONIO rmarkdown rsolr shiny]; };
+  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]; };
   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]; };
   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.1-4"; sha256="0vwfbx5s8ywasxwv8cld4s6r96vlyknxipp49rsfpqn94nawhwnx"; depends=[lattice sp spacetime]; };
+  trajectories = derive2 { name="trajectories"; version="0.2-0"; sha256="0zd2a57pfc6aamh6d3n79sxlsvdwzrnq77xsfjyil4kvgh9ajd9c"; depends=[lattice sp spacetime]; };
   trajr = derive2 { name="trajr"; version="1.1.0"; sha256="1wfncd3ays8wqz8hhwz46diyac49ivz31qm1rvy1gkbw71icmnd7"; depends=[plotrix signal]; };
-  tram = derive2 { name="tram"; version="0.2-2"; sha256="1lyk2srbj5axh2h8y54sxn5l36sa9q9nkkb7vvbhms5dinld1z6j"; depends=[basefun Formula mlt multcomp sandwich survival variables]; };
+  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]; };
   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=[]; };
   transport = derive2 { name="transport"; version="0.9-4"; sha256="0ham0cla4qwfd6fqyckpdl2n2gm3qnl7ry1xi9kjvbajlcc0xwi2"; depends=[Rcpp]; };
   trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
+  trawl = derive2 { name="trawl"; version="0.2.1"; sha256="1ns4nk8zdnl2z9clc2q38sbb1ijkj86lcifxq7d111mcwsmpb6fi"; depends=[DEoptim MASS rootSolve Runuran squash TSA]; };
   treatSens = derive2 { name="treatSens"; version="2.1.3"; sha256="159dpd4wg0i4cidg40lad665sm3j4qch8d1y3k9chwggbhcad5jn"; depends=[BH dbarts lme4 mvtnorm nlme Rcpp RcppEigen]; };
   tree = derive2 { name="tree"; version="1.0-39"; sha256="0q2dnl1hvyaw76lkfq0i9d92z68r29ssb3a9j8jknnzx896x055x"; depends=[]; };
   tree_bins = derive2 { name="tree.bins"; version="0.1.1"; sha256="1flrkhdqimsn8dxn97xzl1fykx916i1dis1bfany44yk0cjmd85g"; depends=[data_table dplyr rpart rpart_utils]; };
@@ -12173,27 +12713,29 @@ in with self; {
   treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; };
   treedater = derive2 { name="treedater"; version="0.2.0"; sha256="18y1nbpinpcnczyn0kwlcnhbmnxv7814ms6l5qfikdqrxd2gx3si"; depends=[ape limSolve]; };
   treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; };
-  treeman = derive2 { name="treeman"; version="1.1.2"; sha256="0imwg4wi85gjhbhpym5gs0my8kacx28l74m5xbfwqdi4gxpz3kkc"; depends=[ape bigmemory plyr RJSONIO stringr]; };
+  treeman = derive2 { name="treeman"; version="1.1.3"; sha256="0xvazizpi3dbdgjd48ff4kg4dhsi2yzbnkk43pgyi21zii673yyn"; depends=[ape bigmemory plyr RJSONIO stringr]; };
   treemap = derive2 { name="treemap"; version="2.4-2"; sha256="15bdgkdwryb55v82b3hpcx4ykfg5z7zf10h0wwknf6kl1kn34v90"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
-  treemapify = derive2 { name="treemapify"; version="2.5.0"; sha256="0s8qrm2ifbpm31zwyc2f2f6jyc04r06vy6vgq3k99aq67mz6krdq"; depends=[ggfittext ggplot2]; };
+  treemapify = derive2 { name="treemapify"; version="2.5.2"; sha256="0iraqkvlk97xk8iv23nvcb144h195l3kbis3lm4r58prlgffyac3"; depends=[ggfittext ggplot2]; };
   treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; };
   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=[]; };
-  trelliscope = derive2 { name="trelliscope"; version="0.9.8"; sha256="1581ss5c3f7mnv6s3p9f8kfwnks0l80kxwpxv9mq61w3lf9fksm2"; depends=[base64enc curl data_table datadr digest DistributionUtils ggplot2 hexbin htmltools htmlwidgets jpeg jsonlite lattice png rsconnect shiny]; };
+  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.0"; sha256="06yifqbsvxbmk5gld4z2nnyhf59v8ks5xjwacmb25mv9r6bn388b"; depends=[extraDistr]; };
-  trialr = derive2 { name="trialr"; version="0.0.1"; sha256="0v274a4w9pamlp9y7xs8hw783ib7z3p19gx94dciyvgm2wj9h7di"; depends=[BH gtools Rcpp RcppEigen rstan rstantools StanHeaders]; };
+  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]; };
   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.6"; sha256="0sx6hyfyg8x0vxq4l4gvv5kb8afrbjp3qk3s48l85vf5v1chwnhf"; depends=[bazar dplyr lazyeval magrittr rlist rstudioapi]; };
-  tricolore = derive2 { name="tricolore"; version="1.0.3"; sha256="0lycsb29havx911q0fv4r184nr81w1c7yvy4sn6jqg35g2p1qqdv"; depends=[assertthat dplyr ggplot2 ggtern shiny]; };
+  tribe = derive2 { name="tribe"; version="0.1.7"; sha256="1k12yzicf3p5wpgzpsv4kk5xzrdfx712z67kj9xmcr1mbs8l5skb"; depends=[bazar dplyr lazyeval magrittr rlist rstudioapi]; };
+  tricolore = derive2 { name="tricolore"; version="1.2.0"; sha256="0mv72lh5z8drdn96nb39dz9gnzia6vm6vbl8z6ldmd952x727y0a"; depends=[assertthat dplyr ggplot2 ggtern shiny]; };
   triebeard = derive2 { name="triebeard"; version="0.3.0"; sha256="1hqyz57gph02c9fdc07lxz113bbklif3g18sw8jan6pakhhdc7dz"; depends=[Rcpp]; };
   trifield = derive2 { name="trifield"; version="1.1"; sha256="0xk48fkd5xa3mfn3pwdya0ihpkwnh20sgj3rc7fmzjil47kqscvy"; depends=[]; };
+  trigpoints = derive2 { name="trigpoints"; version="1.0.0"; sha256="1hckjh2gb0fvd2c8x6mj0idpk3im7b831y7mbli1hqhry6qqdw15"; depends=[sf tibble]; };
   trimTrees = derive2 { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; };
-  trimcluster = derive2 { name="trimcluster"; version="0.1-2"; sha256="0lsgbg93hm0w1rdb813ry0ks2l0jfpyqzqkf3h3bj6fch0avcbv2"; depends=[]; };
+  trimcluster = derive2 { name="trimcluster"; version="0.1-2.1"; sha256="0013bpyq6mkvjn38qsmwnsxfiwxgwngnqxycxvgpgmiadhm8fjmn"; depends=[]; };
   trimr = derive2 { name="trimr"; version="1.0.1"; sha256="0gcn18nwxmax9c35is0nldyh74cw8rg3gj60cixzs9qjnpb9xx3d"; depends=[]; };
+  trinROC = derive2 { name="trinROC"; version="0.2"; sha256="1hdqf845sb44wrzjb0lk1n24zcf9psv7ck6cwvpjvlwscrqbfd0p"; depends=[ggplot2 gridExtra rgl]; };
   trioGxE = derive2 { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[gtools mgcv msm]; };
   trip = derive2 { name="trip"; version="1.5.0"; sha256="1qdq3hbqqaa0cmb47ssg3pr3jksni7g4xsc7bsj6wwdw62d9wzf6"; depends=[maptools MASS raster sp spatstat]; };
   tripEstimation = derive2 { name="tripEstimation"; version="0.0-44"; sha256="1ylpyzlqr6l5haxq4icnlxw6vgvc2lsfz5sm2wqqm4m6h3p0i6s6"; depends=[lattice mgcv rgdal sp zoo]; };
@@ -12201,24 +12743,24 @@ in with self; {
   triversity = derive2 { name="triversity"; version="1.0"; sha256="1bar2bpy8jvj91jmzzdwy6rlvirsbxrzqnx4r825irqhc69gc53r"; depends=[data_tree Matrix]; };
   tropAlgebra = derive2 { name="tropAlgebra"; version="0.1.1"; sha256="1idvhxhw2f6z8iq0nfdj6jmzy8913vid84rvln6rx2dkzw3s9wnl"; depends=[]; };
   tropicalSparse = derive2 { name="tropicalSparse"; version="0.1.0"; sha256="1ay6i3pzz5lpvznxqln31mijp86p6z0df7rvp0gm4lxvn294m7f8"; depends=[]; };
-  tropr = derive2 { name="tropr"; version="0.1.2"; sha256="1nm97sqmj4nfy7h8z58gmd9ipyrkw6skh2wx2g3ivm9pn3m50bwl"; depends=[digest httr magrittr rvest stringr xml2]; };
   trotter = derive2 { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; };
-  trtf = derive2 { name="trtf"; version="0.3-2"; sha256="16nsrg68vn9p4s5al7fg6fg02cr3ccswzmhig7k4irprsnhdy4fr"; depends=[Formula libcoin mlt partykit sandwich variables]; };
+  trread = derive2 { name="trread"; version="0.2.5"; sha256="0rygk71qrp9k3hw3fq80q5kf9fwwfpwlgl268ij2x84n399g16p2"; depends=[assertthat dplyr here htmltools httr magrittr readr scales stringr tibble]; };
+  trtf = derive2 { name="trtf"; version="0.3-3"; sha256="1jvbh4c1s8nd4yf04i2rmrzx6rw92imdyp41wl40097133x9a0fb"; depends=[Formula libcoin mlt partykit sandwich variables]; };
   trueskill = derive2 { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; };
   truncSP = derive2 { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[boot truncreg]; };
   truncdist = derive2 { name="truncdist"; version="1.0-2"; sha256="02ihw4ixhadwr3sqm6r264i8vpcaz8pn69vkzabd8fwqvn5vcj5q"; depends=[evd]; };
   truncgof = derive2 { name="truncgof"; version="0.6-0"; sha256="0b499i9zjwvva5jfl9fj02jjrgy8myxqfjwa0cjg0jrpgxczgwg8"; depends=[MASS]; };
   truncnorm = derive2 { name="truncnorm"; version="1.0-8"; sha256="0zn88wdd58223kibk085rhsikl4yhlrwiyq109hzjg06hy6lwmj9"; depends=[]; };
-  truncreg = derive2 { name="truncreg"; version="0.2-4"; sha256="1rmf1v2khsx82yzyyk51k7fbnbchf21lj9yqrays1z2mx3p1l1fc"; depends=[maxLik]; };
+  truncreg = derive2 { name="truncreg"; version="0.2-5"; sha256="1scbjh5k1b8cjjavax08grlxdfs75s63dss0ifpz4d0axc4nm3iy"; depends=[maxLik]; };
   trust = derive2 { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfdapwdxas0llg954hlcvgki9al5mlg3"; depends=[]; };
   trustOptim = derive2 { name="trustOptim"; version="0.8.6.2"; sha256="1nsl8jd6cna52b5dd92jw3sh84jqpg7gazskn7166bcjbph19bf7"; depends=[Matrix Rcpp RcppEigen]; };
   tryCatchLog = derive2 { name="tryCatchLog"; version="1.0.2"; sha256="0452xcfv98d2nfdhi9l2033s381lsa1kjghmrk05d3kc88d22np7"; depends=[futile_logger]; };
-  tsBSS = derive2 { name="tsBSS"; version="0.5.1"; sha256="0hysb132cjymlqg5bcsqdvii7kyx3rh07c4bsds636j1cypi86kd"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo]; };
+  tsBSS = derive2 { name="tsBSS"; version="0.5.2"; sha256="00brzy0dkvdwrsf5jlpyp6ggwc2wkmdkb3l6h8fx1i3lmhnaqhkg"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo]; };
   tsDyn = derive2 { name="tsDyn"; version="0.9-48"; sha256="01yqfd156ffnxy9wyd3s9vkpkc9n0davs1cq606sbpvvkmphnws3"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
   tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
   tsPI = derive2 { name="tsPI"; version="1.0.2"; sha256="0lw4s7gxn4xldsk5f3dz27bb9jywa14195703b5q1497h9j966gk"; depends=[KFAS]; };
   tsSelect = derive2 { name="tsSelect"; version="0.1.8"; sha256="0ysijzhhwaj5n7h50jacshnla6d0h61q0f6lj19ic0lwvlz4yazy"; depends=[forecast]; };
-  tsallisqexp = derive2 { name="tsallisqexp"; version="0.9-2"; sha256="19535zlr6gjg45f8z6hm98pamgn20z19m8qb63997vbj4azsrjfv"; depends=[]; };
+  tsallisqexp = derive2 { name="tsallisqexp"; version="0.9-3"; sha256="0mzqplsj2w4a7jnav43afyk8ymy6p444j7km6kc8c2g4aifpgxcb"; depends=[]; };
   tsbox = derive2 { name="tsbox"; version="0.0.3"; sha256="1dcfp0lg6fvhhkspgk9a41crnfq7gx50ll4a4a0qil795349srnj"; depends=[anytime data_table]; };
   tsbridge = derive2 { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; };
   tsbugs = derive2 { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; };
@@ -12235,17 +12777,18 @@ in with self; {
   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.3.0"; sha256="0rakw6fwkxlvdwzw5cj31a6dkq88jr2ffrkdwc41vasdxzf6xwrc"; depends=[dplyr lubridate pillar purrr Rcpp rlang tibble tidyr tidyselect]; };
+  tsibble = derive2 { name="tsibble"; version="0.5.3"; sha256="0i026q33zsv184rbywbmcd8m7cilg89m7ai0n1m74z6c57zs8lc0"; 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]; };
   tsne = derive2 { name="tsne"; version="0.1-3"; sha256="0s8cv2pndkddq62rzlgzgfdjp1vjv5hz5i5957sllnb97vbzbzb6"; depends=[]; };
   tsoutliers = derive2 { name="tsoutliers"; version="0.6-6"; sha256="0q4lkqasnsps8lzpiyk074nfhv29sbma080729c8l3ba1sa9pmyn"; depends=[forecast KFKSDS stsm]; };
   tspmeta = derive2 { name="tspmeta"; version="1.2"; sha256="028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd"; depends=[BBmisc checkmate fpc ggplot2 MASS splancs stringr TSP vegan]; };
   tsqn = derive2 { name="tsqn"; version="1.0.0"; sha256="1iv1wwa6a9824dbgfk5a609szppc3a8j250z74hb8csjvwwx9qq9"; depends=[fracdiff MASS robustbase]; };
-  tstools = derive2 { name="tstools"; version="0.3.6.1"; sha256="066bkm4hqkbhslk3f3vk9w4hzv3smg718vpav04byrvlcdiibv0c"; depends=[data_table jsonlite xts zoo]; };
+  tstools = derive2 { name="tstools"; version="0.3.8"; sha256="0daxrp91hxc367hlzla0s7x5dddnx462239jcq0ickx6awkk753g"; depends=[data_table jsonlite xts zoo]; };
   tswge = derive2 { name="tswge"; version="1.0.0"; sha256="0wj0kyb1dcwfn8wjp7skgcflc48cr4va0i0jg8x970658if7z6fz"; depends=[astsa MASS PolynomF signal waveslim]; };
   tsxtreme = derive2 { name="tsxtreme"; version="0.3.1"; sha256="0cfska93ws5x11pslcdhf5rrshxzh6ddlgmfkl9zlci2rqdbwz35"; depends=[evd MASS mvtnorm]; };
-  ttScreening = derive2 { name="ttScreening"; version="1.5"; sha256="0qn8lkvgvqpmm368fwpqkm09yaj9mw42mjlikyiwpv2wrgbpmg9n"; depends=[corpcor limma MASS matrixStats sva]; };
+  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=[]; };
   tth = derive2 { name="tth"; version="4.3-2-1"; sha256="19rvmyprl1nk9mmngk6dax8rnli10msfvm3vzp86pbdjxnsh3hjc"; depends=[]; };
   tttplot = derive2 { name="tttplot"; version="1.1.1"; sha256="0rmgp1888y07w0h8kwq1azpr6bysjq4pyjf6ygpra75jj4563wx9"; depends=[]; };
@@ -12254,71 +12797,76 @@ in with self; {
   tuber = derive2 { name="tuber"; version="0.9.7"; sha256="0ypfzxk0cyb81y61xxj4bhr5v9afnd7z9wi09xippjv8djbm78yb"; depends=[dplyr httr jsonlite plyr purrr]; };
   tubern = derive2 { name="tubern"; version="0.1.0"; sha256="0wpn4aig6r1kpncrgrqra4kr0f07rdq7z4p2k0h28f7kww6l52vv"; depends=[httr jsonlite]; };
   tuckerR_mmgg = derive2 { name="tuckerR.mmgg"; version="1.5.1"; sha256="0lrylh0np0kbl4xx3gmlvid0g11fh0ad39wdwbz6hrmf5pzsjdjq"; depends=[]; };
-  tufte = derive2 { name="tufte"; version="0.3"; sha256="1fpv9ilf8ajynz38ny0abfnq20xzpgwbxaxj8ijwy8viki893bd0"; depends=[htmltools knitr rmarkdown xfun]; };
+  tufte = derive2 { name="tufte"; version="0.4"; sha256="0vp7rsb8qa21mkcfxy57sgb26nm4s492r0069rmn8fcpazcsbzqb"; depends=[htmltools knitr rmarkdown xfun]; };
   tufterhandout = derive2 { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[knitr rmarkdown]; };
   tukeytrend = derive2 { name="tukeytrend"; version="0.6"; sha256="0lsxfpkim4fkrm2lrjhn3w55c0p694vbkal3mjqk6vnmnycg9d71"; depends=[lme4 Matrix mgcv multcomp nlme pbkrtest]; };
   tumblR = derive2 { name="tumblR"; version="1.1"; sha256="0gl6q6rff9bp21gvi3bz8kmwbhimxqrv1mmzwshl1ys9r7d4dvps"; depends=[httr RCurl RJSONIO stringr]; };
   tumgr = derive2 { name="tumgr"; version="0.0.4"; sha256="1ylfmrsg177g75l2scjpgw6v4dpz62r7cy89pql9zd5zqy167xqj"; depends=[minpack_lm]; };
-  tuneR = derive2 { name="tuneR"; version="1.3.2"; sha256="1xk66rrahfvvbjzpx2mkbmlmyj0l3vidd8kz24f72wh56gbdgbsa"; depends=[signal]; };
-  tuneRanger = derive2 { name="tuneRanger"; version="0.2"; sha256="0dk8nnh3sp0mlfr4vfc33r83a5kdgdi3sbqs0v4311i6dv72c1hn"; depends=[BBmisc DiceKriging lhs lubridate mlr mlrMBO ParamHelpers ranger smoof]; };
+  tuneR = derive2 { name="tuneR"; version="1.3.3"; sha256="0av978m4h2iqazyfq6n2cgkh4wpllihh7s29lah2nb8ngc0w5hxx"; depends=[signal]; };
+  tuneRanger = derive2 { name="tuneRanger"; version="0.3"; sha256="1hj77fy522lr68h3ypsms96pkrahhn0sp50cggmnf60qdqcgdbjq"; depends=[BBmisc DiceKriging lhs lubridate mlr mlrMBO ParamHelpers ranger smoof]; };
   tuple = derive2 { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; };
   turboEM = derive2 { name="turboEM"; version="2018.1"; sha256="1xjpm2dxn48nflqriplxxbrjxv0spix6v7cp76gyh4kj8ylnbna6"; depends=[doParallel foreach iterators numDeriv quantreg]; };
   turfR = derive2 { name="turfR"; version="0.8-7"; sha256="007jmkppfv1x4zzvvd65fhg5k15ybjhsya2zfjgwm77wm34y81ca"; depends=[dplyr]; };
   turner = derive2 { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; };
   tutorial = derive2 { name="tutorial"; version="0.4.3"; sha256="0sxdlpw0w4azlaxdlk36ycrric6pbj2zi4nyv26pgsp0cr1hrx6r"; depends=[base64enc knitr markdown rjson]; };
   tuts = derive2 { name="tuts"; version="0.1.1"; sha256="0mwc6lsnhxww041wh3020wz7w812asp1d6djv4n9pl7jil0kvkry"; depends=[coda doParallel foreach lomb mcmcplots rjags truncnorm]; };
-  tvR = derive2 { name="tvR"; version="0.2.0"; sha256="06h90r0mlflsbbvg09s1ap8b16yfk285ma8rzzdi7cmkfdc5hlyx"; depends=[filling Matrix Rcpp RcppArmadillo Rdpack]; };
+  tvR = derive2 { name="tvR"; version="0.3.0"; sha256="1pg13bvndqyyi2yl1bg3bkdh2xq060ihl25j3a91nahwasy3225m"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; };
   tvReg = derive2 { name="tvReg"; version="0.3.0"; sha256="16z032j5wxyvgc29m8sgh4wcvsdam6a0srjwym52885rdslbkmjy"; depends=[bvarsv MASS Matrix systemfit vars]; };
   tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; };
   tvm = derive2 { name="tvm"; version="0.3.0"; sha256="1iv0qrks1zdiq8jaqr1h46snq8wc3g3q017hxc8zc6fqnsz1whf6"; depends=[ggplot2 reshape2]; };
   twang = derive2 { name="twang"; version="1.5"; sha256="1sp1vb6l0mwpy9b9my5d3spc0q0zs7xg4dkmi4cl7hy7m9xy1dbk"; depends=[gbm lattice latticeExtra survey xtable]; };
   tweedie = derive2 { name="tweedie"; version="2.3.2"; sha256="10fv998qjxsyx0h94fi0xbh6xbf24nwgh254n9zfnmix9vk2cqls"; depends=[]; };
-  tweenr = derive2 { name="tweenr"; version="0.1.5"; sha256="06h0vhxlljmvxg4a62sqrq53lpbvl5w19dqcpyw1jqvrb5agidnq"; depends=[Rcpp]; };
-  tweet2r = derive2 { name="tweet2r"; version="1.0"; sha256="0v7xshk389k3aws72ww9kqc2ycw6l6q9xmhps47g3bdl64jy8bay"; depends=[ggmap ggplot2 maptools plyr rgdal ROAuth RPostgreSQL RSQLite sp spacetime spatstat splancs streamR]; };
+  tweenr = derive2 { name="tweenr"; version="1.0.0"; sha256="0r98ln17fdzdda66rsj6lqwi843anl6m7c287kbzc4gkj931cifh"; depends=[farver magrittr Rcpp rlang]; };
+  tweet2r = derive2 { name="tweet2r"; version="1.1"; sha256="1ivzc05af3fbdxn99lcphm74qs64lz8577zzi6r52r9xjpsqpqzi"; depends=[ggmap ggplot2 maptools plyr rgdal ROAuth RPostgreSQL RSQLite sp spacetime spatstat splancs streamR]; };
   twfy = derive2 { name="twfy"; version="0.1.0"; sha256="14xxl9y8iagnn5jd06k6jyy4wk7crm64svz8h0zmzcvg47k8bwc7"; depends=[httr jsonlite]; };
   twiddler = derive2 { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; };
   twilio = derive2 { name="twilio"; version="0.1.0"; sha256="0b70vcc2bd5jpd2d82i2k828q90viah0b9abz2r627bbyxivpcnd"; depends=[httr jsonlite lubridate magrittr purrr]; };
   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=[]; };
   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=[]; };
-  txtq = derive2 { name="txtq"; version="0.0.4"; sha256="0ipfc68m7l72wdnd4lmy7jm2dxs4xayzrd0g58m44dbikgwnw20i"; depends=[base64url filelock fs R6]; };
+  txtq = derive2 { name="txtq"; version="0.1.1"; sha256="1nnwxqxmh820b8ksbqk3g7lnf895684k60k5r1ahh105mqccq2x9"; depends=[base64url filelock fs R6]; };
   types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; };
   uCAREChemSuiteCLI = derive2 { name="uCAREChemSuiteCLI"; version="0.1.2"; sha256="0nvpmlp8dd250xn3g936wm52s2m6hb82lpvgpdak44ydhhswds0m"; depends=[ChemmineR usethis]; };
-  uGMAR = derive2 { name="uGMAR"; version="2.0.2"; sha256="1rbhinq3s818c11kj5ybz1v3xmfpzz55i7mh20a0r3pq64jdh7kc"; depends=[Brobdingnag]; };
+  uGMAR = derive2 { name="uGMAR"; version="3.0.1"; sha256="19sxzsz21nysxiydcgm0g4sd40jmqvysrxka0j2zcg7yfmg3hr5w"; depends=[Brobdingnag pbapply]; };
   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.3"; sha256="05annx1vzpssxf5ycrgk2dizgl83zbwvl2x3bj8r5d8w5lvlpwrb"; depends=[brew data_table devtools gdalUtils geosphere htmltools htmlwidgets log4r maptools raster rgdal rgeos roxygen2 sf sp spatial_tools stringr zoo]; };
-  ubci = derive2 { name="ubci"; version="0.0.2"; sha256="1k2fgzz286qyzqk216saz52s6044zhwgzgv6ra03513vgm9w45ld"; depends=[dplyr httr lubridate magrittr tibble tidyr]; };
+  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]; };
+  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.1"; sha256="0mhkf1s7pv8d5hbianzcpc3jxps2i6y955n6bplikcz1l1pnb9ib"; depends=[curl httr]; };
-  udpipe = derive2 { name="udpipe"; version="0.6"; sha256="0mzqyp3mhcchfknpspc79fmf5sf9n94dxpvssl393p2fd92gkajy"; depends=[data_table Matrix Rcpp]; };
+  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]; };
   udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; };
-  uiucthemes = derive2 { name="uiucthemes"; version="0.2.0"; sha256="1z1wx89b2d7z1a2zc4ai05v9slfpidja8f561jcsrcdi9hz2yp81"; depends=[rmarkdown]; };
+  ufs = derive2 { name="ufs"; version="0.0.1"; sha256="0sp4963ijhn5zgni2kcx1shf59p7dr0pigb368fp8b01077q8qqn"; depends=[]; };
+  uiucthemes = derive2 { name="uiucthemes"; version="0.2.1"; sha256="1l96mch9r5npsdv1v4qfyj43ana7a2ff7yj04q6fzhh27v0fx7ak"; depends=[rmarkdown]; };
   ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; };
   ukbtools = derive2 { name="ukbtools"; version="0.11.0"; sha256="0ww8knrivykk8zx0mqc0bg9f1m64psdpjcxvdn4alhs88ywc71cf"; depends=[data_table dplyr ggplot2 magrittr plyr purrr readr scales stringr tibble tidyr XML]; };
-  ukgasapi = derive2 { name="ukgasapi"; version="0.13"; sha256="0bnblha96ldbxj0nqhcj26d1dk2xm6nkjqqval1jlc2pki20mr9n"; depends=[RCurl XML]; };
-  umap = derive2 { name="umap"; version="0.1.0.3"; sha256="039pmpbh60m9p3i07mg4gv01p3x4ad0ngpcw76dgarr3yqkx4ic6"; depends=[Rcpp reticulate]; };
+  ukgasapi = derive2 { name="ukgasapi"; version="0.15"; sha256="051bavhsqybg0m1nkv52k9vy5a80aanas146ndx0k9dn2mqmpsw7"; depends=[RCurl XML]; };
+  umap = derive2 { name="umap"; version="0.2.0.0"; sha256="1qdq3isrv6dqz462sfwk1albbs6h8lcnqidhwr1jxa09bwinhk7q"; depends=[Rcpp reticulate RSpectra]; };
   ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; };
-  umx = derive2 { name="umx"; version="2.8.0"; sha256="06r93dli8rxj0b7kz2s5395xnr8ka4bikdvfda882jjnv2rprdbb"; depends=[cowplot DiagrammeR ggplot2 knitr MASS Matrix mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; };
+  umx = derive2 { name="umx"; version="2.8.5"; sha256="1fi4k6asw3rmh88rvdwrf63xi5yqdd9h0bq1bs10j7h9mw9a119j"; depends=[cowplot DiagrammeR ggplot2 knitr MASS Matrix MuMIn mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; };
   unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; };
   unbalhaar = derive2 { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; };
   uncertainty = derive2 { name="uncertainty"; version="0.2.0"; sha256="1mq14ny7l3gy3wjsqijnm37azavyapxszjnckd861h4hgcpdcdjz"; depends=[mvtnorm triangle]; };
   uncmbb = derive2 { name="uncmbb"; version="0.2.0"; sha256="0cvbh7a81g52hd2qzp23jwwjd5406iszf4wilgrz8sjfrfgybgfm"; depends=[dplyr rlang]; };
   understandBPMN = derive2 { name="understandBPMN"; version="1.1.0"; sha256="11ijxr5nzg6ivx2c9shgba9nfjb8ixypbj8jvhl7zjkwjrpb6f1y"; depends=[devtools dplyr purrr R_utils Rcpp tibble tidyr XML]; };
-  unfoldr = derive2 { name="unfoldr"; version="0.6.5"; sha256="18k1bq3vdsiyg55zvs0sx5wgmslxvj283g742rkh214mfy5d89l5"; depends=[]; };
+  unfoldr = derive2 { name="unfoldr"; version="0.6.9"; sha256="1zr5k1vcqp16zc9i538fk5gcs900nsl140vx2dpi818jv84md1ij"; depends=[]; };
   ungeneanno = derive2 { name="ungeneanno"; version="0.1.6"; sha256="0fm47vmzn4z73pn37p94r84lbkg5amk0sl78304ibwz0rhlda0y5"; depends=[httr XML]; };
+  ungroup = derive2 { name="ungroup"; version="1.1.1"; sha256="0jrxxp93ak9bva98j3nmkhrb7znz7lpywk56415k4b2rzpy3j7fs"; depends=[MortalitySmooth pbapply Rcpp RcppEigen Rdpack rgl]; };
   uniCox = derive2 { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; };
   uniReg = derive2 { name="uniReg"; version="1.1"; sha256="0wjc7pgaisvk26j7grxp2ypsabb5my9wg6c9i5w9zhh5jdx1fdab"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; };
   uniah = derive2 { name="uniah"; version="1.0"; sha256="19zwy33gwa749i81mi9h05k8k3l4xbbln3k6q70fa7ic5lqbbdzj"; depends=[ahaz Iso survival]; };
   unifDAG = derive2 { name="unifDAG"; version="1.0.1"; sha256="1zf2pclddswrssil7ikq75449ks3070jxkzy2lmggq9gyipdypps"; depends=[gmp graph]; };
+  uniformly = derive2 { name="uniformly"; version="0.1.0"; sha256="0n3s0x05v4d79jn51nwj06gm074rgy269f57y2q5z0bkwyp6yc7n"; depends=[pgnorm]; };
   uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; };
   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-0"; sha256="06g4ihhxvcc9d28zd1nznd2h5fd8zamq7jcxw6qj0ghb8878mw2n"; depends=[Rcpp]; };
+  units = derive2 { name="units"; version="0.6-1"; sha256="0gafl1d89gvmpndmkb9ng7dqhvnb5cx9igza0rjdrdn285icb07i"; 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=[]; };
@@ -12330,6 +12878,7 @@ in with self; {
   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=[]; };
+  updog = derive2 { name="updog"; version="1.0.1"; sha256="0y2w62f25an1d7fpkiqhimak0ww201r873sjb08akwf82v4k34wz"; depends=[assertthat doParallel foreach ggplot2 ggthemes Rcpp RcppArmadillo stringr]; };
   uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; };
   upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; };
   uptasticsearch = derive2 { name="uptasticsearch"; version="0.3.0"; sha256="09g50szxbgc7x2py647lzwmljspks7s6xbbjplbzbpkdc2z4pndh"; depends=[assertthat data_table futile_logger httr jsonlite purrr stringr uuid]; };
@@ -12338,32 +12887,33 @@ in with self; {
   uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; };
   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.0"; sha256="0kxv54j4rf8jwyfv3z3plyb9vycwi0m1jv7z2nxnm3729p72y9xl"; depends=[Rcpp triebeard]; };
+  urltools = derive2 { name="urltools"; version="1.7.1"; sha256="01h3fwk5mzicy2isvdla9r0zxrxhaf902xx4dg3f16a1l4fgi1a4"; depends=[Rcpp triebeard]; };
   uroot = derive2 { name="uroot"; version="2.0-9"; sha256="0nxc8d4v9v5z3wbnj325iq2yrh0mipqgg2rn8pp2jyyq9vb1cxlv"; depends=[]; };
   usdm = derive2 { name="usdm"; version="1.1-18"; sha256="1sis47fri2lrbx2ll5ps7bvycjqhncnia800izf11szgayim5lrv"; depends=[raster sp]; };
   usedist = derive2 { name="usedist"; version="0.1.0"; sha256="17mldp0888ig2xc8cp1nhldj5g3srwmbx3mfcnzz21n1fz31jkmg"; depends=[]; };
-  useful = derive2 { name="useful"; version="1.2.5"; sha256="05198zzlvzmmsic3g6nlxlwivpaszkzx61ximw0v4i4sahblxmp7"; depends=[assertthat dplyr ggplot2 magrittr Matrix plyr purrr scales]; };
-  userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.1"; sha256="1lkxzd5j51q57m5fqv21y6m37fgjwzjh0hhf940czhlwkk1idyld"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest fBasics GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists viridis XML xtable]; };
-  usethis = derive2 { name="usethis"; version="1.3.0"; sha256="0r61pf8qisjvrshm6jpcb76ck1v79s7lg9zwdgad4fasyyrzrcx2"; depends=[backports clipr clisymbols crayon curl desc gh git2r httr rematch2 rmarkdown rprojroot rstudioapi styler whisker]; };
+  useful = derive2 { name="useful"; version="1.2.6"; sha256="0n50v1q75k518sq23id14jphwla35q4sasahrnrnllwrachl67v1"; depends=[assertthat dplyr ggplot2 magrittr Matrix plyr purrr scales]; };
+  userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.2"; sha256="17arxxha8qr876nrf9szpymgamxlvacj3lfbmpiv973kyi3hr7m4"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists ufs viridis XML xtable]; };
+  usethis = derive2 { name="usethis"; version="1.4.0"; sha256="1gadckx3sxz9gxvpkprj9x7zcgg2nz5m4q0vi76ya9li1v03rwwn"; depends=[clipr clisymbols crayon curl desc fs gh git2r glue rlang rprojroot rstudioapi whisker]; };
   usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; };
   uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; };
   usl = derive2 { name="usl"; version="1.8.0"; sha256="04w7p9i08a51smgg11kh4hablic5rjmr5hndrnlg49j5h20i7w1v"; depends=[nlsr]; };
-  usmap = derive2 { name="usmap"; version="0.3.0"; sha256="0zf3frhdg08fa5m25gln5b7xpbyjr0sbybyih0yd5hgvw0fnk4dm"; depends=[]; };
+  usmap = derive2 { name="usmap"; version="0.4.0"; sha256="1sslvh2wbc52dnc9sy8m312amykcl5bvqhws1lvma5d21jn3scmh"; depends=[]; };
   ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; };
   utf8 = derive2 { name="utf8"; version="1.1.4"; sha256="0m0ywg8k3blfiahxvh1i4zn9dksrlc937d2lbza5fc38zjnrrnpn"; depends=[]; };
   utf8latex = derive2 { name="utf8latex"; version="1.0.4"; sha256="12isrl056h7y7nr7wk52dnvf3frcp66qqy7si869ark2aj81f959"; depends=[]; };
-  utility = derive2 { name="utility"; version="1.4.2"; sha256="0q08yc0sxbcjhsr0nkgc2pyxkd93zwlbf0jyq21cf535mj4036gq"; depends=[]; };
+  utility = derive2 { name="utility"; version="1.4.3"; sha256="12g2y9xzzi2sl3ya3va1p7nc7hrjhr4arsz06f8xlxw5n8kvdxag"; depends=[]; };
   utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.6"; sha256="07avc0j6qkzqmznbydn0zdg743g7g7kn2bcx5n03m3wg0fqyggr7"; depends=[data_table dplyr RCurl stringdist stringr]; };
   utiml = derive2 { name="utiml"; version="0.1.4"; sha256="1z93a7ldgkab6hsa9a0hzyhxsbac45sgqn7fy2jh615d2kw7pqr1"; depends=[mldr]; };
   uuid = derive2 { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; };
+  uwIntroStats = derive2 { name="uwIntroStats"; version="0.0.7"; sha256="0lihcjd79sqnw64bd2d4p02rl7fmzpyykrdi7b5dsnnwjhr0ks6r"; depends=[Exact geepack plyr sandwich survival]; };
   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.4"; sha256="15znkwbhr624qgwlcrdhaxpdfl85ym845mr2sy8b016d3ngz7n94"; depends=[]; };
-  vagalumeR = derive2 { name="vagalumeR"; version="0.1.1"; sha256="1l1p63yhwqvkh8kgqii9n96vdm86jfc64nrinjp5l7jhx99sn013"; depends=[httr jsonlite plyr stringr]; };
+  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]; };
   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]; };
-  validate = derive2 { name="validate"; version="0.2.5"; sha256="069r6a0l719napmrf37rwi2dvm4ql5ip3g7kba3s96b1qamh8afi"; depends=[settings yaml]; };
+  validate = derive2 { name="validate"; version="0.2.6"; sha256="0aadfqk02c3qjzyn0n7g62b5dv1mhyic76xprfa2cdy3sg8vp8jd"; depends=[settings yaml]; };
   validateRS = derive2 { name="validateRS"; version="1.0.0"; sha256="1ivw9ddr6z2wrsqvhbn87p5pikhkxlz8p45pb5nq13dvs359vkww"; depends=[data_table reshape2 triangle truncnorm]; };
   validatejsonr = derive2 { name="validatejsonr"; version="1.0.4"; sha256="1n8jf7j3hvz47z1x3gqz5yj5wxfjzz0zgzkgckdvy1nbsqf7w3cr"; depends=[Rcpp]; };
   validatetools = derive2 { name="validatetools"; version="0.4.3"; sha256="1v6mmk3iq5nzzjkkj1spiqfmqq2133xg2qyy3y8h4pwwfynp4v7c"; depends=[lpSolveAPI validate]; };
@@ -12371,46 +12921,51 @@ in with self; {
   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]; };
   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]; };
+  vanquish = derive2 { name="vanquish"; version="1.0.0"; sha256="01di1j36npl7vnyhgsagvyf6j8bxcw867dwf9dgi7l1328s7lf0l"; depends=[changepoint e1071 ggplot2 VGAM]; };
+  vapour = derive2 { name="vapour"; version="0.1.0"; sha256="0skayxfwr9dqdr0mxj7h0gz08niib9mgv5vgl621fnzw481282fn"; depends=[Rcpp]; };
+  varImp = derive2 { name="varImp"; version="0.2"; sha256="1jc6aadcqqrmn5wsh2spq21nc20jpfdh9rspzsk99aymnv46sdyv"; depends=[measures party]; };
   varSel = derive2 { name="varSel"; version="0.1"; sha256="0ddj3swfxzchs75kfi6h25h3c33hpapnd5kcwcijnqhlh902b1r0"; depends=[]; };
   varSelRF = derive2 { name="varSelRF"; version="0.7-8"; sha256="0h49rl1j13yfh97rsfsyh9s2c4wajny4rzms2qw77d0cavxqg53i"; depends=[randomForest]; };
   varband = derive2 { name="varband"; version="0.9.0"; sha256="16z66rx7xq5zan8pnw100c9r5syw1ml4hgzi9mch52aia23v21p9"; depends=[Rcpp RcppArmadillo]; };
+  varbin = derive2 { name="varbin"; version="0.2.1"; sha256="0gcynwc0vx7qlp3z0pcc4i7mjlnxkwy8ydxz2wr244fw32qgp4kq"; depends=[rpart]; };
   varbvs = derive2 { name="varbvs"; version="2.4-0"; sha256="0f6c9acrir8c8m8mg928azlp31yh49faz5s2g7cbgf5f1pxi07nl"; depends=[lattice latticeExtra Matrix Rcpp]; };
   vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; };
-  vardpoor = derive2 { name="vardpoor"; version="0.10.0"; sha256="0v1l6rw8in0nr1a7g1mgfimjxjzjww174y8vxvmgirlifnnjxkc8"; depends=[data_table foreach laeken MASS plyr stringr surveyplanning]; };
+  vardpoor = derive2 { name="vardpoor"; version="0.12.0"; sha256="1a6s2zip5lks4yfmpdiplqzfx97xsfyhr61yizvmm0yrnwr1a4g9"; depends=[data_table foreach ggplot2 laeken MASS plyr pracma stringr surveyplanning]; };
   varhandle = derive2 { name="varhandle"; version="2.0.3"; sha256="11yisjgqc8fq0sj1kzgp51i926cs4yqkpfmbis5ak786wqalc6na"; depends=[]; };
-  variables = derive2 { name="variables"; version="1.0-0"; sha256="0i1nmrbps1snyzdwlki7sfxf2vpqghd9ap8pmy235d5r399jmpkb"; 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]; };
   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-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[lmtest MASS sandwich strucchange urca]; };
+  vars = derive2 { name="vars"; version="1.5-3"; sha256="0zc6v827ll19n088n31afgjf65zqwvyzmmj4q3ab1xhqzxfsgbw6"; depends=[lmtest MASS sandwich strucchange urca]; };
   vbdm = derive2 { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
   vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
   vcd = derive2 { name="vcd"; version="1.4-4"; sha256="1lp99h0wvsc61l1dgcqjxdrcgpgw88ak430cdsv43kmm43qssqd5"; depends=[colorspace lmtest MASS]; };
   vcdExtra = derive2 { name="vcdExtra"; version="0.7-1"; sha256="163x9hhvhgdmrqbcig7b120lk63svy0y652scbrcb11f85zrgb0c"; depends=[ca gnm MASS vcd]; };
   vcfR = derive2 { name="vcfR"; version="1.8.0"; sha256="1684lamsivwaqzvmwzhrrziwczkaqn3mhbdr86zbjdhr1jcgkz2z"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble vegan viridisLite]; };
   vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; };
-  vcr = derive2 { name="vcr"; version="0.1.0"; sha256="1f0hjfip7k9gd7lbaqk97idan2qfns7yiw6rsxp8q7szmjyhb6ga"; depends=[base64enc crul lazyeval R6 urltools webmockr yaml]; };
+  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]; };
   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.5"; sha256="1v96khvg3k33kg3aavanl8g05n5mjkbqsbf8c4lya73f3rs4sfgb"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr Rdpack rgdal rgeos rjson Rook sp]; };
+  vdmR = derive2 { name="vdmR"; version="0.2.6"; sha256="15d3yrwiqs7cfyzl6v5vqgi33arx9lxjbqpif9zzfb56j0x1xsk5"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr Rdpack rgdal rgeos rjson Rook sp]; };
   vec2dtransf = derive2 { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; };
   veccompare = derive2 { name="veccompare"; version="0.1.0"; sha256="03nyyxvhhwfxxg5w6qflk7q234ipbhj9fd4abcp50sxz3diabch1"; depends=[corrplot gtools pander purrr qgraph reshape2 VennDiagram]; };
   vecsets = derive2 { name="vecsets"; version="1.2.1"; sha256="086af6swjpbkd140yvb76affy5gn4p9xm41m3akm8axc3qk0hybg"; depends=[]; };
   vegalite = derive2 { name="vegalite"; version="0.6.1"; sha256="0dlzhvrg3nj6knyycdgg3d1vzq3dn9vxb34fjin9hzilszqmarbk"; depends=[base64 clipr digest htmltools htmlwidgets jsonlite magrittr webshot]; };
-  vegan = derive2 { name="vegan"; version="2.5-2"; sha256="13pyqvlpz64qibi8k5d109v7q09j06mbv6ndix3n4cn21mjx391c"; depends=[cluster lattice MASS mgcv permute]; };
-  vegan3d = derive2 { name="vegan3d"; version="1.1-1"; sha256="1jd9m2immkhgb1zr39gsgl746y7qpi5fhj8awmqq5lyr5j6jp6jh"; depends=[cluster rgl scatterplot3d vegan]; };
+  vegan = derive2 { name="vegan"; version="2.5-3"; sha256="023xznh0iy0496icpchadmp7a3rk3nj9s48fvwlvp3dssw58yp3c"; depends=[cluster lattice MASS mgcv permute]; };
+  vegan3d = derive2 { name="vegan3d"; version="1.1-2"; sha256="01yyhrapdvs6rr5hw1ij4jnpz7mq005s35pn96snpy8ngn6ir386"; depends=[cluster rgl scatterplot3d vegan]; };
   vegclust = derive2 { name="vegclust"; version="1.7.4"; sha256="1fz3p5jpqy99r601dj9fahgv32vw0v54jlrq48wn81rzg2wwfmk7"; depends=[Kendall Rcpp sp vegan]; };
-  vegdata = derive2 { name="vegdata"; version="0.9.1"; sha256="0w4dk7qcl89w04qgnlna5lk5hxnyrvwmgjjxmnvb6r5dspq7qyad"; depends=[foreign httr jsonlite XML]; };
+  vegdata = derive2 { name="vegdata"; version="0.9.5"; sha256="145frmlsdb7m5z8qa03js4061pqmgvy3gykxkpiv1wv2wnfzyvnr"; depends=[foreign XML]; };
   vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; 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.3.35"; sha256="0jmsr7vw2p7r6z3s1kqkrnkd5f0w6mjzv2ln3s446c1z3bmvv5zv"; depends=[data_table eixport sf sp units]; };
+  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.6"; sha256="0ipfysb9kjq07rvf6szy1cci4waw905bavk9bs60aii5858k9rcs"; depends=[]; };
+  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]; };
   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]; };
@@ -12419,29 +12974,29 @@ in with self; {
   vertexenum = derive2 { name="vertexenum"; version="1.0.2"; sha256="16ywz3z1kzhb3knhhi2i5igm3djdaaxyyrw69wkc5saa7ayhdb4y"; depends=[numbers]; };
   vesselr = derive2 { name="vesselr"; version="0.2.1"; sha256="1wzprnpiv04gxhqgki36gp1a0xj9l3mchllphwkfsdja4axq3prk"; depends=[oro_nifti pbapply pbmcapply]; };
   vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; };
-  vetr = derive2 { name="vetr"; version="0.2.5"; sha256="164zs1bxhkjzicip95lhyb2yi4hgg08zm6i18z6g4bjgn1ban1id"; depends=[]; };
+  vetr = derive2 { name="vetr"; version="0.2.6"; sha256="02sa0l4dh0n066y0ls377dh6q4fdhlx2jj80gk5c5x9l5ms649xk"; depends=[]; };
   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=[]; };
-  vimp = derive2 { name="vimp"; version="1.0.0"; sha256="0q92zgs52nxrxswnvascbpfvg51hvy08cwjy2vjjvzjydicsfnxh"; depends=[SuperLearner]; };
-  vinereg = derive2 { name="vinereg"; version="0.3.0"; sha256="05vd9ilnx9cswsa21bnw6p5q44yyc7adm4xh966dnsdrsdj6dd7s"; depends=[cctools furrr future kde1d rvinecopulib]; };
+  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]; };
   violinmplot = derive2 { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; };
   vioplot = derive2 { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
   viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
-  vip = derive2 { name="vip"; version="0.1.0"; sha256="1blyyy17f4gxhbw7jwwf0xrq4ha142k356dfhasnvk4jqrpajcxc"; depends=[dplyr ggplot2 gridExtra magrittr pdp plyr tibble tidyr]; };
+  vip = derive2 { name="vip"; version="0.1.2"; sha256="1y4v0qd7qag9jw9vazlnl3hp4813lcbhmbq60s3znhdmxnbb4irw"; depends=[ggplot2 gridExtra magrittr ModelMetrics pdp plyr tibble]; };
   vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; };
   viridis = derive2 { name="viridis"; version="0.5.1"; sha256="060rf1jn29dq53y3nhb0hykvcap6rqsk04rq544ypiiqb18ngwnx"; depends=[ggplot2 gridExtra viridisLite]; };
   viridisLite = derive2 { name="viridisLite"; version="0.3.0"; sha256="1by2l05f0yabwvv64lhnv7bbhx0w683s3wr9j2xda920ghpa23kq"; depends=[]; };
-  virtualspecies = derive2 { name="virtualspecies"; version="1.4-2"; sha256="19qw8vqf08x6fgm8w159qabpgr2wv2cxishpj6888ihcaa9ykp8f"; depends=[ade4 dismo raster rworldmap]; };
+  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]; };
   visreg = derive2 { name="visreg"; version="2.5-0"; sha256="0n19k6rsmpqga6r8lyhjviqs3nw881dhr211621m2cl7knqhhi4y"; depends=[lattice]; };
-  vistime = derive2 { name="vistime"; version="0.5.0"; sha256="1h7dm66m0qx3hmfx1hlv5na65swdhdykyg1fsqzgnjl6p98cg81j"; depends=[plotly RColorBrewer]; };
+  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]; };
   visualize = derive2 { name="visualize"; version="4.3.0"; sha256="1s49sx828f25d4n93mn28xdbc81zflk2sr3h8ffs2mkjr888qd8y"; depends=[]; };
-  visvow = derive2 { name="visvow"; version="0.1.0"; sha256="0nb849m6dqfanqlaqcargw0rlf4ch9v09zmf0zqmxkwcil0w0dka"; depends=[Cairo DT ggplot2 plot3D plyr pracma psych Rdpack readxl shiny shinyBS svglite WriteXLS]; };
+  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]; };
   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]; };
@@ -12453,13 +13008,13 @@ in with self; {
   vortexRdata = derive2 { name="vortexRdata"; version="1.0.3"; sha256="1pq910xaqk6d5amg8hj7xagb5wn2ahfrmqairf3vhwqx55lhjbg1"; depends=[]; };
   vosonSML = derive2 { name="vosonSML"; version="0.23.4"; sha256="0y2jyrkld02ksn2ipkkxzc724dhbqbja120gg7sm67v6x444pma7"; depends=[bitops data_table Hmisc httpuv httr igraph instaR plyr RCurl Rfacebook rjson stringr tm twitteR]; };
   vote = derive2 { name="vote"; version="1.1-0"; sha256="1kxbv4062g4x9vn4gh74c6zwdshysw5n7vx9qljhq2wrdnqzjpyg"; depends=[formattable knitr]; };
-  voteogram = derive2 { name="voteogram"; version="0.2.0"; sha256="0m4j7iz7mc6z536vk0kmqfd8ank87ingv5vnjl7mn62r53c5fbsf"; depends=[dplyr ggplot2 jsonlite scales]; };
+  voteogram = derive2 { name="voteogram"; version="0.3.1"; sha256="12xv0c3g4vr23c8adkk8z7m7sx31w5mjvdg9h4qbvaimb99p2r7z"; depends=[dplyr ggplot2 jsonlite scales]; };
   votesys = derive2 { name="votesys"; version="0.1.1"; sha256="1z7cx3rj3bfrkb6jkmf1m1wad5ff46zrab5vhk69wf3jbwd9h920"; depends=[data_table gtools Matrix]; };
   vottrans = derive2 { name="vottrans"; version="1.0"; sha256="1fp7jrw072ws39bqsg88bm2qndcv68aa2vdqwgnza58p1dfq3x9f"; depends=[quadprog]; };
   vowels = derive2 { name="vowels"; version="1.2-2"; sha256="0xhfn3avx9h6kg3jwd47n2x7w8q8c9h13wsxd74hhbbn2gkjrs84"; depends=[]; };
   vows = derive2 { name="vows"; version="0.5"; sha256="06akjdbab9v7r47di7syvcm7gf4k81djizg8maszs5l1ksyhmv6b"; depends=[fda gamm4 mgcv oro_nifti RLRsim shape stringr]; };
   voxel = derive2 { name="voxel"; version="1.3.5"; sha256="1xlym8xc22dq67h0lylrr16z7b4zdidpgrkvbs7n9fnkh6vijw2j"; depends=[gamm4 ggplot2 lmerTest mgcv oro_nifti purrr]; };
-  vpc = derive2 { name="vpc"; version="1.0.1"; sha256="0zxiakls7wi0278f6v74xdcaw500am8gfs8lp7cciaxnw2clvsbv"; depends=[classInt dplyr ggplot2 MASS readr reshape2 survival]; };
+  vpc = derive2 { name="vpc"; version="1.1.0"; sha256="15ws6zfizyryn3bvjvs053n81k2g9k641dqmwvgy152bsg7w7fwx"; depends=[classInt dplyr ggplot2 MASS readr reshape2 survival]; };
   vqtl = derive2 { name="vqtl"; version="2.0.4"; sha256="1jp7h2afnfgn8i65qg64lwbjw56s37w8fgwfajcgxn2mwb5z0jcb"; depends=[dglm doParallel dplyr evd foreach ggplot2 gtools iterators knitr lazyeval purrr qtl stringr testthat tidyr]; };
   vrcp = derive2 { name="vrcp"; version="0.1.1"; sha256="1wrch1dqy752gkj24h1dgi2x3kf1797xj4pf1s9mszf3x3ic905d"; depends=[ggplot2]; };
   vrmlgen = derive2 { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; };
@@ -12467,7 +13022,7 @@ 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.2.2"; sha256="06r8ib4l3cyxrx8ykkvjj7ycrjsrv5d5y0lm6zj12lc9l298zj49"; depends=[wrapr]; };
+  vtreat = derive2 { name="vtreat"; version="1.3.1"; sha256="00iwxfn42zanhs2bwk73731nzwzpjwb127dig91dqhdsvng9585s"; depends=[wrapr]; };
   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]; };
@@ -12476,24 +13031,25 @@ 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.1"; sha256="0iw5vg3qpjgyx6n2p10a2ma9dpcm1hchvrm2brh1a0j1xmjwpsrl"; depends=[data_table igraph magrittr plyr reshape2 shiny som visNetwork]; };
+  wTO = derive2 { name="wTO"; version="1.6.2"; sha256="04393rwl74m8qj89kcsnyayvhwkf9bynga33pc09spvjnpnfjj14"; 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.1"; sha256="1q99nny7mdh7wc3yj4dz0s2454aqyxjcsp5hpjrha14h4p3fcirf"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; };
+  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]; };
   walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
-  wallace = derive2 { name="wallace"; version="1.0.5"; sha256="1c3ghc5prkw44sq93klj1cfgllsz3830y78i4b1y6r23bj2z9520"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin testthat XML]; };
+  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]; };
   walmartAPI = derive2 { name="walmartAPI"; version="0.1.5"; sha256="1nng8izncj2nmmpywn1ggpzvjh8q7y3q6260qhy9kbmvrrl26spf"; depends=[dplyr glue httr magrittr purrr stringr tibble]; };
   walrus = derive2 { name="walrus"; version="1.0.3"; sha256="1nk2glcvy4hyksl5ipq2mz8jy4fss90hx6cq98m3w96kzjni6jjj"; depends=[ggplot2 jmvcore R6 WRS2]; };
   wand = derive2 { name="wand"; version="0.2.0"; sha256="1p2r96nyr36jv418xi4j2ldarymb4xmpis6d2iz7mq9755kb4fnh"; depends=[dplyr purrr rappdirs Rcpp stringi tibble tidyr]; };
-  warbleR = derive2 { name="warbleR"; version="1.1.14"; sha256="0wr0m950y404chh8gipx1v5mvldypm0iwyiqn4ypz5143fzlhwih"; depends=[bitops dtw fftw iterators jpeg maps monitoR NatureSounds pbapply pracma RCurl rjson seewave Sim_DiffProc tuneR]; };
+  warbleR = derive2 { name="warbleR"; version="1.1.15"; sha256="1vd2yvb1crzxbrbfk8iv31ir09xc646m8glfgqkgazhnj0y6l6yr"; depends=[bioacoustics bitops dtw fftw iterators jpeg maps monitoR NatureSounds pbapply pracma RCurl rjson seewave Sim_DiffProc soundgen tuneR]; };
   warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; };
   washdata = derive2 { name="washdata"; version="0.1.2"; sha256="01cnlhymh3qg9c7fda8s6lvm4j2vklmb72dfk17sn4p0kkikf9m8"; depends=[]; };
+  washeR = derive2 { name="washeR"; version="0.1.2"; sha256="0sb5sgwf7y9sd291qfj1az3x6h6gmznnnsdmqizkmv2xz9029rxz"; depends=[gplots]; };
   wasim = derive2 { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; };
   water = derive2 { name="water"; version="0.8"; sha256="0qglf922dlgi41jzz3sivq7ckmzl8axqjfg4klcgnddycmm3ha5j"; depends=[raster rgdal sp]; };
   waterData = derive2 { name="waterData"; version="1.0.8"; sha256="0884agh876wf3qlbc75fbaa47x2iwvncz7r2l25qw34n8lxq1yr6"; depends=[dataRetrieval lattice latticeExtra lubridate xml2]; };
@@ -12511,33 +13067,35 @@ in with self; {
   wbstats = derive2 { name="wbstats"; version="0.2"; sha256="0rfc9c6892jq7y17dwp6vsn62ggnac964xndmxq3mip6k2pk8yi0"; depends=[httr jsonlite tidyr]; };
   wbsts = derive2 { name="wbsts"; version="2.0"; sha256="12k68nsrrxglrm9ik53rm8160xvjlsgzi7v4wp78jhmh2slmyxw3"; depends=[mvtnorm Rcpp wmtsa]; };
   wdm = derive2 { name="wdm"; version="0.1.1"; sha256="0mr901l2378dyygdhc5agx93lm46a44fs3kr3ax2wnv1cdhmc379"; depends=[Rcpp]; };
-  weathercan = derive2 { name="weathercan"; version="0.2.7"; sha256="09465l1gy349vgnpasxazp3i5x82hld8k06ba6556k4r9jypx08v"; depends=[dplyr httr lubridate purrr stringi tidyr xml2]; };
+  wdman = derive2 { name="wdman"; version="0.2.4"; sha256="00q9qk8qgz7fjbd9j8pxknrw8lk1ardifg8w4agyrk8r4q56b1a0"; depends=[assertthat binman semver subprocess yaml]; };
+  weathercan = derive2 { name="weathercan"; version="0.2.8"; sha256="1hspjij4rhlnl3k1hidpa9sclml95q9igwf9dsy0kihlsl0g35h1"; depends=[dplyr httr lubridate purrr rlang stringi tidyr xml2]; };
   weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; };
   weatherr = derive2 { name="weatherr"; version="0.1.2"; sha256="11sb5bmqccqkvlabsw4siy9n6ivsrvxavywvaffgrs3blmnygql9"; depends=[ggmap lubridate RJSONIO XML]; };
-  webTRISr = derive2 { name="webTRISr"; version="0.1.0"; sha256="19xal5zg9mg25vzvkz55zm6gkd8b0y3sw3zbbrxn73a1jg8x5v0l"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr stringr]; };
+  webTRISr = derive2 { name="webTRISr"; version="0.1.1"; sha256="044a079fj4ryykj2n8zlfipmjyrfyfvhrqcd1wbb6r440yjkvali"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr stringr]; };
   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.6"; sha256="00akqj7lw3hvwxllnn48zpq5wk70bbr4ghzilh6064jwkk365c8v"; depends=[crul curl fauxpas jsonlite lazyeval magrittr R6 urltools]; };
+  webmockr = derive2 { name="webmockr"; version="0.2.8"; sha256="03744y89d1cklidd5lyqw23yaz71yyv6w8gk5qqibg2alq58gcn8"; 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]; };
-  websearchr = derive2 { name="websearchr"; version="0.0.2"; sha256="1yf8ch86khg5syppcxs94mxgc3i5623qyhzh174nssw1wzyqb9ba"; depends=[]; };
-  webshot = derive2 { name="webshot"; version="0.5.0"; sha256="07r71zzmggp4jf92x4ws4wg6v1x98vaj01lsar85bnb30n5vx8gh"; depends=[jsonlite magrittr processx withr]; };
-  webuse = derive2 { name="webuse"; version="0.1.2"; sha256="0ks3pb9ir778j9x4l0s4ly2xa1jc9syddqm65wkck52q3lrarg3l"; depends=[haven]; };
+  websearchr = derive2 { name="websearchr"; version="0.0.3"; sha256="1c6dwm5g5rjq0b12zrwwi5k9760jb0ph83v4j2gm8zm0x9dhiqm9"; depends=[]; };
+  webshot = derive2 { name="webshot"; version="0.5.1"; sha256="08sb1xi376pfy1vwilk2d68zljsg9yiv04n2dkqz383gdhh0sxdr"; depends=[callr jsonlite magrittr]; };
+  webuse = derive2 { name="webuse"; version="0.1.3"; sha256="09xvw0v991cq1ck2kfxblp5cngfh9j6swvh5xv420mvky0kshv32"; depends=[haven]; };
   webutils = derive2 { name="webutils"; version="0.6"; sha256="1basl7q2m8y9nw5ksi1kdz6an9pybvsmdd4snrm7a37041xymnps"; depends=[curl jsonlite]; };
   wec = derive2 { name="wec"; version="0.4-1"; sha256="10lqh43536d44d6082rpp11q1323pmjbmgrgb8v9mrk9c1ysf50w"; depends=[dplyr]; };
   weco = derive2 { name="weco"; version="1.2"; sha256="1prk8hn782pd8g2rbbaj7y10vjimqs9n8i4rab6aw6fc3k759d6b"; depends=[]; };
   weibullness = derive2 { name="weibullness"; version="1.18.6"; sha256="046fs6b5yb6ckddcb9vplc5478c7xprnafsj4rvzb1gmcpcrqqck"; depends=[]; };
+  weibulltools = derive2 { name="weibulltools"; version="0.5.4"; sha256="0xxqcvxd489qhdais7f2xnscz8bfcsl4k1qggl35v65bn7bm7hjw"; depends=[dplyr magrittr plotly Rcpp sandwich segmented SPREDA survival]; };
   weightTAPSPACK = derive2 { name="weightTAPSPACK"; version="0.1"; sha256="0kpfw477qka5qrc6sh73had38xbrwrqp1yv0dj2qiihkiyrp67ks"; depends=[HotDeckImputation mice plyr survey]; };
   weightedScores = derive2 { name="weightedScores"; version="0.9.5.1"; sha256="118hzwaarcb8pk2zz83m6zzzndlpbbzb7gz87vc7zggpa998k1gr"; depends=[mvtnorm rootSolve]; };
   weightr = derive2 { name="weightr"; version="1.1.2"; sha256="13wy7ygx7khbmymg2r0rr6mrl4lbapf5bnnq1rq8izl38sjk7csx"; depends=[]; };
-  weights = derive2 { name="weights"; version="0.90"; sha256="0wgh2nb2y0xr20y6ig9mric34zhwpndb71ddpbrf5sjqg3hijj96"; depends=[gdata Hmisc mice]; };
+  weights = derive2 { name="weights"; version="1.0"; sha256="0186bfpkhxngrshac6bpg37alp6slwhwd43inrm8hqg0vhpfgc4c"; depends=[gdata Hmisc mice]; };
   weirs = derive2 { name="weirs"; version="0.25"; sha256="17a0ppi7ghikrwn39zvhg2cvhmnr3w0qi7r9lj22x65ii9nzadd7"; depends=[]; };
   welchADF = derive2 { name="welchADF"; version="0.3"; sha256="0k2di5fwh5jv87mw4bjnhbk2rmhf2v2f5ksjr5dgnyhnawwxqq97"; depends=[lme4]; };
   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.4.2"; sha256="0d771r3xrd7nwnpwnhzqaqybimjg0gaikqqagbf483x423ijfdny"; depends=[ggplot2 pROC reshape2 zoo]; };
+  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]; };
   wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; };
   wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; };
@@ -12546,8 +13104,9 @@ in with self; {
   wheatmap = derive2 { name="wheatmap"; version="0.1.0"; sha256="1c1xvzy194vw3idkwkqp9kyrfldzczj30cl15jw1bbnw87zcwdzy"; depends=[colorspace RColorBrewer]; };
   whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; };
   whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
-  whitening = derive2 { name="whitening"; version="1.0.0"; sha256="0vncjbrw9gafplz6r02x0j1fnrfvxq027h1pqcbdwqykjzg0zcym"; depends=[corpcor]; };
-  whoami = derive2 { name="whoami"; version="1.1.2"; sha256="1wkgh8mxm2ci5ylwppbh38sx5fm5rsm06bimdpc07z35bz4825xg"; depends=[httr jsonlite]; };
+  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]; };
+  whoami = derive2 { name="whoami"; version="1.2.0"; sha256="1b1zvbvmyh979fq72qa5k83888wpfr44l0qjz0pgdlad1li0nfnc"; depends=[httr jsonlite]; };
   whoapi = derive2 { name="whoapi"; version="0.1.2"; sha256="0ib0an08xsxan24q8mb5ai375njmkdc61lh4321rzgr25iqvi682"; depends=[httr]; };
   wicket = derive2 { name="wicket"; version="0.4.0"; sha256="1lizzmj69bswzlk18fv2v4yxxc6dynvmkymdiafznzcyyz4a8xnf"; depends=[BH Rcpp]; };
   widals = derive2 { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; };
@@ -12557,10 +13116,12 @@ 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]; };
-  wikitaxa = derive2 { name="wikitaxa"; version="0.2.0"; sha256="06ccb1ix5lsz3jgr3aq2ywq9bdnz020sa5dzlq1ayw95gdqj6icl"; depends=[crul curl data_table jsonlite tibble WikidataR xml2]; };
+  wikisourcer = derive2 { name="wikisourcer"; version="0.1.1"; sha256="03n813w281y6zk0xl248jdis6jr10dgpax7lcmx8av18dipssf1d"; 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]; };
   wildpoker = derive2 { name="wildpoker"; version="1.1"; sha256="1302ain55spz34irmq49sp9b1pvrn2nxmzmqs8m9wdk6g82h3s27"; depends=[]; };
+  wilson = derive2 { name="wilson"; version="2.0.2"; sha256="0ivd3cm6swhbcg38f66505rwf8h19wcg69mf3p4f9vjif8l13q4s"; depends=[circlize colourpicker ComplexHeatmap data_table DESeq2 DT factoextra FactoMineR ggplot2 ggrepel gplots heatmaply log4r openssl plotly plyr R6 RColorBrewer reshape rintrojs rje rjson RJSONIO scales shiny shinycssloaders shinydashboard shinyjs viridis]; };
   winRatioAnalysis = derive2 { name="winRatioAnalysis"; version="0.1.0"; sha256="1msvc06bfzw9clinxbvr5fdw38dff0c0xii46182nwnk5kj0libr"; depends=[data_table JM Matrix MLEcens mvtnorm nlme plyr pssm survival]; };
   windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; };
   windfarmGA = derive2 { name="windfarmGA"; version="1.2.1"; sha256="1v4brwi92a2kchak43z0vxjq11373amh190fnmpmnpz58zbls448"; depends=[calibrate data_table doParallel dplyr foreach geoR ggplot2 googleVis gstat gtools leaflet magrittr maptools RandomFields raster RColorBrewer rgdal rgeos rgl RgoogleMaps sp spatstat]; };
@@ -12576,22 +13137,22 @@ in with self; {
   wnl = derive2 { name="wnl"; version="0.4.1"; sha256="0gr0jf549nmavlzra6b1jg9306chl2l5qivizn5xkkcf8hmq5rm6"; depends=[numDeriv]; };
   wnominate = derive2 { name="wnominate"; version="1.2.5"; sha256="0pvw36jzx90z7ah4f7cyf95csdn5x7n9rh3ddsppa61y1dmjsn5k"; depends=[pscl]; };
   woe = derive2 { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; };
-  woeBinning = derive2 { name="woeBinning"; version="0.1.5"; sha256="04pw32vng31v1n4r1g1fisvv8cacxmcx7m65vw4a2byamp2d25yq"; 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]; };
-  wooldridge = derive2 { name="wooldridge"; version="1.3.0"; sha256="029vdiglwkr7ilr7jvzarvphcc71n1majn6bh427b4qq7n01a7wb"; depends=[]; };
+  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]; };
-  wordcloud = derive2 { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer Rcpp slam]; };
+  wordcloud = derive2 { name="wordcloud"; version="2.6"; sha256="0j96yyvm6bcrrpbdx4w26piqx44a0vbsr3px9cb4zk8a8da6jwak"; depends=[RColorBrewer Rcpp]; };
   wordcloud2 = derive2 { name="wordcloud2"; version="0.2.1"; sha256="1a2q42bn65q4idxq0vxysyam16q6c18inxv4dqhfy0x52j8z9x6k"; depends=[base64enc htmlwidgets]; };
   wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; };
   wordnet = derive2 { name="wordnet"; version="0.1-14"; sha256="12a21zlc7h973gi1632gngbk8b09vhp3sldh1mh9b5n6h18ga25p"; depends=[rJava]; };
   wordspace = derive2 { name="wordspace"; version="0.2-0"; sha256="0rrnbimf68ax1qxsyn7g0kd76abijzxg5i11h93l0fnzi2g2a9xn"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; };
-  workflowr = derive2 { name="workflowr"; version="1.1.0"; sha256="0vpnrldn798g3hcf1i30l5306259idbn5h3s23hjx3vxqjznss7f"; depends=[callr getPass git2r glue knitr R_utils rmarkdown rprojroot rstudioapi stringr whisker yaml]; };
+  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.1.1"; sha256="1jmq4z5myjxww2lz20i70vyvsvjxm1n9ayvxggxvzl28kwhpi5ca"; depends=[httr jsonlite pbapply xml2]; };
+  wosr = derive2 { name="wosr"; version="0.2.0"; sha256="0q8mswxb3w4d9pgc2fi64142i3dad4f2999vr1jvc9n8sjrmmmfc"; 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=[]; };
@@ -12601,8 +13162,8 @@ 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.5.0"; sha256="1r3h4h9vd0j4pbxh72557vqhdm1b79d35ialxr5919afx0nw1sg8"; depends=[]; };
-  wrassp = derive2 { name="wrassp"; version="0.1.7"; sha256="0wbgrpxp4ck8cpfnv6n5lf04ga12gn8cm3rm5jj32gcm4gvdvzjl"; depends=[]; };
+  wrapr = derive2 { name="wrapr"; version="1.6.3"; sha256="0qvlyj3wnvy6wxdnkb49c7a16v14xkk5zb9bw27w06p9iikc66i0"; 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=[]; };
   wrspathrow = derive2 { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[raster rgdal rgeos sp wrspathrowData]; };
@@ -12613,7 +13174,7 @@ in with self; {
   wskm = derive2 { name="wskm"; version="1.4.28"; sha256="0d9hcriakg6fxzc8wjsahc4zkyjza31mb9dv2h4xcf8298xa96i4"; depends=[clv lattice latticeExtra]; };
   wsrf = derive2 { name="wsrf"; version="1.7.17"; sha256="0gmlvfcy2iqa5sqhwps3hx0hl9fir8nf5xq62f25sn8i3llw752z"; depends=[Rcpp]; };
   wtest = derive2 { name="wtest"; version="3.1"; sha256="1rlas9jn57mcyjic9dhkqj355djldc95q07b076w847cd4pmzqvb"; depends=[]; };
-  wtss = derive2 { name="wtss"; version="1.0.0"; sha256="041686mnhqcljxm3ska35mslpq30ah47anvnmrgnkx5y05pwa8pj"; depends=[jsonlite lubridate RCurl roxygen2 zoo]; };
+  wtss = derive2 { name="wtss"; version="1.1.0"; sha256="019zvmq4z5xy5dwcf4g0z43x2mb14d1lgqhs1zp6821izffpbd0s"; depends=[jsonlite lubridate RCurl roxygen2 zoo]; };
   wunderscraper = derive2 { name="wunderscraper"; version="0.1.0"; sha256="1h9nhxvs673n2ivw466qm77k20541cwgmmq35iv3dcb3hvw36p0r"; depends=[httr jsonlite sf tigris]; };
   wux = derive2 { name="wux"; version="2.2-1"; sha256="0iw0kf0wfspnpc83v7gxhcakmp0z34cccnm0jn9c2za9ay9l2swv"; depends=[abind class corpcor fields gdata Hmisc ncdf4 reshape rgdal rgeos rworldmap sp stringr]; };
   wvtool = derive2 { name="wvtool"; version="1.0"; sha256="0x9awj6g5lzqp2lhwgh9ib7jmfdzyhwazrjvw1vwacqqfhbz8qxv"; depends=[]; };
@@ -12623,20 +13184,23 @@ 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.1.2"; sha256="01xicw6ffrzs0df69dmylfxxfszqy5j81vba1w1l99h7hxq5a6bs"; depends=[colourpicker data_table jpeg lubridate moments plotly raster RCurl rgdal rjson shiny shinyAce shinyBS shinydashboard shinyFiles shinyjs shinythemes shinyTime sp stringr tiff]; };
-  xSub = derive2 { name="xSub"; version="0.0.1"; sha256="0ccvkdylsia8qkfjlbbyggpy4l8z3r05cmvp4xb3j4628fa82jav"; depends=[countrycode haven RCurl]; };
+  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]; };
+  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]; };
-  xaringan = derive2 { name="xaringan"; version="0.6"; sha256="0jgdixgbkwp9jnvjnrzdmlawz8f24z8in56cma3hn79glbvxfaw4"; depends=[htmltools knitr rmarkdown servr xfun]; };
+  xaringan = derive2 { name="xaringan"; version="0.8"; sha256="05a2x3a8irvj34zvpbnivwi73i2i6hsh63rw56lj0b4y8d8cqgby"; depends=[htmltools knitr rmarkdown servr xfun]; };
   xbreed = derive2 { name="xbreed"; version="1.0.1"; sha256="0grrfra9j0k3mqikmrif5qawh4260ayr40irskzpp9ywsixim63h"; depends=[BGLR]; };
-  xergm = derive2 { name="xergm"; version="1.8.2"; sha256="0rg8b0r27nzjnf0zkwfbkw96439h0b40k1l5lqi5igyr0bm7w0cc"; depends=[btergm GERGM rem tnam xergm_common]; };
+  xdcclarge = derive2 { name="xdcclarge"; version="0.1.0"; sha256="1j8wsidwmfjygqlwavxinv4bqc6rddy42jdmlknsjfrrs49yj8kn"; depends=[nlshrink Rcpp RcppArmadillo]; };
+  xergm = derive2 { name="xergm"; version="1.8.3"; sha256="155469550rsdwszrhw7vdgwz2h0d72a8f4hirrb6hny7f1q63ykk"; depends=[btergm GERGM rem tnam xergm_common]; };
   xergm_common = derive2 { name="xergm.common"; version="1.7.7"; sha256="0nfls8a1knmnjjrrw0q93qsfrrb9p3yqsm5dxp13z0780vrzxvcj"; depends=[ergm network]; };
   xesreadR = derive2 { name="xesreadR"; version="0.2.2"; sha256="1y7iilqdj9jv5snzylihs996hvpcj9s3yaiy7wr20m5yh1ngwkvj"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; };
-  xfun = derive2 { name="xfun"; version="0.2"; sha256="0zl22fcw90kdvzkjyf6vbmdmn9rz3bl51522fasvmykypffyng4a"; depends=[]; };
+  xfun = derive2 { name="xfun"; version="0.4"; sha256="0991ywgc2dsraba91kkj37akhfzhzn02cnz7c88hhdis9kag3pwv"; depends=[]; };
   xgboost = derive2 { name="xgboost"; version="0.71.2"; sha256="134q69xbi93ajjlwrp838jgypjdjipmbkzmr31mvc100i9nsr14x"; depends=[data_table magrittr Matrix stringi]; };
   xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; };
   xhmmScripts = derive2 { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; };
-  xkcd = derive2 { name="xkcd"; version="0.0.5"; sha256="1cq4n7w4adj24qq658z15jkqvrn4pd5abxpcsdkzb2cq98m69iis"; depends=[extrafont ggplot2 Hmisc]; };
+  xkcd = derive2 { name="xkcd"; version="0.0.6"; sha256="1z2y0ihn68ppay7xkglhw7djki5654g6z4bbpyy41if57z9q554f"; depends=[extrafont ggplot2 Hmisc]; };
   xkcdcolors = derive2 { name="xkcdcolors"; version="1.0"; sha256="07fnjv01r3b951dqca2zs9b9f6hsgbpbpsrggvb8rps53kpid0i7"; depends=[FNN]; };
+  xlm = derive2 { name="xlm"; version="0.1.1"; sha256="0hr95x3s3gbyj12xb8kvy2kzlmjr2ycdw79r2kfcqvvabd2h41dv"; depends=[data_table httr R6 RJSONIO]; };
   xlsimple = derive2 { name="xlsimple"; version="0.0.1"; sha256="1x0b2pb1sg2sqmh4z03bchsc9fhcphi6mxk4nbb6my2cr0kqrrdq"; depends=[]; };
   xlsx = derive2 { name="xlsx"; version="0.6.1"; sha256="1d58qlzdj4vrk4vnlyzri600ix7z3wnc30gnbcc1qz27nlbbv055"; depends=[rJava xlsxjars]; };
   xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; };
@@ -12644,32 +13208,33 @@ in with self; {
   xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; };
   xmeta = derive2 { name="xmeta"; version="1.1-4"; sha256="1y9jldi8qn4jpr05g8fnvb23gig180hh36pc2v4y8n8289s9yvg2"; depends=[aod glmmML metafor mvmeta numDeriv]; };
   xml2 = derive2 { name="xml2"; version="1.2.0"; sha256="154lmksfiwkhnlmryas25mjhfg6k4mmnnk7bbb29mnn5x5pr2yha"; depends=[Rcpp]; };
-  xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.1"; sha256="0q9d4l3p4ypc0qswnjwrd3as9bx9f1niixsc19y1msva51sg5h39"; depends=[]; };
-  xmlrpc2 = derive2 { name="xmlrpc2"; version="1.0"; sha256="1h99z0kmmp5rmyglqwpaan6hbb8kg8q4783kjsyww43fl0l3imd8"; depends=[base64enc curl xml2]; };
-  xmrr = derive2 { name="xmrr"; version="1.0.1"; sha256="0h5861mym7k7xkby6zilcxq8i3yr06kcaam5pzi2y0q85iycb88f"; depends=[dplyr ggplot2 tidyr]; };
+  xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.2"; sha256="1npf4ng9d34k56ib1ac4cb3p2x8gqm3jha1sc25nv6546ahcrcjh"; depends=[]; };
+  xmlrpc2 = derive2 { name="xmlrpc2"; version="1.1"; sha256="13rfw0civp3hzi4hn31x1idliid1qb73495x4c31z5msd35lzxrs"; depends=[base64enc curl xml2]; };
+  xmrr = derive2 { name="xmrr"; version="1.0.36"; sha256="0xxi8z9sp156508y5a7f4ax8yry7lg4qmn0hyk04dn1xr7syd4gs"; depends=[dplyr ggplot2 tidyr]; };
   xoi = derive2 { name="xoi"; version="0.67-4"; sha256="180zzc81d883qzl1xgj88d9aslqmsgdvv8w1mx2613h1rkirkpdp"; depends=[qtl]; };
+  xopen = derive2 { name="xopen"; version="1.0.0"; sha256="1vrvgdika1d63dwygynbv2wmd87ll8dji5dy89hj576n8hw601z2"; depends=[processx]; };
   xplain = derive2 { name="xplain"; version="0.2.1"; sha256="01hl9dxiqqxzdixqccga0sywlhv97pi1l51r9sr7v106s7q11jxn"; depends=[RCurl readr XML]; };
-  xpose = derive2 { name="xpose"; version="0.4.2"; sha256="11k07z76fpp4fvp3kfx1jc7bx1mwc1xfwyp46xwfhgfbazbvyfd7"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; };
+  xpose = derive2 { name="xpose"; version="0.4.3"; sha256="1h1wx0pyr2l93pc59ybgg124fs1qhwhhyarafmh4s9b0ps0a451c"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; };
   xpose4 = derive2 { name="xpose4"; version="4.6.1"; sha256="1722ai8r94dmy4d2r728iir0hl2b2gmym8xjsqscfc6jw070734i"; depends=[dplyr gam Hmisc lattice lazyeval readr survival]; };
   xptr = derive2 { name="xptr"; version="1.1"; sha256="12yvgbwm311hap3kk24wdx5zz084h0lhkj9k10mjzqp4a6aayi88"; depends=[]; };
   xray = derive2 { name="xray"; version="0.2"; sha256="1ibj92ljlj8a5rmbrci691yhpd4kwrfyl944nzl2dcbf58l01dzq"; depends=[dplyr foreach ggplot2 lubridate scales]; };
   xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; };
   xslt = derive2 { name="xslt"; version="1.3"; sha256="0giqzmdby9ax8gwx9b7xqka28k3hgymv4289k8p8dvg26d683p3l"; depends=[Rcpp xml2]; };
   xsp = derive2 { name="xsp"; version="0.1.2"; sha256="1jbmxa234v52qji8sz4bkg24c2n65b0zh9py1wyyfzw9n1wx5w0r"; depends=[ggplot2 reshape2]; };
-  xtable = derive2 { name="xtable"; version="1.8-2"; sha256="0398qkpvlw3dv0myz4mjcyqwpwc2m31l127r8vdzwc71wb6s28qn"; depends=[]; };
+  xtable = derive2 { name="xtable"; version="1.8-3"; sha256="09f311gq9g7dzf8jdvcx72j11xb7p00jlg066jjbpa6pz3zv1cjk"; depends=[]; };
   xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; };
-  xtensor = derive2 { name="xtensor"; version="0.6.1-0"; sha256="0ajxzjj8nyn7a0z16agj499j6qwj0ykag152pvmqvdm000dx5n1l"; depends=[Rcpp]; };
+  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.10-2"; sha256="1i11fczks4lh8rpi6xbm9bm7f3jpcp6xw03kv178g3n3361qhmc1"; depends=[zoo]; };
-  xwf = derive2 { name="xwf"; version="0.2-1"; sha256="1g94wbsq8flnkxxfxx6yg87siiwpyrx219an9a2cf1blnwjv9b68"; depends=[mgcv]; };
-  xxIRT = derive2 { name="xxIRT"; version="2.1.0"; sha256="17cyvbywfvbs93ky8qmzh6fp94dk24p3wpzb76lxb8nfsvakq5pf"; depends=[ggplot2 lpSolveAPI reshape2]; };
+  xts = derive2 { name="xts"; version="0.11-1"; sha256="17d3g14xkxa1a5z5gd3gk1xjqfkjg1ik3i12q0arina8frql3jhd"; 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=[]; };
   xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; };
-  yaImpute = derive2 { name="yaImpute"; version="1.0-29"; sha256="1zxl4l54y9f9lmi17hlhsbsc4f1qb0dnnl5dg9frhq6bhw2lqxqb"; depends=[]; };
-  yacca = derive2 { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; };
+  yaImpute = derive2 { name="yaImpute"; version="1.0-30"; sha256="0s997gb9ig2if6nc4g89vi1yz6my3z9m7ai3bgjqw836643dmhg9"; depends=[]; };
+  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.1.19"; sha256="04bzrnfgbpk0rhkvzwp3k3ip7jpq26bjxz71bx5mwxmcjdb07nz5"; depends=[]; };
+  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]; };
   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=[]; };
@@ -12683,7 +13248,7 @@ in with self; {
   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]; };
   yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; };
-  zCompositions = derive2 { name="zCompositions"; version="1.1.1"; sha256="1j6v7mfxhn67mr3q6cvcjj9pqc8a02w114z8q74h3l6jw8ahjg6m"; depends=[MASS NADA truncnorm]; };
+  zCompositions = derive2 { name="zCompositions"; version="1.1.1-1"; sha256="147layq5hj7hba2a5q9sb7dwv6rwha9d8040p1npmdif3nbap2zd"; 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]; };
   zeallot = derive2 { name="zeallot"; version="0.1.0"; sha256="1sd1igcfnv27pa3bqxlbyxchi562h7grnjg1l7wxx3bwr49i57s3"; depends=[]; };
@@ -12692,6 +13257,7 @@ in with self; {
   zeligverse = derive2 { name="zeligverse"; version="0.1.1"; sha256="1hf3hbgzdlhhyy2gvg984dwp8d0qm0ziyn8i9h5x00gwf74vn9dr"; depends=[Amelia dplyr MatchIt purrr rstudioapi tibble WhatIf Zelig ZeligChoice ZeligEI]; };
   zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
   zenplots = derive2 { name="zenplots"; version="0.0-3"; sha256="1ba9xv522knzbirl6ac5hzbmsw8ignsmymbkps2w057w0fsc9iyz"; depends=[graph MASS PairViz]; };
+  zeroEQpart = derive2 { name="zeroEQpart"; version="0.1.0"; sha256="1n24nqyl0irpyspwx4b73xy228a84aa8zsn9fcf2lrlni5vyzmm0"; depends=[MASS ppcor]; };
   zetadiv = derive2 { name="zetadiv"; version="1.1.1"; sha256="0laxp2pd5s0s9wcnvs1r4shid2gi8ap4y9py6gpl207ywq6cxmgz"; depends=[car glm2 Imap mgcv nnls scam vegan]; };
   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]; };
@@ -12703,16 +13269,16 @@ in with self; {
   zoeppritz = derive2 { name="zoeppritz"; version="1.0-7"; sha256="14j9jl2g7gn94nzs96mwsgwlxnfbr1crjfmfwbi3rk367xi197jb"; depends=[]; };
   zoib = derive2 { name="zoib"; version="1.5.1"; sha256="0lsyr8hfhk4dk129x2l1793v6nmf2k97wnsc44ir6ymip3i4zfld"; depends=[abind coda Formula matrixcalc rjags]; };
   zonator = derive2 { name="zonator"; version="0.5.9"; sha256="04gjrm9nxnxsigrc30zghmv37ijsx27134hfnrbm51smw2y60dm4"; depends=[ggplot2 raster RColorBrewer reshape2 rgdal]; };
-  zoo = derive2 { name="zoo"; version="1.8-2"; sha256="1lpwigxmi5sc23xrha4gcsccsm4yfsg0sa97y6vac3pg1lliblvx"; depends=[lattice]; };
+  zoo = derive2 { name="zoo"; version="1.8-4"; sha256="1pywcp86kqijdrvl42qwdy75szrag9pzj0p88zbrj2r1klb8rn5i"; depends=[lattice]; };
   zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; };
   zooaRchGUI = derive2 { name="zooaRchGUI"; version="1.0.2"; sha256="0snggx0d69ajz6xxwnv03l12jpjrjkpy2dgf4lrpm2l8rspd27i4"; depends=[car coda foreign geomorph ggplot2 MASS pgirmess raster readxl rjags sp spdep splancs tcltk2 tkrplot vegan]; };
-  zoocat = derive2 { name="zoocat"; version="0.2.0"; sha256="1xqi90jnpqjdf3zr4pldh1a2gjppjwjrgkq71rvdhmcrf5s8jav0"; depends=[plyr reshape2 scales zoo]; };
+  zoocat = derive2 { name="zoocat"; version="0.2.0.1"; sha256="0rdjgf1gvnixqwxrnvzswb53yzcvjgvfkrms6d38bhfyw320kgdp"; depends=[plyr reshape2 scales zoo]; };
   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=[]; };
   zstdr = derive2 { name="zstdr"; version="0.1.1"; sha256="1rigsdh0f68l6vvvxp277cp8hbxj10x4588s6az1njxfpxrc8ajj"; depends=[Rcpp]; };
-  ztable = derive2 { name="ztable"; version="0.1.8"; sha256="1hk5k9614n52dpfrhdws06w4gvwhnz8q47x4cwxx88qmrzm8z2m3"; depends=[]; };
+  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]; };
   zyp = derive2 { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; };
 }
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index c9766a985f6..066ad48d953 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -278,7 +278,6 @@ let
     kza = [ pkgs.fftw.dev ];
     libamtrack = [ pkgs.gsl_1 ];
     magick = [ pkgs.imagemagick.dev ];
-    mixcat = [ pkgs.gsl_1 ];
     mvabund = [ pkgs.gsl_1 ];
     mwaved = [ pkgs.fftw.dev ];
     ncdf4 = [ pkgs.netcdf ];
@@ -353,7 +352,6 @@ let
     sf = [ pkgs.gdal pkgs.proj pkgs.geos ];
     showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype.dev ];
     simplexreg = [ pkgs.gsl_1 ];
-    SOD = [ pkgs.opencl-headers ];
     spate = [ pkgs.fftw.dev ];
     ssanv = [ pkgs.proj ];
     stsm = [ pkgs.gsl_1 ];
@@ -602,11 +600,9 @@ let
     "RcmdrPlugin_coin"
     "RcmdrPlugin_depthTools"
     "RcmdrPlugin_DoE"
-    "RcmdrPlugin_doex"
     "RcmdrPlugin_EACSPIR"
     "RcmdrPlugin_EBM"
     "RcmdrPlugin_EcoVirtual"
-    "RcmdrPlugin_epack"
     "RcmdrPlugin_EZR"
     "RcmdrPlugin_FactoMineR"
     "RcmdrPlugin_HH"
@@ -624,7 +620,6 @@ let
     "RcmdrPlugin_sampling"
     "RcmdrPlugin_SCDA"
     "RcmdrPlugin_SLC"
-    "RcmdrPlugin_SM"
     "RcmdrPlugin_sos"
     "RcmdrPlugin_steepness"
     "RcmdrPlugin_survival"
@@ -641,7 +636,6 @@ let
     "rich"
     "rioja"
     "ripa"
-    "rite"
     "RNCEP"
     "RQDA"
     "RSDA"
-- 
GitLab


From 9b63cc63131176cf232d8677ba56b4e57563982c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Nov 2018 11:46:37 +0100
Subject: [PATCH 0876/1065] r-rlang: patch shebang in configure script to fix
 the build

---
 pkgs/development/r-modules/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 066ad48d953..56c707c6fa7 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -942,6 +942,11 @@ let
       PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include -I${pkgs.cyrus_sasl.dev}/include -I${pkgs.zlib.dev}/include";
       PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -L${pkgs.cyrus_sasl.out}/lib -L${pkgs.zlib.out}/lib -lssl -lcrypto -lsasl2 -lz";
     });
+
+    rlang = old.rlang.overrideDerivation (attrs: {
+      preConfigure = "patchShebangs configure";
+    });
+
   };
 in
   self
-- 
GitLab


From 9f9fc7ae1545306837948cda08a16c10fdbcce2a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Nov 2018 12:44:08 +0100
Subject: [PATCH 0877/1065] nlopt: update from 2.4.2 to 2.5.0

---
 pkgs/development/libraries/nlopt/default.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 904cdc6a3da..48b7acf2896 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -1,13 +1,20 @@
-{ fetchurl, stdenv, octave ? null }:
+{ fetchurl, stdenv, octave ? null, cmake }:
 
-stdenv.mkDerivation rec {
-  name = "nlopt-2.4.2";
+let
+
+  version = "2.5.0";
+
+in
+
+stdenv.mkDerivation {
+  name = "nlopt-${version}";
 
   src = fetchurl {
-    url = "http://ab-initio.mit.edu/nlopt/${name}.tar.gz";
-    sha256 = "12cfkkhcdf4zmb6h7y6qvvdvqjs2xf9sjpa3rl3bq76px4yn76c0";
+    url = "https://github.com/stevengj/nlopt/archive/v${version}.tar.gz";
+    sha256 = "1bmlsdzkw8xbigiihffyb0kdaqbyfn7dr8s5pdgavy7z05bpmpf6";
   };
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [ octave ];
 
   configureFlags = [
@@ -24,7 +31,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    homepage = http://ab-initio.mit.edu/nlopt/;
+    homepage = "https://nlopt.readthedocs.io/en/latest/";
     description = "Free open-source library for nonlinear optimization";
     license = stdenv.lib.licenses.lgpl21Plus;
     hydraPlatforms = stdenv.lib.platforms.linux;
-- 
GitLab


From c9e13806267f7fd3351d52a19cc6db5fa2985ca9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Nov 2018 12:41:45 +0100
Subject: [PATCH 0878/1065] r-nloptr: fix build by adding pkgconfig

---
 pkgs/development/r-modules/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 56c707c6fa7..f40c0fcb559 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -281,7 +281,7 @@ let
     mvabund = [ pkgs.gsl_1 ];
     mwaved = [ pkgs.fftw.dev ];
     ncdf4 = [ pkgs.netcdf ];
-    nloptr = [ pkgs.nlopt ];
+    nloptr = [ pkgs.nlopt pkgs.pkgconfig ];
     odbc = [ pkgs.unixODBC ];
     outbreaker = [ pkgs.gsl_1 ];
     pander = [ pkgs.pandoc pkgs.which ];
@@ -855,10 +855,9 @@ let
     });
 
     nloptr = old.nloptr.overrideDerivation (attrs: {
-      configureFlags = [
-        "--with-nlopt-cflags=-I${pkgs.nlopt}/include"
-        "--with-nlopt-libs='-L${pkgs.nlopt}/lib -lnlopt_cxx -lm'"
-      ];
+      # Drop bundled nlopt source code. Probably unnecessary, but I want to be
+      # sure we're using the system library, not this one.
+      preConfigure = "rm -r src/nlopt_src";
     });
 
     V8 = old.V8.overrideDerivation (attrs: {
-- 
GitLab


From c78761b5bdd814956364d851bbcb08cab4279876 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 2 Nov 2018 13:12:54 -0500
Subject: [PATCH 0879/1065] tor: 0.3.4.8 -> 0.3.4.9

https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-0.3.4.9

Please confirm the sha256 is correct for a verified tarball,
I'm not setup (or know how offhand but docs look promising)
to do this myself.
---
 pkgs/tools/security/tor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index d7344884951..d43b8598c18 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -14,11 +14,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.3.4.8";
+  name = "tor-0.3.4.9";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${name}.tar.gz";
-    sha256 = "08qhzcmzxp5xr2l5721vagksqnnbrzzzy5hmz5y9r8lrq2r4qsl2";
+    sha256 = "0jhnvnp08hsfrzgsvg5xnfxyaw3nzgg9h24cwbwnz6iby20i05qs";
   };
 
   outputs = [ "out" "geoip" ];
-- 
GitLab


From 508ce6e208c2cce1522c6b399a1344c3008133d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Nov 2018 17:42:42 +0100
Subject: [PATCH 0880/1065] haskellPackages: default to ghc 8.4.4 as per
 Stackage LTS 12.16

---
 .../haskell-modules/configuration-hackage2nix.yaml | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  2 +-
 pkgs/top-level/haskell-packages.nix                |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 1b85a564e31..aa96bebc21b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1,6 +1,6 @@
 # pkgs/development/haskell-modules/configuration-hackage2nix.yaml
 
-compiler: ghc-8.4.3
+compiler: ghc-8.4.4
 
 core-packages:
   - array-0.5.2.0
@@ -12,12 +12,12 @@ core-packages:
   - deepseq-1.4.3.0
   - directory-1.3.1.5
   - filepath-1.4.2
-  - ghc-8.4.3
-  - ghc-boot-8.4.3
-  - ghc-boot-th-8.4.3
+  - ghc-8.4.4
+  - ghc-boot-8.4.4
+  - ghc-boot-th-8.4.4
   - ghc-compact-0.1.0.0
   - ghc-prim-0.5.2.0
-  - ghci-8.4.3
+  - ghci-8.4.4
   - haskeline-0.7.4.2
   - hpc-0.6.0.3
   - integer-gmp-1.0.2.0
@@ -26,10 +26,10 @@ core-packages:
   - pretty-1.1.3.6
   - process-1.6.3.0
   - rts-1.0
-  - stm-2.4.5.0
+  - stm-2.4.5.1
   - template-haskell-2.13.0.0
   - terminfo-0.4.1.1
-  - text-1.2.3.0
+  - text-1.2.3.1
   - time-1.8.0.2
   - transformers-0.5.5.0
   - unix-2.7.2.2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 192d9013229..9b9bcacc451 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6861,7 +6861,7 @@ with pkgs;
 
   haskell = callPackage ./haskell-packages.nix { };
 
-  haskellPackages = haskell.packages.ghc843.override {
+  haskellPackages = haskell.packages.ghc844.override {
     overrides = config.haskellPackageOverrides or haskell.packageOverrides;
   };
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e654b35d258..dea3ba95425 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -103,7 +103,7 @@ in {
       stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
     };
     ghcjs84 = callPackage ../development/compilers/ghcjs-ng {
-      bootPkgs = packages.ghc843;
+      bootPkgs = packages.ghc844;
       ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json;
       stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
       ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {};
-- 
GitLab


From 7766df8eba9869813c1a031d28601eabb7325652 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 Nov 2018 02:31:11 +0100
Subject: [PATCH 0881/1065] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1-2-g57c4f0f from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/98ec0eee2ddef5d4a00e2ac4a95e8add46d23b69.
---
 .../haskell-modules/hackage-packages.nix      | 705 +++++++++++++++---
 1 file changed, 604 insertions(+), 101 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index bb6e6da1e0c..34c63821756 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -30439,8 +30439,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "3.2.3.0";
-       sha256 = "0yirmngvkmkxdbhh3r6b1j9385hhwnqpr6mmw9kf50axd7czx421";
+       version = "3.2.4.0";
+       sha256 = "0pj7zyf38rbi48lh8jhcm54wrflkdyh1583d9h4iy9nj5apa85ip";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -31563,7 +31563,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "avro_0_3_6_1" = callPackage
+  "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
@@ -31572,8 +31572,8 @@ self: {
      }:
      mkDerivation {
        pname = "avro";
-       version = "0.3.6.1";
-       sha256 = "0b1pj47nfpbqvcp5vzraa1przq1c9ll8n76qbyg05fjfvamycbq3";
+       version = "0.4.0.0";
+       sha256 = "1cly3x4lmibcjm5sz68s2fncakpx2cfvyimv4ck1mm5v94yfp8pi";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
@@ -33786,6 +33786,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bazel-runfiles" = callPackage
+    ({ mkDerivation, base, directory, filepath }:
+     mkDerivation {
+       pname = "bazel-runfiles";
+       version = "0.7.0.1";
+       sha256 = "000awjykargiirnmb3nfqp8dk1p87f5aqx2d07nxrrgflxs7y8ad";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base filepath ];
+       description = "Locate Bazel runfiles location";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "bbdb" = callPackage
     ({ mkDerivation, base, hspec, parsec }:
      mkDerivation {
@@ -47925,8 +47939,8 @@ self: {
      }:
      mkDerivation {
        pname = "cloben";
-       version = "0.1.0.3";
-       sha256 = "1nzks0p5p0a76jys5dza6iqp48kd1lgxla3k3dfd8znlg9nd7dy2";
+       version = "0.1.1.0";
+       sha256 = "14vkga43sm995rg4s4npjca7xslgs33kl1ivknbflfidvgpdlxmb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -50289,8 +50303,8 @@ self: {
      }:
      mkDerivation {
        pname = "compdata-fixplate";
-       version = "0.1.2";
-       sha256 = "1ljnmwgjllpcrgibfxxb4zghfl76g7951i2r9haycpwmikz7dggz";
+       version = "0.1.3";
+       sha256 = "1b9xmp2lps9k9fvvpqlha0vkncs4pivixyyqs71zl4dxcrsa8ryx";
        libraryHaskellDepends = [
          base composition containers deriving-compat fixplate tree-view
        ];
@@ -54868,8 +54882,8 @@ self: {
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.25";
-       sha256 = "00bhszbjz7in5z1bilb1m3ld5sdd6xk5s95h6cw882qz0i1dmlp5";
+       version = "5.9.27";
+       sha256 = "016f5rzn2dvd85mdjcdrc7jmy4v75sa4qf98rqyp8qc8cpcqcx4c";
        libraryHaskellDepends = [
          array base binary bytestring cereal cond directory exceptions
          filepath gray-extended hdaemonize hsyslog MonadRandom mtl random
@@ -61900,6 +61914,8 @@ self: {
        pname = "deriving-compat";
        version = "0.5.2";
        sha256 = "0h5jfpwawp7xn9vi82zqskaypa3vypm97lz2farmmfqvnkw60mj9";
+       revision = "1";
+       editedCabalFile = "1s672vc7w96fmvr1p3fkqi9q80sn860j14545sskpxb8iz9f7sxg";
        libraryHaskellDepends = [
          base containers ghc-boot-th ghc-prim template-haskell
          th-abstraction transformers transformers-compat
@@ -85876,19 +85892,20 @@ self: {
      , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
      , free, git, gnupg, hinotify, hslogger, http-client
      , http-client-tls, http-conduit, http-types, IfElse, lsof, magic
-     , memory, 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
+     , 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 {
        pname = "git-annex";
-       version = "6.20181011";
-       sha256 = "0k18vrk5g9fdlhvklg14fyjk7x9css18i82xzl8wsycjbcq9ncgf";
+       version = "7.20181031";
+       sha256 = "02h3c77mdlr4c6l7c14ai0i2kq8c7pawvsf33my449b1srviazlm";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3"
@@ -85907,7 +85924,7 @@ self: {
          crypto-api cryptonite data-default DAV dbus directory
          disk-free-space dlist edit-distance esqueleto exceptions fdo-notify
          feed filepath free hinotify hslogger http-client http-client-tls
-         http-conduit http-types IfElse magic memory monad-control
+         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
          persistent-sqlite persistent-template process QuickCheck random
@@ -94388,8 +94405,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.14.0";
-       sha256 = "0cypqvl04fd0gdakl2kf087fjy6qw968isx2hmli5z5gza18hl0b";
+       version = "1.15.0";
+       sha256 = "13xpbwnh6xs3lj6vgqanww3ipz8bsfh3q305rkrb7kgl338nqgsm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100220,8 +100237,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-node";
-       version = "0.9.3";
-       sha256 = "149k9b11c0dj3qqdbinwqnjxy8bxmc4bk65lfxpic2zy26n46k7q";
+       version = "0.9.4";
+       sha256 = "1lwlbi5pw9wngmhk6dkyc05ahq1w1a0jxipkf9g5spq7ipfw4v6y";
        libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra data-default hashable
          haskoin-core monad-logger mtl network nqe random resourcet
@@ -100292,8 +100309,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.4.2";
-       sha256 = "0fjp566icp76dqhivl9jn3s3k2fvxmjysj4rpmrvwfyzb7snlqvp";
+       version = "0.6.0";
+       sha256 = "1qzxx1rbwv792f96wcsqmbsshd6qf34fqj6byi17la51s900zr09";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100556,6 +100573,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasktorch" = callPackage
+    ({ mkDerivation, backprop, base, dimensions, generic-lens
+     , ghc-typelits-natnormalise, hasktorch-ffi-th, hasktorch-ffi-thc
+     , hasktorch-indef, hasktorch-signatures-partial, hasktorch-types-th
+     , hasktorch-types-thc, hspec, microlens-platform, monad-loops, mtl
+     , QuickCheck, safe-exceptions, singletons, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "hasktorch";
+       version = "0.0.1.0";
+       sha256 = "10lmas8x4nk7z7phxj1a2bhzjz7qhbmy472f9j584mbagvklfkmc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base dimensions hasktorch-ffi-th hasktorch-ffi-thc hasktorch-indef
+         hasktorch-signatures-partial hasktorch-types-th hasktorch-types-thc
+         safe-exceptions singletons text
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         backprop base dimensions generic-lens ghc-typelits-natnormalise
+         hspec microlens-platform monad-loops mtl QuickCheck singletons time
+         transformers
+       ];
+       doHaddock = false;
+       description = "Torch for tensors and neural networks in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hasktorch-codegen" = callPackage
     ({ mkDerivation, base, containers, directory, hashable, hspec
      , hspec-discover, megaparsec, optparse-applicative, pretty-show
@@ -100563,8 +100609,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasktorch-codegen";
-       version = "0.0.1.0";
-       sha256 = "0s48myr8k96kb0mwvfcc9h5razp8y5k8dk987hfg101h2nfz5k10";
+       version = "0.0.1.1";
+       sha256 = "0yygx1w7i9mnyxrqzz94vrni5y7rkn92yycax7rqg2r5cds2xb6g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100583,6 +100629,180 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hasktorch-ffi-tests" = callPackage
+    ({ mkDerivation, base, hasktorch-types-th, hspec, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "hasktorch-ffi-tests";
+       version = "0.0.1.0";
+       sha256 = "0850v3wqf0x5hkk5py7k1glh591p59fs1y1kn2jf2giqmy05qzlc";
+       libraryHaskellDepends = [
+         base hasktorch-types-th hspec QuickCheck text
+       ];
+       description = "Testing library for Hasktorch's FFI bindings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hasktorch-ffi-th" = callPackage
+    ({ mkDerivation, ATen, base, c2hs, hasktorch-ffi-tests
+     , hasktorch-types-th, hspec, inline-c, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "hasktorch-ffi-th";
+       version = "0.0.1.0";
+       sha256 = "10gdvkwcjjzmrvmlz8vf823ja1jpab1nrph5lq46fcz8nqycsjq0";
+       libraryHaskellDepends = [ base hasktorch-types-th inline-c text ];
+       librarySystemDepends = [ ATen ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base hasktorch-ffi-tests hasktorch-types-th hspec QuickCheck text
+       ];
+       description = "Bindings to Torch";
+       license = stdenv.lib.licenses.bsd3;
+     }) {ATen = null;};
+
+  "hasktorch-ffi-thc" = callPackage
+    ({ mkDerivation, ATen, base, c2hs, hasktorch-ffi-tests
+     , hasktorch-ffi-th, hasktorch-types-th, hasktorch-types-thc, hspec
+     , inline-c, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "hasktorch-ffi-thc";
+       version = "0.0.1.0";
+       sha256 = "0l3xvhdyn2dzw999fbhihl20s3q01r5vp247d0rh27zvyszg7l3y";
+       libraryHaskellDepends = [
+         base hasktorch-types-th hasktorch-types-thc inline-c text
+       ];
+       librarySystemDepends = [ ATen ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base hasktorch-ffi-tests hasktorch-ffi-th hasktorch-types-th
+         hasktorch-types-thc hspec QuickCheck text
+       ];
+       description = "Bindings to Cutorch";
+       license = stdenv.lib.licenses.bsd3;
+     }) {ATen = null;};
+
+  "hasktorch-indef" = callPackage
+    ({ mkDerivation, backprop, base, containers, deepseq, dimensions
+     , ghc-typelits-natnormalise, hasktorch-ffi-th, hasktorch-signatures
+     , hasktorch-signatures-partial, hasktorch-signatures-support
+     , hasktorch-types-th, hspec, managed, mtl, QuickCheck
+     , safe-exceptions, singletons, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "hasktorch-indef";
+       version = "0.0.1.0";
+       sha256 = "0xmz7jid3sg3d2b4q1051fs7g0fljgvqxqwhzhd4g85fx7zr5nk3";
+       libraryHaskellDepends = [
+         backprop base containers deepseq dimensions
+         ghc-typelits-natnormalise hasktorch-ffi-th hasktorch-signatures
+         hasktorch-signatures-partial hasktorch-signatures-support
+         hasktorch-types-th managed mtl safe-exceptions singletons text
+         transformers vector
+       ];
+       testHaskellDepends = [
+         backprop base dimensions ghc-typelits-natnormalise hasktorch-ffi-th
+         hasktorch-types-th hspec mtl QuickCheck singletons text
+         transformers
+       ];
+       doHaddock = false;
+       description = "Core Hasktorch abstractions wrapping FFI bindings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hasktorch-signatures" = callPackage
+    ({ mkDerivation, base, hasktorch-ffi-th, hasktorch-ffi-thc
+     , hasktorch-signatures-partial, hasktorch-signatures-support
+     , hasktorch-signatures-types, hasktorch-types-th
+     , hasktorch-types-thc
+     }:
+     mkDerivation {
+       pname = "hasktorch-signatures";
+       version = "0.0.1.0";
+       sha256 = "1p8c3h0naqcbjxb3jbiss9zgfyg0hj0wcb6qlid6kwy925i4cyk1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base hasktorch-signatures-partial hasktorch-signatures-support
+         hasktorch-signatures-types hasktorch-types-th hasktorch-types-thc
+       ];
+       executableHaskellDepends = [
+         base hasktorch-ffi-th hasktorch-ffi-thc hasktorch-types-th
+         hasktorch-types-thc
+       ];
+       doHaddock = false;
+       description = "Backpack signatures for Tensor operations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hasktorch-signatures-partial" = callPackage
+    ({ mkDerivation, base, hasktorch-signatures-types
+     , hasktorch-types-th
+     }:
+     mkDerivation {
+       pname = "hasktorch-signatures-partial";
+       version = "0.0.1.0";
+       sha256 = "12dc5i4818j4q09mdshygz16zq1zyp32k6c1imgp9dl6bl4l05ss";
+       libraryHaskellDepends = [
+         base hasktorch-signatures-types hasktorch-types-th
+       ];
+       description = "Functions to partially satisfy tensor signatures";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hasktorch-signatures-support" = callPackage
+    ({ mkDerivation, base, hasktorch-signatures-types
+     , hasktorch-types-th
+     }:
+     mkDerivation {
+       pname = "hasktorch-signatures-support";
+       version = "0.0.1.0";
+       sha256 = "1vfmpsmgak4ifhpqh15ycf01p8l3a5qas3m7lkg09y8mqimwq5hh";
+       libraryHaskellDepends = [
+         base hasktorch-signatures-types hasktorch-types-th
+       ];
+       doHaddock = false;
+       description = "Signatures for support tensors in hasktorch";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hasktorch-signatures-types" = callPackage
+    ({ mkDerivation, base, deepseq }:
+     mkDerivation {
+       pname = "hasktorch-signatures-types";
+       version = "0.0.1.0";
+       sha256 = "0zaa0ihgbsiwqla46dixmxki75miy5dz91agvvd147rmr2khx1j2";
+       libraryHaskellDepends = [ base deepseq ];
+       doHaddock = false;
+       description = "Core types for Hasktorch backpack signatures";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hasktorch-types-th" = callPackage
+    ({ mkDerivation, base, c2hs, inline-c }:
+     mkDerivation {
+       pname = "hasktorch-types-th";
+       version = "0.0.1.0";
+       sha256 = "0irlf1lvadnr3j3zjakvkvrwdw8gpg5smk69w9l54idwsi6yvhdd";
+       libraryHaskellDepends = [ base inline-c ];
+       libraryToolDepends = [ c2hs ];
+       description = "C-types for Torch";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hasktorch-types-thc" = callPackage
+    ({ mkDerivation, base, c2hs, hasktorch-types-th, inline-c }:
+     mkDerivation {
+       pname = "hasktorch-types-thc";
+       version = "0.0.1.0";
+       sha256 = "06jxjn9s34myy4v8ad42xqmkyad5qraj99a3vpcxfagjxwcn4hbd";
+       libraryHaskellDepends = [ base hasktorch-types-th inline-c ];
+       libraryToolDepends = [ c2hs ];
+       description = "C-types for Cutorch";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskus-binary" = callPackage
     ({ mkDerivation, base, bytestring, cereal, criterion, haskus-utils
      , mtl, QuickCheck, tasty, tasty-quickcheck
@@ -107893,8 +108113,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoauth2";
-       version = "1.8.0";
-       sha256 = "02pirdgq1l638n126qj6sccfkjc6scxl53m584fxq79gfdwarx2q";
+       version = "1.8.1";
+       sha256 = "1b2rjqd8q0ybx26pmmsb1am9v6pnbp0xb3fzqvivxppdr5z6kl29";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111060,17 +111280,18 @@ self: {
 
   "hs2ats" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude
-     , criterion, deepseq, haskell-src-exts, hspec, hspec-dirstream
-     , language-ats, microlens, optparse-generic, system-filepath
+     , cpphs, criterion, deepseq, haskell-src-exts, hspec
+     , hspec-dirstream, language-ats, microlens, optparse-generic
+     , system-filepath
      }:
      mkDerivation {
        pname = "hs2ats";
-       version = "0.4.0.0";
-       sha256 = "1564xybdqli5i3096xmccy6z0xgm5yvfmjmz60r9ny3h54ahlj7r";
+       version = "0.5.0.0";
+       sha256 = "0ga90mkz11iis5knd51dqpqd4qyj6fwl15nbdbwzlynpk0wsdsga";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base casing composition-prelude deepseq
+         ansi-wl-pprint base casing composition-prelude cpphs deepseq
          haskell-src-exts language-ats microlens
        ];
        executableHaskellDepends = [ base optparse-generic ];
@@ -114182,6 +114403,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {seccomp = null;};
 
+  "hssh" = callPackage
+    ({ mkDerivation, async, base, bytestring, cereal, containers
+     , cryptonite, data-default, memory, stm, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "hssh";
+       version = "0.1.0.0";
+       sha256 = "00g87418fhzcxf1xmrj9s40g6i1cgjx65ki027sqgkss49w1w6ig";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring cereal containers cryptonite data-default
+         memory stm
+       ];
+       testHaskellDepends = [
+         async base bytestring cereal containers cryptonite data-default
+         memory stm tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "SSH protocol implementation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hsshellscript" = callPackage
     ({ mkDerivation, base, c2hs, directory, parsec, random, unix }:
      mkDerivation {
@@ -117583,6 +117827,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-prim_0_6_2_18" = 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.18";
+       sha256 = "1sm6rji0vv3ddi4sjp1q8nz271a084xpnv86n0adqzvd7b7sihip";
+       libraryHaskellDepends = [
+         base bytestring mmap semigroups transformers vector
+       ];
+       testHaskellDepends = [
+         base bytestring directory exceptions hedgehog hspec
+         hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion mmap semigroups transformers vector
+       ];
+       description = "Primitive functions and data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-prim-bits" = callPackage
     ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog
      , hw-hspec-hedgehog, QuickCheck, vector
@@ -117731,8 +117999,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-streams";
-       version = "0.0.0.4";
-       sha256 = "08dmcbvw3z53plzgq5z3pa9ns9rjj0xs9rx70pyfrqrrc2f98hwi";
+       version = "0.0.0.5";
+       sha256 = "0qhpkgxip9bnx6bcg1cnz9gbnwifkp9vinvp89152h720rsawh4i";
        libraryHaskellDepends = [
          base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups
          transformers vector
@@ -122172,8 +122440,8 @@ self: {
      }:
      mkDerivation {
        pname = "intero";
-       version = "0.1.32";
-       sha256 = "0xk693yhq2hkilznjzsszamvg7pg1l0qyb2y17ffr2s966i4pfr0";
+       version = "0.1.34";
+       sha256 = "02yq6rxg50za2lcsf6hvld5f1ab4q91kmw74j6kngm7921fa8fi3";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -122437,15 +122705,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "intro_0_5_1_0" = callPackage
+  "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
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.5.1.0";
-       sha256 = "0gsj5l0vgvpbdw2vwlr9r869jwc08lqbypp24g33dlnd338pjxzs";
+       version = "0.5.2.1";
+       sha256 = "0i5cpa5jx82nb1gi1wdhgnbmxlb7s4nbya46k6byajf7g50i5qp8";
        libraryHaskellDepends = [
          base bytestring containers deepseq dlist extra hashable mtl safe
          text transformers unordered-containers writer-cps-mtl
@@ -122559,6 +122827,8 @@ self: {
        pname = "invariant";
        version = "0.5.1";
        sha256 = "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b";
+       revision = "1";
+       editedCabalFile = "100gsacbpal53khj94m5qs4aq70hbsp4dz4065czfm49ysd4yqq4";
        libraryHaskellDepends = [
          array base bifunctors comonad containers contravariant ghc-prim
          profunctors semigroups StateVar stm tagged template-haskell
@@ -130164,13 +130434,17 @@ self: {
      }) {};
 
   "language-elm" = callPackage
-    ({ mkDerivation, base, hspec, MissingH, mtl, pretty, protolude }:
+    ({ mkDerivation, base, doctest, hspec, MissingH, mtl, pretty
+     , protolude
+     }:
      mkDerivation {
        pname = "language-elm";
-       version = "0.1.0.3";
-       sha256 = "07pyj3ibrpa3mrqn6skjpk0w44hi32mm0c08yqpnql3qv2xy4wcz";
+       version = "0.1.1.0";
+       sha256 = "0hg9b8cyw08gwbsdmqhadnx0clj3rvjavrd3hw597bh2iss3rafl";
        libraryHaskellDepends = [ base MissingH mtl pretty protolude ];
+       libraryToolDepends = [ doctest ];
        testHaskellDepends = [ base hspec mtl pretty protolude ];
+       testToolDepends = [ doctest ];
        description = "Generate elm code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132529,8 +132803,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.1.0.0";
-       sha256 = "0qw6nvhlczqywwzinsj0x5p2xw8490bbizl2lmj48dr71mndxdz0";
+       version = "1.1.0.1";
+       sha256 = "1psb3ywbzg6k0cir5bxphjqmbzd0n1l2w3skkr31px79haa4wbm7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -141302,7 +141576,7 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "megaparsec_7_0_2" = callPackage
+  "megaparsec_7_0_3" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-expectations, mtl
      , parser-combinators, QuickCheck, scientific, text, transformers
@@ -141310,8 +141584,8 @@ self: {
      }:
      mkDerivation {
        pname = "megaparsec";
-       version = "7.0.2";
-       sha256 = "1ny54saxiz0md50mp24gz267gmqjbl8d8b1zi74hi6bcxyhzd278";
+       version = "7.0.3";
+       sha256 = "1zngs6x7d1yp192pg8b0j5banq4y1vr1fwh1mxrxx0834bmqrll0";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -145988,12 +146262,17 @@ self: {
      }) {};
 
   "monopati" = callPackage
-    ({ mkDerivation, base, directory, free, split }:
+    ({ mkDerivation, base, directory, free, hedgehog, split
+     , transformers
+     }:
      mkDerivation {
        pname = "monopati";
-       version = "0.1.2";
-       sha256 = "1bimppfh14754a8dra6cjd2ricdyry5fmm0shryf974h9l6wbrp8";
+       version = "0.1.3";
+       sha256 = "1g7n1m6df2c9rl99fii7x4a7z3xwv2mcvxd96gg1maji9709chqb";
        libraryHaskellDepends = [ base directory free split ];
+       testHaskellDepends = [
+         base directory free hedgehog split transformers
+       ];
        description = "Well-typed paths";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -147415,6 +147694,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "multilinear" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, mwc-random
+     , primitive, statistics, vector
+     }:
+     mkDerivation {
+       pname = "multilinear";
+       version = "0.2.2.1";
+       sha256 = "0clqjf37gsgkc2lghrvdqjpzxxx1ly4zymkcflaph5x3klqlv4xy";
+       libraryHaskellDepends = [
+         base containers deepseq mwc-random primitive statistics vector
+       ];
+       testHaskellDepends = [ base criterion deepseq ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
+       description = "Comprehensive and efficient (multi)linear algebra implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "multilinear-io" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cereal, cereal-vector
+     , criterion, csv-enumerator, deepseq, either, multilinear
+     , transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "multilinear-io";
+       version = "0.2.1.2";
+       sha256 = "12kydrh8rzvwlgd634x6swd1yv9pyxa23yh2yxj86mnisb467llj";
+       libraryHaskellDepends = [
+         aeson base bytestring cereal cereal-vector csv-enumerator either
+         multilinear transformers vector zlib
+       ];
+       testHaskellDepends = [ base either multilinear transformers ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq either multilinear transformers
+       ];
+       description = "Input/output capability for multilinear package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "multimap" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -148958,6 +149275,68 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "n2o" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, hspec, text
+     }:
+     mkDerivation {
+       pname = "n2o";
+       version = "0.11.1";
+       sha256 = "0yvgis2v2jgdny50py8xmc9b1p2zi5kjgf45xsgsyyhzjyr30kb7";
+       libraryHaskellDepends = [ base binary bytestring containers text ];
+       testHaskellDepends = [ base hspec ];
+       description = "Abstract Protocol Loop";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "n2o-nitro" = callPackage
+    ({ mkDerivation, base, base64-bytestring, binary, bytestring
+     , containers, n2o, text
+     }:
+     mkDerivation {
+       pname = "n2o-nitro";
+       version = "0.11.2";
+       sha256 = "1vh0r03h0k60z4q722pw4h5q0l7l56fmyp57im0nankci8vj0s38";
+       libraryHaskellDepends = [
+         base base64-bytestring binary bytestring containers n2o text
+       ];
+       description = "Nitro Elements, Events and Actions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "n2o-protocols" = callPackage
+    ({ mkDerivation, base, base64-bytestring, binary, bytestring
+     , containers, n2o, n2o-nitro, time
+     }:
+     mkDerivation {
+       pname = "n2o-protocols";
+       version = "0.11.2";
+       sha256 = "1w5r99k9wvhbwvx0hzgpn1aahhnb84ib0n7xgq1ybpgy3s9cggzk";
+       libraryHaskellDepends = [
+         base base64-bytestring binary bytestring containers n2o n2o-nitro
+         time
+       ];
+       description = "N2O Protocols Starter Pack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "n2o-web" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+     , bytestring, case-insensitive, containers, n2o, n2o-protocols
+     , network, text, websockets
+     }:
+     mkDerivation {
+       pname = "n2o-web";
+       version = "0.11.2";
+       sha256 = "0d01lsfd2rwavzm01bkk3020r0wpfqyyqjbdf1pc8hw1im3843p6";
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring binary bytestring
+         case-insensitive containers n2o n2o-protocols network text
+         websockets
+       ];
+       description = "N2O adapter for WebSockets";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nagios-check" = callPackage
     ({ mkDerivation, base, bifunctors, exceptions, hspec, mtl
      , QuickCheck, text
@@ -151891,8 +152270,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "0.2.1.0";
-       sha256 = "1xavggdab7khi8isvrcf85xlrxhy852fb2ccj7jhmdnfmqzbzyyq";
+       version = "0.2.1.1";
+       sha256 = "0z406bmfk9b1b6knpxwzkwh8n2cpfwgxdh52vghpgjf69c0yrjq1";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export safe template-haskell
        ];
@@ -153703,17 +154082,19 @@ self: {
      }) {};
 
   "nuxeo" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, conduit
-     , conduit-extra, optparse-applicative, text, time
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
+     , conduit-extra, http-conduit, http-types, optparse-applicative
+     , text, time, url
      }:
      mkDerivation {
        pname = "nuxeo";
-       version = "0.3.0.2";
-       sha256 = "1h0asiqlffy0wy76q2dz7id6nzsid5nqkmsy1mxdl77zm3d9id4f";
+       version = "0.3.2";
+       sha256 = "0m0rnrcay92vi47dd6cbba5vdjzdrmwb9s7wic95cbsb7wmajc72";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring conduit conduit-extra text time
+         aeson attoparsec base bytestring conduit conduit-extra http-conduit
+         http-types text time url
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
        license = stdenv.lib.licenses.bsd3;
@@ -156279,8 +156660,8 @@ self: {
      }:
      mkDerivation {
        pname = "order-statistic-tree";
-       version = "0.1.1.0";
-       sha256 = "1gcjlvb0wbjkb3vg1bsiqip3wmacpvbc3s96f0vcm67dssdaws80";
+       version = "0.1.1.1";
+       sha256 = "13fhnbsx95w79r7lb1mfah8hj3cp6cqpphy31ajc6gcnzbiaqgk5";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        benchmarkHaskellDepends = [
@@ -156323,8 +156704,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "ordered-containers";
-       version = "0.1.0";
-       sha256 = "11smyc3z6xhb8j23wlgvvs8dvr82xmzpx2nhvkzazmgzrx3rf26b";
+       version = "0.1.1";
+       sha256 = "0m86imawwvr0bl18bbv9np8hlhs8ssn4l2dvxswa8f83fm61ai5a";
        libraryHaskellDepends = [ base containers ];
        description = "Set- and Map-like types that remember the order elements were inserted";
        license = stdenv.lib.licenses.bsd3;
@@ -156411,8 +156792,8 @@ self: {
      }:
      mkDerivation {
        pname = "orgmode-parse";
-       version = "0.2.2";
-       sha256 = "1f6wcxkln5ddaa2z7wbkp6wndgq38qv9h1wnn27gqcms02758v2r";
+       version = "0.3.0";
+       sha256 = "0p1lb3ba060nnr3msqzqy0ymbm4i0nkmwix8xx5zz6hir74ix3y9";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable
          old-locale semigroups text thyme unordered-containers
@@ -157629,10 +158010,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-pyplot";
-       version = "1.0.2.0";
-       sha256 = "0q6qj45g8d95z86lqkwpxw7c929x7q68611602mp2ip31dib11xc";
-       revision = "1";
-       editedCabalFile = "0zmvgzqhb4cggsr3m5xw1lhcns586jq5b0s9fhpwq1c3c6k5nq96";
+       version = "1.0.3.0";
+       sha256 = "0nzpww21j79s1ww2q26856m6zq325pz32jjd4hanki7ch0ni2kg2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158995,8 +159374,8 @@ self: {
      }:
      mkDerivation {
        pname = "parsers-megaparsec";
-       version = "0.1.0.0";
-       sha256 = "1xn12jbxv72hgkp9xarm9nr9rpqcijlyma47y31jz985r32nhaxj";
+       version = "0.1.0.1";
+       sha256 = "1fgxnxv5ispf7zg40fa35f1n7x7mk1pc8r96sbqpjbzasga79rx8";
        libraryHaskellDepends = [
          base fail megaparsec mtl parsers semigroups text transformers
        ];
@@ -161604,6 +161983,26 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "persistent-template-classy" = callPackage
+    ({ mkDerivation, base, lens, persistent, persistent-sqlite
+     , persistent-template, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "persistent-template-classy";
+       version = "0.1.0.1";
+       sha256 = "0ph5cfm5gj6qydv70s9bmb5ynymqnrhqiwcqpd0s87xj2iv9v46a";
+       libraryHaskellDepends = [
+         base lens persistent persistent-sqlite persistent-template
+         template-haskell text
+       ];
+       testHaskellDepends = [
+         base lens persistent persistent-sqlite persistent-template
+         template-haskell text
+       ];
+       description = "Generate classy lens field accessors for persistent models";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "persistent-test" = callPackage
     ({ mkDerivation, aeson, aeson-compat, attoparsec, base
      , base64-bytestring, blaze-builder, blaze-html, blaze-markup
@@ -163959,6 +164358,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pixela" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, http-client
+     , http-client-tls, http-types, split, text, unordered-containers
+     , uri-encode, vector
+     }:
+     mkDerivation {
+       pname = "pixela";
+       version = "0.1.0.0";
+       sha256 = "02ab3n56j3y93wrwdj8rd3ff9zw9kskily1s9j2yq49zwpjnilpj";
+       revision = "3";
+       editedCabalFile = "0kndzh00saxdinyz5hbqkir9n578fz8db291nqynqpymw6lwkyc3";
+       libraryHaskellDepends = [
+         aeson base bytestring data-default http-client http-client-tls
+         http-types split text unordered-containers uri-encode vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring data-default http-client http-client-tls
+         http-types split text unordered-containers uri-encode vector
+       ];
+       description = "Pixela client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pixelated-avatar-generator" = callPackage
     ({ mkDerivation, async, base, bytestring, cli, hspec, JuicyPixels
      , pureMD5, QuickCheck, random, split
@@ -165677,6 +166099,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "port-utils" = callPackage
+    ({ mkDerivation, async, base, hspec, network, stm }:
+     mkDerivation {
+       pname = "port-utils";
+       version = "0.1.0.2";
+       sha256 = "0a27xsz4agm4bf1i8nrsmlz509yv65fvf3a8pzaqm6qxj7ir7g8i";
+       libraryHaskellDepends = [ base network ];
+       testHaskellDepends = [ async base hspec network stm ];
+       description = "Utilities for creating and waiting on ports";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "portable-lines" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -175656,8 +176090,8 @@ self: {
        pname = "recursion-schemes";
        version = "5.0.3";
        sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v";
-       revision = "2";
-       editedCabalFile = "13n38bchrkkijvy6jvhjskqn1b2kahfa9rvjvjcdn4bih4ylivk7";
+       revision = "3";
+       editedCabalFile = "05fvpi3dc44h2a097fb9cq1jqdjq2b3sdf5hzfn9g00bid37bb5q";
        libraryHaskellDepends = [
          base base-orphans comonad free template-haskell th-abstraction
          transformers
@@ -181028,15 +181462,15 @@ self: {
      }:
      mkDerivation {
        pname = "rounded";
-       version = "0.1";
-       sha256 = "02xlc369yi8wvf41z4d3291i63rcryl0yjp0k5lkn3c2f0k5w244";
+       version = "0.1.0.1";
+       sha256 = "04abl192vq1xq7kf9fackcb17wjyxw4068fsks3pxm9dd4iymgls";
        libraryHaskellDepends = [
          base ghc-prim hgmp long-double reflection singletons
        ];
        librarySystemDepends = [ gmp mpfr ];
        testHaskellDepends = [ base long-double ];
        description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
-       license = "LGPL";
+       license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;};
 
   "rounding" = callPackage
@@ -181490,6 +181924,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rstream" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "rstream";
+       version = "0.1.0.0";
+       sha256 = "14l2jww91w993b61xn1m9y9wh27dvy1l1x2fh7g9f0l8mc5a9dpv";
+       libraryHaskellDepends = [ base ghc-prim ];
+       description = "stream-fusion framework from vector";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rtcm" = callPackage
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-bits, binary-conduit, bytestring
@@ -188261,7 +188706,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "serverless-haskell_0_8_1" = callPackage
+  "serverless-haskell_0_8_2" = 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
@@ -188269,8 +188714,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.8.1";
-       sha256 = "1s5i2l57s0crpk3lysdw0v7kvfx567bhl0v5i18mdsa331bifcpd";
+       version = "0.8.2";
+       sha256 = "1ia1vjiw71qkqdpbna2jgxznwlhbh184fr5m95dcyl5kwwlb3nb8";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -189198,8 +189643,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.10.1.0";
-       sha256 = "1b5mbb3azjn2wwagciayd5lyb6jd2siwn1l9ispnqrkrh1bqgzb5";
+       version = "1.10.2.0";
+       sha256 = "0kc7yy2qv4d2n3j0qwsg37ga9yyb380d6zni08l1jabrl84maly8";
        libraryHaskellDepends = [
          base binary dependency directory hs2ats language-ats microlens
          shake shake-c shake-cabal shake-ext text
@@ -190004,6 +190449,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shh" = callPackage
+    ({ mkDerivation, async, base, deepseq, directory, filepath, mtl
+     , process, split, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, unix
+     }:
+     mkDerivation {
+       pname = "shh";
+       version = "0.1.0.0";
+       sha256 = "0ixvfwrz1bsj1c2ln7fhvf6wawf75nzqfb784xgral33hmflm518";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base deepseq directory filepath mtl process split
+         template-haskell unix
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       description = "Simple shell scripting from Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "shift" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, bytestring
      , composition-prelude, data-default, microlens
@@ -194872,8 +195338,8 @@ self: {
      }:
      mkDerivation {
        pname = "socket";
-       version = "0.8.1.0";
-       sha256 = "1sbxcs1fmd7x95yk7sqv3q6gg2azn77l6sngiiv692966a0bxba0";
+       version = "0.8.2.0";
+       sha256 = "176px9n2f8mnxi3r2sqshrpbp7i11fskch1nkjhgqzq917sz0zgb";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -201243,8 +201709,8 @@ self: {
      }:
      mkDerivation {
        pname = "structured-cli";
-       version = "2.2.0.0";
-       sha256 = "1ia9xbbshzx0p69i8gq3y88qbg60cks52kb6hxm2ylkm7jnzgxzj";
+       version = "2.2.1.0";
+       sha256 = "1b75wnmprbb4sfnwyn5arc205ad5rlyz4hv63ai35i9iryax875s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -205919,6 +206385,8 @@ self: {
        pname = "tdigest";
        version = "0.2.1";
        sha256 = "0kmqmzjcs406hv2fv9bkfayxpsd41dbry8bpkhy4y1jdgh33hvnl";
+       revision = "1";
+       editedCabalFile = "1jrq22j9jbvx31pspwjvyb539gix7vfb8cinqkkb2abmr0jrhibn";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-compat binary deepseq reducers semigroupoids transformers
@@ -208393,6 +208861,8 @@ self: {
        pname = "text-show";
        version = "3.7.5";
        sha256 = "1by89i3c6qyjh7jjld06wb2sphb236rbvwb1mmvq8f6mxliiyf1r";
+       revision = "1";
+       editedCabalFile = "1v8czpi9mn54850k0pilqh1f3yfr5n5vykmg5k57wmrdpx25vkws";
        libraryHaskellDepends = [
          array base base-compat-batteries bifunctors bytestring
          bytestring-builder containers contravariant generic-deriving
@@ -211983,8 +212453,8 @@ self: {
      }:
      mkDerivation {
        pname = "toodles";
-       version = "0.1.0.16";
-       sha256 = "1xr9cl69v5m08d44xgprlpk9j5j2lby84lzcp3fjzlvfdnnx0q72";
+       version = "0.1.1";
+       sha256 = "1g806bdm6l52yg6q3jni94iacp7sfdacfx6rddnsdzqb0cj6ym0w";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -217582,7 +218052,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "universum_1_4_0" = callPackage
+  "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
@@ -217590,8 +218060,8 @@ self: {
      }:
      mkDerivation {
        pname = "universum";
-       version = "1.4.0";
-       sha256 = "1qhpz4wlvhrdjb1pvs0lgm0pghrciqasb3378zw32lqh3pv2pnrk";
+       version = "1.5.0";
+       sha256 = "17rzi17k2wj3p6dzd0dggzgyhh0c2mma4znkci1hqcihwr6rrljk";
        libraryHaskellDepends = [
          base bytestring containers deepseq ghc-prim hashable microlens
          microlens-mtl mtl safe-exceptions stm text transformers
@@ -218444,8 +218914,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
      mkDerivation {
        pname = "uri-bytestring-aeson";
-       version = "0.1.0.6";
-       sha256 = "02pgzkgmcam06qy1lqbmmjbah95b08hl5d5q61smmx78f83mzgfq";
+       version = "0.1.0.7";
+       sha256 = "16zg0fsxzdii72119jyhn2g2gy7j6pk7r8i7w5hk9a353kmvb43y";
        libraryHaskellDepends = [
          aeson base bytestring text uri-bytestring
        ];
@@ -221760,23 +222230,24 @@ self: {
 
   "voicebase" = callPackage
     ({ mkDerivation, aeson, base, bytestring, filepath, HsOpenSSL
-     , http-client, http-client-openssl, json-autotype, lens, mime-types
-     , optparse-applicative, text, wreq
+     , hspec, http-client, http-client-openssl, lens, lens-aeson
+     , mime-types, mtl, optparse-applicative, roundtrip, roundtrip-aeson
+     , text, wreq
      }:
      mkDerivation {
        pname = "voicebase";
-       version = "0.1.1.4";
-       sha256 = "17yrdrvvd3kyd6qnkfhqdwjxc5ripmzwa056rvn38ny3cxcfkd78";
+       version = "0.2.0.0";
+       sha256 = "0ih0z27vz7767gr11lz227vb84i2kwc6wn9z1yd0zma5nj8x73hw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring HsOpenSSL http-client http-client-openssl
-         json-autotype lens mime-types text wreq
+         lens lens-aeson mime-types mtl roundtrip roundtrip-aeson text wreq
        ];
        executableHaskellDepends = [
          aeson base bytestring filepath mime-types optparse-applicative text
        ];
-       testHaskellDepends = [ aeson base ];
+       testHaskellDepends = [ aeson base hspec roundtrip-aeson ];
        description = "Upload audio files to voicebase to get a transcription";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -222062,6 +222533,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "waargonaut" = callPackage
+    ({ mkDerivation, attoparsec, base, bifunctors, bytestring, Cabal
+     , cabal-doctest, containers, contravariant, digit, directory
+     , distributive, doctest, errors, filepath, generics-sop, hedgehog
+     , hoist-error, hw-balancedparens, hw-bits, hw-json, hw-prim
+     , hw-rankselect, lens, mmorph, mtl, nats, parsers, scientific
+     , semigroups, tagged, tasty, tasty-expected-failure, tasty-hedgehog
+     , tasty-hunit, template-haskell, text, transformers, vector
+     , witherable, wl-pprint-annotated, zippers
+     }:
+     mkDerivation {
+       pname = "waargonaut";
+       version = "0.1.0.0";
+       sha256 = "0y3h1kgh7n639h714ji4fycj6b8vcsa79jfv36w995p9gbjxxdjc";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base bifunctors bytestring containers contravariant digit
+         distributive errors generics-sop hoist-error hw-balancedparens
+         hw-bits hw-json hw-prim hw-rankselect lens mmorph mtl nats parsers
+         scientific semigroups tagged text transformers vector witherable
+         wl-pprint-annotated zippers
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring digit directory distributive doctest
+         filepath generics-sop hedgehog lens scientific semigroups tagged
+         tasty tasty-expected-failure tasty-hedgehog tasty-hunit
+         template-haskell text vector zippers
+       ];
+       description = "JSON wrangling";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wacom-daemon" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, Glob, libnotify, process, select, text, udev
-- 
GitLab


From 1bc120fa5faf996a248bdbb4cb7c4327ca368e06 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Nov 2018 17:29:06 +0100
Subject: [PATCH 0882/1065] git-annex: update sha256 hash for new version
 7.20181031

---
 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 33f498d922b..08597e4644c 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 = "069w4gdb104lc3vp48k3wywmgql56yc5g2g2i240xrr88in3qvqw";
+      sha256 = "0mgmxcr36b86jh56my3vhp9y4cravi0hbppa463q3c21a1cmjc19";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
-- 
GitLab


From f648605b4e521667baeeda71d8bf5573100bdb7b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Nov 2018 17:48:16 +0100
Subject: [PATCH 0883/1065] all-cabal-hashes: update to Hackage at
 2018-11-02T16:36:33Z

---
 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 0be9abba71d..5fac1606788 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/420a405e4dbccd78b2a471b632b9fe1a1e04502b.tar.gz";
-  sha256 = "01vdbp1yh2s0afijz9ap4590mlpiica7l6k0mpfc0jwzymn9w86n";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/98ec0eee2ddef5d4a00e2ac4a95e8add46d23b69.tar.gz";
+  sha256 = "0svcaaflqi5c815z3yrh61bjny1jnwp42sylmsnwryjldqvizc1a";
 }
-- 
GitLab


From 2266f2014b41e29ccf8c70a67a0af0133f8eb270 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 2 Nov 2018 13:31:20 -0500
Subject: [PATCH 0884/1065] nixos/postgresql: add myself as maintainer

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/databases/postgresql.nix | 2 +-
 pkgs/servers/sql/postgresql/default.nix         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 6edb1503c23..f592be0e768 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -271,5 +271,5 @@ in
   };
 
   meta.doc = ./postgresql.xml;
-
+  meta.maintainers = with lib.maintainers; [ thoughtpolice ];
 }
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index b81b4340d76..f8bf08b55b7 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -89,11 +89,11 @@ let
     };
 
     meta = with lib; {
-      homepage = https://www.postgresql.org;
+      homepage    = https://www.postgresql.org;
       description = "A powerful, open source object-relational database system";
-      license = licenses.postgresql;
-      maintainers = [ maintainers.ocharles ];
-      platforms = platforms.unix;
+      license     = licenses.postgresql;
+      maintainers = with maintainers; [ ocharles thoughtpolice ];
+      platforms   = platforms.unix;
     };
   });
 
-- 
GitLab


From 648f4a2769d46ec532c259ed082e36193ff7349e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 6 Aug 2018 10:17:54 -0500
Subject: [PATCH 0885/1065] nixpkgs: tidy up pgjwt package

This makes pgjwt take a dummy 'postgresql' argument, which it does not *need*
in the buildInputs (it is purely a SQL extension with no C code). However, this
argument will be necessary for an upcoming change that will parameterize the
extensions over a particular PostgreSQL version.

It also does some tiny cleanup, setting a null build phase.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/sql/postgresql/pgjwt/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/pgjwt/default.nix b/pkgs/servers/sql/postgresql/pgjwt/default.nix
index 3e01d9bfe2c..ab7ba8943a7 100644
--- a/pkgs/servers/sql/postgresql/pgjwt/default.nix
+++ b/pkgs/servers/sql/postgresql/pgjwt/default.nix
@@ -1,19 +1,23 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, postgresql }:
+
 stdenv.mkDerivation rec {
-  name = "pgjwt-${version}";
+  name    = "pgjwt-${version}";
   version = "unstable-2017-04-24";
+
   src = fetchFromGitHub {
-    owner = "michelp";
-    repo = "pgjwt";
-    rev = "546a2911027b716586e241be7fd4c6f1785237cd";
+    owner  = "michelp";
+    repo   = "pgjwt";
+    rev    = "546a2911027b716586e241be7fd4c6f1785237cd";
     sha256 = "1riz0xvwb6y02j0fljbr9hcbqb2jqs4njlivmavy9ysbcrrv1vrf";
   };
-  dontBuild = true;
+
+  buildPhase = ":";
   installPhase = ''
     mkdir -p $out/bin  # current postgresql extension mechanism in nixos requires bin directory
     mkdir -p $out/share/extension
     cp pg*sql *.control $out/share/extension
   '';
+
   meta = with stdenv.lib; {
     description = "PostgreSQL implementation of JSON Web Tokens";
     longDescription = ''
-- 
GitLab


From 32dcb6051a9a2fa687283f4883d3552c3a46c081 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Nov 2018 19:59:05 +0100
Subject: [PATCH 0886/1065] haskell-brick: drop obsolete jailbreak for
 ghc-8.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index b9277727650..fa14d21afa2 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 = doJailbreak super.brick_0_41_2;      # https://github.com/jtdaugherty/brick/pull/188
+  brick = self.brick_0_41_2;
   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;
-- 
GitLab


From 2f0de54ddbfdb03540128f8d2abcc47221d42b25 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Nov 2018 20:13:55 +0100
Subject: [PATCH 0887/1065] Drop obsolete GHC versions 7.10.3, 8.0.2, and
 8.4.3.

We keep the latest minor release of each one of the last 3 major releases,
which currently are GHC versions 8.2.2, 8.4.4, and 8.6.1. We also have
ghc-HEAD, but this doesn't count.

Dropping these compilers implied that we have to drop the corresponding
versions of ghcjs, too. We can also drop a shitload of obsolete compiler
patches that newer versions no longer need.

At some point, we can probably simplify the generic builder, too.
---
 pkgs/development/compilers/ghc/7.10.3.nix     | 194 -------
 pkgs/development/compilers/ghc/8.0.2.nix      | 201 -------
 pkgs/development/compilers/ghc/8.4.3.nix      | 247 --------
 .../ghc/ghc-8.0.2-no-cpp-warnings.patch       |  23 -
 .../compilers/ghc/ghc-gold-linker.patch       |  54 --
 .../compilers/ghc/ghc-no-madv-free.patch      |  18 -
 .../compilers/ghc/relocation.patch            |  27 -
 .../compilers/ghcjs/7.10/boot.patch           | 104 ----
 .../compilers/ghcjs/7.10/default.nix          |  50 --
 .../compilers/ghcjs/7.10/shims.nix            |   7 -
 .../compilers/ghcjs/7.10/stage2.nix           | 344 -----------
 .../compilers/ghcjs/8.0/boot.patch            |  86 ---
 .../compilers/ghcjs/8.0/default.nix           |  50 --
 .../development/compilers/ghcjs/8.0/shims.nix |   7 -
 .../compilers/ghcjs/8.0/stage2.nix            | 545 ------------------
 .../configuration-ghc-7.10.x.nix              | 239 --------
 .../configuration-ghc-8.0.x.nix               |  91 ---
 .../configuration-halvm-2.4.0.nix             |  59 --
 pkgs/top-level/haskell-packages.nix           |  40 --
 19 files changed, 2386 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghc/7.10.3.nix
 delete mode 100644 pkgs/development/compilers/ghc/8.0.2.nix
 delete mode 100644 pkgs/development/compilers/ghc/8.4.3.nix
 delete mode 100644 pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch
 delete mode 100644 pkgs/development/compilers/ghc/ghc-gold-linker.patch
 delete mode 100644 pkgs/development/compilers/ghc/ghc-no-madv-free.patch
 delete mode 100644 pkgs/development/compilers/ghc/relocation.patch
 delete mode 100644 pkgs/development/compilers/ghcjs/7.10/boot.patch
 delete mode 100644 pkgs/development/compilers/ghcjs/7.10/default.nix
 delete mode 100644 pkgs/development/compilers/ghcjs/7.10/shims.nix
 delete mode 100644 pkgs/development/compilers/ghcjs/7.10/stage2.nix
 delete mode 100644 pkgs/development/compilers/ghcjs/8.0/boot.patch
 delete mode 100644 pkgs/development/compilers/ghcjs/8.0/default.nix
 delete mode 100644 pkgs/development/compilers/ghcjs/8.0/shims.nix
 delete mode 100644 pkgs/development/compilers/ghcjs/8.0/stage2.nix
 delete mode 100644 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
 delete mode 100644 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
 delete mode 100644 pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix

diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
deleted file mode 100644
index b69ae80d0db..00000000000
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ /dev/null
@@ -1,194 +0,0 @@
-{ stdenv, targetPackages
-
-# build-tools
-, bootPkgs
-, coreutils, fetchurl, perl
-, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt
-
-, libiconv ? null, ncurses
-
-, useLLVM ? !stdenv.targetPlatform.isx86
-, # 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 ? true
-
-, # 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"
-}:
-
-let
-  inherit (stdenv) buildPlatform hostPlatform targetPlatform;
-
-  inherit (bootPkgs) ghc;
-
-  # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
-    (targetPlatform != hostPlatform)
-    "${targetPlatform.config}-";
-
-  docFixes = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3a.patch";
-    sha256 = "1j45z4kcd3w1rzm4hapap2xc16bbh942qnzzdbdjcwqznsccznf0";
-  };
-
-  buildMK = ''
-    BuildFlavour = ${ghcFlavour}
-    ifneq \"\$(BuildFlavour)\" \"\"
-    include mk/flavours/\$(BuildFlavour).mk
-    endif
-    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-  '' + stdenv.lib.optionalString enableIntegerSimple ''
-    INTEGER_LIBRARY = integer-simple
-  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    Stage1Only = YES
-    HADDOCK_DOCS = NO
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
-    GhcLibHcOpts += -fPIC
-    GhcRtsHcOpts += -fPIC
-  '';
-
-  # Splicer will pull out correct variations
-  libDeps = platform: [ ncurses ]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc") 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 = "7.10.3";
-  name = "${targetPrefix}ghc-${version}";
-
-  src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
-    sha256 = "1vsgmic8csczl62ciz51iv8nhrkm72lyhbz7p7id13y2w7fcx46g";
-  };
-
-  enableParallelBuilding = true;
-
-  outputs = [ "out" "doc" ];
-
-  patches = [
-    docFixes
-    ./relocation.patch
-  ];
-
-  postPatch = "patchShebangs .";
-
-  # GHC is a bit confused on its cross terminology.
-  preConfigure = ''
-    for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
-      export "''${env#TARGET_}=''${!env}"
-    done
-    # GHC is a bit confused on its cross terminology, as these would normally be
-    # the *host* tools.
-    export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
-    export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld"
-    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"
-  '';
-
-  # 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=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
-    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
-    "--enable-bootstrap-with-devel-snapshot"
-  ] ++ 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 libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42
-    ghc bootPkgs.hscolour
-  ];
-
-  # For building runtime libs
-  depsBuildTarget = toolsForTarget;
-
-  buildInputs = libDeps hostPlatform;
-
-  propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
-
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
-  hardeningDisable = [ "format" ];
-
-  postInstall = ''
-    # Install the bash completion file.
-    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
-    # Patch scripts to include "readelf" and "cat" in $PATH.
-    for i in "$out/bin/"*; do
-      test ! -h $i || continue
-      egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
-    done
-  '';
-
-  passthru = {
-    inherit bootPkgs targetPrefix;
-
-    inherit llvmPackages;
-    inherit enableShared;
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-7.10.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;
-  };
-
-}
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
deleted file mode 100644
index f7422d150ac..00000000000
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ /dev/null
@@ -1,201 +0,0 @@
-{ stdenv, targetPackages
-
-# build-tools
-, bootPkgs
-, coreutils, fetchpatch, fetchurl, perl, sphinx
-
-, libiconv ? null, ncurses
-
-, useLLVM ? !stdenv.targetPlatform.isx86
-, # 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 ? true
-
-, # 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 = YES
-    HADDOCK_DOCS = NO
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
-    GhcLibHcOpts += -fPIC
-    GhcRtsHcOpts += -fPIC
-  '';
-
-  # Splicer will pull out correct variations
-  libDeps = platform: [ ncurses ]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc") 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.0.2";
-  name = "${targetPrefix}ghc-${version}";
-
-  src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
-    sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi";
-  };
-
-  enableParallelBuilding = true;
-
-  outputs = [ "out" "man" "doc" ];
-
-  patches = [
-    ./ghc-gold-linker.patch
-    (fetchpatch { # Unreleased 1.24.x commit
-      url = "https://github.com/haskell/cabal/commit/6394cb0b6eba91a8692a3d04b2b56935aed7cccd.patch";
-      sha256 = "14xxjg0nb1j1pw0riac3v385ka92qhxxblfmwyvbghz7kry6axy0";
-      stripLen = 1;
-      extraPrefix = "libraries/Cabal/";
-    })
-  ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch
-    ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch
-    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
-
-  postPatch = "patchShebangs .";
-
-  # GHC is a bit confused on its cross terminology.
-  preConfigure = ''
-    for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
-      export "''${env#TARGET_}=''${!env}"
-    done
-    # GHC is a bit confused on its cross terminology, as these would normally be
-    # the *host* tools.
-    export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
-    export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld"
-    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"
-  '';
-
-  # 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") [
-    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
-    "--enable-bootstrap-with-devel-snapshot"
-  ] ++ 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 sphinx
-    ghc bootPkgs.hscolour
-  ];
-
-  # For building runtime libs
-  depsBuildTarget = toolsForTarget;
-
-  buildInputs = libDeps hostPlatform;
-
-  propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
-
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
-  hardeningDisable = [ "format" ];
-
-  postInstall = ''
-    for bin in "$out"/lib/${name}/bin/*; do
-      isELF "$bin" || continue
-      paxmark m "$bin"
-    done
-
-    # Install the bash completion file.
-    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
-    # Patch scripts to include "readelf" and "cat" in $PATH.
-    for i in "$out/bin/"*; do
-      test ! -h $i || continue
-      egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
-    done
-  '';
-
-  passthru = {
-    inherit bootPkgs targetPrefix;
-
-    inherit llvmPackages;
-    inherit enableShared;
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-8.0.2";
-  };
-
-  meta = {
-    homepage = http://haskell.org/ghc;
-    description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
-    inherit (ghc.meta) license platforms;
-  };
-
-}
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
deleted file mode 100644
index e43f9a57d0a..00000000000
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ /dev/null
@@ -1,247 +0,0 @@
-{ stdenv, targetPackages
-
-# build-tools
-, bootPkgs
-, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
-
-, libiconv ? null, ncurses
-
-, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
-, # LLVM is conceptually a run-time-only depedendency, but for
-  # non-x86, we need LLVM to bootstrap later stages, so it becomes a
-  # build-time dependency too.
-  buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
-  # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
-
-, # If enabled, use -fPIC when compiling static libs.
-  enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
-
-, # Whether to build dynamic libs for the standard library (on the target
-  # platform). Static libs are always built.
-  enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
-
-, # Whetherto build terminfo.
-  enableTerminfo ? !stdenv.targetPlatform.isWindows
-
-, # What flavour to build. An empty string indicates no
-  # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
-, # Whether to backport https://phabricator.haskell.org/D4388 for
-  # deterministic profiling symbol names, at the cost of a slightly
-  # non-standard GHC API
-  deterministicProfiling ? false
-}:
-
-assert !enableIntegerSimple -> gmp != null;
-
-let
-  inherit (stdenv) buildPlatform hostPlatform targetPlatform;
-
-  inherit (bootPkgs) ghc;
-
-  # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
-    (targetPlatform != hostPlatform)
-    "${targetPlatform.config}-";
-
-  buildMK = ''
-    BuildFlavour = ${ghcFlavour}
-    ifneq \"\$(BuildFlavour)\" \"\"
-    include mk/flavours/\$(BuildFlavour).mk
-    endif
-    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
-  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
-    CrossCompilePrefix = ${targetPrefix}
-    HADDOCK_DOCS = NO
-    BUILD_SPHINX_HTML = NO
-    BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
-    GhcLibHcOpts += -fPIC
-    GhcRtsHcOpts += -fPIC
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
-    EXTRA_CC_OPTS += -std=gnu99
-  '';
-
-  # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
-
-  toolsForTarget =
-    if hostPlatform == buildPlatform then
-      [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm
-    else assert targetPlatform == hostPlatform; # build != host == target
-      [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
-
-  targetCC = builtins.head toolsForTarget;
-
-in
-stdenv.mkDerivation (rec {
-  version = "8.4.3";
-  name = "${targetPrefix}ghc-${version}";
-
-  src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
-    sha256 = "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf";
-  };
-
-  enableParallelBuilding = true;
-
-  outputs = [ "out" "doc" ];
-
-  patches = [(fetchpatch {
-    url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf";
-    sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
-    extraPrefix = "utils/hsc2hs/";
-    stripLen = 1;
-  }) (fetchpatch rec { # https://phabricator.haskell.org/D5123
-    url = "http://tarballs.nixos.org/sha256/${sha256}";
-    name = "D5123.diff";
-    sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
-  })] ++ stdenv.lib.optional deterministicProfiling
-    (fetchpatch rec {
-      url = "http://tarballs.nixos.org/sha256/${sha256}";
-      name = "D4388.diff";
-      sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s";
-    })
-    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
-
-  postPatch = "patchShebangs .";
-
-  # GHC is a bit confused on its cross terminology.
-  preConfigure = ''
-    for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
-      export "''${env#TARGET_}=''${!env}"
-    done
-    # GHC is a bit confused on its cross terminology, as these would normally be
-    # the *host* tools.
-    export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
-    export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
-    # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
-    export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
-    export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
-    export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
-    export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
-    export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
-    export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
-    echo -n "${buildMK}" > mk/build.mk
-    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
-    sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
-  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
-      echo "patching llvm-targets for musl targets..."
-      echo "Cloning these existing '*-linux-gnu*' targets:"
-      grep linux-gnu llvm-targets | sed 's/^/  /'
-      echo "(go go gadget sed)"
-      sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
-      echo "llvm-targets now contains these '*-linux-musl*' targets:"
-      grep linux-musl llvm-targets | sed 's/^/  /'
-
-      echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
-      # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
-      for x in configure aclocal.m4; do
-        substituteInPlace $x \
-          --replace '*-android*|*-gnueabi*)' \
-                    '*-android*|*-gnueabi*|*-musleabi*)'
-      done
-  '';
-
-  # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
-  # `--with` flags for libraries needed for RTS linker
-  configureFlags = [
-    "--datadir=$doc/share/doc/ghc"
-    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
-    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
-    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
-    "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
-    "CFLAGS=-fuse-ld=gold"
-    "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
-    "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
-    # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
-    "--disable-large-address-space"
-  ];
-
-  # Make sure we never relax`$PATH` and hooks support for compatability.
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    perl autoconf automake m4 python3
-    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
-  ];
-
-  # For building runtime libs
-  depsBuildTarget = toolsForTarget;
-
-  buildInputs = libDeps hostPlatform;
-
-  propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
-
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
-  checkTarget = "test";
-
-  hardeningDisable = [ "format" ];
-
-  postInstall = ''
-    for bin in "$out"/lib/${name}/bin/*; do
-      isELF "$bin" || continue
-      paxmark m "$bin"
-    done
-
-    # Install the bash completion file.
-    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
-    # Patch scripts to include "readelf" and "cat" in $PATH.
-    for i in "$out/bin/"*; do
-      test ! -h $i || continue
-      egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
-    done
-  '';
-
-  passthru = {
-    inherit bootPkgs targetPrefix;
-
-    inherit llvmPackages;
-    inherit enableShared;
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-8.4.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/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch b/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch
deleted file mode 100644
index 90224df19f6..00000000000
--- a/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- b/includes/rts/storage/ClosureMacros.h        2017-05-21 12:54:09.000000000 +0200
-+++ a/includes/rts/storage/ClosureMacros.h        2017-05-21 12:55:57.000000000 +0200
-@@ -499,8 +499,17 @@
-
-    -------------------------------------------------------------------------- */
-
--#define ZERO_SLOP_FOR_LDV_PROF     (defined(PROFILING))
--#define ZERO_SLOP_FOR_SANITY_CHECK (defined(DEBUG) && !defined(THREADED_RTS))
-+#if defined(PROFILING)
-+#define ZERO_SLOP_FOR_LDV_PROF 1
-+#else
-+#define ZERO_SLOP_FOR_LDV_PROF 0
-+#endif
-+
-+#if defined(DEBUG) && !defined(THREADED_RTS)
-+#define ZERO_SLOP_FOR_SANITY_CHECK 1
-+#else
-+#define ZERO_SLOP_FOR_SANITY_CHECK 0
-+#endif
-
- #if ZERO_SLOP_FOR_LDV_PROF || ZERO_SLOP_FOR_SANITY_CHECK
- #define OVERWRITING_CLOSURE(c) overwritingClosure(c)
-
diff --git a/pkgs/development/compilers/ghc/ghc-gold-linker.patch b/pkgs/development/compilers/ghc/ghc-gold-linker.patch
deleted file mode 100644
index edce7ef3a17..00000000000
--- a/pkgs/development/compilers/ghc/ghc-gold-linker.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 46fe80ab7c0013a929d0934e61429820042a70a9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
-Date: Fri, 21 Jul 2017 20:09:11 +0200
-Subject: [PATCH 1/2] base: Add `extra-libraries: m` because base uses libm
- functions.
-
-Linking with gold needs this because in contrast to ld, gold
-doesn't implicitly link libm.
-
-Found by Michael Bishop <cleverca22@gmail.com>.
----
- libraries/base/base.cabal | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
-index f00fb8768e5..fd91f268ffe 100644
---- a/libraries/base/base.cabal
-+++ b/libraries/base/base.cabal
-@@ -342,6 +342,10 @@ Library
-         WCsubst.h
-         consUtils.h
- 
-+    -- Base uses libm functions. ld.bfd links libm implicitly when necessary.
-+    -- Other linkers, like gold, don't, so we have to declare it explicitly.
-+    extra-libraries: m
-+
-     -- OS Specific
-     if os(windows)
-         -- Windows requires some extra libraries for linking because the RTS
-
-From 900a8f4931e9bc6d3219d9263cfecfc6af8fc766 Mon Sep 17 00:00:00 2001
-From: michael bishop <cleverca22@gmail.com>
-Date: Sat, 22 Jul 2017 13:12:39 -0300
-Subject: [PATCH 2/2] also add -lm to ghc-prim
-
----
- libraries/ghc-prim/ghc-prim.cabal | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
-index 00a029efedf..6db85dd69fc 100644
---- a/libraries/ghc-prim/ghc-prim.cabal
-+++ b/libraries/ghc-prim/ghc-prim.cabal
-@@ -42,6 +42,10 @@ Library
-         UnliftedFFITypes
- 
-     build-depends: rts == 1.0.*
-+    
-+    -- Base uses libm functions. ld.bfd links libm implicitly when necessary.
-+    -- Other linkers, like gold, don't, so we have to declare it explicitly.
-+    extra-libraries: m
- 
-     exposed-modules:
-         GHC.CString
diff --git a/pkgs/development/compilers/ghc/ghc-no-madv-free.patch b/pkgs/development/compilers/ghc/ghc-no-madv-free.patch
deleted file mode 100644
index 8fea9f92012..00000000000
--- a/pkgs/development/compilers/ghc/ghc-no-madv-free.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
-index 99620ee..e052a84 100644
---- a/rts/posix/OSMem.c
-+++ b/rts/posix/OSMem.c
-@@ -523,13 +523,7 @@ void osDecommitMemory(void *at, W_ size)
-         sysErrorBelch("unable to make released memory unaccessible");
- #endif
- 
--#ifdef MADV_FREE
--    // Try MADV_FREE first, FreeBSD has both and MADV_DONTNEED
--    // just swaps memory out
--    r = madvise(at, size, MADV_FREE);
--#else
-     r = madvise(at, size, MADV_DONTNEED);
--#endif
-     if(r < 0)
-         sysErrorBelch("unable to decommit memory");
- }
diff --git a/pkgs/development/compilers/ghc/relocation.patch b/pkgs/development/compilers/ghc/relocation.patch
deleted file mode 100644
index b9becfc86b5..00000000000
--- a/pkgs/development/compilers/ghc/relocation.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Adding support for the R_X86_64_REX_GOTPCRELX relocation type. 
-This relocation is treated by the linker the same as the R_X86_64_GOTPCRELX type
-G + GOT + A - P to generate relative offsets to the GOT.
-The REX prefix has no influence in this stage.
-
-This caused breakage when enabling relro/bindnow hardening e.g. in ghcPaclages.vector
-
-Source: https://phabricator.haskell.org/D2303#67070
-diff --git a/rts/Linker.c b/rts/Linker.c
---- a/rts/Linker.c
-+++ b/rts/Linker.c
-@@ -5681,7 +5681,13 @@
-           *(Elf64_Sword *)P = (Elf64_Sword)value;
- #endif
-           break;
--
-+/* These two relocations were introduced in glibc 2.23 and binutils 2.26.
-+    But in order to use them the system which compiles the bindist for GHC needs
-+    to have glibc >= 2.23. So only use them if they're defined. */
-+#if defined(R_X86_64_REX_GOTPCRELX) && defined(R_X86_64_GOTPCRELX)
-+      case R_X86_64_REX_GOTPCRELX:
-+      case R_X86_64_GOTPCRELX:
-+#endif
-       case R_X86_64_GOTPCREL:
-       {
-           StgInt64 gotAddress = (StgInt64) &makeSymbolExtra(oc, ELF_R_SYM(info), S)->addr;
-
diff --git a/pkgs/development/compilers/ghcjs/7.10/boot.patch b/pkgs/development/compilers/ghcjs/7.10/boot.patch
deleted file mode 100644
index 9f4fa3a8b7a..00000000000
--- a/pkgs/development/compilers/ghcjs/7.10/boot.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs
-index db8b12e..7b815c5 100644
---- a/src-bin/Boot.hs
-+++ b/src-bin/Boot.hs
-@@ -540,9 +540,7 @@ initPackageDB :: B ()
- initPackageDB = do
-   msg info "creating package databases"
-   initDB "--global" <^> beLocations . blGlobalDB
--  traverseOf_ _Just initUser <^> beLocations . blUserDBDir
-   where
--    initUser dir = rm_f (dir </> "package.conf") >> initDB "--user" (dir </> "package.conf.d")
-     initDB dbName db = do
-       rm_rf db >> mkdir_p db
-       ghcjs_pkg_ ["init", toTextI db] `catchAny_` return ()
-@@ -566,29 +564,22 @@ installDevelopmentTree = subTop $ do
-   msgD info $ "preparing development boot tree"
-   checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do
-     testGit "ghcjs-boot" >>= \case
--      Just False -> failWith "ghcjs-boot already exists and is not a git repository"
--      Just True  -> do
--        msg info "ghcjs-boot repository already exists but checkpoint not reached, cleaning first, then cloning"
--        rm_rf "ghcjs-boot"
-+      Just _ -> do
-+        msg info "ghcjs-boot repository already exists; initializing ghcjs-boot"
-         initGhcjsBoot
-       Nothing    -> do
-         msgD info "cloning ghcjs-boot git repository"
-         initGhcjsBoot
-   checkpoint' "shims-git" "shims repository already cloned" $ do
-     testGit "shims" >>= \case
--      Just False -> failWith "shims already exists and is not a git repository"
--      Just True  -> do
--        msgD info "shims repository already exists but checkpoint not reached, cleaning first, then cloning"
--        rm_rf "shims"
--        cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev
-+      Just _ -> do
-+        msgD info "shims repository already exists; moving on"
-       Nothing    -> do
-         msgD info "cloning shims git repository"
-         cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev
-   where
-     initGhcjsBoot = sub $ do
--      cloneGit bootDescr "ghcjs-boot"  bsrcBootDevBranch bsrcBootDev
-       cd "ghcjs-boot"
--      git_ ["submodule", "update", "--init", "--recursive"]
-       mapM_ patchPackage =<< allPackages
-       preparePrimops
-       buildGenPrim
-@@ -1141,7 +1132,7 @@ cabalStage1 pkgs = sub $ do
-   globalFlags <- cabalGlobalFlags
-   flags <- cabalInstallFlags (length pkgs == 1)
-   let args = globalFlags ++ ("install" : pkgs) ++
--             [ "--solver=topdown" -- the modular solver refuses to install stage1 packages
-+             [ "--allow-boot-library-installs"
-              ] ++ map ("--configure-option="<>) configureOpts ++ flags
-   checkInstallPlan pkgs args
-   cabal_ args
-@@ -1162,7 +1153,7 @@ cabalInstall pkgs = do
- -- uses somewhat fragile parsing of --dry-run output, find a better way
- checkInstallPlan :: [Package] -> [Text] -> B ()
- checkInstallPlan pkgs opts = do
--  plan <- cabal (opts ++ ["-v2", "--dry-run"])
-+  plan <- cabal (opts ++ ["-vverbose+nowrap", "--dry-run"])
-   when (hasReinstalls plan || hasUnexpectedInstalls plan || hasNewVersion plan) (err plan)
-   where
-     hasReinstalls = T.isInfixOf "(reinstall)"   -- reject reinstalls
-@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do
-            , "--avoid-reinstalls"
-            , "--builddir",      "dist"
-            , "--with-compiler", ghcjs ^. pgmLocText
-+           , "--with-gcc",      "@CC@"
-            , "--with-hc-pkg",   ghcjsPkg ^. pgmLocText
--           , "--prefix",        toTextI instDir
-+           , "--prefix",        "@PREFIX@"
-+           , "--libdir",        "$prefix/lib/$compiler"
-+           , "--libsubdir",     "$pkgid"
-            , bool haddock "--enable-documentation" "--disable-documentation"
-            , "--haddock-html"
---- workaround for hoogle support being broken in haddock for GHC 7.10RC1
--#if !(__GLASGOW_HASKELL__ >= 709)
-            , "--haddock-hoogle"
--#endif
-            , "--haddock-hyperlink-source"
- -- don't slow down Windows builds too much, on other platforms we get this more
- -- or less for free, thanks to dynamic-too
-diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs
-index 33a401f..e2405a7 100644
---- a/src/Compiler/Info.hs
-+++ b/src/Compiler/Info.hs
-@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do
- 
- -- | the directory to use if started without -B flag
- getDefaultTopDir :: IO FilePath
--getDefaultTopDir = do
--  appdir <- getAppUserDataDirectory "ghcjs"
--  return (appdir </> subdir </> "ghcjs")
--      where
--        targetARCH = arch
--        targetOS   = os
--        subdir     = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion
-+getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@"
- 
- getDefaultLibDir :: IO FilePath
- getDefaultLibDir = getDefaultTopDir
diff --git a/pkgs/development/compilers/ghcjs/7.10/default.nix b/pkgs/development/compilers/ghcjs/7.10/default.nix
deleted file mode 100644
index f18a094aa3c..00000000000
--- a/pkgs/development/compilers/ghcjs/7.10/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }:
-
-bootPkgs.callPackage ../base.nix {
-  version = "0.2.0";
-
-  inherit bootPkgs cabal-install;
-
-  ghcjsSrc = fetchFromGitHub {
-    owner = "ghcjs";
-    repo = "ghcjs";
-    rev = "689c7753f50353dd05606ed79c51cd5a94d3922a";
-    sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4";
-  };
-  ghcjsBootSrc = fetchgit {
-    url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "8c549931da27ba9e607f77195208ec156c840c8a";
-    sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv";
-    fetchSubmodules = true;
-  };
-
-  shims = import ./shims.nix { inherit fetchFromGitHub; };
-  stage1Packages = [
-    "array"
-    "base"
-    "binary"
-    "bytestring"
-    "containers"
-    "deepseq"
-    "directory"
-    "filepath"
-    "ghc-boot"
-    "ghc-boot-th"
-    "ghc-prim"
-    "ghci"
-    "ghcjs-prim"
-    "ghcjs-th"
-    "integer-gmp"
-    "pretty"
-    "primitive"
-    "process"
-    "rts"
-    "template-haskell"
-    "time"
-    "transformers"
-    "unix"
-  ];
-  stage2 = import ./stage2.nix;
-
-  patches = [ ./boot.patch ];
-}
diff --git a/pkgs/development/compilers/ghcjs/7.10/shims.nix b/pkgs/development/compilers/ghcjs/7.10/shims.nix
deleted file mode 100644
index fa706699449..00000000000
--- a/pkgs/development/compilers/ghcjs/7.10/shims.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ fetchFromGitHub }:
-fetchFromGitHub {
-  owner = "ghcjs";
-  repo = "shims";
-  rev = "b97015229c58eeab7c1d0bb575794b14a9f6efca";
-  sha256 = "1p5adkqvmb1gsv9hnn3if0rdpnaq3v9a1zkfdy282yw05jaaaggz";
-}
diff --git a/pkgs/development/compilers/ghcjs/7.10/stage2.nix b/pkgs/development/compilers/ghcjs/7.10/stage2.nix
deleted file mode 100644
index 3483afc99ef..00000000000
--- a/pkgs/development/compilers/ghcjs/7.10/stage2.nix
+++ /dev/null
@@ -1,344 +0,0 @@
-{ ghcjsBoot }: { callPackage }:
-
-{
-  async = callPackage
-    ({ mkDerivation, base, HUnit, stdenv, stm, test-framework
-      , test-framework-hunit
-      }:
-      mkDerivation {
-        pname = "async";
-        version = "2.0.1.6";
-        src = "${ghcjsBoot}/boot/async";
-        doCheck = false;
-        libraryHaskellDepends = [ base stm ];
-        testHaskellDepends = [
-          base HUnit test-framework test-framework-hunit
-        ];
-        jailbreak = true;
-        homepage = https://github.com/simonmar/async;
-        description = "Run IO operations asynchronously and wait for their results";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  aeson = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
-      , dlist, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific
-      , stdenv, syb, template-haskell, test-framework
-      , test-framework-hunit, test-framework-quickcheck2, text, time
-      , transformers, unordered-containers, vector
-      }:
-      mkDerivation {
-        pname = "aeson";
-        version = "0.9.0.1";
-        src = "${ghcjsBoot}/boot/aeson";
-        doCheck = false;
-        libraryHaskellDepends = [
-          attoparsec base bytestring containers deepseq dlist ghc-prim
-          hashable mtl scientific syb template-haskell text time transformers
-          unordered-containers vector
-        ];
-        testHaskellDepends = [
-          attoparsec base bytestring containers ghc-prim HUnit QuickCheck
-          template-haskell test-framework test-framework-hunit
-          test-framework-quickcheck2 text time unordered-containers vector
-        ];
-        jailbreak = true;
-        homepage = https://github.com/bos/aeson;
-        description = "Fast JSON parsing and encoding";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  attoparsec = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-      , QuickCheck, quickcheck-unicode, scientific, stdenv
-      , test-framework, test-framework-quickcheck2, text, transformers
-      , vector
-      }:
-      mkDerivation {
-        pname = "attoparsec";
-        version = "0.13.0.1";
-        src = "${ghcjsBoot}/boot/attoparsec";
-        doCheck = false;
-        libraryHaskellDepends = [
-          array base bytestring containers deepseq scientific text
-          transformers
-        ];
-        testHaskellDepends = [
-          array base bytestring containers deepseq QuickCheck
-          quickcheck-unicode scientific test-framework
-          test-framework-quickcheck2 text transformers vector
-        ];
-        jailbreak = true;
-        homepage = https://github.com/bos/attoparsec;
-        description = "Fast combinator parsing for bytestrings and text";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  case-insensitive = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit, stdenv
-      , test-framework, test-framework-hunit, text
-      }:
-      mkDerivation {
-        pname = "case-insensitive";
-        version = "1.2.0.4";
-        src = "${ghcjsBoot}/boot/case-insensitive";
-        doCheck = false;
-        libraryHaskellDepends = [ base bytestring deepseq hashable text ];
-        testHaskellDepends = [
-          base bytestring HUnit test-framework test-framework-hunit text
-        ];
-        jailbreak = true;
-        homepage = https://github.com/basvandijk/case-insensitive;
-        description = "Case insensitive string comparison";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  dlist = callPackage
-    ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }:
-      mkDerivation {
-        pname = "dlist";
-        version = "0.7.1.1";
-        src = "${ghcjsBoot}/boot/dlist";
-        doCheck = false;
-        libraryHaskellDepends = [ base deepseq ];
-        testHaskellDepends = [ base Cabal QuickCheck ];
-        jailbreak = true;
-        homepage = https://github.com/spl/dlist;
-        description = "Difference lists";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  extensible-exceptions = callPackage
-    ({ mkDerivation, base, stdenv }:
-      mkDerivation {
-        pname = "extensible-exceptions";
-        version = "0.1.1.4";
-        src = "${ghcjsBoot}/boot/extensible-exceptions";
-        doCheck = false;
-        libraryHaskellDepends = [ base ];
-        jailbreak = true;
-        description = "Extensible exceptions";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  hashable = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
-      , QuickCheck, random, stdenv, test-framework, test-framework-hunit
-      , test-framework-quickcheck2, text, unix
-      }:
-      mkDerivation {
-        pname = "hashable";
-        version = "1.2.3.2";
-        src = "${ghcjsBoot}/boot/hashable";
-        doCheck = false;
-        libraryHaskellDepends = [
-          base bytestring ghc-prim integer-gmp text
-        ];
-        testHaskellDepends = [
-          base bytestring ghc-prim HUnit QuickCheck random test-framework
-          test-framework-hunit test-framework-quickcheck2 text unix
-        ];
-        jailbreak = true;
-        homepage = https://github.com/tibbe/hashable;
-        description = "A class for types that can be converted to a hash value";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  mtl = callPackage
-    ({ mkDerivation, base, stdenv, transformers }:
-      mkDerivation {
-        pname = "mtl";
-        version = "2.2.1";
-        src = "${ghcjsBoot}/boot/mtl";
-        doCheck = false;
-        libraryHaskellDepends = [ base transformers ];
-        jailbreak = true;
-        homepage = https://github.com/ekmett/mtl;
-        description = "Monad classes, using functional dependencies";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  old-time = callPackage
-    ({ mkDerivation, base, old-locale, stdenv }:
-      mkDerivation {
-        pname = "old-time";
-        version = "1.1.0.3";
-        src = "${ghcjsBoot}/boot/old-time";
-        doCheck = false;
-        libraryHaskellDepends = [ base old-locale ];
-        jailbreak = true;
-        description = "Time library";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  parallel = callPackage
-    ({ mkDerivation, array, base, containers, deepseq, stdenv }:
-      mkDerivation {
-        pname = "parallel";
-        version = "3.2.0.6";
-        src = "${ghcjsBoot}/boot/parallel";
-        doCheck = false;
-        libraryHaskellDepends = [ array base containers deepseq ];
-        jailbreak = true;
-        description = "Parallel programming library";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  scientific = callPackage
-    ({ mkDerivation, array, base, bytestring, deepseq, ghc-prim
-      , hashable, integer-gmp, QuickCheck, smallcheck, stdenv, tasty
-      , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck
-      , text
-      }:
-      mkDerivation {
-        pname = "scientific";
-        version = "0.3.3.8";
-        src = "${ghcjsBoot}/boot/scientific";
-        doCheck = false;
-        libraryHaskellDepends = [
-          array base bytestring deepseq ghc-prim hashable integer-gmp text
-        ];
-        testHaskellDepends = [
-          base bytestring QuickCheck smallcheck tasty tasty-ant-xml
-          tasty-hunit tasty-quickcheck tasty-smallcheck text
-        ];
-        jailbreak = true;
-        homepage = https://github.com/basvandijk/scientific;
-        description = "Numbers represented using scientific notation";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  stm = callPackage
-    ({ mkDerivation, array, base, stdenv }:
-      mkDerivation {
-        pname = "stm";
-        version = "2.4.4";
-        src = "${ghcjsBoot}/boot/stm";
-        doCheck = false;
-        libraryHaskellDepends = [ array base ];
-        jailbreak = true;
-        description = "Software Transactional Memory";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  syb = callPackage
-    ({ mkDerivation, base, containers, HUnit, mtl, stdenv }:
-      mkDerivation {
-        pname = "syb";
-        version = "0.5.1";
-        src = "${ghcjsBoot}/boot/syb";
-        doCheck = false;
-        libraryHaskellDepends = [ base ];
-        testHaskellDepends = [ base containers HUnit mtl ];
-        jailbreak = true;
-        homepage = http://www.cs.uu.nl/wiki/GenericProgramming/SYB;
-        description = "Scrap Your Boilerplate";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  text = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, deepseq, directory
-      , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode
-      , random, stdenv, test-framework, test-framework-hunit
-      , test-framework-quickcheck2
-      }:
-      mkDerivation {
-        pname = "text";
-        version = "1.2.1.1";
-        src = "${ghcjsBoot}/boot/text";
-        doCheck = false;
-        libraryHaskellDepends = [
-          array base binary bytestring deepseq ghc-prim integer-gmp
-        ];
-        testHaskellDepends = [
-          array base binary bytestring deepseq directory ghc-prim HUnit
-          integer-gmp QuickCheck quickcheck-unicode random test-framework
-          test-framework-hunit test-framework-quickcheck2
-        ];
-        jailbreak = true;
-        homepage = https://github.com/bos/text;
-        description = "An efficient packed Unicode text type";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  unordered-containers = callPackage
-    ({ mkDerivation, base, ChasingBottoms, containers, deepseq, hashable
-      , HUnit, QuickCheck, stdenv, test-framework, test-framework-hunit
-      , test-framework-quickcheck2
-      }:
-      mkDerivation {
-        pname = "unordered-containers";
-        version = "0.2.5.1";
-        src = "${ghcjsBoot}/boot/unordered-containers";
-        doCheck = false;
-        libraryHaskellDepends = [ base deepseq hashable ];
-        testHaskellDepends = [
-          base ChasingBottoms containers hashable HUnit QuickCheck
-          test-framework test-framework-hunit test-framework-quickcheck2
-        ];
-        jailbreak = true;
-        homepage = https://github.com/tibbe/unordered-containers;
-        description = "Efficient hashing-based container types";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  vector = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
-      , random, stdenv, template-haskell, test-framework
-      , test-framework-quickcheck2, transformers
-      }:
-      mkDerivation {
-        pname = "vector";
-        version = "0.11.0.0";
-        src = "${ghcjsBoot}/boot/vector";
-        doCheck = false;
-        libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
-        testHaskellDepends = [
-          base QuickCheck random template-haskell test-framework
-          test-framework-quickcheck2 transformers
-        ];
-        jailbreak = true;
-        homepage = https://github.com/haskell/vector;
-        description = "Efficient Arrays";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  ghcjs-base = callPackage
-    ({ mkDerivation, aeson, array, attoparsec, base, bytestring
-      , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim
-      , hashable, HUnit, integer-gmp, primitive, QuickCheck
-      , quickcheck-unicode, random, scientific, stdenv, test-framework
-      , test-framework-hunit, test-framework-quickcheck2, text, time
-      , transformers, unordered-containers, vector
-      }:
-      mkDerivation {
-        pname = "ghcjs-base";
-        version = "0.2.0.0";
-        src = "${ghcjsBoot}/ghcjs/ghcjs-base";
-        doCheck = false;
-        libraryHaskellDepends = [
-          aeson attoparsec base bytestring containers deepseq dlist ghc-prim
-          ghcjs-prim hashable integer-gmp primitive scientific text time
-          transformers unordered-containers vector
-        ];
-        testHaskellDepends = [
-          array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit
-          primitive QuickCheck quickcheck-unicode random test-framework
-          test-framework-hunit test-framework-quickcheck2 text
-        ];
-        jailbreak = true;
-        homepage = https://github.com/ghcjs/ghcjs-base;
-        description = "Base library for GHCJS";
-        license = stdenv.lib.licenses.mit;
-      }) {};
-  Cabal = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-      , deepseq, directory, extensible-exceptions, filepath, HUnit
-      , old-time, pretty, process, QuickCheck, regex-posix, stdenv
-      , test-framework, test-framework-hunit, test-framework-quickcheck2
-      , time, unix
-      }:
-      mkDerivation {
-        pname = "Cabal";
-        version = "1.22.8.0";
-        src = "${ghcjsBoot}/boot/cabal/Cabal";
-        doCheck = false;
-        libraryHaskellDepends = [
-          array base binary bytestring containers deepseq directory filepath
-          pretty process time unix
-        ];
-        testHaskellDepends = [
-          base bytestring containers directory extensible-exceptions filepath
-          HUnit old-time process QuickCheck regex-posix test-framework
-          test-framework-hunit test-framework-quickcheck2 unix
-        ];
-        jailbreak = true;
-        homepage = http://www.haskell.org/cabal/;
-        description = "A framework for packaging Haskell software";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-}
diff --git a/pkgs/development/compilers/ghcjs/8.0/boot.patch b/pkgs/development/compilers/ghcjs/8.0/boot.patch
deleted file mode 100644
index bbb5b30468c..00000000000
--- a/pkgs/development/compilers/ghcjs/8.0/boot.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs
-index db8b12e..7b815c5 100644
---- a/src-bin/Boot.hs
-+++ b/src-bin/Boot.hs
-@@ -540,9 +540,7 @@ initPackageDB :: B ()
- initPackageDB = do
-   msg info "creating package databases"
-   initDB "--global" <^> beLocations . blGlobalDB
--  traverseOf_ _Just initUser <^> beLocations . blUserDBDir
-   where
--    initUser dir = rm_f (dir </> "package.conf") >> initDB "--user" (dir </> "package.conf.d")
-     initDB dbName db = do
-       rm_rf db >> mkdir_p db
-       ghcjs_pkg_ ["init", toTextI db] `catchAny_` return ()
-@@ -566,29 +564,22 @@ installDevelopmentTree = subTop $ do
-   msgD info $ "preparing development boot tree"
-   checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do
-     testGit "ghcjs-boot" >>= \case
--      Just False -> failWith "ghcjs-boot already exists and is not a git repository"
--      Just True  -> do
--        msg info "ghcjs-boot repository already exists but checkpoint not reached, cleaning first, then cloning"
--        rm_rf "ghcjs-boot"
-+      Just _ -> do
-+        msg info "ghcjs-boot repository already exists; initializing ghcjs-boot"
-         initGhcjsBoot
-       Nothing    -> do
-         msgD info "cloning ghcjs-boot git repository"
-         initGhcjsBoot
-   checkpoint' "shims-git" "shims repository already cloned" $ do
-     testGit "shims" >>= \case
--      Just False -> failWith "shims already exists and is not a git repository"
--      Just True  -> do
--        msgD info "shims repository already exists but checkpoint not reached, cleaning first, then cloning"
--        rm_rf "shims"
--        cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev
-+      Just _ -> do
-+        msgD info "shims repository already exists; moving on"
-       Nothing    -> do
-         msgD info "cloning shims git repository"
-         cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev
-   where
-     initGhcjsBoot = sub $ do
--      cloneGit bootDescr "ghcjs-boot"  bsrcBootDevBranch bsrcBootDev
-       cd "ghcjs-boot"
--      git_ ["submodule", "update", "--init", "--recursive"]
-       mapM_ patchPackage =<< allPackages
-       preparePrimops
-       buildGenPrim
-@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do
-            , "--avoid-reinstalls"
-            , "--builddir",      "dist"
-            , "--with-compiler", ghcjs ^. pgmLocText
-+           , "--with-gcc",      "@CC@"
-            , "--with-hc-pkg",   ghcjsPkg ^. pgmLocText
--           , "--prefix",        toTextI instDir
-+           , "--prefix",        "@PREFIX@"
-+           , "--libdir",        "$prefix/lib/$compiler"
-+           , "--libsubdir",     "$pkgid"
-            , bool haddock "--enable-documentation" "--disable-documentation"
-            , "--haddock-html"
---- workaround for hoogle support being broken in haddock for GHC 7.10RC1
--#if !(__GLASGOW_HASKELL__ >= 709)
-            , "--haddock-hoogle"
--#endif
-            , "--haddock-hyperlink-source"
- -- don't slow down Windows builds too much, on other platforms we get this more
- -- or less for free, thanks to dynamic-too
-diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs
-index 33a401f..e2405a7 100644
---- a/src/Compiler/Info.hs
-+++ b/src/Compiler/Info.hs
-@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do
- 
- -- | the directory to use if started without -B flag
- getDefaultTopDir :: IO FilePath
--getDefaultTopDir = do
--  appdir <- getAppUserDataDirectory "ghcjs"
--  return (appdir </> subdir </> "ghcjs")
--      where
--        targetARCH = arch
--        targetOS   = os
--        subdir     = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion
-+getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@"
- 
- getDefaultLibDir :: IO FilePath
- getDefaultLibDir = getDefaultTopDir
diff --git a/pkgs/development/compilers/ghcjs/8.0/default.nix b/pkgs/development/compilers/ghcjs/8.0/default.nix
deleted file mode 100644
index a786f536eb9..00000000000
--- a/pkgs/development/compilers/ghcjs/8.0/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }:
-
-bootPkgs.callPackage ../base.nix {
-  version = "0.2.020170323";
-
-  inherit bootPkgs cabal-install;
-
-  ghcjsSrc = fetchFromGitHub {
-    owner = "ghcjs";
-    repo = "ghcjs";
-    rev = "2b3759942fb5b2fc1a58d314d9b098d4622fa6b6";
-    sha256 = "15asapg0va8dvcdycsx8dgk4xcpdnhml4h31wka6vvxf5anzz8aw";
-  };
-  ghcjsBootSrc = fetchgit {
-    url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "106e144cca6529a1b9612c11aea5d6ef65b96745";
-    sha256 = "0gxg8iiwvm93x1dwhxypczn9qiz4m1xvj8i7cf4snfdy2jdyhi5l";
-    fetchSubmodules = true;
-  };
-
-  shims = import ./shims.nix { inherit fetchFromGitHub; };
-  stage1Packages = [
-    "array"
-    "base"
-    "binary"
-    "bytestring"
-    "containers"
-    "deepseq"
-    "directory"
-    "filepath"
-    "ghc-boot"
-    "ghc-boot-th"
-    "ghc-prim"
-    "ghci"
-    "ghcjs-prim"
-    "ghcjs-th"
-    "integer-gmp"
-    "pretty"
-    "primitive"
-    "process"
-    "rts"
-    "template-haskell"
-    "time"
-    "transformers"
-    "unix"
-  ];
-  stage2 = import ./stage2.nix;
-
-  patches = [ ./boot.patch ];
-}
diff --git a/pkgs/development/compilers/ghcjs/8.0/shims.nix b/pkgs/development/compilers/ghcjs/8.0/shims.nix
deleted file mode 100644
index a9a7f8d45e2..00000000000
--- a/pkgs/development/compilers/ghcjs/8.0/shims.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ fetchFromGitHub }:
-fetchFromGitHub {
-  owner = "ghcjs";
-  repo = "shims";
-  rev = "85395dce971e23a39e5f93af4ed139ca36d4e448";
-  sha256 = "1kqgik75jx681s1kjx1s7dryigr3m940c3zb9vy0r3psxrw6sf2g";
-}
diff --git a/pkgs/development/compilers/ghcjs/8.0/stage2.nix b/pkgs/development/compilers/ghcjs/8.0/stage2.nix
deleted file mode 100644
index 18c7a76dd3a..00000000000
--- a/pkgs/development/compilers/ghcjs/8.0/stage2.nix
+++ /dev/null
@@ -1,545 +0,0 @@
-{ ghcjsBoot }: { callPackage }:
-
-{
-  async = callPackage
-    ({ mkDerivation, base, HUnit, stdenv, stm, test-framework
-      , test-framework-hunit
-      }:
-      mkDerivation {
-        pname = "async";
-        version = "2.1.1";
-        src = "${ghcjsBoot}/boot/async";
-        doCheck = false;
-        libraryHaskellDepends = [ base stm ];
-        testHaskellDepends = [
-          base HUnit test-framework test-framework-hunit
-        ];
-        jailbreak = true;
-        homepage = "https://github.com/simonmar/async";
-        description = "Run IO operations asynchronously and wait for their results";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  aeson = callPackage
-    ({ 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, stdenv, tagged
-      , template-haskell, test-framework, test-framework-hunit
-      , test-framework-quickcheck2, text, th-abstraction, time
-      , time-locale-compat, unordered-containers, uuid-types, vector
-      }:
-      mkDerivation {
-        pname = "aeson";
-        version = "1.2.2.0";
-        src = "${ghcjsBoot}/boot/aeson";
-        doCheck = false;
-        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 template-haskell
-          test-framework test-framework-hunit test-framework-quickcheck2 text
-          time time-locale-compat unordered-containers uuid-types vector
-        ];
-        jailbreak = true;
-        homepage = "https://github.com/bos/aeson";
-        description = "Fast JSON parsing and encoding";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  attoparsec = callPackage
-    ({ mkDerivation, array, base, bytestring, case-insensitive
-      , containers, criterion, deepseq, directory, filepath, ghc-prim
-      , http-types, parsec, QuickCheck, quickcheck-unicode, scientific
-      , stdenv, tasty, tasty-quickcheck, text, transformers
-      , unordered-containers, vector
-      }:
-      mkDerivation {
-        pname = "attoparsec";
-        version = "0.13.1.0";
-        src = "${ghcjsBoot}/boot/attoparsec";
-        doCheck = false;
-        libraryHaskellDepends = [
-          array base bytestring containers deepseq scientific text
-          transformers
-        ];
-        testHaskellDepends = [
-          array base bytestring deepseq QuickCheck quickcheck-unicode
-          scientific tasty tasty-quickcheck text transformers vector
-        ];
-        benchmarkHaskellDepends = [
-          array base bytestring case-insensitive containers criterion deepseq
-          directory filepath ghc-prim http-types parsec scientific text
-          transformers unordered-containers vector
-        ];
-        jailbreak = true;
-        homepage = "https://github.com/bos/attoparsec";
-        description = "Fast combinator parsing for bytestrings and text";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  base-compat = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, stdenv, unix }:
-      mkDerivation {
-        pname = "base-compat";
-        version = "0.9.3";
-        src = "${ghcjsBoot}/boot/base-compat";
-        doCheck = false;
-        libraryHaskellDepends = [ base unix ];
-        testHaskellDepends = [ base hspec QuickCheck ];
-        jailbreak = true;
-        description = "A compatibility layer for base";
-        license = stdenv.lib.licenses.mit;
-      }) {};
-  bytestring-builder = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, stdenv }:
-      mkDerivation {
-        pname = "bytestring-builder";
-        version = "0.10.8.1.0";
-        src = "${ghcjsBoot}/boot/bytestring-builder";
-        doCheck = false;
-        libraryHaskellDepends = [ base bytestring deepseq ];
-        jailbreak = true;
-        description = "The new bytestring builder, packaged outside of GHC";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  case-insensitive = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
-      , HUnit, stdenv, test-framework, test-framework-hunit, text
-      }:
-      mkDerivation {
-        pname = "case-insensitive";
-        version = "1.2.0.8";
-        src = "${ghcjsBoot}/boot/case-insensitive";
-        doCheck = false;
-        libraryHaskellDepends = [ base bytestring deepseq hashable text ];
-        testHaskellDepends = [
-          base bytestring HUnit test-framework test-framework-hunit text
-        ];
-        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
-        jailbreak = true;
-        homepage = "https://github.com/basvandijk/case-insensitive";
-        description = "Case insensitive string comparison";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  dlist = callPackage
-    ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }:
-      mkDerivation {
-        pname = "dlist";
-        version = "0.8.0.2";
-        src = "${ghcjsBoot}/boot/dlist";
-        doCheck = false;
-        libraryHaskellDepends = [ base deepseq ];
-        testHaskellDepends = [ base Cabal QuickCheck ];
-        jailbreak = true;
-        homepage = "https://github.com/spl/dlist";
-        description = "Difference lists";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  extensible-exceptions = callPackage
-    ({ mkDerivation, base, stdenv }:
-      mkDerivation {
-        pname = "extensible-exceptions";
-        version = "0.1.1.4";
-        src = "${ghcjsBoot}/boot/extensible-exceptions";
-        doCheck = false;
-        libraryHaskellDepends = [ base ];
-        jailbreak = true;
-        description = "Extensible exceptions";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  fail = callPackage
-    ({ mkDerivation, stdenv }:
-      mkDerivation {
-        pname = "fail";
-        version = "4.9.0.0";
-        src = "${ghcjsBoot}/boot/fail";
-        jailbreak = true;
-        homepage = "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail";
-        description = "Forward-compatible MonadFail class";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  hashable = callPackage
-    ({ mkDerivation, base, bytestring, criterion, ghc-prim, HUnit
-      , integer-gmp, QuickCheck, random, siphash, stdenv, test-framework
-      , test-framework-hunit, test-framework-quickcheck2, text, unix
-      }:
-      mkDerivation {
-        pname = "hashable";
-        version = "1.2.4.0";
-        src = "${ghcjsBoot}/boot/hashable";
-        doCheck = false;
-        libraryHaskellDepends = [
-          base bytestring ghc-prim integer-gmp text
-        ];
-        testHaskellDepends = [
-          base bytestring ghc-prim HUnit QuickCheck random test-framework
-          test-framework-hunit test-framework-quickcheck2 text unix
-        ];
-        benchmarkHaskellDepends = [
-          base bytestring criterion ghc-prim integer-gmp siphash text
-        ];
-        jailbreak = true;
-        homepage = "http://github.com/tibbe/hashable";
-        description = "A class for types that can be converted to a hash value";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  integer-logarithms = callPackage
-    ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
-      , smallcheck, stdenv, tasty, tasty-hunit, tasty-quickcheck
-      , tasty-smallcheck
-      }:
-      mkDerivation {
-        pname = "integer-logarithms";
-        version = "1.0.2";
-        src = "${ghcjsBoot}/boot/integer-logarithms";
-        doCheck = false;
-        libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
-        testHaskellDepends = [
-          base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
-          tasty-smallcheck
-        ];
-        jailbreak = true;
-        homepage = "https://github.com/phadej/integer-logarithms";
-        description = "Integer logarithms";
-        license = stdenv.lib.licenses.mit;
-      }) {};
-  mtl = callPackage
-    ({ mkDerivation, base, stdenv, transformers }:
-      mkDerivation {
-        pname = "mtl";
-        version = "2.2.1";
-        src = "${ghcjsBoot}/boot/mtl";
-        doCheck = false;
-        libraryHaskellDepends = [ base transformers ];
-        jailbreak = true;
-        homepage = "http://github.com/ekmett/mtl";
-        description = "Monad classes, using functional dependencies";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  nats = callPackage
-    ({ mkDerivation, stdenv }:
-      mkDerivation {
-        pname = "nats";
-        version = "1.1.1";
-        src = "${ghcjsBoot}/boot/nats";
-        jailbreak = true;
-        homepage = "http://github.com/ekmett/nats/";
-        description = "Natural numbers";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  old-time = callPackage
-    ({ mkDerivation, base, old-locale, stdenv }:
-      mkDerivation {
-        pname = "old-time";
-        version = "1.1.0.3";
-        src = "${ghcjsBoot}/boot/old-time";
-        doCheck = false;
-        libraryHaskellDepends = [ base old-locale ];
-        jailbreak = true;
-        description = "Time library";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  parallel = callPackage
-    ({ mkDerivation, array, base, containers, deepseq, stdenv }:
-      mkDerivation {
-        pname = "parallel";
-        version = "3.2.1.0";
-        src = "${ghcjsBoot}/boot/parallel";
-        doCheck = false;
-        libraryHaskellDepends = [ array base containers deepseq ];
-        jailbreak = true;
-        description = "Parallel programming library";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  random = callPackage
-    ({ mkDerivation, base, stdenv, time }:
-      mkDerivation {
-        pname = "random";
-        version = "1.1";
-        src = "${ghcjsBoot}/boot/random";
-        doCheck = false;
-        libraryHaskellDepends = [ base time ];
-        testHaskellDepends = [ base ];
-        jailbreak = true;
-        description = "random number library";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  scientific = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-      , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
-      , QuickCheck, smallcheck, stdenv, tasty, tasty-ant-xml, tasty-hunit
-      , tasty-quickcheck, tasty-smallcheck, text, vector
-      }:
-      mkDerivation {
-        pname = "scientific";
-        version = "0.3.4.10";
-        src = "${ghcjsBoot}/boot/scientific";
-        doCheck = false;
-        libraryHaskellDepends = [
-          base binary bytestring containers deepseq ghc-prim hashable
-          integer-gmp integer-logarithms text vector
-        ];
-        testHaskellDepends = [
-          base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
-          tasty-hunit tasty-quickcheck tasty-smallcheck text
-        ];
-        benchmarkHaskellDepends = [ base criterion ];
-        jailbreak = true;
-        homepage = "https://github.com/basvandijk/scientific";
-        description = "Numbers represented using scientific notation";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  semigroups = callPackage
-    ({ mkDerivation, base, stdenv }:
-      mkDerivation {
-        pname = "semigroups";
-        version = "0.18.3";
-        src = "${ghcjsBoot}/boot/semigroups";
-        doCheck = false;
-        libraryHaskellDepends = [ base ];
-        jailbreak = true;
-        homepage = "http://github.com/ekmett/semigroups/";
-        description = "Anything that associates";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  stm = callPackage
-    ({ mkDerivation, array, base, stdenv }:
-      mkDerivation {
-        pname = "stm";
-        version = "2.4.4.1";
-        src = "${ghcjsBoot}/boot/stm";
-        doCheck = false;
-        libraryHaskellDepends = [ array base ];
-        jailbreak = true;
-        description = "Software Transactional Memory";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  syb = callPackage
-    ({ mkDerivation, base, containers, HUnit, mtl, stdenv }:
-      mkDerivation {
-        pname = "syb";
-        version = "0.6";
-        src = "${ghcjsBoot}/boot/syb";
-        doCheck = false;
-        libraryHaskellDepends = [ base ];
-        testHaskellDepends = [ base containers HUnit mtl ];
-        jailbreak = true;
-        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
-        description = "Scrap Your Boilerplate";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  tagged = callPackage
-    ({ mkDerivation, base, deepseq, stdenv, template-haskell
-      , transformers, transformers-compat
-      }:
-      mkDerivation {
-        pname = "tagged";
-        version = "0.8.5";
-        src = "${ghcjsBoot}/boot/tagged";
-        doCheck = false;
-        libraryHaskellDepends = [
-          base deepseq template-haskell transformers transformers-compat
-        ];
-        jailbreak = true;
-        homepage = "http://github.com/ekmett/tagged";
-        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  text = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, deepseq, directory
-      , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode
-      , random, stdenv, test-framework, test-framework-hunit
-      , test-framework-quickcheck2
-      }:
-      mkDerivation {
-        pname = "text";
-        version = "1.2.2.1";
-        src = "${ghcjsBoot}/boot/text";
-        doCheck = false;
-        libraryHaskellDepends = [
-          array base binary bytestring deepseq ghc-prim integer-gmp
-        ];
-        testHaskellDepends = [
-          array base binary bytestring deepseq directory ghc-prim HUnit
-          integer-gmp QuickCheck quickcheck-unicode random test-framework
-          test-framework-hunit test-framework-quickcheck2
-        ];
-        jailbreak = true;
-        homepage = "https://github.com/bos/text";
-        description = "An efficient packed Unicode text type";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  th-abstraction = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, stdenv
-      , template-haskell
-      }:
-      mkDerivation {
-        pname = "th-abstraction";
-        version = "0.2.6.0";
-        src = "${ghcjsBoot}/boot/th-abstraction";
-        doCheck = false;
-        libraryHaskellDepends = [
-          base containers ghc-prim template-haskell
-        ];
-        testHaskellDepends = [ base containers template-haskell ];
-        jailbreak = true;
-        homepage = "https://github.com/glguy/th-abstraction";
-        description = "Nicer interface for reified information about data types";
-        license = stdenv.lib.licenses.isc;
-      }) {};
-  time-locale-compat = callPackage
-    ({ mkDerivation, base, old-locale, stdenv, time }:
-      mkDerivation {
-        pname = "time-locale-compat";
-        version = "0.1.1.3";
-        src = "${ghcjsBoot}/boot/time-locale-compat";
-        doCheck = false;
-        libraryHaskellDepends = [ base old-locale time ];
-        jailbreak = true;
-        homepage = "https://github.com/khibino/haskell-time-locale-compat";
-        description = "Compatibility of TimeLocale between old-locale and time-1.5";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  transformers-compat = callPackage
-    ({ mkDerivation, base, ghc-prim, stdenv, transformers }:
-      mkDerivation {
-        pname = "transformers-compat";
-        version = "0.5.1.4";
-        src = "${ghcjsBoot}/boot/transformers-compat";
-        doCheck = false;
-        libraryHaskellDepends = [ base ghc-prim transformers ];
-        jailbreak = true;
-        homepage = "http://github.com/ekmett/transformers-compat/";
-        description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  unordered-containers = callPackage
-    ({ mkDerivation, base, bytestring, ChasingBottoms, containers
-      , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
-      , mtl, QuickCheck, random, stdenv, test-framework
-      , test-framework-hunit, test-framework-quickcheck2
-      }:
-      mkDerivation {
-        pname = "unordered-containers";
-        version = "0.2.7.2";
-        src = "${ghcjsBoot}/boot/unordered-containers";
-        doCheck = false;
-        libraryHaskellDepends = [ base deepseq hashable ];
-        testHaskellDepends = [
-          base ChasingBottoms containers hashable HUnit QuickCheck
-          test-framework test-framework-hunit test-framework-quickcheck2
-        ];
-        benchmarkHaskellDepends = [
-          base bytestring containers criterion deepseq deepseq-generics
-          hashable hashmap mtl random
-        ];
-        jailbreak = true;
-        homepage = "https://github.com/tibbe/unordered-containers";
-        description = "Efficient hashing-based container types";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  uuid-types = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-      , deepseq, hashable, HUnit, QuickCheck, random, stdenv, tasty
-      , tasty-hunit, tasty-quickcheck, text, unordered-containers
-      }:
-      mkDerivation {
-        pname = "uuid-types";
-        version = "1.0.3";
-        src = "${ghcjsBoot}/boot/uuid/uuid-types";
-        doCheck = false;
-        libraryHaskellDepends = [
-          base binary bytestring deepseq hashable random text
-        ];
-        testHaskellDepends = [
-          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
-        ];
-        benchmarkHaskellDepends = [
-          base bytestring containers criterion deepseq random
-          unordered-containers
-        ];
-        jailbreak = true;
-        homepage = "https://github.com/hvr/uuid";
-        description = "Type definitions for Universally Unique Identifiers";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  vector = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
-      , random, stdenv, template-haskell, test-framework
-      , test-framework-quickcheck2, transformers
-      }:
-      mkDerivation {
-        pname = "vector";
-        version = "0.11.0.0";
-        src = "${ghcjsBoot}/boot/vector";
-        doCheck = false;
-        libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
-        testHaskellDepends = [
-          base QuickCheck random template-haskell test-framework
-          test-framework-quickcheck2 transformers
-        ];
-        jailbreak = true;
-        homepage = "https://github.com/haskell/vector";
-        description = "Efficient Arrays";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-  ghcjs-base = callPackage
-    ({ mkDerivation, aeson, array, attoparsec, base, bytestring
-      , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim
-      , hashable, HUnit, integer-gmp, primitive, QuickCheck
-      , quickcheck-unicode, random, scientific, stdenv, test-framework
-      , test-framework-hunit, test-framework-quickcheck2, text, time
-      , transformers, unordered-containers, vector
-      }:
-      mkDerivation {
-        pname = "ghcjs-base";
-        version = "0.2.0.0";
-        src = "${ghcjsBoot}/ghcjs/ghcjs-base";
-        doCheck = false;
-        libraryHaskellDepends = [
-          aeson attoparsec base bytestring containers deepseq dlist ghc-prim
-          ghcjs-prim hashable integer-gmp primitive scientific text time
-          transformers unordered-containers vector
-        ];
-        testHaskellDepends = [
-          array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit
-          primitive QuickCheck quickcheck-unicode random test-framework
-          test-framework-hunit test-framework-quickcheck2 text
-        ];
-        jailbreak = true;
-        homepage = "http://github.com/ghcjs/ghcjs-base";
-        description = "base library for GHCJS";
-        license = stdenv.lib.licenses.mit;
-      }) {};
-  Cabal = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-      , deepseq, directory, exceptions, filepath, old-time, pretty
-      , process, QuickCheck, regex-posix, stdenv, tagged, tasty
-      , tasty-hunit, tasty-quickcheck, time, transformers, unix
-      }:
-      mkDerivation {
-        pname = "Cabal";
-        version = "1.24.0.0";
-        src = "${ghcjsBoot}/boot/cabal/Cabal";
-        doCheck = false;
-        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
-        ];
-        jailbreak = true;
-        homepage = "http://www.haskell.org/cabal/";
-        description = "A framework for packaging Haskell software";
-        license = stdenv.lib.licenses.bsd3;
-      }) {};
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
deleted file mode 100644
index 85efecc8ed3..00000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ /dev/null
@@ -1,239 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
-  # Suitable LLVM version.
-  llvmPackages = pkgs.llvmPackages_35;
-
-  # Disable GHC 7.10.x core libraries.
-  array = null;
-  base = null;
-  binary = null;
-  bin-package-db = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  deepseq = null;
-  directory = null;
-  filepath = null;
-  ghc-boot = null;
-  ghc-boot-th = null;
-  ghc-prim = null;
-  ghci = null;
-  haskeline = null;
-  hoopl = null;
-  hpc = null;
-  integer-gmp = null;
-  pretty = null;
-  process = null;
-  rts = null;
-  template-haskell = null;
-  terminfo = null;
-  time = null;
-  transformers = null;
-  unix = null;
-  xhtml = null;
-
-  # These are now core libraries in GHC 8.4.x.
-  mtl = self.mtl_2_2_2;
-  parsec = self.parsec_3_1_13_0;
-  parsec_3_1_13_0 = addBuildDepends super.parsec_3_1_13_0 [self.fail self.semigroups];
-  stm = self.stm_2_5_0_0;
-  text = self.text_1_2_3_1;
-
-  # Build jailbreak-cabal with the latest version of Cabal.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
-
-  gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.buildHaskellPackages.Cabal_1_24_2_0; };
-
-  # https://github.com/mrkkrp/megaparsec/issues/282
-  megaparsec = addBuildDepend (dontCheck super.megaparsec) self.fail;
-
-  Extra = appendPatch super.Extra (pkgs.fetchpatch {
-    url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";
-    sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f";
-  });
-
-  # Requires ghc 8.2
-  ghc-proofs = dontDistribute super.ghc-proofs;
-
-  # haddock: No input file(s).
-  nats = dontHaddock super.nats;
-  bytestring-builder = dontHaddock super.bytestring-builder;
-
-  # Setup: At least the following dependencies are missing: base <4.8
-  hspec-expectations = overrideCabal super.hspec-expectations (drv: {
-    postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
-  });
-  utf8-string = overrideCabal super.utf8-string (drv: {
-    postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
-  });
-
-  # acid-state/safecopy#25 acid-state/safecopy#26
-  safecopy = dontCheck (super.safecopy);
-
-  # test suite broken, some instance is declared twice.
-  # https://bitbucket.org/FlorianHartwig/attobencode/issue/1
-  AttoBencode = dontCheck super.AttoBencode;
-
-  # Test suite fails with some (seemingly harmless) error.
-  # https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24
-  syb = dontCheck super.syb;
-
-  # Test suite has stricter version bounds
-  retry = dontCheck super.retry;
-
-  # test/System/Posix/Types/OrphansSpec.hs:19:13:
-  #    Not in scope: type constructor or class ‘Int32’
-  base-orphans = dontCheck super.base-orphans;
-
-  # Test suite fails with time >= 1.5
-  http-date = dontCheck super.http-date;
-
-  # Version 1.19.5 fails its test suite.
-  happy = dontCheck super.happy;
-
-  # Upstream was notified about the over-specified constraint on 'base'
-  # but refused to do anything about it because he "doesn't want to
-  # support a moving target". Go figure.
-  barecheck = doJailbreak super.barecheck;
-
-  # https://github.com/kazu-yamamoto/unix-time/issues/30
-  unix-time = dontCheck super.unix-time;
-
-  # diagrams/monoid-extras#19
-  monoid-extras = overrideCabal super.monoid-extras (drv: {
-    prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal";
-  });
-
-  # diagrams/statestack#5
-  statestack = overrideCabal super.statestack (drv: {
-    prePatch = "sed -i 's|4\.8|4.9|' statestack.cabal";
-  });
-
-  # diagrams/diagrams-core#83
-  diagrams-core = overrideCabal super.diagrams-core (drv: {
-    prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal";
-  });
-
-  timezone-olson = doJailbreak super.timezone-olson;
-  xmonad-extras = overrideCabal super.xmonad-extras (drv: {
-    postPatch = ''
-      sed -i -e "s,<\*,<¤,g" XMonad/Actions/Volume.hs
-    '';
-  });
-
-  # Workaround for a workaround, see comment for "ghcjs" flag.
-  jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
-            in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
-                                          self.webkitgtk3-javascriptcore ];
-
-  # https://github.com/lymar/hastache/issues/47
-  hastache = dontCheck super.hastache;
-
-  # The compat library is empty in the presence of mtl 2.2.x.
-  mtl-compat = dontHaddock super.mtl-compat;
-
-  # https://github.com/bos/bloomfilter/issues/11
-  bloomfilter = dontHaddock (appendConfigureFlag super.bloomfilter "--ghc-option=-XFlexibleContexts");
-
-  # https://github.com/ocharles/tasty-rerun/issues/5
-  tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
-
-  # http://hub.darcs.net/ivanm/graphviz/issue/5
-  graphviz = dontCheck (appendPatch super.graphviz ./patches/graphviz-fix-ghc710.patch);
-
-  # https://github.com/HugoDaniel/RFC3339/issues/14
-  timerep = dontCheck super.timerep;
-
-  # Required to fix version 0.91.0.0.
-  wx = dontHaddock (appendConfigureFlag super.wx "--ghc-option=-XFlexibleContexts");
-
-  # Inexplicable haddock failure
-  # https://github.com/gregwebs/aeson-applicative/issues/2
-  aeson-applicative = dontHaddock super.aeson-applicative;
-
-  # GHC 7.10.1 is affected by https://github.com/srijs/hwsl2/issues/1.
-  hwsl2 = dontCheck super.hwsl2;
-
-  # https://github.com/haskell/haddock/issues/427
-  haddock = dontCheck self.haddock_2_16_1;
-
-  # haddock-api >= 2.17 is GHC 8.0 only
-  haddock-api = self.haddock-api_2_16_1;
-  haddock-library = self.haddock-library_1_2_1;
-
-  # The tests in vty-ui do not build, but vty-ui itself builds.
-  vty-ui = enableCabalFlag super.vty-ui "no-tests";
-
-  # https://github.com/fpco/stackage/issues/1112
-  vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms) [ self.mtl self.mwc-random ];
-
-  # vector with ghc < 8.0 needs semigroups
-  vector = addBuildDepend super.vector self.semigroups;
-
-  # too strict dependency on directory
-  tasty-ant-xml = doJailbreak super.tasty-ant-xml;
-
-  # https://github.com/thoughtpolice/hs-ed25519/issues/13
-  ed25519 = dontCheck super.ed25519;
-
-  # Breaks a dependency cycle between QuickCheck and semigroups
-  hashable = dontCheck super.hashable;
-  unordered-containers = dontCheck super.unordered-containers;
-
-  # GHC versions prior to 8.x require additional build inputs.
-  aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";
-  ansi-wl-pprint = addBuildDepend super.ansi-wl-pprint self.semigroups;
-  attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]);
-  bytes = addBuildDepend super.bytes self.doctest;
-  case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
-  cmdargs = addBuildDepend super.cmdargs self.semigroups;
-  contravariant = addBuildDepend super.contravariant self.semigroups;
-  dependent-map = addBuildDepend super.dependent-map self.semigroups;
-  distributive = addBuildDepend (dontCheck super.distributive) self.semigroups;
-  Glob = addBuildDepends super.Glob (with self; [semigroups]);
-  hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
-  hslogger = addBuildDepend super.hslogger self.HUnit;
-  intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
-  lens = addBuildDepend super.lens self.generic-deriving;
-  mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
-  natural-transformation = addBuildDepend super.natural-transformation self.semigroups;
-  optparse-applicative = addBuildDepends super.optparse-applicative [self.semigroups self.fail];
-  parser-combinators = addBuildDepend super.parser-combinators self.semigroups;
-  QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
-  reflection = addBuildDepend super.reflection self.semigroups;
-  semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]);
-  tar = addBuildDepend super.tar self.semigroups;
-  texmath = addBuildDepend super.texmath self.network-uri;
-  yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; });
-
-  # cereal must have `fail` in pre-ghc-8.0.x versions and tests require
-  # bytestring>=0.10.8.1.
-  cereal = dontCheck (addBuildDepend super.cereal self.fail);
-
-  # The test suite requires Cabal 1.24.x or later to compile.
-  comonad = dontCheck super.comonad;
-  semigroupoids = dontCheck super.semigroupoids;
-
-  # Newer versions require base >=4.9 && <5.
-  colour = self.colour_2_3_3;
-
-  # https://github.com/atzedijkstra/chr/issues/1
-  chr-pretty = doJailbreak super.chr-pretty;
-  chr-parse = doJailbreak super.chr-parse;
-
-  # The autogenerated Nix expressions don't take into
-  # account `if impl(ghc >= x.y)`, which is a common method to depend
-  # on `semigroups` or `fail` when building with GHC < 8.0.
-  system-filepath = addBuildDepend super.system-filepath self.semigroups;
-  haskell-src-exts = addBuildDepend super.haskell-src-exts self.semigroups;
-  free = addBuildDepend super.free self.fail;
-
-  # Newer versions don't build without base-4.9
-  resourcet = self.resourcet_1_1_11;
-  conduit = self.conduit_1_2_13_1;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
deleted file mode 100644
index 43f769ff6fd..00000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
-  # Suitable LLVM version.
-  llvmPackages = pkgs.llvmPackages_37;
-
-  # Disable GHC 8.0.x core libraries.
-  array = null;
-  base = null;
-  binary = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  deepseq = null;
-  directory = null;
-  filepath = null;
-  ghc-boot = null;
-  ghc-boot-th = null;
-  ghc-compact = null;
-  ghc-prim = null;
-  ghci = null;
-  haskeline = null;
-  hoopl = null;
-  hpc = null;
-  integer-gmp = null;
-  pretty = null;
-  process = null;
-  rts = null;
-  template-haskell = null;
-  terminfo = null;
-  time = null;
-  transformers = null;
-  unix = null;
-  xhtml = null;
-
-  # These are now core libraries in GHC 8.4.x.
-  mtl = self.mtl_2_2_2;
-  parsec = self.parsec_3_1_13_0;
-  stm = self.stm_2_5_0_0;
-  text = self.text_1_2_3_1;
-
-  # https://github.com/bmillwood/applicative-quoters/issues/6
-  applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
-    url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";
-    sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
-  });
-
-  # Requires ghc 8.2
-  ghc-proofs = dontDistribute super.ghc-proofs;
-
-  # https://github.com/thoughtbot/yesod-auth-oauth2/pull/77
-  yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2;
-
-  # https://github.com/nominolo/ghc-syb/issues/20
-  ghc-syb-utils = dontCheck super.ghc-syb-utils;
-
-  # Newer versions require ghc>=8.2
-  apply-refact = super.apply-refact_0_3_0_1;
-
-  # This builds needs the latest Cabal version.
-  cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; });
-
-  # Add appropriate Cabal library to build this code.
-  stack = addSetupDepend super.stack self.Cabal_2_0_1_1;
-
-  # inline-c > 0.5.6.0 requires template-haskell >= 2.12
-  inline-c = super.inline-c_0_5_6_1;
-  inline-c-cpp = super.inline-c-cpp_0_1_0_0;
-
-  # test dep hedgehog pulls in concurrent-output, which does not build
-  # due to processing version mismatch
-  either = dontCheck super.either;
-
-  # test dep tasty has a version mismatch
-  indents = dontCheck super.indents;
-
-  # Newer versions require GHC 8.2.
-  haddock-library = self.haddock-library_1_4_3;
-  haddock-api = self.haddock-api_2_17_4;
-  haddock = self.haddock_2_17_5;
-
-  # GHC 8.0 doesn't have semigroups included by default
-  ListLike = addBuildDepend super.ListLike self.semigroups;
-
-  # Add missing build depedency for this compiler.
-  base-compat-batteries = addBuildDepend super.base-compat-batteries self.bifunctors;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix
deleted file mode 100644
index be90794f58d..00000000000
--- a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
-  # Suitable LLVM version.
-  llvmPackages = pkgs.llvmPackages_35;
-
-  # Disable GHC 8.0.x core libraries.
-  array = null;
-  base = null;
-  binary = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  deepseq = null;
-  directory = null;
-  filepath = null;
-  ghc-boot = null;
-  ghc-boot-th = null;
-  ghc-prim = null;
-  ghci = null;
-  haskeline = null;
-  hoopl = null;
-  hpc = null;
-  integer-gmp = null;
-  pretty = null;
-  process = null;
-  rts = null;
-  template-haskell = null;
-  terminfo = null;
-  time = null;
-  transformers = null;
-  unix = null;
-  xhtml = null;
-
-  # cabal-install can use the native Cabal library.
-  cabal-install = super.cabal-install.override { Cabal = null; };
-
-  # jailbreak-cabal can use the native Cabal library.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
-
-  # https://github.com/bmillwood/applicative-quoters/issues/6
-  applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
-    url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";
-    sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
-  });
-
-  # https://github.com/christian-marie/xxhash/issues/3
-  xxhash = doJailbreak super.xxhash;
-
-  # https://github.com/Deewiant/glob/issues/8
-  Glob = doJailbreak super.Glob;
-
-  # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
-  vector-algorithms = dontCheck super.vector-algorithms;
-
-}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index dea3ba95425..13250ea8814 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -8,8 +8,6 @@ let
     "ghc7103Binary"
     "ghc821Binary"
     "ghcjs"
-    "ghcjs710"
-    "ghcjs80"
     "ghcjs82"
     "ghcjs84"
     "integer-simple"
@@ -47,28 +45,12 @@ in {
     ghc7103Binary = callPackage ../development/compilers/ghc/7.10.3-binary.nix { };
     ghc821Binary = callPackage ../development/compilers/ghc/8.2.1-binary.nix { };
 
-    ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix {
-      bootPkgs = packages.ghc7103Binary;
-      buildLlvmPackages = buildPackages.llvmPackages_35;
-      llvmPackages = pkgs.llvmPackages_35;
-    };
-    ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix {
-      bootPkgs = packages.ghc7103Binary;
-      inherit (buildPackages.python27Packages) sphinx;
-      buildLlvmPackages = buildPackages.llvmPackages_37;
-      llvmPackages = pkgs.llvmPackages_37;
-    };
     ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix {
       bootPkgs = packages.ghc821Binary;
       inherit (buildPackages.python3Packages) sphinx;
       buildLlvmPackages = buildPackages.llvmPackages_39;
       llvmPackages = pkgs.llvmPackages_39;
     };
-    ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix {
-      bootPkgs = packages.ghc821Binary;
-      buildLlvmPackages = buildPackages.llvmPackages_5;
-      llvmPackages = pkgs.llvmPackages_5;
-    };
     ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix {
       bootPkgs = packages.ghc821Binary;
       buildLlvmPackages = buildPackages.llvmPackages_5;
@@ -85,18 +67,6 @@ in {
       llvmPackages = pkgs.llvmPackages_5;
     };
     ghcjs = compiler.ghcjs84;
-    # Use `import` because `callPackage inside`.
-    ghcjs710 = import ../development/compilers/ghcjs/7.10 {
-      bootPkgs = packages.ghc7103;
-      inherit (pkgs) cabal-install;
-      inherit (buildPackages) fetchgit fetchFromGitHub;
-    };
-    # `import` on purpose; see above.
-    ghcjs80 = import ../development/compilers/ghcjs/8.0 {
-      bootPkgs = packages.ghc802;
-      inherit (pkgs) cabal-install;
-      inherit (buildPackages) fetchgit fetchFromGitHub;
-    };
     ghcjs82 = callPackage ../development/compilers/ghcjs-ng {
       bootPkgs = packages.ghc822;
       ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json;
@@ -126,22 +96,12 @@ in {
   # Always get compilers from `buildPackages`
   packages = let bh = buildPackages.haskell; in {
 
-    ghc7103 = callPackage ../development/haskell-modules {
-      buildHaskellPackages = bh.packages.ghc7103;
-      ghc = bh.compiler.ghc7103;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
-    };
     ghc7103Binary = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghc7103Binary;
       ghc = bh.compiler.ghc7103Binary;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
       packageSetConfig = bootstrapPackageSet;
     };
-    ghc802 = callPackage ../development/haskell-modules {
-      buildHaskellPackages = bh.packages.ghc802;
-      ghc = bh.compiler.ghc802;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
-    };
     ghc821Binary = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghc821Binary;
       ghc = bh.compiler.ghc821Binary;
-- 
GitLab


From 5ca1b19dab954a5b1f59776b4e9ea4b8798bd44d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 7 Aug 2018 17:17:18 -0500
Subject: [PATCH 0888/1065] timescaledb-parallel-copy: init at 2018-05-14

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../timescaledb-parallel-copy/default.nix     | 26 +++++++++++++++++++
 .../timescaledb-parallel-copy/deps.nix        | 21 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
 create mode 100644 pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix

diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
new file mode 100644
index 00000000000..d667e49e7cb
--- /dev/null
+++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "timescaledb-parallel-copy-${version}";
+  version = "2018-05-14";
+
+  owner  = "timescale";
+  repo   = "timescaledb-parallel-copy";
+
+  goPackagePath = with src; "github.com/${owner}/${repo}";
+  goDeps = ./deps.nix;
+
+  src = fetchFromGitHub {
+    inherit owner repo;
+    rev    = "20d3e8f8219329f2f4b0a5aa985f280dd04d10bb";
+    sha256 = "0waaccw991cnxaxjdxh9ksb94kiiyx1r7gif6pkd5k58js0kfvdn";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Bulk, parallel insert of CSV records into PostgreSQL";
+    homepage    = http://github.com/timescale/timescaledb-parallel-copy;
+    license     = licenses.asl20;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix
new file mode 100644
index 00000000000..c672611e09c
--- /dev/null
+++ b/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix
@@ -0,0 +1,21 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/jmoiron/sqlx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jmoiron/sqlx";
+      rev = "0dae4fefe7c0e190f7b5a78dac28a1c82cc8d849";
+      sha256 = "0r8fyj70n0v84byvagw8w8rzz532s94mjr72b9sx018j0b6xglmy";
+    };
+  }
+  {
+    goPackagePath = "github.com/lib/pq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lib/pq";
+      rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8";
+      sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b9bcacc451..73f2d448909 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13594,6 +13594,8 @@ with pkgs;
     libmemcached = null; # Detection is broken upstream
   };
 
+  timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { };
+
   postgresql = postgresql_9_6;
 
   inherit (callPackages ../servers/sql/postgresql { })
-- 
GitLab


From bf26876a2829232b45061976ed455c2048ebab1c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Nov 2018 20:16:56 +0100
Subject: [PATCH 0889/1065] zsh-git-prompt: don't hard-code any particular
 compiler version

Just use whatever is the current default.
---
 pkgs/shells/zsh/zsh-git-prompt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix
index 7318da83d17..761ad071da9 100644
--- a/pkgs/shells/zsh/zsh-git-prompt/default.nix
+++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix
@@ -29,10 +29,10 @@
 , python
 , git
 , lib
-, ghcVersion ? "ghc802"
+, haskellPackages
 }:
 
-haskell.packages.${ghcVersion}.callPackage
+haskellPackages.callPackage
   ({ mkDerivation, base, HUnit, parsec, process, QuickCheck, stdenv }:
    mkDerivation rec {
      pname = "zsh-git-prompt";
-- 
GitLab


From fdc19ff3111baa03de4c2d5f1a64318886dc4b63 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Nov 2018 20:23:22 +0100
Subject: [PATCH 0890/1065] haskell-polyparse: use latest version for ghc-8.6.1

---
 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 fa14d21afa2..bf021956593 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,7 @@ self: super: {
   megaparsec = dontCheck (doJailbreak super.megaparsec);
   neat-interpolation = dontCheck super.neat-interpolation;  # test suite depends on broken HTF
   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;
-- 
GitLab


From 0a2420bccd5660b3af642039d945e512490d51ae Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 2 Nov 2018 16:01:05 -0400
Subject: [PATCH 0891/1065] nasc: 0.4.7 -> 0.5.0

---
 .../science/math/nasc/default.nix             | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
index cac403b131b..bba08e3ae29 100644
--- a/pkgs/applications/science/math/nasc/default.nix
+++ b/pkgs/applications/science/math/nasc/default.nix
@@ -7,49 +7,39 @@
 , gnome3
 , cmake
 , ninja
-, vala
+, vala_0_40
 , libqalculate
 , gobjectIntrospection
 , wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "nasc-${version}";
-  version = "0.4.7";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "parnold-x";
     repo = "nasc";
     rev = version;
-    sha256 = "0p74953pdgsijvqj3msssqiwm6sc1hzp68dlmjamqrqirwgqv5aa";
+    sha256 = "1rrp3djsv7lrgsqjn7x50msv0c5ffhz90lj1v11di0kp05m6q9j9";
   };
 
-  patches = [
-    # Install libqalculatenasc.so
-    (fetchpatch {
-      url = https://github.com/parnold-x/nasc/commit/93a799f9afb3e32f3f1a54e056b59570aae2e437.patch;
-      sha256 = "1m32w2zaswzxnzbr7p3lf8s6fac4mjvfhm8v9k59b4jyzmvrl631";
-    })
-    (fetchpatch {
-      url = https://github.com/parnold-x/nasc/commit/570b49169326de154af2cf43c5f12268fff1dc6d.patch;
-      sha256 = "1y3w6rxn0453iscx2xg427wy1bd5kv4z1c41hhbjmg614ycp6bka";
-    })
-  ];
-
   nativeBuildInputs = [
     pkgconfig
     wrapGAppsHook
-    vala
+    vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
     cmake
     ninja
     gobjectIntrospection # for setup-hook
   ];
+  
   buildInputs = [
-    libqalculate
-    gtk3
-    granite
+    gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
+    gnome3.gtksourceview
     gnome3.libgee
     gnome3.libsoup
-    gnome3.gtksourceview
+    granite
+    gtk3
+    libqalculate
   ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From 45db4162014e32ac3039dbabe524766789c58413 Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Fri, 2 Nov 2018 13:03:35 -0700
Subject: [PATCH 0892/1065] folly: 2018.08.27.00 -> 2018.10.29.00

Folly disabled autotools-based builds in favor of CMake.
---
 pkgs/development/libraries/folly/default.nix | 27 +++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 9694765bb93..1598dafaad0 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -1,26 +1,29 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, libevent
-, double-conversion, glog, google-gflags, python, libiberty, openssl }:
+{ stdenv, fetchFromGitHub, cmake, boost, libevent, double-conversion, glog
+, google-gflags, libiberty, openssl }:
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
-  version = "2018.08.27.00";
+  version = "2018.10.29.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "0slnhn8q26mj23gm36c61b4ar857q8c844ifpvw4q329nndbrgcz";
+    sha256 = "0bbp4w8wbawh3ilgkl7rwvbqkdczpvfn92f9lcvxj8sili0nldab";
   };
 
-  nativeBuildInputs = [ autoreconfHook python pkgconfig ];
-  buildInputs = [ libiberty boost libevent double-conversion glog google-gflags openssl ];
+  nativeBuildInputs = [ cmake ];
 
-  postPatch = "cd folly";
-  preBuild = ''
-    patchShebangs build
-  '';
-
-  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
+  # See CMake/folly-deps.cmake in the Folly source tree.
+  buildInputs = [
+    boost
+    double-conversion
+    glog
+    google-gflags
+    libevent
+    libiberty
+    openssl
+  ];
 
   enableParallelBuilding = true;
 
-- 
GitLab


From 0b66270adac94937ee3c4a3ad4de644e8b65c679 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 2 Nov 2018 15:10:57 -0500
Subject: [PATCH 0893/1065] avrlibc: set platforms to avr-none

It will only build on avr architectures.
---
 pkgs/development/misc/avr/libc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix
index afe30e4b5ee..ab9a696afb0 100644
--- a/pkgs/development/misc/avr/libc/default.nix
+++ b/pkgs/development/misc/avr/libc/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     description = "a C runtime library for AVR microcontrollers";
     homepage = http://savannah.nongnu.org/projects/avr-libc/;
     license = licenses.bsd3;
-    platforms = platforms.all;
+    platforms = [ "avr-none" ];
     maintainers = with maintainers; [ mguentner ];
   };
 }
-- 
GitLab


From 836cbf6a5ca44fd18219c7ea80550d0e38a66f90 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 2 Nov 2018 15:28:53 -0500
Subject: [PATCH 0894/1065] =?UTF-8?q?opentx:=20don=E2=80=99t=20use=20nano?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Vanilla newlib doesn’t install nano.
---
 pkgs/applications/misc/opentx/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index 0aecc43d1e5..95a2f2b940c 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -42,6 +42,7 @@ in stdenv.mkDerivation {
     # 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"
   ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From 5df22e343d17213cf986653f5d730f738f9cac71 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 2 Nov 2018 15:29:30 -0500
Subject: [PATCH 0895/1065] =?UTF-8?q?axoloti:=20don=E2=80=99t=20hardode=20?=
 =?UTF-8?q?paths?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some of these paths are not in gcc-arm-embedded (instead binutils-arm-embedded).
---
 pkgs/applications/audio/axoloti/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix
index 3c3198e1734..e3f1b6acf87 100644
--- a/pkgs/applications/audio/axoloti/default.nix
+++ b/pkgs/applications/audio/axoloti/default.nix
@@ -40,15 +40,6 @@ stdenv.mkDerivation rec {
     substituteInPlace "chibios/os/various/shell.c" \
       --replace "#ifdef __DATE__" "#if 0"
 
-    # Hardcode full path to compiler tools
-    for f in "firmware/Makefile.patch" \
-             "firmware/Makefile" \
-             "firmware/flasher/Makefile" \
-             "firmware/mounter/Makefile"; do
-      substituteInPlace "$f" \
-        --replace "arm-none-eabi-" "${gcc-arm-embedded}/bin/arm-none-eabi-"
-    done
-
     # Hardcode path to "make"
     for f in "firmware/compile_firmware_linux.sh" \
              "firmware/compile_patch_linux.sh"; do
-- 
GitLab


From 94a2cdebaa0f25d52a08e3b2d3bdcdabd62e16ba Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 2 Nov 2018 15:30:10 -0500
Subject: [PATCH 0896/1065] =?UTF-8?q?inav:=20don=E2=80=99t=20use=20nano?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

not in newlib
---
 pkgs/development/misc/stm32/inav/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix
index 9c35ac2ffce..102b1eb8048 100644
--- a/pkgs/development/misc/stm32/inav/default.nix
+++ b/pkgs/development/misc/stm32/inav/default.nix
@@ -26,6 +26,9 @@ in stdenv.mkDerivation rec {
     sed -ri "s/REVISION.*=.*shell git.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev.
     sed -ri "s/-j *[0-9]+//" Makefile # Eliminate parallel build args in submakes
     sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
+
+    substitutateInPlace Makefile \
+      --replace "--specs=nano.specs" ""
   '';
 
   enableParallelBuilding = true;
-- 
GitLab


From a4234645fe2445fe503413b159a842dbb280a777 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 2 Nov 2018 15:30:30 -0500
Subject: [PATCH 0897/1065] =?UTF-8?q?betaflight:=20don=E2=80=99t=20use=20n?=
 =?UTF-8?q?ano?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

not in newlib
---
 pkgs/development/misc/stm32/betaflight/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix
index 21230464e74..fbe48803f2d 100644
--- a/pkgs/development/misc/stm32/betaflight/default.nix
+++ b/pkgs/development/misc/stm32/betaflight/default.nix
@@ -32,6 +32,9 @@ in stdenv.mkDerivation rec {
   postPatch = ''
     sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev.
     sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
+
+    substitutateInPlace Makefile \
+      --replace "--specs=nano.specs" ""
   '';
 
   enableParallelBuilding = true;
-- 
GitLab


From ec7cb84bf07ef1064a28b0b4dbb370efacd9e56e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 2 Nov 2018 21:22:51 +0100
Subject: [PATCH 0898/1065] gitlab: refactor and fix test

---
 nixos/modules/services/misc/gitlab.nix        | 214 ++++++++----------
 nixos/release.nix                             |   2 +-
 nixos/tests/gitlab.nix                        |  18 +-
 .../version-management/gitlab/default.nix     |  12 +-
 4 files changed, 109 insertions(+), 137 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 8ea831afb7c..ce1cb6ad37f 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -14,15 +14,16 @@ let
   pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
   pgSuperUser = config.services.postgresql.superUser;
 
-  databaseYml = ''
-    production:
-      adapter: postgresql
-      database: ${cfg.databaseName}
-      host: ${cfg.databaseHost}
-      password: ${cfg.databasePassword}
-      username: ${cfg.databaseUsername}
-      encoding: utf8
-  '';
+  databaseConfig = {
+    production = {
+      adapter = "postgresql";
+      database = cfg.databaseName;
+      host = cfg.databaseHost;
+      password = cfg.databasePassword;
+      username = cfg.databaseUsername;
+      encoding = "utf8";
+    };
+  };
 
   gitalyToml = pkgs.writeText "gitaly.toml" ''
     socket_path = "${lib.escape ["\""] gitalySocket}"
@@ -45,35 +46,31 @@ let
     '') gitlabConfig.production.repositories.storages))}
   '';
 
-  gitlabShellYml = ''
-    user: ${cfg.user}
-    gitlab_url: "http+unix://${pathUrlQuote gitlabSocket}"
-    http_settings:
-      self_signed_cert: false
-    repos_path: "${cfg.statePath}/repositories"
-    secret_file: "${cfg.statePath}/config/gitlab_shell_secret"
-    log_file: "${cfg.statePath}/log/gitlab-shell.log"
-    custom_hooks_dir: "${cfg.statePath}/custom_hooks"
-    redis:
-      bin: ${pkgs.redis}/bin/redis-cli
-      host: 127.0.0.1
-      port: 6379
-      database: 0
-      namespace: resque:gitlab
-  '';
+  gitlabShellConfig = {
+    user = cfg.user;
+    gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}";
+    http_settings.self_signed_cert = false;
+    repos_path = "${cfg.statePath}/repositories";
+    secret_file = "${cfg.statePath}/config/gitlab_shell_secret";
+    log_file = "${cfg.statePath}/log/gitlab-shell.log";
+    custom_hooks_dir = "${cfg.statePath}/custom_hooks";
+    redis = {
+      bin = "${pkgs.redis}/bin/redis-cli";
+      host = "127.0.0.1";
+      port = 6379;
+      database = 0;
+      namespace = "resque:gitlab";
+    };
+  };
 
-  redisYml = ''
-    production:
-      url: redis://localhost:6379/
-  '';
+  redisConfig.production.url = "redis://localhost:6379/";
 
-  secretsYml = ''
-    production:
-      secret_key_base: ${cfg.secrets.secret}
-      otp_key_base: ${cfg.secrets.otp}
-      db_key_base: ${cfg.secrets.db}
-      openid_connect_signing_key: ${builtins.toJSON cfg.secrets.jws}
-  '';
+  secretsConfig.production = {
+    secret_key_base = cfg.secrets.secret;
+    otp_key_base = cfg.secrets.otp;
+    db_key_base = cfg.secrets.db;
+    openid_connect_signing_key = cfg.secrets.jws;
+  };
 
   gitlabConfig = {
     # These are the default settings from config/gitlab.example.yml
@@ -115,12 +112,8 @@ let
         upload_pack = true;
         receive_pack = true;
       };
-      workhorse = {
-        secret_file = "${cfg.statePath}/.gitlab_workhorse_secret";
-      };
-      git = {
-        bin_path = "git";
-      };
+      workhorse.secret_file = "${cfg.statePath}/.gitlab_workhorse_secret";
+      git.bin_path = "git";
       monitoring = {
         ip_whitelist = [ "127.0.0.0/8" "::1/128" ];
         sidekiq_exporter = {
@@ -138,7 +131,7 @@ let
     HOME = "${cfg.statePath}/home";
     UNICORN_PATH = "${cfg.statePath}/";
     GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/";
-    GITLAB_STATE_PATH = "${cfg.statePath}";
+    GITLAB_STATE_PATH = cfg.statePath;
     GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads";
     SCHEMA = "${cfg.statePath}/db/schema.rb";
     GITLAB_LOG_PATH = "${cfg.statePath}/log";
@@ -146,13 +139,11 @@ let
     GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml";
     GITLAB_SHELL_SECRET_PATH = "${cfg.statePath}/config/gitlab_shell_secret";
     GITLAB_SHELL_HOOKS_PATH = "${cfg.statePath}/shell/hooks";
-    GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "gitlab-redis.yml" redisYml;
+    GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "redis.yml" (builtins.toJSON redisConfig);
     prometheus_multiproc_dir = "/run/gitlab";
     RAILS_ENV = "production";
   };
 
-  unicornConfig = builtins.readFile ./defaultUnicornConfig.rb;
-
   gitlab-rake = pkgs.stdenv.mkDerivation rec {
     name = "gitlab-rake";
     buildInputs = [ pkgs.makeWrapper ];
@@ -162,7 +153,6 @@ let
       mkdir -p $out/bin
       makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \
           ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
-          --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \
           --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package pkgs.coreutils pkgs.procps ]}:$PATH' \
           --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \
           --run 'cd ${cfg.packages.gitlab}/share/gitlab'
@@ -306,7 +296,6 @@ in {
 
       initialRootPassword = mkOption {
         type = types.str;
-        default = "UseNixOS!";
         description = ''
           Initial password of the root account if this is a new install.
         '';
@@ -461,10 +450,30 @@ in {
       }
     ];
 
+    systemd.tmpfiles.rules = [
+      "d /run/gitlab 0755 ${cfg.user} ${cfg.group} -"
+      "d ${gitlabEnv.HOME} 0750 ${cfg.user} ${cfg.group} -"
+      "d ${cfg.backupPath} 0750 ${cfg.user} ${cfg.group} -"
+      "d ${cfg.statePath}/builds 0750 ${cfg.user} ${cfg.group} -"
+      "d ${cfg.statePath}/config 0750 ${cfg.user} ${cfg.group} -"
+      "d ${cfg.statePath}/db 0750 ${cfg.user} ${cfg.group} -"
+      "d ${cfg.statePath}/log 0750 ${cfg.user} ${cfg.group} -"
+      "d ${cfg.statePath}/repositories 2770 ${cfg.user} ${cfg.group} -"
+      "d ${cfg.statePath}/shell 0750 ${cfg.user} ${cfg.group} -"
+      "d ${cfg.statePath}/tmp/pids 0750 ${cfg.user} ${cfg.group} -"
+      "d ${cfg.statePath}/tmp/sockets 0750 ${cfg.user} ${cfg.group} -"
+      "d ${cfg.statePath}/uploads 0700 ${cfg.user} ${cfg.group} -"
+      "d ${cfg.statePath}/custom_hooks/pre-receive.d 0700 ${cfg.user} ${cfg.group} -"
+      "d ${cfg.statePath}/custom_hooks/post-receive.d 0700 ${cfg.user} ${cfg.group} -"
+      "d ${cfg.statePath}/custom_hooks/update.d 0700 ${cfg.user} ${cfg.group} -"
+      "d ${gitlabConfig.production.shared.path}/artifacts 0750 ${cfg.user} ${cfg.group} -"
+      "d ${gitlabConfig.production.shared.path}/lfs-objects 0750 ${cfg.user} ${cfg.group} -"
+      "d ${gitlabConfig.production.shared.path}/pages 0750 ${cfg.user} ${cfg.group} -"
+    ];
+
     systemd.services.gitlab-sidekiq = {
-      after = [ "network.target" "redis.service" ];
+      after = [ "network.target" "redis.service" "gitlab.service" ];
       wantedBy = [ "multi-user.target" ];
-      partOf = [ "gitlab.service" ];
       environment = gitlabEnv;
       path = with pkgs; [
         config.services.postgresql.package
@@ -486,10 +495,8 @@ in {
     };
 
     systemd.services.gitaly = {
-      after = [ "network.target" "gitlab.service" ];
+      after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      environment.HOME = gitlabEnv.HOME;
-      environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH;
       path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv cfg.packages.gitaly.rubyEnv.wrappedRuby ];
       serviceConfig = {
         Type = "simple";
@@ -505,8 +512,6 @@ in {
     systemd.services.gitlab-workhorse = {
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      environment.HOME = gitlabEnv.HOME;
-      environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH;
       path = with pkgs; [
         gitAndTools.git
         gnutar
@@ -514,10 +519,6 @@ in {
         openssh
         gitlab-workhorse
       ];
-      preStart = ''
-        mkdir -p /run/gitlab
-        chown ${cfg.user}:${cfg.group} /run/gitlab
-      '';
       serviceConfig = {
         PermissionsStartOnly = true; # preStart must be run as root
         Type = "simple";
@@ -538,7 +539,7 @@ in {
     };
 
     systemd.services.gitlab = {
-      after = [ "network.target" "postgresql.service" "redis.service" ];
+      after = [ "gitlab-workhorse.service" "gitaly.service" "network.target" "postgresql.service" "redis.service" ];
       requires = [ "gitlab-sidekiq.service" ];
       wantedBy = [ "multi-user.target" ];
       environment = gitlabEnv;
@@ -551,102 +552,75 @@ in {
         gnupg
       ];
       preStart = ''
-        mkdir -p ${cfg.backupPath}
-        mkdir -p ${cfg.statePath}/builds
-        mkdir -p ${cfg.statePath}/repositories
-        mkdir -p ${gitlabConfig.production.shared.path}/artifacts
-        mkdir -p ${gitlabConfig.production.shared.path}/lfs-objects
-        mkdir -p ${gitlabConfig.production.shared.path}/pages
-        mkdir -p ${cfg.statePath}/log
-        mkdir -p ${cfg.statePath}/tmp/pids
-        mkdir -p ${cfg.statePath}/tmp/sockets
-        mkdir -p ${cfg.statePath}/shell
-        mkdir -p ${cfg.statePath}/db
-        mkdir -p ${cfg.statePath}/uploads
-        mkdir -p ${cfg.statePath}/custom_hooks/pre-receive.d
-        mkdir -p ${cfg.statePath}/custom_hooks/post-receive.d
-        mkdir -p ${cfg.statePath}/custom_hooks/update.d
-
-        rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
-        mkdir -p ${cfg.statePath}/config
-
         ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret
 
-        mkdir -p /run/gitlab
-        mkdir -p ${cfg.statePath}/log
-        [ -d /run/gitlab/log ] || ln -sf ${cfg.statePath}/log /run/gitlab/log
-        [ -d /run/gitlab/tmp ] || ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
-        [ -d /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
-        ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml
-        chown -R ${cfg.user}:${cfg.group} /run/gitlab
-
-        # Prepare home directory
-        mkdir -p ${gitlabEnv.HOME}/.ssh
-        touch ${gitlabEnv.HOME}/.ssh/authorized_keys
-        chown -R ${cfg.user}:${cfg.group} ${gitlabEnv.HOME}/
-
         cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
         cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
-        ${optionalString cfg.smtp.enable ''
-          ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
-        ''}
-        ln -sf ${cfg.statePath}/config /run/gitlab/config
         if [ -e ${cfg.statePath}/lib ]; then
           rm ${cfg.statePath}/lib
         fi
-        ln -sf ${pkgs.gitlab}/share/gitlab/lib ${cfg.statePath}/lib
+
+        ln -sf ${cfg.packages.gitlab}/share/gitlab/lib ${cfg.statePath}/lib
+        [ -L /run/gitlab/config ] || ln -sf ${cfg.statePath}/config /run/gitlab/config
+        [ -L /run/gitlab/log ] || ln -sf ${cfg.statePath}/log /run/gitlab/log
+        [ -L /run/gitlab/tmp ] || ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
+        [ -L /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
+        ${optionalString cfg.smtp.enable ''
+          ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
+        ''}
         cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
 
         # JSON is a subset of YAML
-        ln -fs ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)} ${cfg.statePath}/config/gitlab.yml
-        ln -fs ${pkgs.writeText "database.yml" databaseYml} ${cfg.statePath}/config/database.yml
-        ln -fs ${pkgs.writeText "secrets.yml" secretsYml} ${cfg.statePath}/config/secrets.yml
-        ln -fs ${pkgs.writeText "unicorn.rb" unicornConfig} ${cfg.statePath}/config/unicorn.rb
-
-        chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}/
-        chmod -R ug+rwX,o-rwx+X ${cfg.statePath}/
+        ln -sf ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)} ${cfg.statePath}/config/gitlab.yml
+        ln -sf ${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} ${cfg.statePath}/config/database.yml
+        ln -sf ${pkgs.writeText "secrets.yml" (builtins.toJSON secretsConfig)} ${cfg.statePath}/config/secrets.yml
+        ln -sf ${./defaultUnicornConfig.rb} ${cfg.statePath}/config/unicorn.rb
 
         # Install the shell required to push repositories
-        ln -fs ${pkgs.writeText "config.yml" gitlabShellYml} "$GITLAB_SHELL_CONFIG_PATH"
-        ln -fs ${cfg.packages.gitlab-shell}/hooks "$GITLAB_SHELL_HOOKS_PATH"
+        ln -sf ${pkgs.writeText "config.yml" (builtins.toJSON gitlabShellConfig)} /run/gitlab/shell-config.yml
+        [ -L ${cfg.statePath}/shell/hooks ] ||  ln -sf ${cfg.packages.gitlab-shell}/hooks ${cfg.statePath}/shell/hooks
         ${cfg.packages.gitlab-shell}/bin/install
 
-        if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
-          if ! test -e "${cfg.statePath}/db-created"; then
+        chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}/
+        chmod -R ug+rwX,o-rwx+X ${cfg.statePath}/
+        chown -R ${cfg.user}:${cfg.group} /run/gitlab
+
+        if ! test -e "${cfg.statePath}/db-created"; then
+          if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
             ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.databasePassword}'"
             ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName}
-            touch "${cfg.statePath}/db-created"
+
+            # enable required pg_trgm extension for gitlab
+            ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
           fi
 
-          # enable required pg_trgm extension for gitlab
-          ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
+          ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake db:schema:load
+
+          touch "${cfg.statePath}/db-created"
         fi
 
         # Always do the db migrations just to be sure the database is up-to-date
-        ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production
+        ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake db:migrate
 
-        # The gitlab:setup task is horribly broken somehow, the db:migrate
-        # task above and the db:seed_fu below will do the same for setting
-        # up the initial database
         if ! test -e "${cfg.statePath}/db-seeded"; then
-          ${gitlab-rake}/bin/gitlab-rake db:seed_fu RAILS_ENV=production \
+          ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${gitlab-rake}/bin/gitlab-rake db:seed_fu \
             GITLAB_ROOT_PASSWORD='${cfg.initialRootPassword}' GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}'
           touch "${cfg.statePath}/db-seeded"
         fi
 
         # The gitlab:shell:setup regenerates the authorized_keys file so that
         # the store path to the gitlab-shell in it gets updated
-        ${pkgs.sudo}/bin/sudo -u ${cfg.user} force=yes ${gitlab-rake}/bin/gitlab-rake gitlab:shell:setup RAILS_ENV=production
+        ${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
-        ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks RAILS_ENV=production
+        ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks
+
+        ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${pkgs.git}/bin/git config --global core.autocrlf "input"
 
         # Change permissions in the last step because some of the
         # intermediary scripts like to create directories as root.
-        chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}
-        chmod -R ug+rwX,o-rwx+X ${cfg.statePath}
         chmod -R u+rwX,go-rwx+X ${gitlabEnv.HOME}
         chmod -R ug+rwX,o-rwx ${cfg.statePath}/repositories
         chmod -R ug-s ${cfg.statePath}/repositories
diff --git a/nixos/release.nix b/nixos/release.nix
index 51505d6aab9..96d2e11fff3 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -300,7 +300,7 @@ in rec {
   tests.fsck = callTest tests/fsck.nix {};
   tests.fwupd = callTest tests/fwupd.nix {};
   tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {};
-  #tests.gitlab = callTest tests/gitlab.nix {};
+  tests.gitlab = callTest tests/gitlab.nix {};
   tests.gitolite = callTest tests/gitolite.nix {};
   tests.gjs = callTest tests/gjs.nix {};
   tests.gocd-agent = callTest tests/gocd-agent.nix {};
diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index 3af2cbcd098..53675c375e3 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -1,14 +1,18 @@
 # This test runs gitlab and checks if it works
 
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test.nix ({ pkgs, lib, ...} : with lib; {
   name = "gitlab";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ domenkozar offline ];
+    maintainers = [ globin ];
   };
 
   nodes = {
     gitlab = { ... }: {
-      virtualisation.memorySize = 768;
+      virtualisation.memorySize = 4096;
+      systemd.services.gitlab.serviceConfig.Restart = mkForce "no";
+      systemd.services.gitlab-workhorse.serviceConfig.Restart = mkForce "no";
+      systemd.services.gitaly.serviceConfig.Restart = mkForce "no";
+      systemd.services.gitlab-sidekiq.serviceConfig.Restart = mkForce "no";
 
       services.nginx = {
         enable = true;
@@ -19,10 +23,10 @@ import ./make-test.nix ({ pkgs, ...} : {
         };
       };
 
-      systemd.services.gitlab.serviceConfig.TimeoutStartSec = "10min";
       services.gitlab = {
         enable = true;
         databasePassword = "dbPassword";
+        initialRootPassword = "notproduction";
         secrets = {
           secret = "secret";
           otp = "otpsecret";
@@ -65,8 +69,12 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   testScript = ''
     $gitlab->start();
+    $gitlab->waitForUnit("gitaly.service");
+    $gitlab->waitForUnit("gitlab-workhorse.service");
     $gitlab->waitForUnit("gitlab.service");
     $gitlab->waitForUnit("gitlab-sidekiq.service");
-    $gitlab->waitUntilSucceeds("curl http://localhost:80/users/sign_in");
+    $gitlab->waitForFile("/var/gitlab/state/tmp/sockets/gitlab.socket");
+    $gitlab->waitUntilSucceeds("curl -sSf http://localhost/users/sign_in");
+    $gitlab->succeed("${pkgs.sudo}/bin/sudo -u gitlab -H gitlab-rake gitlab:check 1>&2")
   '';
 })
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index ace0df5efdf..933db40cfc0 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -63,17 +63,7 @@ stdenv.mkDerivation rec {
         --replace "ps -U" "${procps}/bin/ps -U"
 
     sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake
-
-    # required for some gems:
-    cat > config/database.yml <<EOF
-      production:
-        adapter: <%= ENV["GITLAB_DATABASE_ADAPTER"] || sqlite %>
-        database: gitlab
-        host: <%= ENV["GITLAB_DATABASE_HOST"] || "127.0.0.1" %>
-        password: <%= ENV["GITLAB_DATABASE_PASSWORD"] || "blerg" %>
-        username: gitlab
-        encoding: utf8
-    EOF
+    sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb
   '';
 
   buildPhase = ''
-- 
GitLab


From 25e68e30487548091e6936c23d13ea53de3d2fc9 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Fri, 2 Nov 2018 23:02:04 +0100
Subject: [PATCH 0899/1065] r-ps: patchShebangs in ./configure to fix build

---
 pkgs/development/r-modules/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index f40c0fcb559..428d6c60546 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -942,6 +942,10 @@ let
       PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -L${pkgs.cyrus_sasl.out}/lib -L${pkgs.zlib.out}/lib -lssl -lcrypto -lsasl2 -lz";
     });
 
+    ps = old.ps.overrideDerivation (attrs: {
+      preConfigure = "patchShebangs configure";
+    });
+
     rlang = old.rlang.overrideDerivation (attrs: {
       preConfigure = "patchShebangs configure";
     });
-- 
GitLab


From a562c5fc751633e40c23eddebfca4f162411878b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 2 Nov 2018 22:55:26 +0100
Subject: [PATCH 0900/1065] josm: 14289 -> 14382

---
 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 808ff2d6f61..f529fa395d9 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 = "14289";
+  version = "14382";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "102dph3479qskzf72cpb9139pq9ifka6pzna1c6s5rs2il6mfvsb";
+    sha256 = "1a2nx9jr1fvw95gdvl9kj3z0cs6ndafm0k4l0lwfx9p9qn4lgzjg";
   };
 
   buildInputs = [ jdk11 makeWrapper ];
-- 
GitLab


From 811509e5a3b7d7328ecafa2503205fef43c39cb4 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 2 Nov 2018 22:55:45 +0100
Subject: [PATCH 0901/1065] abcmidi: 2018.06.23 -> 2018.10.25

---
 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 2d54c182349..1a215d4ca83 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.06.23";
+  version = "2018.10.25";
 
   src = fetchzip {
     url = "https://ifdo.ca/~seymour/runabc/${name}.zip";
-    sha256 = "0487dlw9v4ayb929w8bk71fs4nbcs1liyk59g6sfr4yn6dx2sl2d";
+    sha256 = "0q7yrds1hpis1821mdsz31c2cvn7hs73a10fi1mrk1v4hqql8vv3";
   };
 
   # There is also a file called "makefile" which seems to be preferred by the standard build phase
-- 
GitLab


From 2db8372554d190c6fd00b990152eef196b740d9a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 2 Nov 2018 23:10:17 +0100
Subject: [PATCH 0902/1065] pythonPackages.PyICU: 2.0.3 -> 2.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 49bc322d479..381cdea938e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4454,21 +4454,21 @@ in {
   };
 
   PyICU = buildPythonPackage rec {
-    name = "PyICU-2.0.3";
+    name = "PyICU-2.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/P/PyICU/${name}.tar.gz";
-      sha256 = "0pzss3l0b0vcsyr7wlqdd6pkcqldspajfgd9k2iijf6r152d2ln4";
+      sha256 = "0wq9y5fi1ighgf5aws9nr87vi1w44p7q1k83rx2y3qj5d2xyhspa";
     };
 
     patches = [
       (pkgs.fetchpatch {
-        url = https://sources.debian.org/data/main/p/pyicu/2.0.3-1/debian/patches/icu_test.patch;
+        url = https://sources.debian.org/data/main/p/pyicu/2.2-1/debian/patches/icu_test.patch;
         sha256 = "1iavdkyqixm9i753svl17barla93b7jzgkw09dn3hnggamx7zwx9";
       })
     ];
 
-    buildInputs = [ pkgs.icu self.pytest ];
+    buildInputs = [ pkgs.icu60 self.pytest ];
 
     propagatedBuildInputs = [ self.six ];
 
-- 
GitLab


From 7bade1b0f3ab78c46d265d279b738c4b20037a4a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 2 Nov 2018 23:23:33 +0100
Subject: [PATCH 0903/1065] overpass: 3.0.2 -> 3.0.3

---
 pkgs/data/fonts/overpass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix
index 8bb4e82747a..c39bb945f48 100644
--- a/pkgs/data/fonts/overpass/default.nix
+++ b/pkgs/data/fonts/overpass/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "3.0.2";
+  version = "3.0.3";
 in fetchzip rec {
   name = "overpass-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip rec {
     mkdir -p $out/share/doc/${name}    ; unzip -j $downloadedFile \*.md  -d $out/share/doc/${name}
   '';
 
-  sha256 = "05zv3zcfc9a707sn3hhf46b126k19d9byzvi5ixp5y2548vjvl6s";
+  sha256 = "1m6p7rrlyqikjvypp4698sn0lp3a4z0z5al4swblfhg8qaxzv5pg";
 
   meta = with stdenv.lib; {
     homepage = http://overpassfont.org/;
-- 
GitLab


From 6b9e570bc2a04e9184ee40edc90426f9ccb5ed65 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 2 Nov 2018 23:29:29 +0100
Subject: [PATCH 0904/1065] open-dyslexic: 2014-11-11 -> 2016-06-23

---
 pkgs/data/fonts/open-dyslexic/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix
index 40a9be3282e..7fa57463ece 100644
--- a/pkgs/data/fonts/open-dyslexic/default.nix
+++ b/pkgs/data/fonts/open-dyslexic/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchzip}:
 
 let
-  version = "2014-11-11";
+  version = "2016-06-23";
 in fetchzip {
   name = "open-dyslexic-${version}";
 
-  url = https://github.com/antijingoist/open-dyslexic/archive/f4b5ba89018b44d633608907e15f93fb3fabbabc.zip;
+  url = https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip;
 
   postFetch = ''
     mkdir -p $out/share/{doc,fonts}
@@ -13,7 +13,7 @@ in fetchzip {
     unzip -j $downloadedFile \*/README.md -d $out/share/doc/open-dyslexic
   '';
 
-  sha256 = "045xc7kj56q4ygnjppm8f8fwqqvf21x1piabm4nh8hwgly42a3w2";
+  sha256 = "1vl8z5rknh2hpr2f0v4b2qgs5kclx5pzyk8al7243k5db82a2cyi";
 
   meta = with stdenv.lib; {
     homepage = https://opendyslexic.org/;
-- 
GitLab


From 1851203c7b16cb1d61e824bb83cccda28817f296 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 2 Nov 2018 23:38:37 +0100
Subject: [PATCH 0905/1065] comfortaa: 2.004 -> 3.001

---
 pkgs/data/fonts/comfortaa/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix
index 0dd4f727ad2..f7ec6e8b8c8 100644
--- a/pkgs/data/fonts/comfortaa/default.nix
+++ b/pkgs/data/fonts/comfortaa/default.nix
@@ -1,18 +1,18 @@
 {stdenv, fetchzip}:
 
 let
-  version = "2.004";
+  version = "3.001";
 in fetchzip rec {
   name = "comfortaa-${version}";
 
-  url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip";
+  url = "https://orig00.deviantart.net/40a3/f/2017/093/d/4/comfortaa___font_by_aajohan-d1qr019.zip";
   postFetch = ''
     mkdir -p $out/share/fonts $out/share/doc
     unzip -l $downloadedFile
     unzip -j $downloadedFile \*.ttf                        -d $out/share/fonts/truetype
     unzip -j $downloadedFile \*/FONTLOG.txt \*/donate.html -d $out/share/doc/${name}
   '';
-  sha256 = "1gnscf3kw9p5gbc5594a22cc6nmiir9mhp1nl3mkbzd4v1jfbh2h";
+  sha256 = "0z7xr0cnn6ghwivrm5b5awq9bzhnay3y99qq6dkdgfkfdsaz0n9h";
 
   meta = with stdenv.lib; {
     homepage = http://aajohan.deviantart.com/art/Comfortaa-font-105395949;
-- 
GitLab


From 411c665f336d6b8a44f27170abd2c0efc19d0c4d Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@galois.com>
Date: Fri, 2 Nov 2018 15:49:09 -0700
Subject: [PATCH 0906/1065] yices: 2.6.0 -> 2.6.1

---
 pkgs/applications/science/logic/yices/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 3121a83e5b9..0ab08db6746 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name    = "yices-${version}";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchurl {
     url = "https://github.com/SRI-CSL/yices2/archive/Yices-${version}.tar.gz";
     name = "${name}-src.tar.gz";
-    sha256 = "10ikq7ib8jhx7hlxfm6mp5qg6r8dflqs8242q5zaicn80qixpm12";
+    sha256 = "14xvflv14qn8ssm8rklvckp6l1q94vn49qz2snz73j40nwzshaww";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
GitLab


From 79dace1b308667722543b16291b58628f8538f18 Mon Sep 17 00:00:00 2001
From: Eric Wolf <ericwolf42@gmail.com>
Date: Sat, 3 Nov 2018 00:11:11 +0100
Subject: [PATCH 0907/1065] haskellPackages.sdl2: test-suite needs x server, so
 deactivate it

---
 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 2c9d9d307ae..56ffd6ee54e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -370,6 +370,7 @@ self: super: {
   safecopy = dontCheck super.safecopy;
   sai-shape-syb = dontCheck super.sai-shape-syb;
   scp-streams = dontCheck super.scp-streams;
+  sdl2 = dontCheck super.sdl2; # the test suite needs an x server
   sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention
   separated = dontCheck super.separated;
   shadowsocks = dontCheck super.shadowsocks;
-- 
GitLab


From de8a3e3125baddc22ef0472ca941b49acf5ca8fd Mon Sep 17 00:00:00 2001
From: Thilo Uttendorfer <tlo@sengaya.de>
Date: Fri, 2 Nov 2018 23:16:07 +0100
Subject: [PATCH 0908/1065] ansible_2_5: 2.5.2 -> 2.5.11

---
 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 2b6877cb25f..b3abd230b74 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -53,8 +53,8 @@ in rec {
   };
 
   ansible_2_5 = generic {
-    version = "2.5.2";
-    sha256  = "1r9sq30xz3jrvx6yqssj5wmkml1f75rx1amd7g89f3ryngrq6m59";
+    version = "2.5.11";
+    sha256  = "07rhgkl3a2ba59rqh9pyz1p661gc389shlwa2sw1m6wwifg4lm24";
   };
 
   ansible_2_6 = generic {
-- 
GitLab


From e63509a651d1ecac2ab712cbc9b7e7c00ed96cbd Mon Sep 17 00:00:00 2001
From: Thilo Uttendorfer <tlo@sengaya.de>
Date: Fri, 2 Nov 2018 23:18:57 +0100
Subject: [PATCH 0909/1065] ansible_2_6: 2.6.2 -> 2.6.7

---
 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 b3abd230b74..9ed4b36f20b 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -58,8 +58,8 @@ in rec {
   };
 
   ansible_2_6 = generic {
-    version = "2.6.2";
-    sha256  = "1y5gd9h641p6pphwd7j99yyqglyj23rkmid7wgzk62611754qzkl";
+    version = "2.6.7";
+    sha256  = "10pakw9k9wd3cy1qk3ah2253ph7c7h3qzpal4k0s5lschzgy2fh0";
   };
 
   ansible2 = ansible_2_6;
-- 
GitLab


From c0d30e5f034cbc72dae15a8986b0a9d70fbe7540 Mon Sep 17 00:00:00 2001
From: Thilo Uttendorfer <tlo@sengaya.de>
Date: Fri, 2 Nov 2018 23:21:53 +0100
Subject: [PATCH 0910/1065] ansible_2_7: init at 2.7.1

---
 pkgs/tools/admin/ansible/default.nix | 7 ++++++-
 pkgs/top-level/all-packages.nix      | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 9ed4b36f20b..c86a108fc42 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -62,6 +62,11 @@ in rec {
     sha256  = "10pakw9k9wd3cy1qk3ah2253ph7c7h3qzpal4k0s5lschzgy2fh0";
   };
 
-  ansible2 = ansible_2_6;
+  ansible_2_7 = generic {
+    version = "2.7.1";
+    sha256  = "0fg95x2nr3j4rwnlyd2n03h91xx9fssi34c32356vk3z6ir395g7";
+  };
+
+  ansible2 = ansible_2_7;
   ansible  = ansible2;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62cef2d5068..aa2ed6d2c59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8059,6 +8059,7 @@ with pkgs;
     ansible_2_4
     ansible_2_5
     ansible_2_6
+    ansible_2_7
     ansible2
     ansible;
 
-- 
GitLab


From a3739a908ce4c2e6dfe1fe08d537867825d84d5e Mon Sep 17 00:00:00 2001
From: Thilo Uttendorfer <tlo@sengaya.de>
Date: Fri, 2 Nov 2018 23:46:13 +0100
Subject: [PATCH 0911/1065] ansible-lint: fix install tests

---
 pkgs/development/tools/ansible-lint/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix
index c460662f4f8..5433725b305 100644
--- a/pkgs/development/tools/ansible-lint/default.nix
+++ b/pkgs/development/tools/ansible-lint/default.nix
@@ -19,6 +19,10 @@ pythonPackages.buildPythonPackage rec {
     patchShebangs bin/ansible-lint
   '';
 
+   preBuild = ''
+     export HOME="$TMP"
+   '';
+
   checkPhase = ''
     nosetests test
   '';
-- 
GitLab


From 29b4ac8e41b339afdeced9e69224773d0a109da9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 2 Nov 2018 18:42:58 -0500
Subject: [PATCH 0912/1065] release-corss.nix: fix ppc-embedded name

s/powerpc-embedded/ppc-embedded
---
 pkgs/top-level/release-cross.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 456bacb106b..6cf0cb57be4 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -142,7 +142,7 @@ in
 
   avr = mapTestOnCross lib.systems.examples.avr embedded;
   arm-embedded = mapTestOnCross lib.systems.examples.arm-embedded embedded;
-  powerpc-embedded = mapTestOnCross lib.systems.examples.powerpc-embedded embedded;
+  powerpc-embedded = mapTestOnCross lib.systems.examples.ppc-embedded embedded;
   aarch64-embedded = mapTestOnCross lib.systems.examples.aarch64-embedded embedded;
   i686-embedded = mapTestOnCross lib.systems.examples.i686-embedded embedded;
   x86_64-embedded = mapTestOnCross lib.systems.examples.x86_64-embedded embedded;
-- 
GitLab


From 13effc913dd016ef5b829fbdea1437f32fa43709 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Sat, 3 Nov 2018 00:50:35 +0100
Subject: [PATCH 0913/1065] terraform-providers: Bump all releases (#49582)

Does what it says on the tin. Auto-generated.
---
 .../cluster/terraform-providers/data.nix      | 132 +++++++++++-------
 1 file changed, 80 insertions(+), 52 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index 261d067eb1d..421fc652a32 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.17.0";
-      sha256  = "1zmywmcgfmx5ccp0qxj912sqymisxdg2s84b4qclfa225hrbaqpn";
+      version = "1.21.0";
+      sha256  = "17853l2s5z1y2g24wdkapdp26hw0sx5w73y118h0px85fiwhkq79";
     };
   archive =
     {
@@ -39,15 +39,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-aws";
-      version = "1.38.0";
-      sha256  = "1jhr2l8p7wf7kgr2y0c40n1jb9p2153xkpcp4b2half2vhsh1nwi";
+      version = "1.42.0";
+      sha256  = "1wi1m7i6vq53p36x1prax4yaz400834024q494zg0ckk4rvngfp6";
     };
   azurerm =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-azurerm";
-      version = "1.15.0";
-      sha256  = "1pdmj0ww5y2nwxivlf5l886nwd76hpqhwdayab2fp16zyl1qbpfd";
+      version = "1.17.0";
+      sha256  = "03sjlqkwy0qa382sjwi21g6h2fz1mpsiqcd4naj5zh76fkp8aslw";
     };
   azurestack =
     {
@@ -88,8 +88,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-circonus";
-      version = "0.1.1";
-      sha256  = "05n1q9hc0h31icxsmyi2y60wiwd5fs2hz1dqm3bl6hgh5x3ss1im";
+      version = "0.2.0";
+      sha256  = "1vcia3p31cgdwjs06k4244bk7ib2qp1f2lhc7hmyhdfi1c8jym45";
     };
   clc =
     {
@@ -102,8 +102,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-cloudflare";
-      version = "1.5.0";
-      sha256  = "0l8bmnxmjr2g3xxw8w0ay91cvs4kzc65wkdwybfahvq9r6mww45n";
+      version = "1.7.0";
+      sha256  = "0sqq6miwyh6z86b3wq2bhkaj4x39g2nqq784py8nm8gvs06gcm5a";
     };
   cloudscale =
     {
@@ -130,22 +130,22 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-consul";
-      version = "2.1.0";
-      sha256  = "1qm29vj8ms37zb4b3bhdv4b4vrl0am134zmc654lb2g582cnj9yw";
+      version = "2.2.0";
+      sha256  = "13jwvf7n7238pzvdq9m6vnl9vqa9hkr1mrcf9sa1q9lxkim9ijfk";
     };
   datadog =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-datadog";
-      version = "1.3.0";
-      sha256  = "0d3xccfkzibjp4jl8irja1cdhppdn3b7nh4wy857zvfxpfhz7aj2";
+      version = "1.4.0";
+      sha256  = "06ik2k0jkm4200d8njpsidwfjl12ikn5ciqkmlxfwr3b8s1w8kpa";
     };
   digitalocean =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-digitalocean";
-      version = "0.1.3";
-      sha256  = "10crxciw7y2gnm8vqp007vw0k7c1a1xk2z2zsjr5rksk6qlnri4k";
+      version = "1.0.2";
+      sha256  = "0ilkdnadzsidq8hia5wk4jyk6034pmajrpkgwf4ryz7kx41vy2g6";
     };
   dme =
     {
@@ -172,8 +172,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-docker";
-      version = "1.0.1";
-      sha256  = "1q5bsdvp47gvpiyqlzgrpxczlh6m9g870pn84ks49xfkwk5izpz6";
+      version = "1.1.0";
+      sha256  = "1ba9z9fd69hpg6kg30nf95zzskzipi74s1aadywc068gfrkdm9jj";
     };
   dyn =
     {
@@ -193,15 +193,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-fastly";
-      version = "0.3.0";
-      sha256  = "1hh4s81g256iy1rvp9snqbyhidz8n6p7pzanlxp89ffrq9p32sp0";
+      version = "0.4.0";
+      sha256  = "1fkn9b6ibs36cmhknb3x05g31rf73w70xwx05rh9fhybrz5dd9z9";
     };
   flexibleengine =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-flexibleengine";
-      version = "1.1.0";
-      sha256  = "07g6kc211crxf9nvgvghg05jdahd1fb09lpwfcps9ph259pwwam3";
+      version = "1.2.1";
+      sha256  = "000v6fmmnwfibzfssk23s9qwrb8a9l0j1qd14x2dqsc7ql0kbnz8";
     };
   github =
     {
@@ -221,8 +221,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-google";
-      version = "1.18.0";
-      sha256  = "0zwy1imby0xqvb86a82rdvglipf2sfpi3rmsj72iikp7vi3mqk64";
+      version = "1.19.1";
+      sha256  = "1n2a1y9103xkndmvr5cvj7i1m8s9lv61vgijgk3m2f73pb4znak0";
     };
   grafana =
     {
@@ -235,15 +235,22 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-hcloud";
-      version = "1.3.0";
-      sha256  = "0sb9pajsy0if18vgw5pllgv8qvb4v7pv65m2f3hfkck2za82ndwb";
+      version = "1.4.0";
+      sha256  = "00mq6p2y61z4hg9dncf3mj59cp6fx4iqrn86m96wkw346shs6prs";
+    };
+  helm =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-helm";
+      version = "0.6.2";
+      sha256  = "11j4lpzbrdszgkjf1gjyibh9c5w0fly01qdkrflv98ry5csx9q5b";
     };
   heroku =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-heroku";
-      version = "1.4.0";
-      sha256  = "159a9add5v4dj2bry1b85i74q2lb4pjjypkm5hzrbqys6gn2imhn";
+      version = "1.5.0";
+      sha256  = "0hzzhqd87vkcbzndsn15g4nl3qhv2kvnhs9zv6kbxaxm7p7rm3pz";
     };
   http =
     {
@@ -284,8 +291,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-kubernetes";
-      version = "1.2.0";
-      sha256  = "0slvhj8f7p27r9v4vb5vjyqpmzlpaji1djzwsxsf247df68mka61";
+      version = "1.3.0";
+      sha256  = "0fhh0r92whcxqz4z2kb6qx9dyygms5mz7ifhb9c7s2r22jnfz1j3";
     };
   librato =
     {
@@ -294,6 +301,13 @@
       version = "0.1.0";
       sha256  = "0bxadwj5s7bvc4vlymn3w6qckf14hz82r7q98w2nh55sqr52d923";
     };
+  linode =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-linode";
+      version = "1.1.0";
+      sha256  = "19c269w8jjx04a8rhm4x7bg2xad3y0s74wgis446mwaw7mhla3l3";
+    };
   local =
     {
       owner   = "terraform-providers";
@@ -340,8 +354,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-newrelic";
-      version = "1.0.1";
-      sha256  = "0g4fd2rvx90f2bmjl6jjdvrsx7ayhf30vj9y3mklhxgsd9x83wpq";
+      version = "1.1.0";
+      sha256  = "040pxbr4xp0h6s0njdwy0phlkblnk5p3xrcms2gkwyzkqpd82s8b";
     };
   nomad =
     {
@@ -371,12 +385,19 @@
       version = "1.0.0";
       sha256  = "12vpa09xrq8z1pjq0bwzq3889c4fl6c5kvynwqy0z1pdx21m60ha";
     };
+  nutanix =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-nutanix";
+      version = "1.0.0";
+      sha256  = "16nky5ryyjvv7vny18ymxvy20ivwmqw7lagnz48pq8mnwwrp5541";
+    };
   oci =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-oci";
-      version = "3.1.1";
-      sha256  = "0wrvb44gs0c1khvam5lrq53l2889japg7d4nyk2hrpywy9japc8m";
+      version = "3.5.0";
+      sha256  = "0f4m6rahis1n62w0h0amg8sjs5bb3ifnrfzq1dys7r01k5411wcf";
     };
   oneandone =
     {
@@ -389,22 +410,22 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-opc";
-      version = "1.2.1";
-      sha256  = "0mnvi47kbdwwpfzdlcd1mhd15w5b0ivwxi1a5lvs0zyqf0g0cas8";
+      version = "1.3.0";
+      sha256  = "1ksqjfp6gxgrpc9gcs9jv3wj5058z93h7prv4mhvc2bilal4gc0p";
     };
   openstack =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-openstack";
-      version = "1.9.0";
-      sha256  = "0prmdj78jsyrns876cglfp8a3dbpfl33bwb0dj072flh4yknfrdr";
+      version = "1.11.0";
+      sha256  = "1wqb7q10nyr4jy9ny4giazblwhh3qrn4s1f0xb5q702b5igbfwwm";
     };
   opentelekomcloud =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-opentelekomcloud";
-      version = "1.1.0";
-      sha256  = "04pcgygcz2ld5hp7f29j2z3d4ypy4fm4m1zbbs9l9gc3fya88iny";
+      version = "1.2.0";
+      sha256  = "05w899l18gmdywfhakjvaxqxxzd9cxga3s932ljfibr0ssipkhh9";
     };
   opsgenie =
     {
@@ -431,8 +452,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-packet";
-      version = "1.2.4";
-      sha256  = "11ga29d5bzmn6rzlb6sb28nh1zbbwglinzn185pysqx6n21l6wva";
+      version = "1.2.5";
+      sha256  = "1c40w1q18piip4fn572mnf67g07h6g03hnin23c7jw265m4yr222";
     };
   pagerduty =
     {
@@ -445,8 +466,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-panos";
-      version = "1.4.0";
-      sha256  = "033xpglbn0q805b129kf1ywl13m4pgrkwlvgl347nldysryiasxq";
+      version = "1.4.1";
+      sha256  = "1mlz01v01675cf9ja8i42c6ssklf65kd8wpjzf0j472lfwki4xpp";
     };
   postgresql =
     {
@@ -508,15 +529,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-runscope";
-      version = "0.4.0";
-      sha256  = "1n3q2hdwvkkn5rphrcl5qfv4ry2mrr13dcjwzhbym2i1nhpxkld0";
+      version = "0.5.0";
+      sha256  = "0n0m39gaiwhqigjny51a7g36ldik33alimkqqbv6hqyzrhk0qs8h";
     };
   scaleway =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-scaleway";
-      version = "1.6.0";
-      sha256  = "1ykcakfw0gp239jp4brpjynxzzvlhldfpv12hkgymj22s37n5jnn";
+      version = "1.7.0";
+      sha256  = "0gsjvpwfw2sc6ncy8v3j6gs0aanq3b08j3gid43687mfd782f4gk";
     };
   softlayer =
     {
@@ -553,6 +574,13 @@
       version = "1.0.0";
       sha256  = "0jl6bp6gwg96sdk5j6s13vv1j9gxjpy2yva3barmzv9138i665mz";
     };
+  tencentcloud =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-tencentcloud";
+      version = "1.2.2";
+      sha256  = "1ypsfm48c30szg3zc1sknblhwcnca8aapfgp62bhszyqxq6zq37s";
+    };
   terraform =
     {
       owner   = "terraform-providers";
@@ -592,8 +620,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-vault";
-      version = "1.1.4";
-      sha256  = "00i9rl9pnmicvndkmvcmlj6y80341dmkqnhq09f94yljh1w1zpvv";
+      version = "1.2.0";
+      sha256  = "1z92dcr5b665l69gxs1hw1rizc5znvf0ck1lksphd301l2ywk97b";
     };
   vcd =
     {
@@ -606,8 +634,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-vsphere";
-      version = "1.8.1";
-      sha256  = "0y6n7mvv1f3jqsxlvf68iq85k69fj7a333203vkvc83dba84aqki";
+      version = "1.9.0";
+      sha256  = "1by9klwvdw3m854jffimfnsz1lnbaixi4zcv4zzs63dc3flwy2b2";
     };
   matchbox =
     {
-- 
GitLab


From f9bf6cef541542a3b02885e6d28dbacd5b8b8450 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 3 Nov 2018 00:52:12 +0100
Subject: [PATCH 0914/1065] terraform_0_11: 0.11.8 -> 0.11.10

---
 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 a4ffe27102a..583b6a06aea 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -113,8 +113,8 @@ in rec {
   terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues;
 
   terraform_0_11 = pluggable (generic {
-    version = "0.11.8";
-    sha256 = "1kdmx21l32vj5kvkimkx0s5mxgmgkdwlgbin4f3iqjflzip0cddh";
+    version = "0.11.10";
+    sha256 = "08mapla89g106bvqr41zfd7l4ki55by6207qlxq9caiha54nx4nb";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });
-- 
GitLab


From 3fb4eb1c432a4f8cc92965db0e7b2c2856bde596 Mon Sep 17 00:00:00 2001
From: lewo <lewo@abesis.fr>
Date: Sat, 3 Nov 2018 01:00:53 +0100
Subject: [PATCH 0915/1065] nixos/dockerPreloader: preload docker images
 (#49379)

This module permits to preload Docker image in a VM in order to reduce
OIs on file copies. This module has to be only used in testing
environments, when the test requires several Docker images such as in
Kubernetes tests. In this case,
`virtualisation.dockerPreloader.images` can replace the
`services.kubernetes.kubelet.seedDockerImages` options.

The idea is to populate the /var/lib/docker directory by mounting qcow
files (we uses qcow file to avoid permission issues) that contain images.

For each image specified in
config.virtualisation.dockerPreloader.images:
1. The image is loaded by Docker in a VM
2. The resulting /var/lib/docker is written to a QCOW file

This set of QCOW files can then be used to populate the
/var/lib/docker:
1. Each QCOW is mounted in the VM
2. Symlink are created from these mount points to /var/lib/docker
3. A /var/lib/docker/image/overlay2/repositories.json file is generated
4. The docker daemon is started.
---
 .../virtualisation/docker-preloader.nix       | 135 ++++++++++++++++++
 nixos/modules/virtualisation/qemu-vm.nix      |   5 +-
 nixos/release.nix                             |   1 +
 nixos/tests/docker-preloader.nix              |  27 ++++
 4 files changed, 167 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/virtualisation/docker-preloader.nix
 create mode 100644 nixos/tests/docker-preloader.nix

diff --git a/nixos/modules/virtualisation/docker-preloader.nix b/nixos/modules/virtualisation/docker-preloader.nix
new file mode 100644
index 00000000000..faa94f53d98
--- /dev/null
+++ b/nixos/modules/virtualisation/docker-preloader.nix
@@ -0,0 +1,135 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+with builtins;
+
+let
+  cfg = config.virtualisation;
+
+  sanitizeImageName = image: replaceStrings ["/"] ["-"] image.imageName;
+  hash = drv: head (split "-" (baseNameOf drv.outPath));
+  # The label of an ext4 FS is limited to 16 bytes
+  labelFromImage = image: substring 0 16 (hash image);
+
+  # The Docker image is loaded and some files from /var/lib/docker/
+  # are written into a qcow image.
+  preload = image: pkgs.vmTools.runInLinuxVM (
+    pkgs.runCommand "docker-preload-image-${sanitizeImageName image}" {
+      buildInputs = with pkgs; [ docker e2fsprogs utillinux curl kmod ];
+      preVM = pkgs.vmTools.createEmptyImage {
+        size = cfg.dockerPreloader.qcowSize;
+        fullName = "docker-deamon-image.qcow2";
+      };
+    }
+    ''
+      mkfs.ext4 /dev/vda
+      e2label /dev/vda ${labelFromImage image}
+      mkdir -p /var/lib/docker
+      mount -t ext4 /dev/vda /var/lib/docker
+
+      modprobe overlay
+
+      # from https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
+      mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
+      cd /sys/fs/cgroup
+      for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
+        mkdir -p $sys
+        if ! mountpoint -q $sys; then
+          if ! mount -n -t cgroup -o $sys cgroup $sys; then
+            rmdir $sys || true
+          fi
+        fi
+      done
+
+      dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock &
+
+      until $(curl --output /dev/null --silent --connect-timeout 2 http://127.0.0.1:5555); do
+        printf '.'
+        sleep 1
+      done
+
+      docker load -i ${image}
+
+      kill %1
+      find /var/lib/docker/ -maxdepth 1 -mindepth 1 -not -name "image" -not -name "overlay2" | xargs rm -rf
+    '');
+
+  preloadedImages = map preload cfg.dockerPreloader.images;
+
+in
+
+{
+  options.virtualisation.dockerPreloader = {
+    images = mkOption {
+      default = [ ];
+      type = types.listOf types.package;
+      description =
+      ''
+        A list of Docker images to preload (in the /var/lib/docker directory).
+      '';
+    };
+    qcowSize = mkOption {
+      default = 1024;
+      type = types.int;
+      description =
+      ''
+        The size (MB) of qcow files.
+      '';
+    };
+  };
+
+  config = {
+    assertions = [{
+      # If docker.storageDriver is null, Docker choose the storage
+      # driver. So, in this case, we cannot be sure overlay2 is used.
+      assertion = cfg.dockerPreloader.images == []
+        || cfg.docker.storageDriver == "overlay2"
+        || cfg.docker.storageDriver == "overlay"
+        || cfg.docker.storageDriver == null;
+      message = "The Docker image Preloader only works with overlay2 storage driver!";
+    }];
+
+    virtualisation.qemu.options =
+      map (path: "-drive if=virtio,file=${path}/disk-image.qcow2,readonly,media=cdrom,format=qcow2")
+      preloadedImages;
+
+
+    # All attached QCOW files are mounted and their contents are linked
+    # to /var/lib/docker/ in order to make image available.
+    systemd.services.docker-preloader = {
+      description = "Preloaded Docker images";
+      wantedBy = ["docker.service"];
+      after = ["network.target"];
+      path = with pkgs; [ mount rsync jq ];
+      script = ''
+        mkdir -p /var/lib/docker/overlay2/l /var/lib/docker/image/overlay2
+        echo '{}' > /tmp/repositories.json
+
+        for i in ${concatStringsSep " " (map labelFromImage cfg.dockerPreloader.images)}; do
+          mkdir -p /mnt/docker-images/$i
+
+          # The ext4 label is limited to 16 bytes
+          mount /dev/disk/by-label/$(echo $i | cut -c1-16) -o ro,noload /mnt/docker-images/$i
+
+          find /mnt/docker-images/$i/overlay2/ -maxdepth 1 -mindepth 1 -not -name l\
+             -exec ln -s '{}' /var/lib/docker/overlay2/ \;
+          cp -P /mnt/docker-images/$i/overlay2/l/* /var/lib/docker/overlay2/l/
+
+          rsync -a /mnt/docker-images/$i/image/ /var/lib/docker/image/
+
+          # Accumulate image definitions
+          cp /tmp/repositories.json /tmp/repositories.json.tmp
+          jq -s '.[0] * .[1]' \
+            /tmp/repositories.json.tmp \
+            /mnt/docker-images/$i/image/overlay2/repositories.json \
+            > /tmp/repositories.json
+        done
+
+        mv /tmp/repositories.json /var/lib/docker/image/overlay2/repositories.json
+      '';
+      serviceConfig = {
+        Type = "oneshot";
+      };
+    };
+  };
+}
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 4e9c87222d0..ed3431554be 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -185,7 +185,10 @@ let
 in
 
 {
-  imports = [ ../profiles/qemu-guest.nix ];
+  imports = [
+    ../profiles/qemu-guest.nix
+   ./docker-preloader.nix
+  ];
 
   options = {
 
diff --git a/nixos/release.nix b/nixos/release.nix
index 51505d6aab9..2bd70f7962f 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -283,6 +283,7 @@ in rec {
   tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {};
   tests.docker-tools-overlay = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools-overlay.nix {};
   tests.docker-edge = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-edge.nix {};
+  tests.docker-preloader = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-preloader.nix {};
   tests.docker-registry = callTest tests/docker-registry.nix {};
   tests.dovecot = callTest tests/dovecot.nix {};
   tests.dnscrypt-proxy = callTestOnMatchingSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {};
diff --git a/nixos/tests/docker-preloader.nix b/nixos/tests/docker-preloader.nix
new file mode 100644
index 00000000000..eeedec9a392
--- /dev/null
+++ b/nixos/tests/docker-preloader.nix
@@ -0,0 +1,27 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "docker-preloader";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ lewo ];
+  };
+
+  nodes = {
+    docker =
+      { pkgs, ... }:
+        {
+          virtualisation.docker.enable = true;
+          virtualisation.dockerPreloader.images = [ pkgs.dockerTools.examples.nix pkgs.dockerTools.examples.bash ];
+
+          services.openssh.enable = true;
+          services.openssh.permitRootLogin = "yes";
+          services.openssh.extraConfig = "PermitEmptyPasswords yes";
+          users.extraUsers.root.password = "";
+        };
+  };    
+  testScript = ''
+    startAll;
+    
+    $docker->waitForUnit("sockets.target");
+    $docker->succeed("docker run nix nix-store --version");
+    $docker->succeed("docker run bash bash --version");
+  '';
+})
-- 
GitLab


From d87a2481d2e7dc8d1a10397c8feb56af0854eaca Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sat, 3 Nov 2018 02:06:08 +0200
Subject: [PATCH 0916/1065] bat: fix build on darwin

---
 pkgs/tools/misc/bat/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 4bd4a02c7a2..d449b3b82f9 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -20,6 +20,9 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
 
+  # https://github.com/NixOS/nixpkgs/issues/49642
+  doCheck = !stdenv.isDarwin;
+
   postInstall = ''
     install -m 444 -Dt $out/share/man/man1 doc/bat.1
 
-- 
GitLab


From 791e98eb900377e7654cdcb1d24e1607d982b940 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 2 Nov 2018 19:07:08 -0500
Subject: [PATCH 0917/1065] Add myself to a few CODEOWNERS paths

---
 .github/CODEOWNERS | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f222af230bb..e819d451fd5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -12,7 +12,7 @@
 
 # Libraries
 /lib                        @edolstra @nbp
-/lib/systems                @nbp @ericson2314
+/lib/systems                @nbp @ericson2314 @matthewbauer
 /lib/generators.nix         @edolstra @nbp @Profpatsch
 /lib/debug.nix              @edolstra @nbp @Profpatsch
 
@@ -20,9 +20,11 @@
 /default.nix                          @nbp
 /pkgs/top-level/default.nix           @nbp @Ericson2314
 /pkgs/top-level/impure.nix            @nbp @Ericson2314
-/pkgs/top-level/stage.nix             @nbp @Ericson2314
-/pkgs/stdenv/generic                  @Ericson2314
-/pkgs/stdenv/cross                    @Ericson2314
+/pkgs/top-level/stage.nix             @nbp @Ericson2314 @matthewbauer
+/pkgs/top-level/splice.nix            @Ericson2314 @matthewbauer
+/pkgs/top-level/release-cross.nix     @Ericson2314 @matthewbauer
+/pkgs/stdenv/generic                  @Ericson2314 @matthewbauer
+/pkgs/stdenv/cross                    @Ericson2314 @matthewbauer
 /pkgs/build-support/cc-wrapper        @Ericson2314 @orivej
 /pkgs/build-support/bintools-wrapper  @Ericson2314 @orivej
 /pkgs/build-support/setup-hooks       @Ericson2314
@@ -74,6 +76,14 @@
 /pkgs/stdenv/darwin         @NixOS/darwin-maintainers
 /pkgs/os-specific/darwin    @NixOS/darwin-maintainers
 
+# C compilers
+/pkgs/development/compilers/gcc @matthewbauer
+/pkgs/development/compilers/llvm @matthewbauer
+
+# Compatibility stuff
+/pkgs/top-level/unix-tools.nix @matthewbauer
+/pkgs/development/tools/xcbuild @matthewbauer
+
 # Beam-related (Erlang, Elixir, LFE, etc)
 /pkgs/development/beam-modules                  @gleber
 /pkgs/development/interpreters/erlang           @gleber
-- 
GitLab


From 9e491f732a6c7d2ab61db0b9c0f625bf560c1b87 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 3 Nov 2018 01:44:47 +0100
Subject: [PATCH 0918/1065] gitlab: 11.4.3 -> 11.4.4

SSRF in Kubernetes integration
The GitLab Kubernetes integration was vulnerable to a SSRF issue which could allow an attacker to make requests to access any internal URLs. The issue is now mitigated in the latest release and is assigned CVE-2018-18843.
---
 .../applications/version-management/gitlab/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 933db40cfc0..c1c4d20feac 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -11,29 +11,29 @@ let
     groups = [ "default" "unicorn" "ed25519" "metrics" ];
   };
 
-  version = "11.4.3";
+  version = "11.4.4";
 
   sources = if gitlabEnterprise then {
     gitlabDeb = fetchurl {
       url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb";
-      sha256 = "1cw75qj508z6n00rqgqjzdm2013kyb7c57cypmq0m08nc6f3jspz";
+      sha256 = "15lpcdjcw6lpmzlhqnpd6pgaxh7wvx2mldjd1vqr414r4bcnhgy4";
     };
     gitlab = fetchFromGitLab {
       owner = "gitlab-org";
       repo = "gitlab-ee";
       rev = "v${version}-ee";
-      sha256 = "1vqc77whpbsifbm9vgcmpxnw13v8jz1s9q04i8jfv99c59fjlids";
+      sha256 = "046hchr7q4jnx3j4yxg3rdixfzlva35al3ci26pf9vxrbbl5y8cg";
     };
   } else {
     gitlabDeb = fetchurl {
       url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb";
-      sha256 = "0vk03k42pp92h520wnynl9czcigjhj9m7y68z1x0gwqr9m61r7zm";
+      sha256 = "02p7azyjgb984bk491q6f4zk1mikbcd38rif08kl07bjjzzkir81";
     };
     gitlab = fetchFromGitLab {
       owner = "gitlab-org";
       repo = "gitlab-ce";
       rev = "v${version}";
-      sha256 = "1zvjz2gv2vwqqjz52zcvi0ap3d8rdbpgsqk9wv80hqq4v37a5gfx";
+      sha256 = "1hq9iyp0xrxwmncn61ja3pdj9h2hmdy1l63d1ic3r1dyacybaf2g";
     };
   };
 
-- 
GitLab


From 7959f77fadb43616b1244a61b8a1c46cced4efa0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 2 Nov 2018 17:09:25 -0500
Subject: [PATCH 0919/1065] bup: 0.29.1 -> 0.29.2

https://github.com/bup/bup/blob/master/note/0.29.2-from-0.29.1.md
---
 pkgs/tools/backup/bup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index f24e89fcc84..bf10f556b6b 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -5,7 +5,7 @@
 
 assert par2Support -> par2cmdline != null;
 
-let version = "0.29.1"; in
+let version = "0.29.2"; in
 
 with stdenv.lib;
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     repo = "bup";
     owner = "bup";
     rev = version;
-    sha256 = "0wdr399jf64zzzsdvldhrwvnh5xpbghjvslr1j2cwr5y4i36znxf";
+    sha256 = "17lpbyhf43gcln5s43m2zzgichcx7jq6ragcawfklw6svg1vnj89";
   };
 
   buildInputs = [
-- 
GitLab


From 0923607ff74c78c4055e936c0a5fc89015c7e6bb Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 2 Nov 2018 20:39:40 -0500
Subject: [PATCH 0920/1065] gemrb: add libiconv

https://hydra.nixos.org/build/83508053/
---
 pkgs/games/gemrb/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix
index 0e902525922..fc7bf7168dd 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/pkgs/games/gemrb/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, cmake
-, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python, libvorbis }:
+, freetype, SDL2, SDL2_mixer, openal, zlib, libpng, python, libvorbis
+, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "gemrb-${version}";
@@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional
-  buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis ];
+  buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ];
 
   nativeBuildInputs = [ cmake ];
 
-- 
GitLab


From 8bae7d328e072901386ff1bb255b56484a606ee1 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 2 Nov 2018 20:41:38 -0500
Subject: [PATCH 0921/1065] gsasl: disable check on darwin

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

diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix
index 71da2c716f8..a1df933149f 100644
--- a/pkgs/development/libraries/gsasl/default.nix
+++ b/pkgs/development/libraries/gsasl/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-gssapi-impl=mit" ];
 
-  doCheck = true;
+  doCheck = !stdenv.hostPlatform.isDarwin;
 
   meta = {
     description = "GNU SASL, Simple Authentication and Security Layer library";
-- 
GitLab


From 3085f5fcb84f47a6ae0590f4be9c8dcce97c413b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 2 Nov 2018 21:12:17 -0500
Subject: [PATCH 0922/1065] libobjc2: mark aarch64 as bad platform

Apparently some assembly has not been ported. This commit should fix
it:

https://github.com/gnustep/libobjc2/commit/b952a21abe8b0f9878b1ec5161ea530058512f4a#diff-e49aa4e60f8ccec1be46afc5e6ffcee5

But no release has been made by the gnustep team yet!
---
 pkgs/desktops/gnustep/libobjc2/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/pkgs/desktops/gnustep/libobjc2/default.nix
index a3e718187c7..3aba235b3a7 100644
--- a/pkgs/desktops/gnustep/libobjc2/default.nix
+++ b/pkgs/desktops/gnustep/libobjc2/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ ashalkhakov matthewbauer ];
     platforms = platforms.unix;
+    badPlatforms = [ "aarch64-linux" ];
   };
 }
-- 
GitLab


From e9db1e29172f478a51b34e317cc141886785e734 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 2 Nov 2018 21:17:13 -0500
Subject: [PATCH 0923/1065] grpc: disable werror for unknown warning option

This seems silly to do an error for. It breaks clang builds.
---
 pkgs/development/libraries/grpc/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index a21e2aacde2..e568ea9eb65 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
     rm -vf BUILD
   '';
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=unknown-warning-option";
+
   enableParallelBuilds = true;
 
   meta = with stdenv.lib; {
-- 
GitLab


From 78ca6d885ffbeba8b2cfe1fe68c3980e74fd4e5d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 2 Nov 2018 21:22:36 -0500
Subject: [PATCH 0924/1065] stage.nix: pkgsi686Linux only works on x86 family

aarch64 cpus are going to break on pkgsi686Linux packages.

See this error:

https://hydra.nixos.org/build/82962379/
---
 pkgs/top-level/stage.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 37724a870a3..f838d707b0c 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -150,7 +150,7 @@ let
 
     # All packages built for i686 Linux.
     # Used by wine, firefox with debugging version of Flash, ...
-    pkgsi686Linux = assert stdenv.hostPlatform.isLinux; nixpkgsFun {
+    pkgsi686Linux = assert stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86; nixpkgsFun {
       inherit overlays config;
       ${if stdenv.hostPlatform == stdenv.buildPlatform
         then "localSystem" else "crossSystem"} = {
-- 
GitLab


From 126e64e658ad41852637a92c48382fab34d86ff4 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Wed, 31 Oct 2018 11:12:56 -0700
Subject: [PATCH 0925/1065] asmfmt: init at 1.1

---
 pkgs/development/tools/asmfmt/default.nix | 37 +++++++++++++++++++++++
 pkgs/development/tools/asmfmt/deps.nix    | 20 ++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 3 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/tools/asmfmt/default.nix
 create mode 100644 pkgs/development/tools/asmfmt/deps.nix

diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix
new file mode 100644
index 00000000000..d2cb7e807b5
--- /dev/null
+++ b/pkgs/development/tools/asmfmt/default.nix
@@ -0,0 +1,37 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+, fetchpatch
+}:
+
+buildGoPackage rec {
+  name = "asmfmt-${version}";
+  version = "1.1";
+
+  goPackagePath = "github.com/klauspost/asmfmt";
+
+  src = fetchFromGitHub {
+    owner = "klauspost";
+    repo = "asmfmt";
+    rev = "v${version}";
+    sha256 = "08mybfizcvck460axakycz9ndzcgwqilp5mmgm4bl8hfrn36mskw";
+  };
+
+  patches = [
+    (fetchpatch {
+      excludes = ["README.md"];
+      url = "https://github.com/klauspost/asmfmt/commit/39a37c8aed8095e0fdfb07f78fc8acbd465d9627.patch";
+      sha256 = "18bc77l87mf0yvqc3adlakxz6wflyqfsc2wrmh9q0nlqghlmnw5k";
+    })
+  ];
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "Go Assembler Formatter";
+    homepage = https://github.com/klauspost/asmfmt;
+    license = licenses.mit;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/tools/asmfmt/deps.nix b/pkgs/development/tools/asmfmt/deps.nix
new file mode 100644
index 00000000000..0288fc206d4
--- /dev/null
+++ b/pkgs/development/tools/asmfmt/deps.nix
@@ -0,0 +1,20 @@
+[
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "3a10b9bf0a52df7e992a8c3eb712a86d3c896c75";
+      sha256 = "19f3dijcc54jnd7458jab2dgpd0gzccmv2qympd9wi8cc8jpnhws";
+    };
+  }
+  {
+    goPackagePath = "sourcegraph.com/sqs/goreturns";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sqs/goreturns";
+      rev = "538ac601451833c7c4449f8431d65d53c1c60e41";
+      sha256 = "0gcplch8zmcgwl6xvcffxg50g3xnf60n7dlqxgn51179qcjr354p";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62cef2d5068..9ee9fc5ccd2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -801,6 +801,8 @@ with pkgs;
   };
   aria = aria2;
 
+  asmfmt = callPackage ../development/tools/asmfmt { };
+
   aspcud = callPackage ../tools/misc/aspcud { };
 
   at = callPackage ../tools/system/at { };
-- 
GitLab


From 6d7413e54aeca2c3fe0314fb3d964c53a9a7fa0e Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Wed, 31 Oct 2018 11:21:52 -0700
Subject: [PATCH 0926/1065] errcheck: init at 1.1.0

---
 pkgs/development/tools/errcheck/default.nix | 29 +++++++++++++++++++++
 pkgs/development/tools/errcheck/deps.nix    | 20 ++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/tools/errcheck/default.nix
 create mode 100644 pkgs/development/tools/errcheck/deps.nix

diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/development/tools/errcheck/default.nix
new file mode 100644
index 00000000000..1ce49a4cbb9
--- /dev/null
+++ b/pkgs/development/tools/errcheck/default.nix
@@ -0,0 +1,29 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  name = "errcheck-${version}";
+  version = "1.1.0";
+
+  goPackagePath = "github.com/kisielk/errcheck";
+  excludedPackages = "\\(testdata\\)";
+
+  src = fetchFromGitHub {
+    owner = "kisielk";
+    repo = "errcheck";
+    rev = "v${version}";
+    sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "errcheck is a program for checking for unchecked errors in go programs.";
+    homepage = https://github.com/kisielk/errcheck;
+    license = licenses.mit;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/tools/errcheck/deps.nix b/pkgs/development/tools/errcheck/deps.nix
new file mode 100644
index 00000000000..8470c9e12aa
--- /dev/null
+++ b/pkgs/development/tools/errcheck/deps.nix
@@ -0,0 +1,20 @@
+[
+  {
+    goPackagePath = "github.com/kisielk/gotool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kisielk/gotool";
+      rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
+      sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "3a10b9bf0a52df7e992a8c3eb712a86d3c896c75";
+      sha256 = "19f3dijcc54jnd7458jab2dgpd0gzccmv2qympd9wi8cc8jpnhws";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ee9fc5ccd2..deea7f6b57c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1313,6 +1313,8 @@ with pkgs;
 
   envsubst = callPackage ../tools/misc/envsubst { };
 
+  errcheck = callPackage ../development/tools/errcheck { };
+
   eschalot = callPackage ../tools/security/eschalot { };
 
   esptool = callPackage ../tools/misc/esptool { };
-- 
GitLab


From f6e78e49fa6bc2f9e613ba95abc38bc4bb0083cc Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Thu, 1 Nov 2018 21:16:46 -0700
Subject: [PATCH 0927/1065] reftools: init at unstable 2018-09-14

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

diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix
new file mode 100644
index 00000000000..6ef724022e8
--- /dev/null
+++ b/pkgs/development/tools/reftools/default.nix
@@ -0,0 +1,29 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  name = "reftools-unstable-${version}";
+  version = "2018-09-14";
+  rev = "654d0ba4f96d62286ca33cd46f7674b84f76d399";
+
+  goPackagePath = "github.com/davidrjenni/reftools";
+  excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)";
+
+  src = fetchFromGitHub {
+    inherit rev;
+
+    owner = "davidrjenni";
+    repo = "reftools";
+    sha256 = "12y2h1h15xadc8pa3xsj11hpdxz5dss6k7xaa4h1ifkvnasjp5w2";
+  };
+
+  meta = with lib; {
+    description = "reftools - refactoring tools for Go";
+    homepage = https://github.com/davidrjenni/reftools;
+    license = licenses.bsd2;
+    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 deea7f6b57c..6524cf2e1bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5095,6 +5095,8 @@ with pkgs;
 
   recoverjpeg = callPackage ../tools/misc/recoverjpeg { };
 
+  reftools = callPackage ../development/tools/reftools { };
+
   reposurgeon = callPackage ../applications/version-management/reposurgeon { };
 
   reptyr = callPackage ../os-specific/linux/reptyr {};
-- 
GitLab


From f5e493927786805280967c8f04d1a5d5c01c8065 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Thu, 1 Nov 2018 21:34:11 -0700
Subject: [PATCH 0928/1065] gogetdoc: init at unstable 2018-10-25

---
 pkgs/development/tools/gogetdoc/default.nix | 31 +++++++++++++++++++++
 pkgs/development/tools/gogetdoc/deps.nix    | 13 +++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/tools/gogetdoc/default.nix
 create mode 100644 pkgs/development/tools/gogetdoc/deps.nix

diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix
new file mode 100644
index 00000000000..7724ee49465
--- /dev/null
+++ b/pkgs/development/tools/gogetdoc/default.nix
@@ -0,0 +1,31 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  name = "gogetdoc-unstable-${version}";
+  version = "2018-10-25";
+  rev = "9098cf5fc236a5e25060730544af2ba6d65cd968";
+
+  goPackagePath = "github.com/zmb3/gogetdoc";
+  excludedPackages = "\\(testdata\\)";
+
+  src = fetchFromGitHub {
+    inherit rev;
+
+    owner = "zmb3";
+    repo = "gogetdoc";
+    sha256 = "159dgkd2lz07kimbpzminli5p539l4ry0dr93r46iz3lk5q76znl";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "Gets documentation for items in Go source code";
+    homepage = https://github.com/zmb3/gogetdoc;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/tools/gogetdoc/deps.nix b/pkgs/development/tools/gogetdoc/deps.nix
new file mode 100644
index 00000000000..d770057d1d7
--- /dev/null
+++ b/pkgs/development/tools/gogetdoc/deps.nix
@@ -0,0 +1,13 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "6adeb8aab2de";
+      sha256 = "0kylkki0ksdm12ppl37fghzbma9hmgqwph0nwngv08v4blk6li6k";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6524cf2e1bd..76ee48be1f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6949,6 +6949,8 @@ with pkgs;
 
   go-junit-report = callPackage ../development/tools/go-junit-report { };
 
+  gogetdoc = callPackage ../development/tools/gogetdoc { };
+
   gox = callPackage ../development/tools/gox { };
 
   gprolog = callPackage ../development/compilers/gprolog { };
-- 
GitLab


From 9795ad34ddffffe9a0389d29a0a001bcf61e082b Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 2 Nov 2018 09:36:24 -0700
Subject: [PATCH 0929/1065] deadcode: init at unstable 2016-07-24

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

diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/development/tools/deadcode/default.nix
new file mode 100644
index 00000000000..fbed4e905cf
--- /dev/null
+++ b/pkgs/development/tools/deadcode/default.nix
@@ -0,0 +1,31 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+}:
+
+# TODO(yl): should we package https://github.com/remyoudompheng/go-misc instead of
+# the standalone extract of deadcode from it?
+buildGoPackage rec {
+  name = "deadcode-unstable-${version}";
+  version = "2016-07-24";
+  rev = "210d2dc333e90c7e3eedf4f2242507a8e83ed4ab";
+
+  goPackagePath = "github.com/tsenart/deadcode";
+  excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)";
+
+  src = fetchFromGitHub {
+    inherit rev;
+
+    owner = "tsenart";
+    repo = "deadcode";
+    sha256 = "05kif593f4wygnrq2fdjhn7kkcpdmgjnykcila85d0gqlb1f36g0";
+  };
+
+  meta = with lib; {
+    description = "deadcode is a very simple utility which detects unused declarations in a Go package.";
+    homepage = https://github.com/remyoudompheng/go-misc/tree/master/deadcode;
+    license = licenses.bsd3;
+    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 76ee48be1f4..ce5d202eaca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -122,6 +122,8 @@ with pkgs;
     inherit dhall-nix;
   };
 
+  deadcode = callPackage ../development/tools/deadcode { };
+
   diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
 
   dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;
-- 
GitLab


From d225933b4e3f543bea9e1935316669f27d4678e5 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 2 Nov 2018 20:20:14 -0700
Subject: [PATCH 0930/1065] go-tools: init at 2017.2.2

---
 pkgs/development/tools/go-tools/default.nix | 29 +++++++++++++++++++++
 pkgs/development/tools/go-tools/deps.nix    | 20 ++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/tools/go-tools/default.nix
 create mode 100644 pkgs/development/tools/go-tools/deps.nix

diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix
new file mode 100644
index 00000000000..7e599ed8de7
--- /dev/null
+++ b/pkgs/development/tools/go-tools/default.nix
@@ -0,0 +1,29 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  name = "go-tools-${version}";
+  version = "2017.2.2";
+
+  goPackagePath = "honnef.co/go/tools";
+  excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|unused\)/testdata'';
+
+  src = fetchFromGitHub {
+    owner = "dominikh";
+    repo = "go-tools";
+    rev = "${version}";
+    sha256 = "1khl6szjj0skkfqp234p9rf3icik7fw2pk2x0wbj3wa9q3f84hb7";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "A collection of tools and libraries for working with Go code, including linters and static analysis.";
+    homepage = https://staticcheck.io;
+    license = licenses.mit;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/tools/go-tools/deps.nix b/pkgs/development/tools/go-tools/deps.nix
new file mode 100644
index 00000000000..afe5e50e47b
--- /dev/null
+++ b/pkgs/development/tools/go-tools/deps.nix
@@ -0,0 +1,20 @@
+[
+  {
+    goPackagePath = "github.com/kisielk/gotool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kisielk/gotool";
+      rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
+      sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "96e9e165b75e735822645eff82850b08c377be36";
+      sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce5d202eaca..0f2bf40435c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14739,6 +14739,8 @@ with pkgs;
 
   govendor = callPackage ../development/tools/govendor { };
 
+  go-tools = callPackage ../development/tools/go-tools { };
+
   gotools = callPackage ../development/tools/gotools { };
 
   gotop = callPackage ../tools/system/gotop { };
-- 
GitLab


From df46a94d8b786553fe0f75a69b5164fc597b3a9d Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 2 Nov 2018 20:29:28 -0700
Subject: [PATCH 0931/1065] ineffassign: init at unstable 2018-09-09

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

diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix
new file mode 100644
index 00000000000..10e5c61025a
--- /dev/null
+++ b/pkgs/development/tools/ineffassign/default.nix
@@ -0,0 +1,29 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  name = "ineffassign-unstable-${version}";
+  version = "2018-09-09";
+	rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514";
+
+  goPackagePath = "github.com/gordonklaus/ineffassign";
+  excludedPackages = ''testdata'';
+
+  src = fetchFromGitHub {
+    inherit rev;
+
+    owner = "gordonklaus";
+    repo = "ineffassign";
+    sha256 = "1rkzqvd3z03vq8q8qi9cghvgggsf02ammj9wq8jvpnx6b2sd16nd";
+  };
+
+  meta = with lib; {
+    description = "Detect ineffectual assignments in Go code.";
+    homepage = https://github.com/gordonklaus/ineffassign;
+    license = licenses.mit;
+    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 0f2bf40435c..50c011729fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10142,6 +10142,8 @@ with pkgs;
 
   imlibsetroot = callPackage ../applications/graphics/imlibsetroot { libXinerama = xorg.libXinerama; } ;
 
+  ineffassign = callPackage ../development/tools/ineffassign { };
+
   ijs = callPackage ../development/libraries/ijs { };
 
   incrtcl = callPackage ../development/libraries/incrtcl { };
-- 
GitLab


From 63d9863394f7359595fc52fc962d8ad58638ee5b Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 2 Nov 2018 20:43:40 -0700
Subject: [PATCH 0932/1065] unconvert: init at unstable 2018-07-03

---
 pkgs/development/tools/unconvert/default.nix | 31 ++++++++++++++++++++
 pkgs/development/tools/unconvert/deps.nix    | 29 ++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 3 files changed, 62 insertions(+)
 create mode 100644 pkgs/development/tools/unconvert/default.nix
 create mode 100644 pkgs/development/tools/unconvert/deps.nix

diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/development/tools/unconvert/default.nix
new file mode 100644
index 00000000000..1e81c5b9f86
--- /dev/null
+++ b/pkgs/development/tools/unconvert/default.nix
@@ -0,0 +1,31 @@
+
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  name = "unconvert-unstable-${version}";
+  version = "2018-07-03";
+  rev = "1a9a0a0a3594e9363e49545fb6a4e24ac4c68b7b";
+
+  goPackagePath = "github.com/mdempsky/unconvert";
+
+  src = fetchFromGitHub {
+    inherit rev;
+
+    owner = "mdempsky";
+    repo = "unconvert";
+    sha256 = "1ww5qk1cmdis4ig5mb0b0w7nzrf3734s51plmgdxqsr35y88q4p9";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "Remove unnecessary type conversions from Go source";
+    homepage = https://github.com/mdempsky/unconvert;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/tools/unconvert/deps.nix b/pkgs/development/tools/unconvert/deps.nix
new file mode 100644
index 00000000000..333ec7ca3b1
--- /dev/null
+++ b/pkgs/development/tools/unconvert/deps.nix
@@ -0,0 +1,29 @@
+[
+  {
+    goPackagePath = "github.com/kisielk/gotool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kisielk/gotool";
+      rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
+      sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2";
+      sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "96e9e165b75e735822645eff82850b08c377be36";
+      sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50c011729fc..5237133645d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12535,6 +12535,8 @@ with pkgs;
     vala = vala_0_40;
   };
 
+  unconvert = callPackage ../development/tools/unconvert { };
+
   unibilium = callPackage ../development/libraries/unibilium { };
 
   unicap = callPackage ../development/libraries/unicap {};
-- 
GitLab


From fe83c5c3f58636f78635d9ed721816f091e41470 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 2 Nov 2018 20:49:58 -0700
Subject: [PATCH 0933/1065] goconst: init at 1.1.0

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

diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix
new file mode 100644
index 00000000000..9ef94ffdc7f
--- /dev/null
+++ b/pkgs/development/tools/goconst/default.nix
@@ -0,0 +1,27 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  name = "goconst-${version}";
+  version = "1.1.0";
+
+  goPackagePath = "github.com/jgautheron/goconst";
+  excludedPackages = ''testdata'';
+
+  src = fetchFromGitHub {
+    owner = "jgautheron";
+    repo = "goconst";
+    rev = version;
+    sha256 = "0zhscvv9w54q1h2vs8xx3qkz98cf36qhxjvdq0xyz3qvn4vhnyw6";
+  };
+
+  meta = with lib; {
+    description = "Find in Go repeated strings that could be replaced by a constant";
+    homepage = https://github.com/jgautheron/goconst;
+    license = licenses.mit;
+    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 5237133645d..9e52f8d1b2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14727,6 +14727,8 @@ with pkgs;
 
   gocode = callPackage ../development/tools/gocode { };
 
+  goconst = callPackage ../development/tools/goconst { };
+
   goconvey = callPackage ../development/tools/goconvey { };
 
   gotags = callPackage ../development/tools/gotags { };
-- 
GitLab


From f10fcf202bf2acac2d276b0689b932babe8998bf Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 2 Nov 2018 21:01:49 -0700
Subject: [PATCH 0934/1065] go-check: init unstable at 2018-09-12

---
 pkgs/development/tools/check/default.nix | 30 ++++++++++++++++++++++++
 pkgs/development/tools/check/deps.nix    | 11 +++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/tools/check/default.nix
 create mode 100644 pkgs/development/tools/check/deps.nix

diff --git a/pkgs/development/tools/check/default.nix b/pkgs/development/tools/check/default.nix
new file mode 100644
index 00000000000..dfa164e6755
--- /dev/null
+++ b/pkgs/development/tools/check/default.nix
@@ -0,0 +1,30 @@
+{ buildGoPackage
+, lib
+, fetchFromGitLab
+}:
+
+buildGoPackage rec {
+  name = "check-unstable-${version}";
+  version = "2018-09-12";
+  rev = "88db195993f8e991ad402754accd0635490769f9";
+
+  goPackagePath = "gitlab.com/opennota/check";
+
+  src = fetchFromGitLab {
+    inherit rev;
+
+    owner = "opennota";
+    repo = "check";
+    sha256 = "1983xmdkgpqda4qz8ashc6xv1zg5jl4zly3w566grxc5sfxpgf0i";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "A set of utilities for checking Go sources.";
+    homepage = https://gitlab.com/opennota/check;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/tools/check/deps.nix b/pkgs/development/tools/check/deps.nix
new file mode 100644
index 00000000000..b9c50d95d11
--- /dev/null
+++ b/pkgs/development/tools/check/deps.nix
@@ -0,0 +1,11 @@
+[
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "677d2ff680c1";
+      sha256 = "0vp1w1haqcjd82dxd6x9xrllbfwvm957rxwkpji96cgvhsli2bq5";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e52f8d1b2f..784823d9be6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -659,6 +659,8 @@ with pkgs;
 
   cconv = callPackage ../tools/text/cconv { };
 
+  go-check = callPackage ../development/tools/check { };
+
   chkcrontab = callPackage ../tools/admin/chkcrontab { };
 
   cozy = callPackage ../applications/audio/cozy-audiobooks { };
-- 
GitLab


From 1efe4d900593f0a34bbd2b32d34071d965fdfd06 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 2 Nov 2018 21:08:19 -0700
Subject: [PATCH 0935/1065] gocyclo: init unstable at 2015-02-08

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

diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix
new file mode 100644
index 00000000000..91ebaff803e
--- /dev/null
+++ b/pkgs/development/tools/gocyclo/default.nix
@@ -0,0 +1,28 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  name = "gocyclo-unstable-${version}";
+  version = "2015-02-08";
+  rev = "aa8f8b160214d8dfccfe3e17e578dd0fcc6fede7";
+
+  goPackagePath = "github.com/alecthomas/gocyclo";
+
+  src = fetchFromGitHub {
+    inherit rev;
+
+    owner = "alecthomas";
+    repo = "gocyclo";
+    sha256 = "094rj97q38j53lmn2scshrg8kws8c542yq5apih1ahm9wdkv8pxr";
+  };
+
+  meta = with lib; {
+    description = "Calculate cyclomatic complexities of functions in Go source code.";
+    homepage = https://github.com/alecthomas/gocyclo;
+    license = licenses.bsd3;
+    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 784823d9be6..4aeb27bd8d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14739,6 +14739,8 @@ with pkgs;
 
   golangci-lint = callPackage ../development/tools/golangci-lint { };
 
+  gocyclo = callPackage ../development/tools/gocyclo { };
+
   godef = callPackage ../development/tools/godef { };
 
   gopkgs = callPackage ../development/tools/gopkgs { };
-- 
GitLab


From ed31a46727b3fca8ed6a4ff5416fad9026cdc9b4 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 2 Nov 2018 21:22:07 -0700
Subject: [PATCH 0936/1065] interfacer: init at unstable 2018-08-31

---
 pkgs/development/tools/interfacer/default.nix | 31 +++++++++++++++++++
 pkgs/development/tools/interfacer/deps.nix    | 29 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 62 insertions(+)
 create mode 100644 pkgs/development/tools/interfacer/default.nix
 create mode 100644 pkgs/development/tools/interfacer/deps.nix

diff --git a/pkgs/development/tools/interfacer/default.nix b/pkgs/development/tools/interfacer/default.nix
new file mode 100644
index 00000000000..274ced0b37c
--- /dev/null
+++ b/pkgs/development/tools/interfacer/default.nix
@@ -0,0 +1,31 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  name = "interfacer-unstable-${version}";
+  version = "2018-08-31";
+  rev = "c20040233aedb03da82d460eca6130fcd91c629a";
+
+  goPackagePath = "mvdan.cc/interfacer";
+  excludedPackages = ''check/testdata'';
+
+  src = fetchFromGitHub {
+    inherit rev;
+
+    owner = "mvdan";
+    repo = "interfacer";
+    sha256 = "0cx4m74mvn200360pmsqxx4z0apk9fcknwwqh8r94zd3jfv4akq2";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "A linter that suggests interface types.";
+    homepage = https://github.com/mvdan/interfacer;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/tools/interfacer/deps.nix b/pkgs/development/tools/interfacer/deps.nix
new file mode 100644
index 00000000000..6810950878b
--- /dev/null
+++ b/pkgs/development/tools/interfacer/deps.nix
@@ -0,0 +1,29 @@
+[
+  {
+    goPackagePath = "github.com/kisielk/gotool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kisielk/gotool";
+      rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
+      sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "96e9e165b75e735822645eff82850b08c377be36";
+      sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg";
+    };
+  }
+  {
+    goPackagePath = "mvdan.cc/lint";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mvdan/lint";
+      rev = "adc824a0674b99099789b6188a058d485eaf61c0";
+      sha256 = "17mi2rvkg9kzv1shxcyawzcj4jj3v738d1j82fp4yygx859yvr8r";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4aeb27bd8d7..b665ea1d393 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15526,6 +15526,8 @@ with pkgs;
 
   hasklig = callPackage ../data/fonts/hasklig {};
 
+  interfacer = callPackage ../development/tools/interfacer { };
+
   inter-ui = callPackage ../data/fonts/inter-ui { };
 
   siji = callPackage ../data/fonts/siji { };
-- 
GitLab


From cfa5c7f89674e4d5505050dda54a73574ca2f294 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 2 Nov 2018 21:30:19 -0700
Subject: [PATCH 0937/1065] maligned: init unstable at 2018-07-07

---
 pkgs/development/tools/maligned/default.nix | 30 +++++++++++++++++++++
 pkgs/development/tools/maligned/deps.nix    | 20 ++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/tools/maligned/default.nix
 create mode 100644 pkgs/development/tools/maligned/deps.nix

diff --git a/pkgs/development/tools/maligned/default.nix b/pkgs/development/tools/maligned/default.nix
new file mode 100644
index 00000000000..7e5cbaddd8b
--- /dev/null
+++ b/pkgs/development/tools/maligned/default.nix
@@ -0,0 +1,30 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  name = "maligned-unstable-${version}";
+  version = "2018-07-07";
+  rev = "6e39bd26a8c8b58c5a22129593044655a9e25959";
+
+  goPackagePath = "github.com/mdempsky/maligned";
+
+  src = fetchFromGitHub {
+    inherit rev;
+
+    owner = "mdempsky";
+    repo = "maligned";
+    sha256 = "08inr5xjqv9flrlyhqd8ck1q26y5xb6iilz0xkb6bqa4dl5ialhi";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "Tool to detect Go structs that would take less memory if their fields were sorted.";
+    homepage = https://github.com/mdempsky/maligned;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/tools/maligned/deps.nix b/pkgs/development/tools/maligned/deps.nix
new file mode 100644
index 00000000000..afe5e50e47b
--- /dev/null
+++ b/pkgs/development/tools/maligned/deps.nix
@@ -0,0 +1,20 @@
+[
+  {
+    goPackagePath = "github.com/kisielk/gotool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kisielk/gotool";
+      rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
+      sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "96e9e165b75e735822645eff82850b08c377be36";
+      sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b665ea1d393..d358f043e38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15528,6 +15528,8 @@ with pkgs;
 
   interfacer = callPackage ../development/tools/interfacer { };
 
+  maligned = callPackage ../development/tools/maligned { };
+
   inter-ui = callPackage ../data/fonts/inter-ui { };
 
   siji = callPackage ../data/fonts/siji { };
-- 
GitLab


From a1faa70368d8163acda30d06ad9e9f1a327ac52d Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 2 Nov 2018 21:38:41 -0700
Subject: [PATCH 0938/1065] gosec: init at 1.1.0

---
 pkgs/development/tools/gosec/default.nix |  29 ++++
 pkgs/development/tools/gosec/deps.nix    | 193 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |   2 +
 3 files changed, 224 insertions(+)
 create mode 100644 pkgs/development/tools/gosec/default.nix
 create mode 100644 pkgs/development/tools/gosec/deps.nix

diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix
new file mode 100644
index 00000000000..2cffd86f396
--- /dev/null
+++ b/pkgs/development/tools/gosec/default.nix
@@ -0,0 +1,29 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  name = "gosec-${version}";
+  version = "1.1.0";
+
+  goPackagePath = "github.com/securego/gosec";
+  excludedPackages = ''cmd/tlsconfig'';
+
+  src = fetchFromGitHub {
+    owner = "securego";
+    repo = "gosec";
+    rev = "${version}";
+    sha256 = "0vjn3g6w4y4ayx0g766jp31vb78cipl90fcg0mccjr0a539qrpy6";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "Golang security checker";
+    homepage = https://github.com/securego/gosec;
+    license = licenses.asl20 ;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/tools/gosec/deps.nix b/pkgs/development/tools/gosec/deps.nix
new file mode 100644
index 00000000000..80a77e7fb80
--- /dev/null
+++ b/pkgs/development/tools/gosec/deps.nix
@@ -0,0 +1,193 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "v1.1.1";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "v1.2.0";
+      sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/kisielk/gotool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kisielk/gotool";
+      rev = "0de1eaf82fa3";
+      sha256 = "177af7bjq6clmkqshnmnwlpwvx80kpi2277q275iwq59lp48viq1";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/kr/pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pretty";
+      rev = "v0.1.0";
+      sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/kr/pty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pty";
+      rev = "v1.1.1";
+      sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/kr/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/text";
+      rev = "v0.1.0";
+      sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/nbutton23/zxcvbn-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nbutton23/zxcvbn-go";
+      rev = "a22cb81b2ecd";
+      sha256 = "0hm16vc7xrw0cqla6xcn59bb7n2sa0j8rkniywn5dqnbrpza12cd";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/onsi/ginkgo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/onsi/ginkgo";
+      rev = "11459a886d9c";
+      sha256 = "1nswc1fnrrs792qbix05h91bilj8rr3wxmxgwi97p2gjk0r292zh";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/onsi/gomega";
+    fetch = {
+      type = "git";
+      url = "https://github.com/onsi/gomega";
+      rev = "dcabb60a477c";
+      sha256 = "1775lv5jbsgv3ghq5v2827slqlhqdadrzc1nkpq4y0hdv2qzrgkm";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "v1.0.0";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/ryanuber/go-glob";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ryanuber/go-glob";
+      rev = "256dc444b735";
+      sha256 = "07rsd7hranghwc68ib0r2zxd9d5djanzjvd84j9dgj3wqsyg5mi2";
+    };
+  }
+
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "v1.2.2";
+      sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+    };
+  }
+
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "8351a756f30f";
+      sha256 = "0b6m579i3wrx1m69mqkdng5gjfssprxx0pg45kzrdi68sh0zr5d1";
+    };
+  }
+
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "1d60e4601c6f";
+      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+    };
+  }
+
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "164713f0dfce";
+      sha256 = "1qn9vvyqsaaj0az0rbilzc4pfv9sl4vh78c2g37yya5gcdnarh3w";
+    };
+  }
+
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "1cbadb444a80";
+      sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56";
+    };
+  }
+
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "e531a2a1c15f";
+      sha256 = "0740w56nmjqdj7ld1h3gpcpi3x8n81bdx0pp267rz9hmwkrb2s1c";
+    };
+  }
+
+  {
+    goPackagePath = "gopkg.in/check.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/check.v1";
+      rev = "788fd7840127";
+      sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+    };
+  }
+
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "eb3733d160e7";
+      sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d358f043e38..4026889d21e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14745,6 +14745,8 @@ with pkgs;
 
   gopkgs = callPackage ../development/tools/gopkgs { };
 
+  gosec = callPackage ../development/tools/gosec { };
+
   govers = callPackage ../development/tools/govers { };
 
   govendor = callPackage ../development/tools/govendor { };
-- 
GitLab


From 6a09bfc8bc57b1635467f94b0afc652d838d37fc Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 2 Nov 2018 21:39:36 -0700
Subject: [PATCH 0939/1065] gometalinter: init at 2.0.11

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

diff --git a/pkgs/development/tools/gometalinter/default.nix b/pkgs/development/tools/gometalinter/default.nix
new file mode 100644
index 00000000000..cce678e9d07
--- /dev/null
+++ b/pkgs/development/tools/gometalinter/default.nix
@@ -0,0 +1,70 @@
+{ buildGoPackage
+, deadcode
+, errcheck
+, fetchFromGitHub
+, go
+, go-check
+, go-tools
+, goconst
+, gocyclo
+, golint
+, gosec
+, gotools
+, ineffassign
+, maligned
+, interfacer
+, lib
+, makeWrapper
+, unconvert
+}:
+
+with lib;
+
+let
+  runtimeDeps = [
+    deadcode
+    errcheck
+    go
+    go-check
+    go-tools
+    goconst
+    gocyclo
+    golint
+    gosec
+    gotools
+    ineffassign
+    interfacer
+    maligned
+    unconvert
+  ];
+
+in buildGoPackage rec {
+  name = "gometalinter-${version}";
+  version = "2.0.11";
+
+  goPackagePath = "github.com/alecthomas/gometalinter";
+  excludedPackages = "\\(regressiontests\\)";
+
+  src = fetchFromGitHub {
+    owner = "alecthomas";
+    repo = "gometalinter";
+    rev = "v${version}";
+    sha256 = "08p7bwvhpgizif8qi59m8mm3mcny70x9msbk8m8vjpphsq55wha4";
+  };
+
+  postInstall = ''
+    wrapProgram $bin/bin/gometalinter --prefix PATH : "${makeBinPath runtimeDeps}"
+  '';
+
+  buildInputs = [ makeWrapper ];
+
+  allowGoReference = true;
+
+  meta = with lib; {
+    description = "Concurrently run Go lint tools and normalise their output";
+    homepage = https://github.com/alecthomas/gometalinter;
+    license = licenses.mit;
+    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 4026889d21e..79940d958a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6955,6 +6955,8 @@ with pkgs;
 
   gogetdoc = callPackage ../development/tools/gogetdoc { };
 
+  gometalinter = callPackage ../development/tools/gometalinter { };
+
   gox = callPackage ../development/tools/gox { };
 
   gprolog = callPackage ../development/compilers/gprolog { };
-- 
GitLab


From fce50a78806550974ddb4b402e72f4a00129fc96 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 2 Nov 2018 21:47:38 -0700
Subject: [PATCH 0940/1065] impl: init unstable at 2018-02-27

---
 pkgs/development/tools/impl/default.nix | 30 +++++++++++++++++++++++++
 pkgs/development/tools/impl/deps.nix    | 11 +++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/tools/impl/default.nix
 create mode 100644 pkgs/development/tools/impl/deps.nix

diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/development/tools/impl/default.nix
new file mode 100644
index 00000000000..69bbf8afe5a
--- /dev/null
+++ b/pkgs/development/tools/impl/default.nix
@@ -0,0 +1,30 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  name = "impl-unstable-${version}";
+  version = "2018-02-27";
+  rev = "3d0f908298c49598b6aa84f101c69670e15d1d03";
+
+  goPackagePath = "github.com/josharian/impl";
+
+  src = fetchFromGitHub {
+    inherit rev;
+
+    owner = "josharian";
+    repo = "impl";
+    sha256 = "0xpip20x5vclrl0by1760lg73v6lj6nmkbiazlskyvpkw44h8a7c";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "impl generates method stubs for implementing an interface.";
+    homepage = https://github.com/josharian/impl;
+    license = licenses.mit;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/tools/impl/deps.nix b/pkgs/development/tools/impl/deps.nix
new file mode 100644
index 00000000000..3477aaed607
--- /dev/null
+++ b/pkgs/development/tools/impl/deps.nix
@@ -0,0 +1,11 @@
+[
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "96e9e165b75e735822645eff82850b08c377be36";
+      sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79940d958a9..d9ddee1454f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14767,6 +14767,8 @@ with pkgs;
 
   gotests = callPackage ../development/tools/gotests { };
 
+  impl = callPackage ../development/tools/impl { };
+
   quicktemplate = callPackage ../development/tools/quicktemplate { };
 
   gogoclient = callPackage ../os-specific/linux/gogoclient { };
-- 
GitLab


From e2355c697335af7a8e132e6acf440418f79dd9e6 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 2 Nov 2018 21:52:22 -0700
Subject: [PATCH 0941/1065] iferr: init unstable at 2018-06-15

---
 pkgs/development/tools/iferr/default.nix | 28 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/iferr/default.nix

diff --git a/pkgs/development/tools/iferr/default.nix b/pkgs/development/tools/iferr/default.nix
new file mode 100644
index 00000000000..e2aebe9b2dc
--- /dev/null
+++ b/pkgs/development/tools/iferr/default.nix
@@ -0,0 +1,28 @@
+{ buildGoPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildGoPackage rec {
+  name = "iferr-unstable-${version}";
+  version = "2018-06-15";
+  rev = "bb332a3b1d9129b6486c7ddcb7030c11b05cfc88";
+
+  goPackagePath = "github.com/koron/iferr";
+
+  src = fetchFromGitHub {
+    inherit rev;
+
+    owner = "koron";
+    repo = "iferr";
+    sha256 = "1nyqy1sgq2afiama4wy7wap8s03c0hiwwa0f6kwq3y59097rfc0c";
+  };
+
+  meta = with lib; {
+    description = ''Generate "if err != nil {" block'';
+    homepage = https://github.com/koron/iferr;
+    license = licenses.mit;
+    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 d9ddee1454f..536cb68dd17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14718,13 +14718,14 @@ with pkgs;
 
   easyjson = callPackage ../development/tools/easyjson { };
 
+  iferr = callPackage ../development/tools/iferr { };
+
   go-bindata = callPackage ../development/tools/go-bindata { };
 
   go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { };
 
   go-protobuf = callPackage ../development/tools/go-protobuf { };
 
-
   go-symbols = callPackage ../development/tools/go-symbols { };
 
   go-outline = callPackage ../development/tools/go-outline { };
-- 
GitLab


From e09e5297d3cf26472ebb2b4fd80cec2eb56f0f15 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Wed, 31 Oct 2018 10:46:59 -0700
Subject: [PATCH 0942/1065] vim-plugins: vim-go: provide the binaries required
 for the plugin to be functional

---
 pkgs/misc/vim-plugins/overrides.nix | 34 +++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 6b8bf42c795..6b1fd423a0a 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -9,6 +9,12 @@
 , languagetool
 , Cocoa, CoreFoundation, CoreServices
 , buildVimPluginFrom2Nix
+
+# vim-go denpencies
+, asmfmt, delve, errcheck, godef, golint
+, gomodifytags, gotags, gotools, motion
+, gnused, reftools, gogetdoc, gometalinter
+, impl, iferr
 }:
 
 let
@@ -247,6 +253,34 @@ with generated;
     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
+    binPath = lib.makeBinPath [
+      asmfmt
+      delve
+      errcheck
+      godef
+      gogetdoc
+      golint
+      gometalinter
+      gomodifytags
+      gotags
+      gotools
+      iferr
+      impl
+      motion
+      reftools
+    ];
+    in {
+    postPatch = ''
+      ${gnused}/bin/sed \
+        -Ee 's@let go_bin_path = go#path#BinPath\(\)@let go_bin_path = "${binPath}"@g' \
+        -i autoload/go/path.vim
+    '';
+  });
+
   vim-grammarous = vim-grammarous.overrideAttrs(old: {
     # use `:GrammarousCheck` to initialize checking
     # In neovim, you also want to use set
-- 
GitLab


From 08b5cffe878bcc7ea230043332db53a0ef8d2758 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 3 Nov 2018 00:47:39 -0500
Subject: [PATCH 0943/1065] Revert "stage.nix: pkgsi686Linux only works on x86
 family"

This reverts commit 78ca6d885ffbeba8b2cfe1fe68c3980e74fd4e5d.

Broke eval on aarch64
---
 pkgs/top-level/stage.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index f838d707b0c..37724a870a3 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -150,7 +150,7 @@ let
 
     # All packages built for i686 Linux.
     # Used by wine, firefox with debugging version of Flash, ...
-    pkgsi686Linux = assert stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86; nixpkgsFun {
+    pkgsi686Linux = assert stdenv.hostPlatform.isLinux; nixpkgsFun {
       inherit overlays config;
       ${if stdenv.hostPlatform == stdenv.buildPlatform
         then "localSystem" else "crossSystem"} = {
-- 
GitLab


From b3ab4d1f8e6fc6897fe561039b14d360fe8164f8 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 3 Nov 2018 00:52:14 -0500
Subject: [PATCH 0944/1065] Revert "Revert "stage.nix: pkgsi686Linux only works
 on x86 family""

This reverts commit 08b5cffe878bcc7ea230043332db53a0ef8d2758.
---
 pkgs/top-level/stage.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 37724a870a3..f838d707b0c 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -150,7 +150,7 @@ let
 
     # All packages built for i686 Linux.
     # Used by wine, firefox with debugging version of Flash, ...
-    pkgsi686Linux = assert stdenv.hostPlatform.isLinux; nixpkgsFun {
+    pkgsi686Linux = assert stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86; nixpkgsFun {
       inherit overlays config;
       ${if stdenv.hostPlatform == stdenv.buildPlatform
         then "localSystem" else "crossSystem"} = {
-- 
GitLab


From 4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 3 Nov 2018 00:55:57 -0500
Subject: [PATCH 0945/1065] treewide: remove pkgs_i686

This was getting evaluated eagerly causing assertion failures in
aarch64 systems. We can replace usages of pkgs_i686 with
pkgs.pkgsi686Linux.
---
 nixos/modules/config/pulseaudio.nix              | 8 ++++----
 nixos/modules/hardware/opengl.nix                | 4 ++--
 nixos/modules/hardware/video/amdgpu-pro.nix      | 4 ++--
 nixos/modules/hardware/video/ati.nix             | 4 ++--
 nixos/modules/hardware/video/nvidia.nix          | 4 ++--
 nixos/modules/misc/nixpkgs.nix                   | 1 -
 nixos/modules/virtualisation/parallels-guest.nix | 4 ++--
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index d4aa5950629..67f7105fe2f 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
 
 with pkgs;
 with lib;
@@ -19,7 +19,7 @@ let
 
   # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps
   # using 32bit alsa on 64bit linux.
-  enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null);
+  enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsaLib != null && pkgs.pkgsi686Linux.libpulseaudio != null);
 
 
   myConfigFile =
@@ -63,7 +63,7 @@ let
     pcm_type.pulse {
       libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;
       ${lib.optionalString enable32BitAlsaPlugins
-     "libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"}
+     "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"}
     }
     pcm.!default {
       type pulse
@@ -72,7 +72,7 @@ let
     ctl_type.pulse {
       libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;
       ${lib.optionalString enable32BitAlsaPlugins
-     "libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"}
+     "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"}
     }
     ctl.!default {
       type pulse
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index 46d06d71333..48e0072e089 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
@@ -148,7 +148,7 @@ in
       [ "/run/opengl-driver/share" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/share";
 
     hardware.opengl.package = mkDefault (makePackage pkgs);
-    hardware.opengl.package32 = mkDefault (makePackage pkgs_i686);
+    hardware.opengl.package32 = mkDefault (makePackage pkgs.pkgsi686Linux);
 
     boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions;
   };
diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix
index 50af022b93c..ab9e0c92020 100644
--- a/nixos/modules/hardware/video/amdgpu-pro.nix
+++ b/nixos/modules/hardware/video/amdgpu-pro.nix
@@ -1,6 +1,6 @@
 # This module provides the proprietary AMDGPU-PRO drivers.
 
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
@@ -11,7 +11,7 @@ let
   enabled = elem "amdgpu-pro" drivers;
 
   package = config.boot.kernelPackages.amdgpu-pro;
-  package32 = pkgs_i686.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; };
+  package32 = pkgs.pkgsi686Linux.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; };
 
   opengl = config.hardware.opengl;
 
diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix
index 2fa37af6ca5..6102919f015 100644
--- a/nixos/modules/hardware/video/ati.nix
+++ b/nixos/modules/hardware/video/ati.nix
@@ -1,6 +1,6 @@
 # This module provides the proprietary ATI X11 / OpenGL drivers.
 
-{ config, lib, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
@@ -24,7 +24,7 @@ in
       { name = "fglrx"; modules = [ ati_x11 ]; libPath = [ "${ati_x11}/lib" ]; };
 
     hardware.opengl.package = ati_x11;
-    hardware.opengl.package32 = pkgs_i686.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
+    hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
 
     environment.systemPackages = [ ati_x11 ];
 
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index f8524ab99e8..21e12395498 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -1,6 +1,6 @@
 # This module provides the proprietary NVIDIA X11 / OpenGL drivers.
 
-{ stdenv, config, lib, pkgs, pkgs_i686, ... }:
+{ stdenv, config, lib, pkgs, ... }:
 
 with lib;
 
@@ -25,7 +25,7 @@ let
   nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;
   nvidia_libs32 =
     if versionOlder nvidia_x11.version "391" then
-      ((nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }).out
+      ((nvidiaForKernel pkgs.pkgsi686Linux.linuxPackages).override { libsOnly = true; kernel = null; }).out
     else
       (nvidiaForKernel config.boot.kernelPackages).lib32;
 
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 7f9833e184a..1dfd2c3c6cf 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -208,7 +208,6 @@ in
   config = {
     _module.args = {
       pkgs = cfg.pkgs;
-      pkgs_i686 = cfg.pkgs.pkgsi686Linux;
     };
   };
 }
diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix
index 36ca7f356d4..4e0f2cae299 100644
--- a/nixos/modules/virtualisation/parallels-guest.nix
+++ b/nixos/modules/virtualisation/parallels-guest.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
@@ -64,7 +64,7 @@ in
     };
 
     hardware.opengl.package = prl-tools;
-    hardware.opengl.package32 = pkgs_i686.linuxPackages.prl-tools.override { libsOnly = true; kernel = null; };
+    hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.prl-tools.override { libsOnly = true; kernel = null; };
 
     services.udev.packages = [ prl-tools ];
 
-- 
GitLab


From 370ce8fcd39a3ed1002db0d7fb281576e39fc4ef Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 3 Nov 2018 00:58:58 -0500
Subject: [PATCH 0946/1065] stage.nix: throw error on incorrect pkgsi686Linux
 usage

pkgsi686Linux now throws an error with a message as opposed to the
previous assertion.
---
 pkgs/top-level/stage.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index f838d707b0c..4e6531286ee 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -150,7 +150,7 @@ let
 
     # All packages built for i686 Linux.
     # Used by wine, firefox with debugging version of Flash, ...
-    pkgsi686Linux = assert stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86; nixpkgsFun {
+    pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then nixpkgsFun {
       inherit overlays config;
       ${if stdenv.hostPlatform == stdenv.buildPlatform
         then "localSystem" else "crossSystem"} = {
@@ -158,7 +158,7 @@ let
           cpu = lib.systems.parse.cpuTypes.i686;
         };
       };
-    };
+    } else throw "i686 Linux package set can only be used with the x86 family.";
 
     # Extend the package set with zero or more overlays. This preserves
     # preexisting overlays. Prefer to initialize with the right overlays
-- 
GitLab


From c64624b8435af07d95effbb928d955963a5fa859 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sat, 3 Nov 2018 04:50:26 +0100
Subject: [PATCH 0947/1065] autoPatchelfHook: Correctly detect PIE binaries

I originally thought it would just be enough to just check for an INTERP
section in isExecutable, however this would mean that we don't detect
statically linked ELF files, which would break our recent improvement to
gracefully handle those.

In theory, we are only interested in ELF files that have an INTERP
section, so checking for INTERP would be enough. Unfortunately the
isExecutable function is already used outside of autoPatchelfHook, so we
can't easily get rid of it now, so let's actually strive for more
correctness and make isExecutable actually match ELF files that are
executable.

So what we're doing instead now is to check whether either the ELF type
is EXEC *or* we have an INTERP section and if one of them is true we
should have an ELF executable, even if it's statically linked.

Along the way I also set LANG=C for the invocations of readelf, just to
be sure we don't get locale-dependent output.

Tested this with the following command (which contains almost[1] all the
packages using autoPatchelfHook), checking whether we run into any
library-related errors:

  nix-build -E 'with import ./. { config.allowUnfree = true; };
    runCommand "test-executables" {
      drvs = [
        anydesk cups-kyodialog3 elasticsearch franz gurobi
        masterpdfeditor oracle-instantclient powershell reaper
        sourcetrail teamviewer unixODBCDrivers.msodbcsql17 virtlyst
        vk-messenger wavebox zoom-us
      ];
    } ("for i in $drvs; do for b in $i/bin/*; do " +
       "[ -x \"$b\" ] && timeout 10 \"$b\" || :; done; done")
  '

Apart from testing against library-related errors I also compared the
resulting store paths against the ones prior to this commit. Only
anydesk and virtlyst had the same as they didn't have self-references,
everything else differed only because of self-references, except
elasticsearch, which had the following PIE binaries:

  * modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/autoconfig
  * modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/autodetect
  * modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/categorize
  * modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/controller
  * modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/normalize

These binaries were now patched, which is what this commit is all about.

[1]: I didn't include the "maxx" package (MaXX Interactive Desktop)
     because the upstream URLs are no longer existing and I couldn't
     find them elsewhere on the web.

Signed-off-by: aszlig <aszlig@nix.build>
Fixes: https://github.com/NixOS/nixpkgs/issues/48330
Cc: @gnidorah (for MaXX Interactive Desktop)
---
 pkgs/build-support/setup-hooks/auto-patchelf.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh
index 7c165627f72..d1ae317ff9a 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh
@@ -7,7 +7,16 @@ gatherLibraries() {
 addEnvHooks "$targetOffset" gatherLibraries
 
 isExecutable() {
-    readelf -h "$1" 2> /dev/null | grep -q '^ *Type: *EXEC\>'
+    # For dynamically linked ELF files it would be enough to check just for the
+    # INTERP section. However, we won't catch statically linked executables as
+    # they only have an ELF type of EXEC but no INTERP.
+    #
+    # So what we do here is just check whether *either* the ELF type is EXEC
+    # *or* there is an INTERP section. This also catches position-independent
+    # executables, as they typically have an INTERP section but their ELF type
+    # is DYN.
+    LANG=C readelf -h -l "$1" 2> /dev/null \
+        | grep -q '^ *Type: *EXEC\>\|^ *INTERP\>'
 }
 
 # We cache dependencies so that we don't need to search through all of them on
@@ -157,7 +166,7 @@ autoPatchelf() {
       isELF "$file" || continue
       if isExecutable "$file"; then
           # Skip if the executable is statically linked.
-          readelf -l "$file" | grep -q "^ *INTERP\\>" || continue
+          LANG=C readelf -l "$file" | grep -q "^ *INTERP\\>" || continue
       fi
       autoPatchelfFile "$file"
     done < <(find "$prefix" -type f -print0)
-- 
GitLab


From fc96e53587aedcb58f74f20a17301fb19db5d040 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 3 Nov 2018 10:43:39 +0300
Subject: [PATCH 0948/1065] maxx: fix urls

---
 pkgs/desktops/maxx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
index 10fa745d978..6f515068418 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/pkgs/desktops/maxx/default.nix
@@ -18,11 +18,11 @@ in stdenv.mkDerivation {
 
   srcs = [
     (fetchurl {
-      url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-NO-ARCH.tar.gz";
+      url = "http://maxxdesktop.arcadedaydream.com/Indy-Releases/Installers/MaXX-${version}-NO-ARCH.tar.gz";
       sha256 = "1d23j08wwrrn5cp7csv70pcz9jppcn0xb1894wkp0caaliy7g31y";
     })
     (fetchurl {
-      url = "http://maxxinteractive.com/downloads/${version}/FEDORA/MaXX-${version}-x86_64.tar.gz";
+      url = "http://maxxdesktop.arcadedaydream.com/Indy-Releases/Installers/MaXX-${version}-x86_64.tar.gz";
       sha256 = "156p2lra184wyvibrihisd7cr1ivqaygsf0zfm26a12gx23b7708";
     })
   ];
-- 
GitLab


From 1f21fc5e47c2bf7d9cf09cc781c76381d017894c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 3 Nov 2018 08:47:18 +0100
Subject: [PATCH 0949/1065] cargo-asm: fix build on macOS Mojave

Building cargo-asm on Mojave fails with

ld: framework not found Security

Add Security as a build input.
---
 pkgs/development/tools/rust/cargo-asm/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix
index ca793bf4908..246f5b18843 100644
--- a/pkgs/development/tools/rust/cargo-asm/default.nix
+++ b/pkgs/development/tools/rust/cargo-asm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform, Security }:
 
 rustPlatform.buildRustPackage rec {
   name = "cargo-asm-${version}";
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1m2j6i8hc8isdlj77gv9m6sk6q0x3bvzpva2k16g27i1ngy1989b";
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+
   # Test checks against machine code output, which fails with some
   # LLVM/compiler versions.
   doCheck = false;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62cef2d5068..9917acbbf10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7357,7 +7357,9 @@ with pkgs;
   cargo-tree = callPackage ../tools/package-management/cargo-tree { };
   cargo-update = callPackage ../tools/package-management/cargo-update { };
 
-  cargo-asm = callPackage ../development/tools/rust/cargo-asm { };
+  cargo-asm = callPackage ../development/tools/rust/cargo-asm {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
   cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
 
   pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { };
-- 
GitLab


From 09d49a1c5d708492dd22d671ea100dd44cba4b64 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 1 Nov 2018 09:12:36 +0900
Subject: [PATCH 0950/1065] thunderbird: 60.2.1 -> 60.3.0

---
 .../networking/mailreaders/thunderbird/default.nix   | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 419cc2fd2d8..69540d6092f 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.2.1";
+  version = "60.3.0";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "018l9pq03nzlirpaf285qpwvb8s4msam8n91d15lzc1bc1caq9zcy2dnrnvn5av3jlapm9ckz028iar66nhqxi2kkqbmiaq0v4s6kfp";
+    sha512 = "39sicxgfzfx4dm50nn2l8mimyjpvfigdpmkbxk6lvvbi8xxl527631xxq0gh1di6iyp590vpwk16z7hvdfbqj2pd3231knjkl991hvc";
   };
 
   # from firefox, but without sound libraries
@@ -48,14 +48,6 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ];
 
   patches = [
-    # https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1479540
-    # https://hg.mozilla.org/releases/mozilla-release/rev/bc651d3d910c
-    (fetchpatch {
-      name = "bc651d3d910c.patch";
-      url = "https://hg.mozilla.org/releases/mozilla-release/raw-rev/bc651d3d910c";
-      sha256 = "0iybkadsgsf6a3pq3jh8z1p110vmpkih8i35jfj8micdkhxzi89g";
-    })
-
     # Remove buildconfig.html to prevent a dependency on clang etc.
     ../../browsers/firefox/no-buildconfig.patch
   ];
-- 
GitLab


From 8a8a2f61a9eebec4e330c59a6de643983dd2162e Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 3 Nov 2018 11:08:23 +0100
Subject: [PATCH 0951/1065] nix-du: 0.2.0 -> 0.3.0

---
 pkgs/tools/package-management/nix-du/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
index 24672296506..59ec714261b 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -1,25 +1,23 @@
-{ stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz }:
+{ stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }:
 rustPlatform.buildRustPackage rec {
   name = "nix-du-${version}";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "symphorien";
     repo = "nix-du";
     rev = "v${version}";
-    sha256 = "1n1qgqjbwbb59xnzgz0dn8h8pckh6yq3crh0w6x2sngijwh678x8";
+    sha256 = "1x6qpivxbn94034jfdxb97xi97fhcdv2z7llq2ccfc80mgd0gz8l";
   };
-  cargoSha256 = "1qidbrkdpf4kliyvy2040qi3a67s8mr2r46rjcblr1v2gar0xgs0";
+  cargoSha256 = "0sva4lnhccm6ly7pa6m99s3fqkmh1dzv7r2727nsg2f55prd4kxc";
 
-  # switch to true when nix includes https://github.com/NixOS/nix/pull/2223 and 
-  # https://github.com/NixOS/nix/pull/2234
-  doCheck = false;
+  doCheck = true;
   checkInputs = [ graphviz ];
 
   buildInputs = [
     boost
     nix
-  ];
+  ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
 
   meta = with stdenv.lib; {
     description = "A tool to determine which gc-roots take space in your nix store";
-- 
GitLab


From ffd083ec44661a263ef5c10760a47a8f92da1991 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Sat, 3 Nov 2018 05:47:35 -0500
Subject: [PATCH 0952/1065] jq: 1.5 -> 1.6

* jq: 1.5 -> 1.6 (!!)

(last release was in 2015! :))

* jq: drop darwin patch, appears resolved by upgrade

commit history isn't that long, and has a few addressing
behavior on osx re:strptime-- and since this patch
doesn't apply it seems likely it's been resolved
but probably can be checked by any interested folks w/darwin.
---
 .../tools/jq/darwin-strptime-test.patch       | 16 ---------------
 pkgs/development/tools/jq/default.nix         | 20 ++-----------------
 2 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/development/tools/jq/darwin-strptime-test.patch

diff --git a/pkgs/development/tools/jq/darwin-strptime-test.patch b/pkgs/development/tools/jq/darwin-strptime-test.patch
deleted file mode 100644
index 4ea83fc164a..00000000000
--- a/pkgs/development/tools/jq/darwin-strptime-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tests/jq.test b/tests/jq.test
-index 4a4018b..f5aa7d5 100644
---- a/src/tests/jq.test
-+++ b/src/tests/jq.test
-@@ -1144,9 +1144,9 @@ bsearch(4)
- [1,2,3]
- -4
- 
--[strptime("%Y-%m-%dT%H:%M:%SZ")|(.,mktime)]
-+[strptime("%Y-%m-%dT%H:%M:%SZ")|mktime]
- "2015-03-05T23:51:47Z"
--[[2015,2,5,23,51,47,4,63],1425599507]
-+[1425599507]
- 
- strftime("%Y-%m-%dT%H:%M:%SZ")
- [2015,2,5,23,51,47,4,63]
diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix
index 712ec64bd41..b7b2b5066b9 100644
--- a/pkgs/development/tools/jq/default.nix
+++ b/pkgs/development/tools/jq/default.nix
@@ -2,33 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "jq-${version}";
-  version="1.5";
+  version="1.6";
 
   src = fetchurl {
     url="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz";
-    sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4";
+    sha256="1a76f46a652i2g333kfvrl6mp2w7whf6h1yly519izg4y967h9cn";
   };
 
   outputs = [ "bin" "doc" "man" "dev" "lib" "out" ];
 
   buildInputs = [ oniguruma ];
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2015-8863.patch";
-      url = https://github.com/stedolan/jq/commit/8eb1367ca44e772963e704a700ef72ae2e12babd.diff;
-      sha256 = "18bjanzvklfzlzzd690y88725l7iwl4f6wnr429na5pfmircbpvh";
-    })
-    (fetchpatch {
-      name = "CVE-2016-4074.patch";
-      url = https://patch-diff.githubusercontent.com/raw/stedolan/jq/pull/1214.diff;
-      sha256 = "1w8bapnyp56di6p9casbfczfn8258rw0z16grydavdjddfm280l9";
-    })
-  ]
-    ++ stdenv.lib.optional stdenv.isDarwin ./darwin-strptime-test.patch;
-
-  patchFlags = [ "-p2" ]; # `src` subdir was introduced after v1.5 was released
-
   configureFlags =
     [
     "--bindir=\${bin}/bin"
-- 
GitLab


From ca7fa914c3bd96521af466d1ed48cc0ac9657cb4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Nov 2018 12:40:03 +0100
Subject: [PATCH 0953/1065] python.pkgs.bsddb3: enable python3 and tests

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

diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix
index 971aac70ad8..700f5b3d0c5 100644
--- a/pkgs/development/python-modules/bsddb3/default.nix
+++ b/pkgs/development/python-modules/bsddb3/default.nix
@@ -3,12 +3,12 @@
 , fetchPypi
 , pkgs
 , isPy3k
+, python
 }:
 
 buildPythonPackage rec {
   pname = "bsddb3";
   version = "6.2.6";
-  disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
@@ -17,8 +17,9 @@ buildPythonPackage rec {
 
   buildInputs = [ pkgs.db ];
 
-  # Judging from SyntaxError in test
-  doCheck = false; # test suite breaks python3 compatibility
+  checkPhase = ''
+    ${python.interpreter} test.py
+  '';
 
   # Path to database need to be set.
   # Somehow the setup.py flag is not propagated.
-- 
GitLab


From f5af5b19f4f151d6e633b8d38234bbde5b7f335a Mon Sep 17 00:00:00 2001
From: Ikarulus <github.ikarulus@zer.one>
Date: Wed, 31 Oct 2018 23:31:24 +0100
Subject: [PATCH 0954/1065] librepcb-unstable: 2018-06-28 -> 2018-10-31

---
 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 33eb52c18ee..c0831847b72 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 = "20180628";
+  version = "20181031";
 
   src = fetchFromGitHub {
     owner = "LibrePCB";
     repo = "LibrePCB";
     fetchSubmodules = true;
-    rev = "68577ecf8f39299ef4d81ff964b01c3908d1f10b";
-    sha256 = "1ca4q8b8fhp19vq5yi55sq6xlsz14ihw3i0h7rq5fw0kigpjldmz";
+    rev = "3cf8dba9fa88e5b392d639c9fdbcf3a44664170a";
+    sha256 = "0kr4mii5w3kj3kqvhgq7zjxjrq44scx8ky0x77gyqmwvwfwk7nmx";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From c1324d571d7c9ce276d29cd789fc6bba95980acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 3 Nov 2018 15:25:56 +0100
Subject: [PATCH 0955/1065] home-assistant: 0.81.2 -> 0.81.5

---
 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 73cc0128149..54419022970 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.81.2";
+  version = "0.81.5";
   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 932995513af..427f35e2fbc 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -79,7 +79,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.81.2";
+  hassVersion = "0.81.5";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -94,7 +94,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "0qg3kh99bqhsraa8jpqqrvaxz9l1gsbh3aazg3v0d6q6ng42y2bq";
+    sha256 = "1fgf9hrv7q7g8s561sir951vd27a459mh3k685xzfnhkh4si47g4";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 4af2a4ec922..89d77649d97 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 = "20181026.1";
+  version = "20181026.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ea5e7fb769df2f096e2993c23d1aa3dc8652e0f0aa09a89863af22e095b80aa8";
+    sha256 = "b0610206eee06042847d89a581ecfcd71255b0e1ecff77e302237e8aa175b00d";
   };
 
   propagatedBuildInputs = [ user-agents ];
-- 
GitLab


From 4b095c6c05e031ef57808be954244b991cff83d6 Mon Sep 17 00:00:00 2001
From: Jonathan Queiroz <github@johnjq.com>
Date: Sat, 3 Nov 2018 11:41:16 -0300
Subject: [PATCH 0956/1065] pythonPackages.fastpbkdf2: init at 0.2 (#47988)

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

diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/pkgs/development/python-modules/fastpbkdf2/default.nix
new file mode 100644
index 00000000000..63a7565cf55
--- /dev/null
+++ b/pkgs/development/python-modules/fastpbkdf2/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage
+, openssl, pytest, cffi, six }:
+
+buildPythonPackage rec {
+  pname = "fastpbkdf2";
+  version = "0.2";
+
+  # Fetching from GitHub as tests are missing in PyPI
+  src = fetchFromGitHub {
+    owner  = "Ayrx";
+    repo   = "python-fastpbkdf2";
+    rev    = "v${version}";
+    sha256 = "1hvvlk3j28i6nswb6gy3mq7278nq0mgfnpxh1rv6jvi7xhd7qmlc";
+  };
+
+  buildInputs = [ openssl ];
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ cffi six ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/Ayrx/python-fastpbkdf2;
+    description = "Python bindings for fastpbkdf2";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jqueiroz ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index efbb0a3acbb..cc608eacb1a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -340,6 +340,8 @@ in {
 
   eradicate = callPackage ../development/python-modules/eradicate {  };
 
+  fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 {  };
+
   fido2 = callPackage ../development/python-modules/fido2 {  };
 
   filterpy = callPackage ../development/python-modules/filterpy { };
-- 
GitLab


From e9d31c85a45c62c8685d30494d10e832031ecd8f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 2 Nov 2018 21:00:40 -0500
Subject: [PATCH 0957/1065] tootle: 0.1.5 -> 0.2.0

https://github.com/bleakgrey/tootle/releases/tag/0.2.0
---
 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 d15b8111fb0..d7a7de36877 100644
--- a/pkgs/applications/misc/tootle/default.nix
+++ b/pkgs/applications/misc/tootle/default.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "tootle";
-  version = "0.1.5";
+  version = "0.2.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
     owner = "bleakgrey";
     repo = pname;
     rev = version;
-    sha256 = "022h1rh1jk3m1f9al0s1rylmnqnkydyc81idfc8jf1g0frnvn5i6";
+    sha256 = "1z3wyx316nns6gi7vlvcfmalhvxncmvcmmlgclbv6b6hwl5x2ysi";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig python3 vala gobjectIntrospection wrapGAppsHook ];
-- 
GitLab


From 99c052bac4e5d2c9f0d8d37d18fc414566f6b205 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Sat, 3 Nov 2018 16:16:17 +0100
Subject: [PATCH 0958/1065] nixos/google-network-daemon: systemd job type
 simple instead of oneshot (#49692)

---
 nixos/modules/virtualisation/google-compute-image.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index caaf6c0aa59..795858e5eae 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -144,7 +144,6 @@ in
     path = with pkgs; [ iproute ];
     serviceConfig = {
       ExecStart = "${gce}/bin/google_network_daemon --debug";
-      Type = "oneshot";
     };
   };
 
-- 
GitLab


From dff14ecfbf7246204f80d5d921ab44562ff9f329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 3 Nov 2018 16:22:53 +0100
Subject: [PATCH 0959/1065] i2pd: 2.21.0 -> 2.21.1

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

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 9ecf6963787..7ab77b2d2ee 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
 
   name = pname + "-" + version;
   pname = "i2pd";
-  version = "2.21.0";
+  version = "2.21.1";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "02zsig63cambwm479ckw4kl1dk00g1q2sbzsvn9vy1xpjy928n7v";
+    sha256 = "0j892s9ga9fjc2q1rw3hp5il4mw1jc0aiw60y1rfaiflyv0wd696";
   };
 
   buildInputs = with stdenv.lib; [ boost zlib openssl ]
-- 
GitLab


From 74ef8234224ffed0624b42dc38cc7c47942ff1ab Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Sat, 3 Nov 2018 16:39:14 +0100
Subject: [PATCH 0960/1065] alacritty: fix build on darwin

---
 pkgs/applications/misc/alacritty/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index e4dffa98f39..594173f11c6 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -73,7 +73,10 @@ in buildRustPackage rec {
   buildInputs = rpathLibs
              ++ lib.optionals stdenv.isDarwin darwinFrameworks;
 
- outputs = [ "out" "terminfo" ];
+  outputs = [ "out" "terminfo" ];
+
+  # https://github.com/NixOS/nixpkgs/issues/49693
+  doCheck = !stdenv.isDarwin;
 
   postPatch = ''
     substituteInPlace copypasta/src/x11.rs \
-- 
GitLab


From 5a1708b1abd7ac6024bb80782d6196afe2fe2e97 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Sat, 3 Nov 2018 17:00:30 +0100
Subject: [PATCH 0961/1065] shutter: 0.94 -> 0.94.2 (#49546)

* shutter: 0.94 -> 0.94.2

* shutter: dependencies refresh

procps and perlPackages.FileBaseDir were missing
Perl package JSONMaybeXS replaces JSONXS
Moved makeWrapper to nativeBuildInputs
---
 pkgs/applications/graphics/shutter/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index a409060afdc..7e7bf644ce7 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -1,27 +1,28 @@
 { stdenv, fetchurl, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg
-, hicolor-icon-theme
+, hicolor-icon-theme, procps
 }:
 
 let
   perlModules = with perlPackages;
     [ Gnome2 Gnome2Canvas Gtk2 Glib Pango Gnome2VFS Gnome2Wnck Gtk2ImageView
-      Gtk2Unique FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig
+      Gtk2Unique FileBaseDir FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig
       XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext
       ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON
-      PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS
+      PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONMaybeXS
       commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo
       EncodeLocale TryTiny TypesSerialiser LWPMediaTypes
     ];
 in
 stdenv.mkDerivation rec {
-  name = "shutter-0.94";
+  name = "shutter-0.94.2";
 
   src = fetchurl {
-    url = "https://launchpad.net/shutter/0.9x/0.94/+download/shutter-0.94.tar.gz";
-    sha256 = "943152cdf9e1b2096d38e3da9622d8bf97956a08eda747c3e7fcc564a3f0f40d";
+    url = "https://launchpad.net/shutter/0.9x/0.94.2/+download/shutter-0.94.2.tar.gz";
+    sha256 = "0mas7npm935j4rhqqjn226822s9sa4bsxrkp0b5fjj3z096k6vw0";
   };
 
-  buildInputs = [ perl makeWrapper gdk_pixbuf librsvg ] ++ perlModules;
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ perl procps gdk_pixbuf librsvg ] ++ perlModules;
 
   installPhase = ''
     mkdir -p "$out"
-- 
GitLab


From b0068a2abe734b2f5cbad8a4cbff29ffa1177cf4 Mon Sep 17 00:00:00 2001
From: Lysergia <prikhi@users.noreply.github.com>
Date: Sat, 3 Nov 2018 12:24:00 -0400
Subject: [PATCH 0962/1065] lightdm-mini-greeter: 0.3.3 -> 0.3.4 (#49655)

New upstream release.
---
 .../display-managers/lightdm-mini-greeter/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
index cf5c30a1ead..91446f73507 100644
--- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lightdm-mini-greeter-${version}";
-  version = "0.3.3";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "prikhi";
     repo = "lightdm-mini-greeter";
     rev = version;
-    sha256 = "1xlj5wqagp765rqw40ci4wir21qwyszasynk82x8308k5d3asvwb";
+    sha256 = "1qi0bsqi8z2zv3303ww0kd7bciz6qx8na5bkvgrqlwyvq31czai5";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From f6aac1cc66c5aa516803fe06e8764a0130ab5ad4 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 3 Nov 2018 12:27:19 -0400
Subject: [PATCH 0963/1065] yoda: 1.7.1 -> 1.7.3 (#49654)

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

diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index c86b0ed3d1c..664d1fa601e 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.1";
+  version = "1.7.3";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
-    sha256 = "0yq20fnckf6h0a53ghxsgia6ikq71ch9a0w0khq188r7rlg9gmzd";
+    sha256 = "0n40qii2ych5yfx6drj79b3rk29dvc3gysjqs719qgl26d3hkxpb";
   };
 
   pythonPath = []; # python wrapper support
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Provides small set of data analysis (specifically histogramming) classes";
-    license     = stdenv.lib.licenses.gpl2;
+    license     = stdenv.lib.licenses.gpl3;
     homepage    = https://yoda.hepforge.org;
     platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ veprbl ];
-- 
GitLab


From df28b4b6e5a996a4971a0b32a98e654e4c44a54a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 3 Nov 2018 17:56:04 +0100
Subject: [PATCH 0964/1065] x11basic: init at 1.26

---
 .../compilers/x11basic/default.nix            | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/compilers/x11basic/default.nix

diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix
new file mode 100644
index 00000000000..a26bc41c594
--- /dev/null
+++ b/pkgs/development/compilers/x11basic/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, lib, fetchFromGitHub
+, automake, autoconf, readline
+, libX11, bluez, SDL2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "X11basic";
+  version = "1.26";
+  name = pname + "-" + version;
+
+  src = fetchFromGitHub {
+    owner = "kollokollo";
+    repo = pname;
+    rev = version;
+    sha256 = "0rwj9cf496xailply0rgw695bzdladh2dhy7vdqac1pwbkl53nvd";
+  };
+
+  buildInputs = [
+    autoconf automake readline libX11 SDL2 bluez
+  ];
+
+  preConfigure = "cd src;autoconf";
+
+  configureFlags = [
+    "--with-bluetooth"
+    "--with-usb"
+    "--with-readline"
+    "--with-sdl"
+    "--with-x"
+    "--enable-cryptography"
+  ];
+
+  preInstall = ''
+    touch x11basic.{eps,svg}
+    mkdir -p $out/{bin,lib}
+    mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
+    cp -r ../examples $out/share/.
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://x11-basic.sourceforge.net/;
+    description = "A Basic interpreter and compiler with graphics capabilities.";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ edwtjo ];
+    platforms = platforms.unix;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fdf6b93539c..38ade0014b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19753,6 +19753,8 @@ with pkgs;
     gtk = gtk2;
   };
 
+  x11basic = callPackage ../development/compilers/x11basic { };
+
   x11vnc = callPackage ../tools/X11/x11vnc { };
 
   x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { };
-- 
GitLab


From 1b725def23dcb82281a2f25d2534d5e3ce9b71a7 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 3 Nov 2018 13:14:13 -0400
Subject: [PATCH 0965/1065] solr: 4.10.3 -> 7.5.0, refactor service to reflect
 major changes in version bump, NixOS test included

---
 nixos/doc/manual/release-notes/rl-1903.xml |   7 +
 nixos/modules/misc/ids.nix                 |   2 +
 nixos/modules/services/search/solr.nix     | 181 ++++++++-------------
 nixos/release.nix                          |   1 +
 nixos/tests/solr.nix                       |  47 ++++++
 pkgs/servers/search/solr/default.nix       |  23 ++-
 6 files changed, 144 insertions(+), 117 deletions(-)
 create mode 100644 nixos/tests/solr.nix

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 6121d32346c..e50624b4906 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -182,6 +182,13 @@
       options can occour more than once in the configuration.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      The <literal>solr</literal> package has been upgraded from 4.10.3 to 7.5.0 and has undergone
+      some major changes. The <literal>services.solr</literal> module has been updated to reflect
+      these changes. Please review http://lucene.apache.org/solr/ carefully before upgrading.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 16737efb185..6e7f0a007bc 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -333,6 +333,7 @@
       lidarr = 306;
       slurm = 307;
       kapacitor = 308;
+      solr = 309;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -626,6 +627,7 @@
       lidarr = 306;
       slurm = 307;
       kapacitor = 308;
+      solr = 309;
 
       # 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/services/search/solr.nix b/nixos/modules/services/search/solr.nix
index 90140a337ed..7200c40e89f 100644
--- a/nixos/modules/services/search/solr.nix
+++ b/nixos/modules/services/search/solr.nix
@@ -6,142 +6,105 @@ let
 
   cfg = config.services.solr;
 
-  # Assemble all jars needed for solr
-  solrJars = pkgs.stdenv.mkDerivation {
-    name = "solr-jars";
-
-    src = pkgs.fetchurl {
-      url = http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/bin/apache-tomcat-5.5.36.tar.gz;
-      sha256 = "01mzvh53wrs1p2ym765jwd00gl6kn8f9k3nhdrnhdqr8dhimfb2p";
-    };
-
-    installPhase = ''
-      mkdir -p $out/lib
-      cp common/lib/*.jar $out/lib/
-      ln -s ${pkgs.ant}/lib/ant/lib/ant.jar $out/lib/
-      ln -s ${cfg.solrPackage}/lib/ext/* $out/lib/
-      ln -s ${pkgs.jdk.home}/lib/tools.jar $out/lib/
-    '' + optionalString (cfg.extraJars != []) ''
-      for f in ${concatStringsSep " " cfg.extraJars}; do
-         cp $f $out/lib
-      done
-    '';
-  };
-
-in {
+in
 
+{
   options = {
     services.solr = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enables the solr service.
-        '';
-      };
-
-      javaPackage = mkOption {
-        type = types.package;
-        default = pkgs.jre;
-        defaultText = "pkgs.jre";
-        description = ''
-          Which Java derivation to use for running solr.
-        '';
-      };
+      enable = mkEnableOption "Enables the solr service.";
 
-      solrPackage = mkOption {
+      package = mkOption {
         type = types.package;
         default = pkgs.solr;
         defaultText = "pkgs.solr";
-        description = ''
-          Which solr derivation to use for running solr.
-        '';
+        description = "Which Solr package to use.";
       };
 
-      extraJars = mkOption {
-        type = types.listOf types.path;
-        default = [];
-        description = ''
-          List of paths pointing to jars. Jars are copied to commonLibFolder to be available to java/solr.
-        '';
+      port = mkOption {
+        type = types.int;
+        default = 8983;
+        description = "Port on which Solr is ran.";
       };
 
-      log4jConfiguration = mkOption {
-        type = types.lines;
-        default = ''
-          log4j.rootLogger=INFO, stdout
-          log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-          log4j.appender.stdout.Target=System.out
-          log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-          log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
-        '';
-        description = ''
-          Contents of the <literal>log4j.properties</literal> used. By default,
-          everything is logged to stdout (picked up by systemd) with level INFO.
-        '';
+      stateDir = mkOption {
+        type = types.path;
+        default = "/var/lib/solr";
+        description = "The solr home directory containing config, data, and logging files.";
       };
 
-      user = mkOption {
-        type = types.str;
-        description = ''
-          The user that should run the solr process and.
-          the working directories.
-        '';
+      extraJavaOptions = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = "Extra command line options given to the java process running Solr.";
       };
 
-      group = mkOption {
+      user = mkOption {
         type = types.str;
-        description = ''
-          The group that will own the working directory.
-        '';
+        default = "solr";
+        description = "User under which Solr is ran.";
       };
 
-      solrHome = mkOption {
+      group = mkOption {
         type = types.str;
-        description = ''
-          The solr home directory. It is your own responsibility to
-          make sure this directory contains a working solr configuration,
-          and is writeable by the the user running the solr service.
-          Failing to do so, the solr will not start properly.
-        '';
-      };
-
-      extraJavaOptions = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          Extra command line options given to the java process running
-          solr.
-        '';
-      };
-
-      extraWinstoneOptions = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          Extra command line options given to the Winstone, which is
-          the servlet container hosting solr.
-        '';
+        default = "solr";
+        description = "Group under which Solr is ran.";
       };
     };
   };
 
   config = mkIf cfg.enable {
 
-    services.winstone.solr = {
-      serviceName = "solr";
-      inherit (cfg) user group javaPackage;
-      warFile = "${cfg.solrPackage}/lib/solr.war";
-      extraOptions = [
-        "--commonLibFolder=${solrJars}/lib"
-        "--useJasper"
-      ] ++ cfg.extraWinstoneOptions;
-      extraJavaOptions = [
-        "-Dsolr.solr.home=${cfg.solrHome}"
-        "-Dlog4j.configuration=file://${pkgs.writeText "log4j.properties" cfg.log4jConfiguration}"
-      ] ++ cfg.extraJavaOptions;
+    environment.systemPackages = [ cfg.package ];
+
+    systemd.services.solr = {
+      after = [ "network.target" "remote-fs.target" "nss-lookup.target" "systemd-journald-dev-log.socket" ];
+      wantedBy = [ "multi-user.target" ];
+
+      environment = {
+        SOLR_HOME = "${cfg.stateDir}/data";
+        LOG4J_PROPS = "${cfg.stateDir}/log4j2.xml";
+        SOLR_LOGS_DIR = "${cfg.stateDir}/logs";
+        SOLR_PORT = "${toString cfg.port}";
+      };
+      path = with pkgs; [
+        gawk
+        procps
+      ];
+      preStart = ''
+        mkdir -p "${cfg.stateDir}/data";
+        mkdir -p "${cfg.stateDir}/logs";
+
+        if ! test -e "${cfg.stateDir}/data/solr.xml"; then
+          install -D -m0640 ${cfg.package}/server/solr/solr.xml "${cfg.stateDir}/data/solr.xml"
+          install -D -m0640 ${cfg.package}/server/solr/zoo.cfg "${cfg.stateDir}/data/zoo.cfg"
+        fi
+
+        if ! test -e "${cfg.stateDir}/log4j2.xml"; then
+          install -D -m0640 ${cfg.package}/server/resources/log4j2.xml "${cfg.stateDir}/log4j2.xml"
+        fi
+      '';
+
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        ExecStart="${cfg.package}/bin/solr start -f -a \"${concatStringsSep " " cfg.extraJavaOptions}\"";
+        ExecStop="${cfg.package}/bin/solr stop";
+      };
     };
 
+    users.users = optionalAttrs (cfg.user == "solr") (singleton
+      { name = "solr";
+        group = cfg.group;
+        home = cfg.stateDir;
+        createHome = true;
+        uid = config.ids.uids.solr;
+      });
+
+    users.groups = optionalAttrs (cfg.group == "solr") (singleton
+      { name = "solr";
+        gid = config.ids.gids.solr;
+      });
+
   };
 
 }
diff --git a/nixos/release.nix b/nixos/release.nix
index c3a10c9d330..4647f28be18 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -410,6 +410,7 @@ in rec {
   tests.slurm = callTest tests/slurm.nix {};
   tests.smokeping = callTest tests/smokeping.nix {};
   tests.snapper = callTest tests/snapper.nix {};
+  tests.solr = callTest tests/solr.nix {};
   #tests.statsd = callTest tests/statsd.nix {}; # statsd is broken: #45946
   tests.strongswan-swanctl = callTest tests/strongswan-swanctl.nix {};
   tests.sudo = callTest tests/sudo.nix {};
diff --git a/nixos/tests/solr.nix b/nixos/tests/solr.nix
new file mode 100644
index 00000000000..9ba3863411e
--- /dev/null
+++ b/nixos/tests/solr.nix
@@ -0,0 +1,47 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+{
+  name = "solr";
+  meta.maintainers = [ lib.maintainers.aanderse ];
+
+  machine =
+    { config, pkgs, ... }:
+    {
+      # Ensure the virtual machine has enough memory for Solr to avoid the following error:
+      #
+      #   OpenJDK 64-Bit Server VM warning:
+      #     INFO: os::commit_memory(0x00000000e8000000, 402653184, 0)
+      #     failed; error='Cannot allocate memory' (errno=12)
+      #
+      #   There is insufficient memory for the Java Runtime Environment to continue.
+      #   Native memory allocation (mmap) failed to map 402653184 bytes for committing reserved memory.
+      virtualisation.memorySize = 2000;
+
+      services.solr.enable = true;
+    };
+
+  testScript = ''
+    startAll;
+
+    $machine->waitForUnit('solr.service');
+    $machine->waitForOpenPort('8983');
+    $machine->succeed('curl --fail http://localhost:8983/solr/');
+
+    # adapted from pkgs.solr/examples/films/README.txt
+    $machine->succeed('sudo -u solr solr create -c films');
+    $machine->succeed(q(curl http://localhost:8983/solr/films/schema -X POST -H 'Content-type:application/json' --data-binary '{
+      "add-field" : {
+        "name":"name",
+        "type":"text_general",
+        "multiValued":false,
+        "stored":true
+      },
+      "add-field" : {
+        "name":"initial_release_date",
+        "type":"pdate",
+        "stored":true
+      }
+    }')) =~ /"status":0/ or die;
+    $machine->succeed('sudo -u solr post -c films ${pkgs.solr}/example/films/films.json');
+    $machine->succeed('curl http://localhost:8983/solr/films/query?q=name:batman') =~ /"name":"Batman Begins"/ or die;
+  '';
+})
diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix
index 0326784b2ac..04e85212f3c 100644
--- a/pkgs/servers/search/solr/default.nix
+++ b/pkgs/servers/search/solr/default.nix
@@ -1,20 +1,27 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "solr-${version}";
-  version = "4.10.3";
+  version = "7.5.0";
 
   src = fetchurl {
     url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz";
-    sha256 = "1dp269jka4q62qhv47j91wsrsnbxfn23lsx6qcycbijrlyh28w5c";
+    sha256 = "1g6f58j2pzb73phj4hfri9mj7vmql72by7w3xrbq1pbnqgzxmhpa";
   };
 
-  phases = [ "unpackPhase" "installPhase" ];
+  nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/lib
-    cp dist/${name}.war $out/lib/solr.war
-    cp -r example/lib/ext $out/lib/ext
+    mkdir -p $out $out/bin
+
+    cp -r bin/solr bin/post $out/bin/
+    cp -r contrib $out/
+    cp -r dist $out/
+    cp -r example $out/
+    cp -r server $out/
+
+    wrapProgram $out/bin/solr --set JAVA_HOME "${jre}"
+    wrapProgram $out/bin/post --set JAVA_HOME "${jre}"
   '';
 
   meta = with stdenv.lib; {
@@ -22,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "Open source enterprise search platform from the Apache Lucene project";
     license = licenses.asl20;
     platforms = platforms.all;
-    maintainers = [ maintainers.rickynils maintainers.domenkozar ];
+    maintainers = [ maintainers.rickynils maintainers.domenkozar maintainers.aanderse ];
   };
 
 }
-- 
GitLab


From 15c2fb7ba17b80dad588b8a885f6411881e2684a Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 3 Nov 2018 20:27:40 +0300
Subject: [PATCH 0966/1065] sway-beta module: add missing pieces

---
 nixos/modules/programs/sway-beta.nix | 33 ++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/programs/sway-beta.nix b/nixos/modules/programs/sway-beta.nix
index 04f2e0662b8..e651ea4cca3 100644
--- a/nixos/modules/programs/sway-beta.nix
+++ b/nixos/modules/programs/sway-beta.nix
@@ -5,6 +5,15 @@ with lib;
 let
   cfg = config.programs.sway-beta;
   swayPackage = cfg.package;
+
+  swayWrapped = pkgs.writeShellScriptBin "sway" ''
+    ${cfg.extraSessionCommands}
+    exec ${pkgs.dbus.dbus-launch} --exit-with-session ${swayPackage}/bin/sway
+  '';
+  swayJoined = pkgs.symlinkJoin {
+    name = "sway-joined";
+    paths = [ swayWrapped swayPackage ];
+  };
 in {
   options.programs.sway-beta = {
     enable = mkEnableOption ''
@@ -20,13 +29,30 @@ in {
       '';
     };
 
+    extraSessionCommands = mkOption {
+      type = types.lines;
+      default = "";
+      example = ''
+        export SDL_VIDEODRIVER=wayland
+        # needs qt5.qtwayland in systemPackages
+        export QT_QPA_PLATFORM=wayland
+        export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+        # Fix for some Java AWT applications (e.g. Android Studio),
+        # use this if they aren't displayed properly:
+        export _JAVA_AWT_WM_NONREPARENTING=1
+      '';
+      description = ''
+        Shell commands executed just before Sway is started.
+      '';
+    };
+
     extraPackages = mkOption {
       type = with types; listOf package;
       default = with pkgs; [
-        xwayland dmenu
+        xwayland rxvt_unicode dmenu
       ];
       defaultText = literalExample ''
-        with pkgs; [ xwayland dmenu ];
+        with pkgs; [ xwayland rxvt_unicode dmenu ];
       '';
       example = literalExample ''
         with pkgs; [
@@ -42,7 +68,7 @@ in {
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [ swayPackage ] ++ cfg.extraPackages;
+    environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages;
     security.pam.services.swaylock = {};
     hardware.opengl.enable = mkDefault true;
     fonts.enableDefaultFonts = mkDefault true;
@@ -51,4 +77,3 @@ in {
 
   meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ];
 }
-
-- 
GitLab


From 2cb7f5fb1e502fe5502d37fce0a9b7a16ea24fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Fri, 26 Oct 2018 18:07:56 +0200
Subject: [PATCH 0967/1065] consul: 0.9.3 -> 1.3.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removes the old UI build tooling; it is no longer necessary
because as of 1.2.0 it's bundled into the server binary.
It doesn't even need to have JS built, because it's bundled into
the release commit's source tree (see #48714).

The UI is enabled by default, so the NixOS service is
updated to directly use `ui = webUi;` now.

Fixes #48714.
Fixes #44192.
Fixes #41243.
Fixes #35602.

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
---
 nixos/modules/services/networking/consul.nix |  7 ++-
 pkgs/servers/consul/Gemfile                  |  5 --
 pkgs/servers/consul/Gemfile.lock             | 25 --------
 pkgs/servers/consul/default.nix              | 19 +++---
 pkgs/servers/consul/gemset.nix               | 62 --------------------
 pkgs/servers/consul/ui-no-bundle-exec.patch  | 17 ------
 pkgs/servers/consul/ui.nix                   | 41 -------------
 pkgs/top-level/all-packages.nix              |  2 -
 8 files changed, 16 insertions(+), 162 deletions(-)
 delete mode 100644 pkgs/servers/consul/Gemfile
 delete mode 100644 pkgs/servers/consul/Gemfile.lock
 delete mode 100644 pkgs/servers/consul/gemset.nix
 delete mode 100644 pkgs/servers/consul/ui-no-bundle-exec.patch
 delete mode 100644 pkgs/servers/consul/ui.nix

diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index ab3f8103768..0e90fed788b 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -6,9 +6,10 @@ let
   dataDir = "/var/lib/consul";
   cfg = config.services.consul;
 
-  configOptions = { data_dir = dataDir; } //
-    (if cfg.webUi then { ui_dir = "${cfg.package.ui}"; } else { }) //
-    cfg.extraConfig;
+  configOptions = {
+    data_dir = dataDir;
+    ui = cfg.webUi;
+  } // cfg.extraConfig;
 
   configFiles = [ "/etc/consul.json" "/etc/consul-addrs.json" ]
     ++ cfg.extraConfigFiles;
diff --git a/pkgs/servers/consul/Gemfile b/pkgs/servers/consul/Gemfile
deleted file mode 100644
index 0e782af6b00..00000000000
--- a/pkgs/servers/consul/Gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# A sample Gemfile
-source "https://rubygems.org"
-
-gem "uglifier"
-gem "sass"
diff --git a/pkgs/servers/consul/Gemfile.lock b/pkgs/servers/consul/Gemfile.lock
deleted file mode 100644
index 60a565f6695..00000000000
--- a/pkgs/servers/consul/Gemfile.lock
+++ /dev/null
@@ -1,25 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    execjs (2.7.0)
-    ffi (1.9.23)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    sass (3.5.6)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    uglifier (4.1.10)
-      execjs (>= 0.3.0, < 3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  sass
-  uglifier
-
-BUNDLED WITH
-   1.14.6
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 5cf19279100..d1dcd78667f 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,22 +1,27 @@
-{ stdenv, buildGoPackage, consul-ui, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "consul-${version}";
-  version = "0.9.3";
+  version = "1.3.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/consul";
 
+  # Note: Currently only release tags are supported, because they have the Consul UI
+  # vendored. See
+  #   https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834
+  # If you want to use a non-release commit as `src`, you probably want to improve
+  # this derivation so that it can build the UI's JavaScript from source.
+  # See https://github.com/NixOS/nixpkgs/pull/49082 for something like that.
+  # Or, if you want to patch something that doesn't touch the UI, you may want
+  # to apply your changes as patches on top of a release commit.
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "consul";
     inherit rev;
-    sha256 = "1176frp7kimpycsmz9wrbizf46jgxr8jq7hz5w4q1x90lswvrxv3";
+    sha256 = "1zv84snvrjm74w3v3rr27linsbxj00m73xd047sb78a4766xs2h0";
   };
 
-  # Keep consul.ui for backward compatability
-  passthru.ui = consul-ui;
-
   preBuild = ''
     buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=")
   '';
@@ -26,6 +31,6 @@ buildGoPackage rec {
     homepage = https://www.consul.io/;
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.mpl20;
-    maintainers = with maintainers; [ pradeepchhetri ];
+    maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 ];
   };
 }
diff --git a/pkgs/servers/consul/gemset.nix b/pkgs/servers/consul/gemset.nix
deleted file mode 100644
index 2a5425ccf5f..00000000000
--- a/pkgs/servers/consul/gemset.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  execjs = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1";
-      type = "gem";
-    };
-    version = "2.7.0";
-  };
-  ffi = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
-      type = "gem";
-    };
-    version = "1.9.23";
-  };
-  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 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
-      type = "gem";
-    };
-    version = "3.5.6";
-  };
-  sass-listen = {
-    dependencies = ["rb-fsevent" "rb-inotify"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
-      type = "gem";
-    };
-    version = "4.0.0";
-  };
-  uglifier = {
-    dependencies = ["execjs"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0dycp9c5xiricla6sgvg0vf22i3axs5k1v1607dvl7nv1xkkaczi";
-      type = "gem";
-    };
-    version = "4.1.10";
-  };
-}
\ No newline at end of file
diff --git a/pkgs/servers/consul/ui-no-bundle-exec.patch b/pkgs/servers/consul/ui-no-bundle-exec.patch
deleted file mode 100644
index 5707b871049..00000000000
--- a/pkgs/servers/consul/ui-no-bundle-exec.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/ui/scripts/dist.sh b/ui/scripts/dist.sh
-index 0ad6e28e..db340da0 100755
---- a/ui/scripts/dist.sh
-+++ b/ui/scripts/dist.sh
-@@ -15,10 +15,9 @@ DEPLOY="../pkg/web_ui"
- rm -rf $DEPLOY
- mkdir -p $DEPLOY
- 
--bundle check >/dev/null 2>&1 || bundle install
--bundle exec sass styles/base.scss static/base.css
-+sass styles/base.scss static/base.css
- 
--bundle exec ruby scripts/compile.rb
-+ruby scripts/compile.rb
- 
- # Copy into deploy
- shopt -s dotglob
diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix
deleted file mode 100644
index da9b518bad7..00000000000
--- a/pkgs/servers/consul/ui.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, consul, ruby, bundlerEnv, zip, nodejs }:
-
-let
-  # `sass` et al
-  gems = bundlerEnv {
-    name = "consul-ui-deps";
-    gemdir = ./.;
-  };
-in
-
-stdenv.mkDerivation {
-  name = "consul-ui-${consul.version}";
-
-  src = consul.src;
-
-  buildInputs = [ ruby gems zip nodejs ];
-
-  patches = [ ./ui-no-bundle-exec.patch ];
-
-  postPatch = "patchShebangs ./ui/scripts/dist.sh";
-
-  buildPhase = ''
-    # Build ui static files
-    cd ui
-    make dist
-  '';
-
-  installPhase = ''
-    # Install ui static files
-    mkdir -p $out
-    mv ../pkg/web_ui/* $out
-  '';
-
-  meta = with stdenv.lib; {
-    homepage    = https://www.consul.io/;
-    description = "A tool for service discovery, monitoring and configuration";
-    maintainers = with maintainers; [ cstrahan wkennington ];
-    license     = licenses.mpl20 ;
-    platforms   = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38ade0014b1..d647840fc18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1136,8 +1136,6 @@ with pkgs;
 
   consul = callPackage ../servers/consul { };
 
-  consul-ui = callPackage ../servers/consul/ui.nix { };
-
   consul-alerts = callPackage ../servers/monitoring/consul-alerts { };
 
   consul-template = callPackage ../tools/system/consul-template { };
-- 
GitLab


From 32c2d485244efa80c704cd17e58dafdffd1616bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Fri, 26 Oct 2018 18:25:11 +0200
Subject: [PATCH 0968/1065] nixos manual: Add changelog for consul
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
---
 nixos/doc/manual/release-notes/rl-1903.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 6121d32346c..fb5d475f693 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -162,6 +162,14 @@
      has been renamed to <varname>postgresql_9_6</varname>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     Package <literal>consul-ui</literal> and passthrough <literal>consul.ui</literal> have been removed.
+     The package <literal>consul</literal> now uses upstream releases that vendor the UI into the binary.
+     See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834">#48714</link>
+     for details.
+    </para>
+   </listitem>
    <listitem>
     <para>
       Slurm introduces the new option
-- 
GitLab


From 666e0ab1dd4c9d58f93882b0d012a49823c4f99b Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 3 Nov 2018 19:05:31 +0100
Subject: [PATCH 0969/1065] pkgs.nixos: Add note about
 systemd.services.*.runner not being systemd

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84b3adf7297..69549dd88ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22121,7 +22121,10 @@ with pkgs;
                # ...
              };
 
-             # This exports a runner for nginx
+             # Use config.system.build to exports relevant parts of a
+             # configuration. The runner attribute should not be
+             # considered a fully general replacement for systemd
+             # functionality.
              config.system.build.run-nginx = config.systemd.services.nginx.runner;
            });
          in
-- 
GitLab


From f3999f6b3c693061551694ceb56d4102fad6b91c Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Sat, 3 Nov 2018 18:57:45 +0100
Subject: [PATCH 0970/1065] Add averelld 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 ec4289f19ea..60354432ad9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -406,6 +406,11 @@
     github = "AveryLychee";
     name = "Avery Lychee";
   };
+  averelld = {
+    email = "averell+nixos@rxd4.com";
+    github = "averelld";
+    name = "averelld";
+  };
   avnik = {
     email = "avn@avnik.info";
     github = "avnik";
-- 
GitLab


From c93caa5a672da36fdc0052b718c9030c9cfc3c06 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Sat, 3 Nov 2018 19:00:11 +0100
Subject: [PATCH 0971/1065] rstudio-preview: init at f33fb2b2

---
 .../editors/rstudio/clang-location.patch      |  25 ++++
 .../editors/rstudio/fix-cmake.patch           |  15 +++
 pkgs/applications/editors/rstudio/preview.nix | 119 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   4 +
 4 files changed, 163 insertions(+)
 create mode 100644 pkgs/applications/editors/rstudio/clang-location.patch
 create mode 100644 pkgs/applications/editors/rstudio/fix-cmake.patch
 create mode 100644 pkgs/applications/editors/rstudio/preview.nix

diff --git a/pkgs/applications/editors/rstudio/clang-location.patch b/pkgs/applications/editors/rstudio/clang-location.patch
new file mode 100644
index 00000000000..402abdd8563
--- /dev/null
+++ b/pkgs/applications/editors/rstudio/clang-location.patch
@@ -0,0 +1,25 @@
+diff --git i/src/cpp/core/libclang/LibClang.cpp w/src/cpp/core/libclang/LibClang.cpp
+index ec12a3a1ff..8c81b633ae 100644
+--- i/src/cpp/core/libclang/LibClang.cpp
++++ w/src/cpp/core/libclang/LibClang.cpp
+@@ -54,7 +54,7 @@ std::vector<std::string> defaultCompileArgs(LibraryVersion version)
+ 
+    // we need to add in the associated libclang headers as
+    // they are not discovered / used by default during compilation
+-   FilePath llvmPath = s_libraryPath.parent().parent();
++   FilePath llvmPath("@clang@");
+    boost::format fmt("%1%/lib/clang/%2%/include");
+    fmt % llvmPath.absolutePath() % version.asString();
+    std::string includePath = fmt.str();
+@@ -77,10 +77,7 @@ std::vector<std::string> systemClangVersions()
+ #elif defined(__unix__)
+    // default set of versions
+    clangVersions = {
+-      "/usr/lib/libclang.so",
+-      "/usr/lib/llvm/libclang.so",
+-      "/usr/lib64/libclang.so",
+-      "/usr/lib64/llvm/libclang.so",
++      "@libclang.so@"
+    };
+    
+    // iterate through the set of available 'llvm' directories
diff --git a/pkgs/applications/editors/rstudio/fix-cmake.patch b/pkgs/applications/editors/rstudio/fix-cmake.patch
new file mode 100644
index 00000000000..3effc0eaa32
--- /dev/null
+++ b/pkgs/applications/editors/rstudio/fix-cmake.patch
@@ -0,0 +1,15 @@
+diff --git a/src/cpp/desktop/CMakeLists.txt b/src/cpp/desktop/CMakeLists.txt
+index f5701bf735..27af4148ff 100644
+--- a/src/cpp/desktop/CMakeLists.txt
++++ b/src/cpp/desktop/CMakeLists.txt
+@@ -112,6 +112,7 @@ find_package(Qt5WebEngine REQUIRED)
+ find_package(Qt5WebEngineWidgets REQUIRED)
+ find_package(Qt5PrintSupport REQUIRED)
+ find_package(Qt5Quick REQUIRED)
++find_package(Qt5QuickWidgets REQUIRED)
+ find_package(Qt5Positioning REQUIRED)
+ find_package(Qt5Sensors REQUIRED)
+ find_package(Qt5Svg REQUIRED)
+-- 
+2.17.1
+
diff --git a/pkgs/applications/editors/rstudio/preview.nix b/pkgs/applications/editors/rstudio/preview.nix
new file mode 100644
index 00000000000..340aeec15e0
--- /dev/null
+++ b/pkgs/applications/editors/rstudio/preview.nix
@@ -0,0 +1,119 @@
+{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib
+, openssl, R, qtbase, qtdeclarative, qtsensors, qtwebengine, qtwebchannel
+, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
+, llvmPackages
+}:
+
+let
+  rev = "f33fb2b2f1";
+  ginVer = "2.1.2";
+  gwtVer = "2.8.1";
+in
+stdenv.mkDerivation rec {
+  name = "RStudio-preview-${rev}";
+
+  nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ];
+
+  buildInputs = [ boost zlib openssl R qtbase qtdeclarative qtsensors
+                  qtwebengine qtwebchannel libuuid ];
+
+  src = fetchFromGitHub {
+    owner = "rstudio";
+    repo = "rstudio";
+    inherit rev;
+    sha256 = "0v3vzqjp74c3m4h9l6w2lrdnjqaimdjzbf7vhnlxj2qa0lwsnykb";
+  };
+
+  # Hack RStudio to only use the input R and provided libclang.
+  patches = [ ./r-location.patch ./clang-location.patch ];
+  postPatch = ''
+    substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}
+    substituteInPlace src/cpp/core/libclang/LibClang.cpp \
+      --replace '@clang@' ${llvmPackages.clang.cc} \
+      --replace '@libclang.so@' ${llvmPackages.clang.cc.lib}/lib/libclang.so
+  '';
+
+  ginSrc = fetchurl {
+    url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip";
+    sha256 = "16jzmljravpz6p2rxa87k5f7ir8vs7ya75lnfybfajzmci0p13mr";
+  };
+
+  gwtSrc = fetchurl {
+    url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip";
+    sha256 = "19x000m3jwnkqgi6ic81lkzyjvvxcfacw2j0vcfcaknvvagzhyhb";
+  };
+
+  hunspellDictionaries = with stdenv.lib; filter isDerivation (attrValues hunspellDicts);
+
+  mathJaxSrc = fetchurl {
+    url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip;
+    sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk";
+  };
+
+  rsconnectSrc = fetchFromGitHub {
+    owner = "rstudio";
+    repo = "rsconnect";
+    rev = "984745d8";
+    sha256 = "037z0y32k1gdda192y5qn5hi7wp8wyap44mkjlklrgcqkmlcylb9";
+  };
+
+  preConfigure =
+    ''
+      GWT_LIB_DIR=src/gwt/lib
+
+      mkdir -p $GWT_LIB_DIR/gin/${ginVer}
+      unzip ${ginSrc} -d $GWT_LIB_DIR/gin/${ginVer}
+
+      unzip ${gwtSrc}
+      mkdir -p $GWT_LIB_DIR/gwt
+      mv gwt-${gwtVer} $GWT_LIB_DIR/gwt/${gwtVer}
+
+      mkdir dependencies/common/dictionaries
+      for dict in ${builtins.concatStringsSep " " hunspellDictionaries}; do
+        for i in "$dict/share/hunspell/"*; do
+          ln -sv $i dependencies/common/dictionaries/
+        done
+      done
+
+      unzip ${mathJaxSrc} -d dependencies/common/mathjax-26
+
+      mkdir -p dependencies/common/pandoc
+      cp ${pandoc}/bin/pandoc dependencies/common/pandoc/
+
+      cp -r ${rsconnectSrc} dependencies/common/rsconnect
+      pushd dependencies/common
+      ${R}/bin/R CMD build -d --no-build-vignettes rsconnect
+      popd
+    '';
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ];
+
+  desktopItem = makeDesktopItem {
+    name = name;
+    exec = "rstudio %F";
+    icon = "rstudio";
+    desktopName = "RStudio Preview";
+    genericName = "IDE";
+    comment = meta.description;
+    categories = "Development;";
+    mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;";
+  };
+
+  postInstall = ''
+      wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin
+      mkdir $out/share
+      cp -r ${desktopItem}/share/applications $out/share
+      mkdir $out/share/icons
+      ln $out/rstudio.png $out/share/icons
+  '';
+
+  meta = with stdenv.lib;
+    { description = "Set of integrated tools for the R language";
+      homepage = https://www.rstudio.com/;
+      license = licenses.agpl3;
+      maintainers = with maintainers; [ averelld ];
+      platforms = platforms.linux;
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d647840fc18..9732e82ff22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18765,6 +18765,10 @@ with pkgs;
   rstudio = libsForQt5.callPackage ../applications/editors/rstudio {
     boost = boost166;
   };
+  rstudio-preview = libsForQt5.callPackage ../applications/editors/rstudio/preview.nix {
+    boost = boost166;
+    llvmPackages = llvmPackages_7;
+  };
 
   rsync = callPackage ../applications/networking/sync/rsync {
     enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);
-- 
GitLab


From f25907413773c2455d1241b93eae8e06d538830e Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 3 Nov 2018 14:46:18 -0400
Subject: [PATCH 0972/1065] lollypop: 0.9.607 -> 0.9.610

---
 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 034d2059283..8df2be1a039 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -4,7 +4,7 @@
 , gobjectIntrospection, wrapGAppsHook }:
 
 python3.pkgs.buildPythonApplication rec  {
-  version = "0.9.607";
+  version = "0.9.610";
   name = "lollypop-${version}";
 
   format = "other";
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec  {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "04giwp4i7j1qad41fiqlb8s3w03f1ww0p2mhi8n162sajnflr1rd";
+    sha256 = "0nn4cjw0c2ysd3y2a7l08ybcd21v993wsz99f7w0881jhws3q5p4";
   };
 
   nativeBuildInputs = with python3.pkgs; [
-- 
GitLab


From ef16e1fe03113b4356aa795741039402cfefe04c Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Thu, 25 Oct 2018 20:17:47 -0400
Subject: [PATCH 0973/1065] nvidia-x11: 410.66 -> 410.73

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 44598588db9..97e5b3aa70a 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -19,10 +19,10 @@ rec {
   stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_410 else stable_390;
 
   stable_410 = generic {
-    version = "410.66";
-    sha256_64bit = "05xjzvj0fgmkpz36dbd7hy2vzl6xxiflzx7kml3k7ad9gy2svdlg";
-    settingsSha256 = "1nsxz1byshgjs3c03lyx6ya36dp0f2vg2l0d9pkh1i6cpzkp53kz";
-    persistencedSha256 = "0m4wdpb8w4y323d8py105p9hizwmf2ai8frkl7h77sn3ski17zw6";
+    version = "410.73";
+    sha256_64bit = "07pzq8rvbsx3v8rgz98amyw0k1mn5mkygpd1q5gfn6r0h7vrrg5y";
+    settingsSha256 = "19xc10b0c074wb9fv9n04dvmi8hrwl6srvvyrjfyj92gch49x6hw";
+    persistencedSha256 = "0vhr7pysv4vk7v96yima0i9zsvvgxaxihjzxlfifpsdki57n2jz7";
   };
 
   # Last one supporting x86
-- 
GitLab


From f0cee6b14f19dfe88aa502d123e11c0ba117b439 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 3 Nov 2018 14:03:34 -0500
Subject: [PATCH 0974/1065] grpc: only set -Wno-error on clang

Apparently GCC errors on this:

https://hydra.nixos.org/build/83561519/
---
 pkgs/development/libraries/grpc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index e568ea9eb65..f4145c85199 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     rm -vf BUILD
   '';
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=unknown-warning-option";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option";
 
   enableParallelBuilds = true;
 
-- 
GitLab


From dfd0818aa5c3ef1d6686e8bf8677761740788cd9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 3 Nov 2018 14:17:21 -0500
Subject: [PATCH 0975/1065] release-cross: use ghc844 for tests

This GHC version has much better support for cross compilation. It should hopefully fix our mingw breakages from #42407.

/cc @ericson2314
---
 pkgs/top-level/release-cross.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 6cf0cb57be4..058182392e9 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -30,7 +30,7 @@ let
     buildPackages.gcc = nativePlatforms;
     coreutils = nativePlatforms;
     haskell.packages.ghcHEAD.hello = nativePlatforms;
-    haskell.packages.ghc822.hello = nativePlatforms;
+    haskell.packages.ghc844.hello = nativePlatforms;
   };
 
   linuxCommon = lib.recursiveUpdate gnuCommon {
-- 
GitLab


From ef4d78adedcfbb69392e7634bc6912c019b88bcc Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 3 Nov 2018 14:37:18 -0500
Subject: [PATCH 0976/1065] krb5: don't pull in keyutils with bionic

keyutils breaks with bionic. since it's an optional dependency, it seems safe to just disable it with libkrb5 (which otherwise works fine with bionic libc).
---
 pkgs/development/libraries/kerberos/krb5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 4e3ba399cc3..afb928aff6e 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     # Provides the mig command used by the build scripts
     ++ optional stdenv.isDarwin bootstrap_cmds;
   buildInputs = [ openssl ]
-    ++ optionals (stdenv.hostPlatform.isLinux) [ keyutils ]
+    ++ optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic") [ keyutils ]
     ++ optionals (!libOnly) [ openldap libedit ];
 
   preConfigure = "cd ./src";
-- 
GitLab


From da1f78bd2bd0c7b7c3fc8c902c314c0c391cfaf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 3 Nov 2018 20:03:34 +0000
Subject: [PATCH 0977/1065] linux_beagleboard: remove

The package is out-of-date and has no maintainer.
It should be now possible to just mainline kernel.
Support for that could be added by copying the right dtb file in our linux_rpi kernel.
I do not have the hardware to test this.

cc @dezgeg @dhess
---
 .../linux/kernel/linux-beagleboard.nix        | 34 -------------------
 pkgs/top-level/all-packages.nix               |  9 -----
 2 files changed, 43 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-beagleboard.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-beagleboard.nix b/pkgs/os-specific/linux/kernel/linux-beagleboard.nix
deleted file mode 100644
index e98104f11ca..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-beagleboard.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ubootTools, dtc, ... } @ args:
-
-let
-  modDirVersion = "4.14.12";
-  tag = "r23";
-in
-stdenv.lib.overrideDerivation (buildLinux (args // rec {
-  version = "${modDirVersion}-ti-${tag}";
-  inherit modDirVersion;
-
-  src = fetchFromGitHub {
-    owner = "beagleboard";
-    repo = "linux";
-    rev = "${version}";
-    sha256 = "07hdv2h12gsgafxsqqr7b0fir10rv9k66riklpjba2cg6x0p2nr4";
-  };
-
-  kernelPatches = args.kernelPatches;
-
-  features = {
-    efiBootStub = false;
-  } // (args.features or {});
-
-  extraMeta.hydraPlatforms = [ "armv7l-linux" ];
-} // (args.argsOverride or {}))) (oldAttrs: {
-
-  # This kernel will run mkuboot.sh.
-  postPatch = ''
-    patchShebangs scripts/
-  '';
-
-  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ dtc ubootTools ];
-
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38f3264838c..0962ba73555 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14213,14 +14213,6 @@ with pkgs;
 
   klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { });
 
-  linux_beagleboard = callPackage ../os-specific/linux/kernel/linux-beagleboard.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-        kernelPatches.cpu-cgroup-v2."4.11"
-        kernelPatches.modinst_arg_list_too_long
-      ];
-  };
-
   linux_mptcp = linux_mptcp_94;
   linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
     kernelPatches =
@@ -14511,7 +14503,6 @@ with pkgs;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
-  linuxPackages_beagleboard = linuxPackagesFor pkgs.linux_beagleboard;
   linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp;
   linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi;
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
-- 
GitLab


From e84291bd23dc2d9936ad9199a9e744e1b25be601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 3 Nov 2018 20:57:58 +0000
Subject: [PATCH 0978/1065] linux-samus: remove

The package is out-of-date and has no maintainer.
I don't own a chromebook device and therefore don't know
if an mainline kernel could be used instead.
cc @lheckemann @zohl
---
 .../linux/kernel/linux-samus-4.12.nix            | 16 ----------------
 pkgs/top-level/all-packages.nix                  | 16 ----------------
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-samus-4.12.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix
deleted file mode 100644
index 0a936c6c053..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ncurses, ... } @ args:
-
-buildLinux (args // rec {
-  version = "4.12.2";
-  extraMeta.branch = "4.12-2";
-
-  src =
-    let upstream = fetchFromGitHub {
-      owner = "raphael";
-      repo = "linux-samus";
-      rev = "v${extraMeta.branch}";
-      sha256 = "1dr74i79p8r13522w2ppi8gnjd9bhngc9d2hsn91ji6f5a8fbxx9";
-    }; in "${upstream}/build/linux";
-
-  extraMeta.platforms = [ "x86_64-linux" ];
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38f3264838c..b954e0474cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14332,17 +14332,6 @@ with pkgs;
     ];
   };
 
-  linux_samus_4_12 = callPackage ../os-specific/linux/kernel/linux-samus-4.12.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-        kernelPatches.p9_fixes
-        # 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_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
@@ -14571,11 +14560,6 @@ with pkgs;
 
   linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));
 
-  # Samus kernels
-  linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12);
-  linuxPackages_samus_latest = linuxPackages_samus_4_12;
-  linux_samus_latest = linuxPackages_samus_latest.kernel;
-
   # Hardkernel (Odroid) kernels.
   linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14);
   linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14;
-- 
GitLab


From eadb9985819327f6bce7da87730d32e5018ee848 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 4 Nov 2018 00:14:52 +0100
Subject: [PATCH 0979/1065] gitlab module: fix config handling

---
 nixos/modules/services/misc/gitlab.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index ce1cb6ad37f..aa72cda7045 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -552,10 +552,9 @@ in {
         gnupg
       ];
       preStart = ''
-        ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret
-
         cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
-        cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
+        rm -rf ${cfg.statePath}/config
+        mkdir ${cfg.statePath}/config
         if [ -e ${cfg.statePath}/lib ]; then
           rm ${cfg.statePath}/lib
         fi
@@ -569,6 +568,8 @@ in {
           ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
         ''}
         cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
+        cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
+        ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret
 
         # JSON is a subset of YAML
         ln -sf ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)} ${cfg.statePath}/config/gitlab.yml
-- 
GitLab


From 2900f824e92f711510e0ae6858865c8af803001a Mon Sep 17 00:00:00 2001
From: Konstantin Nikiforov <nikiforov.ks@gmail.com>
Date: Sun, 4 Nov 2018 03:36:10 +0300
Subject: [PATCH 0980/1065] plex: 1.13.8.5395 ->  1.13.9.5456

---
 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 b562df681a0..4e783f3a507 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.8.5395";
-    vsnHash = "10d48da0d";
-    sha256 = "0lpsh87kcrqwi2qqkj1ccb86hif535yb45hhc41c0ixsfxbqk5cw";
+    version = "1.13.9.5456";
+    vsnHash = "ecd600442";
+    sha256 = "6d1125d4e6eaa94a84f8c600230b867c2d0764644adbc959a96433b8fc210b61";
   };
 
 in stdenv.mkDerivation rec {
-- 
GitLab


From b5be88c97a1cd51f0f08f52200638700840cb337 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 3 Nov 2018 19:44:24 -0500
Subject: [PATCH 0981/1065] pg_hll: 2.10.2-9af41684 -> 2.12

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/sql/postgresql/pg_hll/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/pg_hll/default.nix b/pkgs/servers/sql/postgresql/pg_hll/default.nix
index 6c453f6a40c..f91a8b1bf25 100644
--- a/pkgs/servers/sql/postgresql/pg_hll/default.nix
+++ b/pkgs/servers/sql/postgresql/pg_hll/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "pg_hll-${version}";
-  version = "2.10.2-${builtins.substring 0 7 src.rev}";
+  version = "2.12";
 
   buildInputs = [ postgresql ];
 
   src = fetchFromGitHub {
     owner  = "citusdata";
     repo   = "postgresql-hll";
-    rev    = "9af41684d479a3097bab87d04936702c9e6baf5c";
-    sha256 = "044x9v9kjhxb0idqb9f5i7c3yygxxsqliswl4kspqy9f9qcblckl";
+    rev    = "refs/tags/v${version}";
+    sha256 = "1jdc9gjqc3dkjxv855q1p594j0awhrrymrcqnl5vw5vx2ny3bpgn";
   };
 
   installPhase = ''
-- 
GitLab


From cecee87f396c9fca6c47a8bd91e176c8550ea3ab Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 3 Nov 2018 19:46:05 -0500
Subject: [PATCH 0982/1065] pg_repack: reindent to 2-spaces

More or less all the Postgres code uses this, so it's nice to be
consistent.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../sql/postgresql/pg_repack/default.nix      | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix
index a50605bd040..14f71b1e2b3 100644
--- a/pkgs/servers/sql/postgresql/pg_repack/default.nix
+++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix
@@ -1,35 +1,35 @@
 { stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }:
 
 stdenv.mkDerivation rec {
-    name = "pg_repack-${version}";
-    version = "1.4.4";
+  name = "pg_repack-${version}";
+  version = "1.4.4";
 
-    buildInputs = [ postgresql openssl zlib readline ];
+  buildInputs = [ postgresql openssl zlib readline ];
 
-    src = fetchFromGitHub {
-      owner  = "reorg";
-      repo   = "pg_repack";
-      rev    = "refs/tags/ver_${version}";
-      sha256 = "0ynsmsxfkcp82ccpz2nrgg8wiil8yxqigvw6425lx8v80h5lszbw";
-    };
+  src = fetchFromGitHub {
+    owner  = "reorg";
+    repo   = "pg_repack";
+    rev    = "refs/tags/ver_${version}";
+    sha256 = "0ynsmsxfkcp82ccpz2nrgg8wiil8yxqigvw6425lx8v80h5lszbw";
+  };
 
-    installPhase = ''
-      install -D bin/pg_repack -t $out/bin/
-      install -D lib/pg_repack.so -t $out/lib/
-      install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/extension
-    '';
+  installPhase = ''
+    install -D bin/pg_repack -t $out/bin/
+    install -D lib/pg_repack.so -t $out/lib/
+    install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/extension
+  '';
 
-    meta = with stdenv.lib; {
-      description = "Reorganize tables in PostgreSQL databases with minimal locks";
-      longDescription = ''
-        pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore
-        the physical order of clustered indexes. Unlike CLUSTER and VACUUM FULL it works online, without holding an
-        exclusive lock on the processed tables during processing. pg_repack is efficient to boot,
-        with performance comparable to using CLUSTER directly.
-      '';
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ danbst ];
-      inherit (postgresql.meta) platforms;
-      inherit (src.meta) homepage;
-    };
+  meta = with stdenv.lib; {
+    description = "Reorganize tables in PostgreSQL databases with minimal locks";
+    longDescription = ''
+      pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore
+      the physical order of clustered indexes. Unlike CLUSTER and VACUUM FULL it works online, without holding an
+      exclusive lock on the processed tables during processing. pg_repack is efficient to boot,
+      with performance comparable to using CLUSTER directly.
+    '';
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ danbst ];
+    inherit (postgresql.meta) platforms;
+    inherit (src.meta) homepage;
+  };
 }
-- 
GitLab


From a713251348ac4059a7c2da7ffabdbf2772d90fad Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 3 Nov 2018 19:49:00 -0500
Subject: [PATCH 0983/1065] timescaledb: 0.11.0 -> 1.0.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/sql/postgresql/timescaledb/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix
index fab515035ce..07dcfb0b701 100644
--- a/pkgs/servers/sql/postgresql/timescaledb/default.nix
+++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, postgresql }:
+{ stdenv, fetchFromGitHub, cmake, postgresql, openssl }:
 
 # # To enable on NixOS:
 # config.services.postgresql = {
@@ -8,16 +8,16 @@
 
 stdenv.mkDerivation rec {
   name = "timescaledb-${version}";
-  version = "0.11.0";
+  version = "1.0.0";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ postgresql ];
+  buildInputs = [ postgresql openssl ];
 
   src = fetchFromGitHub {
     owner  = "timescale";
     repo   = "timescaledb";
     rev    = "refs/tags/${version}";
-    sha256 = "06xysf45r0c2sjfl6vgdbrm7pn7nxx2n0k29bm88q0ipyyp9fr0v";
+    sha256 = "1359jc0dw8q3f0iipqfadzs8lvri9qa5w59ziz00x1d09ppw2q40";
   };
 
   # Fix the install phase which tries to install into the pgsql extension dir,
-- 
GitLab


From d8abcdc1de4b918740b34e1862270118a401f13a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 3 Nov 2018 19:50:32 -0500
Subject: [PATCH 0984/1065] pg_topn: 2.0.2 -> 2.2.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/sql/postgresql/topn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/topn/default.nix b/pkgs/servers/sql/postgresql/topn/default.nix
index 6886c80cf50..dae30aadabd 100644
--- a/pkgs/servers/sql/postgresql/topn/default.nix
+++ b/pkgs/servers/sql/postgresql/topn/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "pg_topn-${version}";
-  version = "2.0.2";
+  version = "2.2.0";
 
   nativeBuildInputs = [ protobufc ];
   buildInputs = [ postgresql ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner  = "citusdata";
     repo   = "postgresql-topn";
     rev    = "refs/tags/v${version}";
-    sha256 = "00hc3hgnqv9xaalizbcvprb7s55sydj2qgk3rhgrdlwg2g025h62";
+    sha256 = "1i5fn517mdvzfhlcj7fh4z0iniynanshcn7kzhsq19sgci0g31fr";
   };
 
   installPhase = ''
-- 
GitLab


From 800184df21cfe4924e1e901f387cda49a9a8269c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 3 Nov 2018 19:52:55 -0500
Subject: [PATCH 0985/1065] tsearch_extras: 0.3 -> 0.4

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/sql/postgresql/tsearch_extras/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix
index 5140ae1a228..b43a9c51be0 100644
--- a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix
+++ b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "tsearch-extras-${version}";
-  version = "0.3";
+  version = "0.4";
 
   src = fetchFromGitHub {
-    owner = "zulip";
-    repo = "tsearch_extras";
-    rev = version;
-    sha256 = "0i3i99lw80jwd4xflgdqabxmn1dnm1gm7dzf1mqv2drllxcy3yix";
+    owner  = "zulip";
+    repo   = "tsearch_extras";
+    rev    = "84e78f00931c4ef261d98197d6b5d94fc141f742"; # no release tag?
+    sha256 = "18j0saqblg3jhrz38splk173xjwdf32c67ymm18m8n5y94h8d2ba";
   };
 
   nativenativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From b81a37549eb9cd7080344f63832b3bd902907b75 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 3 Nov 2018 20:32:19 -0500
Subject: [PATCH 0986/1065] ibm-plex: 1.1.6 -> 1.2.1

---
 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 ba214dd35fd..e5a281eebf6 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.1.6";
+  version = "1.2.1";
 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 = "0n9qmh6v7gvrl1mfb0knygxlbkb78hvkdrppssx64m3pk4pxw85a";
+  sha256 = "1mwlw39nbqrk08crvgm77l98yyyabwhcgsng89c9s67gq4mlxmxa";
 
   meta = with lib; {
     description = "IBM Plex Typeface";
-- 
GitLab


From b065bb213335cb0228b2831c3d743f8e7f60ea39 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 3 Nov 2018 20:36:22 -0500
Subject: [PATCH 0987/1065] 1password: 0.5.3 -> 0.5.4

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

diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix
index 331f516c88c..a25d40e29bd 100644
--- a/pkgs/applications/misc/1password/default.nix
+++ b/pkgs/applications/misc/1password/default.nix
@@ -2,24 +2,24 @@
 
 stdenv.mkDerivation rec {
   name = "1password-${version}";
-  version = "0.5.3";
+  version = "0.5.4";
   src =
     if stdenv.hostPlatform.system == "i686-linux" then
       fetchzip {
         url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
-        sha256 = "05s223h1yps4k9kmignl0r5sbh6w7m1hnlmafnf1kiwv7gacvxjc";
+        sha256 = "0wni2hk5b1qfr24vi24jiprpi08k3qgaw9lqp61k41a1sjp3izv0";
         stripRoot = false;
       }
     else if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchzip {
         url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
-        sha256 = "0p9x1fx0309v8dxxaf88m8x8q15zzqywfmjn6v5wb9v3scp9396v";
+        sha256 = "169d5fl3cfw3xrlpm9nlmwbnp0xgh0la9qybzf8ragp0020nlyih";
         stripRoot = false;
       }
     else if stdenv.hostPlatform.system == "x86_64-darwin" then
       fetchzip {
         url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip";
-        sha256 = "1z2xp9bn93gr4ha6zx65va1fb58a2xlnnmpv583y96gq3vbnqdcj";
+        sha256 = "1scikv7v33kzg9rqsrz97yklxaskvif84br13zg8annm43k5vlma";
         stripRoot = false;
       }
     else throw "Architecture not supported";
-- 
GitLab


From ccb76eeb3c607704726deb81eacf26b2ec920c6d Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sun, 4 Nov 2018 03:43:22 +0000
Subject: [PATCH 0988/1065] chrootenv: strip the binary

---
 pkgs/build-support/build-fhs-userenv/chrootenv/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix
index 375c30e1e46..4ab8c248e2f 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix
@@ -8,6 +8,7 @@ stdenv.mkDerivation {
 
   buildCommand = ''
     cc ${./chrootenv.c} $(pkg-config --cflags --libs glib-2.0) -o $out
+    ${stdenv.cc.bintools.bintools}/bin/strip $out
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From e7be7eb7dce25184a2d8631718324f66c60e4f67 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 3 Nov 2018 23:46:31 -0500
Subject: [PATCH 0989/1065] jdupes: 1.10.4 -> 1.11

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

diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index 991066690ee..0df351bdd56 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "jdupes-${version}";
-  version = "1.10.4";
+  version = "1.11";
 
   src = fetchFromGitHub {
     owner = "jbruchon";
     repo  = "jdupes";
     rev   = "v${version}";
-    sha256 = "03a2jxv634xy5qwjrk784k3y3pd8f94pndf5m84yg2y7i8dvppnk";
+    sha256 = "124n9vgnqqhnwgnms7dqmndp25xrcjaykxrzbi4v4as98kxxi3j1";
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The testdir
     # directories have such files and will be removed.
-- 
GitLab


From 08ac10397079217ce6118586822e7f42686ed6b9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Nov 2018 06:29:27 +0000
Subject: [PATCH 0990/1065] acgtk: 1.3.1 -> 1.5.0

---
 .../science/logic/acgtk/default.nix           | 50 ++++---------------
 .../acgtk/install-emacs-to-site-lisp.patch    | 23 ---------
 .../logic/acgtk/use-nix-ocaml-byteflags.patch | 11 ----
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 11 insertions(+), 77 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/acgtk/install-emacs-to-site-lisp.patch
 delete mode 100644 pkgs/applications/science/logic/acgtk/use-nix-ocaml-byteflags.patch

diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index b787a4e7a01..729aef4e21c 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -1,57 +1,27 @@
-{ stdenv, fetchurl, ocamlPackages,
-  buildBytecode ? true,
-  buildNative ? true,
-  installExamples ? true,
-  installEmacsMode ? true }:
-
-let inherit (stdenv.lib) versionAtLeast optionalString; in
-
-let inherit (ocamlPackages) ocaml camlp4; in
-
-assert buildBytecode || buildNative;
+{ stdenv, fetchurl, dune, ocamlPackages }:
 
 stdenv.mkDerivation {
 
-  name = "acgtk-1.3.1";
+  name = "acgtk-1.5.0";
 
   src = fetchurl {
-    url = http://calligramme.loria.fr/acg/software/acg-1.3.1-20170303.tar.gz;
-    sha256 = "1hhrf6bx2x2wbv5ldn4fnxhpr9lyrj3zh1vcnx8wf8f06ih4rzfq";
+    url = http://calligramme.loria.fr/acg/software/acg-1.5.0-20181019.tar.gz;
+    sha256 = "14n003gxzw5w79hlpw1ja4nq97jqf9zqyg00ihvpxw4bv9jlm8jm";
   };
 
-  buildInputs = with ocamlPackages; [
-    ocaml findlib camlp4 ansiterminal biniou bolt cairo2 dypgen easy-format ocf yojson
-  ];
-
-  patches = [ ./install-emacs-to-site-lisp.patch
-              ./use-nix-ocaml-byteflags.patch ];
-
-  postPatch = optionalString (camlp4 != null) ''
-    substituteInPlace src/Makefile.master.in \
-      --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4/"
-  '' + optionalString (versionAtLeast (stdenv.lib.getVersion ocamlPackages.yojson) "1.4") ''
-    substituteInPlace src/scripting/Makefile.in --replace yojson.cmo yojson.cma
-  '';
-
-  # The bytecode executable is dependent on the dynamic library provided by
-  # ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to
-  # -rpath) to make sure that ocamlrun is able to link the library at
-  # runtime and that Nix detects a runtime dependency.
-  NIX_OCAML_BYTEFLAGS = "-dllpath ${ocamlPackages.ansiterminal}/lib/ocaml/${ocaml.version}/site-lib/ANSITerminal";
+  buildInputs = [ dune ] ++ (with ocamlPackages; [
+    ocaml findlib ansiterminal cairo2 fmt logs menhir mtime ocf
+  ]);
 
-  buildFlags = optionalString buildBytecode "byte"
-             + " "
-             + optionalString buildNative "opt";
+  buildPhase = "dune build";
 
-  installTargets = "install"
-                 + " " + optionalString installExamples "install-examples"
-                 + " " + optionalString installEmacsMode "install-emacs";
+  inherit (dune) installPhase;
 
   meta = with stdenv.lib; {
     homepage = http://calligramme.loria.fr/acg/;
     description = "A toolkit for developing ACG signatures and lexicon";
     license = licenses.cecill20;
-    platforms = ocaml.meta.platforms or [];
+    inherit (ocamlPackages.ocaml.meta) platforms;
     maintainers = [ maintainers.jirkamarsik ];
   };
 }
diff --git a/pkgs/applications/science/logic/acgtk/install-emacs-to-site-lisp.patch b/pkgs/applications/science/logic/acgtk/install-emacs-to-site-lisp.patch
deleted file mode 100644
index 43ddd20b4a3..00000000000
--- a/pkgs/applications/science/logic/acgtk/install-emacs-to-site-lisp.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- acg-1.1-20140905/Makefile.in	2014-10-24 15:21:39.442287208 +0200
-+++ acg-1.1-20140905/Makefile.in.new	2014-10-24 15:24:58.557117228 +0200
-@@ -35,6 +35,7 @@
- ACGC_DIR=src/acg-data
- 
- DATA_DIR=@datarootdir@/acgtk
-+EMACS_DIR=@prefix@/share/emacs/site-lisp
- 
- 
- 
-@@ -82,10 +83,10 @@
- 	rm -r $(DATA_DIR)
- 
- install-emacs:
--	mkdir -p $(DATA_DIR) && cp -r emacs $(DATA_DIR)/.
-+	mkdir -p $(EMACS_DIR) && cp emacs/acg.el $(EMACS_DIR)
- 
- uninstall-emacs:
--	rm -rf $(DATA_DIR)/emacs
-+	rm -rf $(EMACS_DIR)/emacs
- 
- install-examples:
- 	mkdir -p $(DATA_DIR) && cp -r examples $(DATA_DIR)/.
diff --git a/pkgs/applications/science/logic/acgtk/use-nix-ocaml-byteflags.patch b/pkgs/applications/science/logic/acgtk/use-nix-ocaml-byteflags.patch
deleted file mode 100644
index 26ade37e452..00000000000
--- a/pkgs/applications/science/logic/acgtk/use-nix-ocaml-byteflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- acg-1.1-20140905/src/Makefile.master.in	2014-10-27 10:59:42.263382081 +0100
-+++ acg-1.1-20140905/src/Makefile.master.in.new	2014-10-27 10:59:59.683597972 +0100
-@@ -23,7 +23,7 @@
- # All warnings are treated as errors
- WARNINGS = @OCAML09WARNINGS@ -warn-error A
- COMMONFLAGS= $(WARNINGS) @TYPES@
--BYTEFLAGS = $(COMMONFLAGS) $(DEBUGFLAG)
-+BYTEFLAGS = $(COMMONFLAGS) $(DEBUGFLAG) $(NIX_OCAML_BYTEFLAGS)
- OPTFLAGS = $(COMMONFLAGS)
- LFLAGS= -a
- 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6bdb2be4480..23590919a0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21351,9 +21351,7 @@ with pkgs;
 
   abella = callPackage ../applications/science/logic/abella {};
 
-  acgtk = callPackage ../applications/science/logic/acgtk {
-    ocamlPackages = ocaml-ng.ocamlPackages_4_05;
-  };
+  acgtk = callPackage ../applications/science/logic/acgtk {};
 
   alt-ergo = callPackage ../applications/science/logic/alt-ergo {};
 
-- 
GitLab


From dd21f83950471bcd1878268b525207df4445ad8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Fri, 2 Nov 2018 10:09:15 +0100
Subject: [PATCH 0991/1065] coq_8_9: init at 8.9+beta1

---
 pkgs/applications/science/logic/coq/default.nix |  1 +
 pkgs/top-level/all-packages.nix                 | 13 +++++++------
 pkgs/top-level/coq-packages.nix                 | 10 +++++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 040d722f941..5fab9788a94 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -25,6 +25,7 @@ let
    "8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8";
    "8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk";
    "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd";
+   "8.9+beta1" = "1yxv2klqal3mh6symi3gc6gv3xm684zlld2c0b6ijhjmp865cin8";
   }."${version}";
   coq-version = builtins.substring 0 3 version;
   ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6bdb2be4480..7fc0c9fee9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21364,13 +21364,14 @@ with pkgs;
   boogie = dotnetPackages.Boogie;
 
   inherit (callPackage ./coq-packages.nix {
-    inherit (ocaml-ng) ocamlPackages_4_02
-                       ocamlPackages_4_05
-    ;
+    inherit (ocaml-ng) ocamlPackages_4_05;
   }) mkCoqPackages
-    coq_8_5 coq_8_6 coq_8_7 coq_8_8
-    coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8
-    coqPackages coq
+    coqPackages_8_5  coq_8_5
+    coqPackages_8_6  coq_8_6
+    coqPackages_8_7  coq_8_7
+    coqPackages_8_8  coq_8_8
+    coqPackages_8_9  coq_8_9
+    coqPackages      coq
   ;
 
   coq2html = callPackage ../applications/science/logic/coq2html {
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index a4f44b6fc6f..3ba90f3b594 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -1,8 +1,4 @@
-{ lib, callPackage, newScope, recurseIntoAttrs
-, gnumake3
-, ocamlPackages_4_02
-, ocamlPackages_4_05
-}:
+{ lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05 }:
 
 let
   mkCoqPackages' = self: coq:
@@ -70,11 +66,15 @@ in rec {
   coq_8_8 = callPackage ../applications/science/logic/coq {
     version = "8.8.2";
   };
+  coq_8_9 = callPackage ../applications/science/logic/coq {
+    version = "8.9+beta1";
+  };
 
   coqPackages_8_5 = mkCoqPackages coq_8_5;
   coqPackages_8_6 = mkCoqPackages coq_8_6;
   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;
   coq = coqPackages.coq;
 
-- 
GitLab


From 6e052567047166460db229074e48d7e6c393957e Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Sun, 4 Nov 2018 04:03:57 +0100
Subject: [PATCH 0992/1065] radeon-crimson: fix download

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

diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index d5d42faa913..cda7e03cd06 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -61,8 +61,8 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url =
     "https://www2.ati.com/drivers/linux/radeon-crimson-15.12-15.302-151217a-297685e.zip";
-    sha256 = "0n0ynqmjkjp5dl5q07as7ps3rlyyn63hq4mlwgd7c7v82ky2skvh";
-    curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux+x86_64";
+    sha256 = "704f2dfc14681f76dae3b4120c87b1ded33cf43d5a1d800b6de5ca292bb61e58";
+    curlOpts = "--referer https://www.amd.com/en/support";
   };
 
   hardeningDisable = [ "pic" "format" ];
-- 
GitLab


From 71449e70e91c46020411f806dd242d0932f1b239 Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Sun, 4 Nov 2018 20:26:07 +1100
Subject: [PATCH 0993/1065] bazel-deps: 2018-08-16 -> 2018-11-01

---
 .../tools/build-managers/bazel/bazel-deps/default.nix    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
index af8cd5faacd..142f729517d 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
@@ -2,7 +2,7 @@
 
 buildBazelPackage rec {
   name = "bazel-deps-${version}";
-  version = "2018-08-16";
+  version = "2018-11-01";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/johnynek/bazel-deps";
@@ -15,8 +15,8 @@ buildBazelPackage rec {
   src = fetchFromGitHub {
     owner = "johnynek";
     repo = "bazel-deps";
-    rev = "942a0b03cbf159dd6e0f0f40787d6d8e4e832d81";
-    sha256 = "0ls2jvz9cxa169a8pbbykv2d4dik4ipf7dj1lkqx5g0ss7lgs6q5";
+    rev = "1af8921d52f053fad575f26762533a3823b4a847";
+    sha256 = "0srz0sbz4bq9n7cp4g1n3kd3j6rcjqfi25sq8aa64l27yqzbk53x";
   };
 
   bazelTarget = "//src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar";
@@ -66,12 +66,13 @@ buildBazelPackage rec {
       find . -type d -empty -delete
     '';
 
-    sha256 = "0jkzf1hay0h8ksk9lhfvdliac6c5d7nih934i1xjbrn6zqlivy19";
+    sha256 = "1gvl4a9z8p4ch2gmcj3lpp0imrkrvy8wng949p3wlkibi14hc6ww";
   };
 
   buildAttrs = {
     installPhase = ''
       mkdir -p $out/bin/bazel-bin/src/scala/com/github/johnynek/bazel_deps
+
       cp gen_maven_deps.sh $out/bin
       wrapProgram "$out/bin/gen_maven_deps.sh" --set JAVA_HOME "${jre}" --prefix PATH : ${lib.makeBinPath [ jre ]}
       cp bazel-bin/src/scala/com/github/johnynek/bazel_deps/parseproject_deploy.jar $out/bin/bazel-bin/src/scala/com/github/johnynek/bazel_deps
-- 
GitLab


From abea6f461ae886544917e32634e5612b0fc73c13 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:01:09 +0100
Subject: [PATCH 0994/1065] Revert "Merge pull request #49398 from
 Synthetica9/implement-rfc0035" to fix eval

This reverts commit 3fc7d5eb83804e10ae55b1ae9b102f88b1ea2b08, reversing
changes made to 1fddf2b68996b56804a24b67191e4d883943057d.

The idea is good, however, before enforcing, make sure all occurences
are fixed.
---
 pkgs/stdenv/generic/make-derivation.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index cb3731da193..e06faed30a1 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -12,9 +12,7 @@ rec {
   # * https://nixos.org/nix/manual/#ssec-derivation
   #   Explanation about derivations in general
   mkDerivation =
-    { name ? if attrs ? pname && attrs ? version
-        then "${attrs.pname}-${attrs.version}"
-        else ""
+    { name ? ""
 
     # These types of dependencies are all exhaustively documented in
     # the "Specifying Dependencies" section of the "Standard
@@ -67,8 +65,6 @@ 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" ]
@@ -82,13 +78,6 @@ rec {
 
     , ... } @ attrs:
 
-    # Check that the name is consistent with pname and version:
-    assert lib.assertMsg
-      (lib.lists.all (name: builtins.hasAttr name attrs) ["name" "pname" "version"]
-        -> lib.strings.hasSuffix "${attrs.pname}-${attrs.version}" attrs.name)
-      ("mkDerivation: `name` (\"${attrs.name}\") must be consistent " +
-       "with `pname-version` \"${attrs.pname}-${attrs.version}\"");
-
     let
       # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
       # no package has `doCheck = true`.
-- 
GitLab


From 058a3c0806e2148ae3d0519bcaa929b7c2486c17 Mon Sep 17 00:00:00 2001
From: Timon Stampfli <timon@timon.ch>
Date: Sat, 27 Oct 2018 15:25:52 +0200
Subject: [PATCH 0995/1065] openjpeg: adding patch for CVE-2018-7648

(cherry picked from commit 3dc0838450ad5ec8c25adcd1c7bfe3b8b630b7e5)
Forward-picking from staging-next.  The CVE is marked as critical,
and the amount of rebuilds isn't that high (~500 linux, ~100 darwin).
---
 pkgs/development/libraries/openjpeg/2.x.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix
index d18c971dc11..77d9e5829a1 100644
--- a/pkgs/development/libraries/openjpeg/2.x.nix
+++ b/pkgs/development/libraries/openjpeg/2.x.nix
@@ -5,4 +5,12 @@ callPackage ./generic.nix (args // rec {
   branch = "2.3";
   revision = "v${version}";
   sha256 = "08plxrnfl33sn2vh5nwbsngyv6b1sfpplvx881crm1v1ai10m2lz";
+
+  patches = [
+    (fetchpatch {
+      name = "CVE-2018-7648.patch";
+      url = "https://github.com/uclouvain/openjpeg/commit/cc3824767bde397fedb8a1ae4786a222ba860c8d.patch";
+      sha256 = "1j5nxmlgyfkxldk2f1ij6h850xw45q3b5brxqa04dxsfsv8cdj5j";
+    })
+  ];
 })
-- 
GitLab


From 587c3774abc075f117eb73bf01ef4d582de03411 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Nov 2018 15:07:45 +0100
Subject: [PATCH 0996/1065] Revert "systemd: 239 -> 239.20181031"

This reverts commit d1de23b8302d02d4699e884533906a3992f370b6.
The changes turned out to be too intrusive, so we'll patch instead.
Discussion: https://github.com/NixOS/systemd/pull/24
---
 pkgs/os-specific/linux/systemd/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 2a17a0a2875..db64b8e6f6d 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -18,7 +18,7 @@ let
   pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
 
 in stdenv.mkDerivation rec {
-  version = "239.20181031";
+  version = "239";
   name = "systemd-${version}";
 
   # When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
@@ -26,8 +26,8 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "systemd";
-    rev = "nixos-v${version}";
-    sha256 = "1rzl0iqrpa4ajvama5k3cb3yc7893c55kzcxkl3cyavpdzsw5505";
+    rev = "31859ddd35fc3fa82a583744caa836d356c31d7f";
+    sha256 = "1xci0491j95vdjgs397n618zii3sgwnvanirkblqqw6bcvcjvir1";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];
@@ -91,7 +91,6 @@ in stdenv.mkDerivation rec {
     "-Dsulogin-path=${utillinux}/bin/sulogin"
     "-Dmount-path=${utillinux}/bin/mount"
     "-Dumount-path=${utillinux}/bin/umount"
-    "-Ddns-over-tls=false"
   ];
 
   preConfigure = ''
-- 
GitLab


From 179b8146e668636fe59ef7663a6c8cd15d00db7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Nov 2018 15:47:44 +0100
Subject: [PATCH 0997/1065] systemd: apply patches from Debian

There are some security fixes among those.
---
 pkgs/os-specific/linux/systemd/default.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index db64b8e6f6d..1d45109ac85 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
+{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, pkgconfig, intltool, gperf, libcap, kmod
 , xz, pam, acl, libuuid, m4, utillinux, libffi
 , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
 , audit, lz4, bzip2, libmicrohttpd, pcre2
@@ -30,6 +30,22 @@ in stdenv.mkDerivation rec {
     sha256 = "1xci0491j95vdjgs397n618zii3sgwnvanirkblqqw6bcvcjvir1";
   };
 
+  prePatch = let
+      # Upstream's maintenance branches are still too intrusive:
+      # https://github.com/systemd/systemd-stable/tree/v239-stable
+      patches-deb = 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.
+        name = "systemd-debian-patches.tar.xz";
+        url = mirror://debian/pool/main/s/systemd/systemd_239-11~bpo9+1.debian.tar.xz;
+        sha256 = "136f6p4jbi4z94mf4g099dfcacwka8jwhza0wxxw2q5l5q3xiysh";
+      };
+      # Note that we skip debian-specific patches, i.e. ./debian/patches/debian/*
+    in ''
+      tar xf ${patches-deb}
+      patches="$patches $(cat debian/patches/series | grep -v '^debian/' | sed 's|^|debian/patches/|')"
+    '';
+
   outputs = [ "out" "lib" "man" "dev" ];
 
   nativeBuildInputs =
-- 
GitLab


From 7859957e569755fe8e1a716e8a8202fb45088148 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 4 Nov 2018 11:30:14 +0100
Subject: [PATCH 0998/1065] spotify: 1.0.83.316.ge96b6e67-5 ->
 1.0.93.242.gc2341a27-15

---
 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 cbcf5220564..15aaab40a67 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.83.316.ge96b6e67-5";
+  version = "1.0.93.242.gc2341a27-15";
   # 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 = "17";
+  rev = "24";
 
 
   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 = "19bbr4142shsl4qrikf48vq7kyrd4k4jbsada13qxicxps46a9bx51vjm2hkijqv739c1gdkgzwx7llyk95z26lhrz53shm2n5ij8xi";
+    sha512 = "920d55b3dcad4ac6acd9bc73c8ad8eb1668327a175da465ce3d8bba2430da47aaefa5218659315fab43b5182611eb03047d4e2679c1345c57380b7def7a1212d";
   };
 
   buildInputs = [ squashfsTools makeWrapper ];
-- 
GitLab


From cea0e9226f09a7887a82094a06d77809181b615f Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sun, 4 Nov 2018 11:33:34 +0000
Subject: [PATCH 0999/1065] chrootenv: use meson

---
 .../build-fhs-userenv/chrootenv/default.nix          | 12 ++++--------
 .../build-fhs-userenv/chrootenv/meson.build          |  5 +++++
 pkgs/build-support/build-fhs-userenv/default.nix     |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/build-support/build-fhs-userenv/chrootenv/meson.build

diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix
index 4ab8c248e2f..70a7a43bd39 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix
@@ -1,19 +1,15 @@
-{ stdenv, pkgconfig, glib }:
+{ stdenv, meson, ninja, pkgconfig, glib }:
 
 stdenv.mkDerivation {
   name = "chrootenv";
+  src = ./.;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];
   buildInputs = [ glib ];
 
-  buildCommand = ''
-    cc ${./chrootenv.c} $(pkg-config --cflags --libs glib-2.0) -o $out
-    ${stdenv.cc.bintools.bintools}/bin/strip $out
-  '';
-
   meta = with stdenv.lib; {
     description = "Setup mount/user namespace for FHS emulation";
-    license = licenses.free;
+    license = licenses.mit;
     maintainers = with maintainers; [ yegortimoshenko ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build b/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build
new file mode 100644
index 00000000000..6d0770a0dc4
--- /dev/null
+++ b/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build
@@ -0,0 +1,5 @@
+project('chrootenv', 'c')
+
+glib = dependency('glib-2.0')
+
+executable('chrootenv', 'chrootenv.c', dependencies: [glib], install: true)
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index 2bad200efc4..707b256cd4b 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -28,7 +28,7 @@ in runCommand name {
   passthru = passthru // {
     env = runCommand "${name}-shell-env" {
       shellHook = ''
-        exec ${chrootenv} ${init runScript} "$(pwd)"
+        exec ${chrootenv}/bin/chrootenv ${init runScript} "$(pwd)"
       '';
     } ''
       echo >&2 ""
@@ -41,7 +41,7 @@ in runCommand name {
   mkdir -p $out/bin
   cat <<EOF >$out/bin/${name}
   #! ${stdenv.shell}
-  exec ${chrootenv} ${init runScript} "\$(pwd)" "\$@"
+  exec ${chrootenv}/bin/chrootenv ${init runScript} "\$(pwd)" "\$@"
   EOF
   chmod +x $out/bin/${name}
   ${extraInstallCommands}
-- 
GitLab


From 1ee4c6451140b4be277afce6d7d6c50adcdc1e59 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 4 Nov 2018 12:47:22 +0100
Subject: [PATCH 1000/1065] pythonPackages.httmock: init at 1.2.6

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

diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix
new file mode 100644
index 00000000000..b50753c5586
--- /dev/null
+++ b/pkgs/development/python-modules/httmock/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, requests }:
+
+buildPythonPackage rec {
+  pname   = "httmock";
+  version = "1.2.6";
+
+  src = fetchFromGitHub {
+    owner = "patrys";
+    repo = "httmock";
+    rev = version;
+    sha256 = "0iya8qsb2jm03s9p6sf1yzgm1irxl3dcq0k0a9ygl0skzjz5pvab";
+  };
+
+  checkInputs = [ requests ];
+
+  meta = with stdenv.lib; {
+    description = "A mocking library for requests";
+    homepage    = https://github.com/patrys/httmock;
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ nyanloutre ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c5870b529c..3d73c3d04b4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2438,6 +2438,8 @@ in {
 
   html5lib = callPackage ../development/python-modules/html5lib { };
 
+  httmock = callPackage ../development/python-modules/httmock { };
+
   http_signature = callPackage ../development/python-modules/http_signature { };
 
   httpbin = callPackage ../development/python-modules/httpbin { };
-- 
GitLab


From 2e49503dfe4cc6dd857476bd904729eaba9dfab8 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 4 Nov 2018 12:47:46 +0100
Subject: [PATCH 1001/1065] pythonPackages.python-gitlab: init at 1.6.0

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

diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
new file mode 100644
index 00000000000..24ab69f1a0b
--- /dev/null
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi, requests, six, mock, httmock }:
+
+buildPythonPackage rec {
+  pname   = "python-gitlab";
+  version = "1.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "20ceb9232f9a412ce6554056a6b5039013d0755261d57b5c8ada7035773de795";
+  };
+
+  propagatedBuildInputs = [ requests six ];
+
+  checkInputs = [ mock httmock ];
+
+  meta = with stdenv.lib; {
+    description = "Interact with GitLab API";
+    homepage    = https://github.com/python-gitlab/python-gitlab;
+    license     = licenses.lgpl3;
+    maintainers = with maintainers; [ nyanloutre ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d73c3d04b4..7e8bd2c3448 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1626,6 +1626,8 @@ in {
     inherit (pkgs.gitAndTools) git-annex;
   };
 
+  python-gitlab = callPackage ../development/python-modules/python-gitlab { };
+
   google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
   google-cloud-sdk-gce = callPackage ../tools/admin/google-cloud-sdk { with-gce=true; };
 
-- 
GitLab


From c4f6745e72ec2db0430c2a91dde28a03700e9147 Mon Sep 17 00:00:00 2001
From: Robert Hensing <roberth@users.noreply.github.com>
Date: Sun, 4 Nov 2018 13:06:13 +0100
Subject: [PATCH 1002/1065] nixos: programs.bash: Fix comment about completion

`XDG_DATA_DIRS` already includes what is typically the `share` directory.
Adding an extra `share` breaks it.
---
 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 0fbc77ea44c..d325fff6a57 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -16,7 +16,7 @@ let
     # programmable completion. If we do, enable all modules installed in
     # the system and user profile in obsolete /etc/bash_completion.d/
     # directories. Bash loads completions in all
-    # $XDG_DATA_DIRS/share/bash-completion/completions/
+    # $XDG_DATA_DIRS/bash-completion/completions/
     # on demand, so they do not need to be sourced here.
     if shopt -q progcomp &>/dev/null; then
       . "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh"
-- 
GitLab


From b0f7c8609488c7db6d6f7dd0c1b6f92a27cba65d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 4 Nov 2018 07:30:14 -0600
Subject: [PATCH 1003/1065] timescaledb: fix license (Apache 2.0, not
 PostgreSQL)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/sql/postgresql/timescaledb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix
index 07dcfb0b701..3c53054ba7d 100644
--- a/pkgs/servers/sql/postgresql/timescaledb/default.nix
+++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
     homepage    = https://www.timescale.com/;
     maintainers = with maintainers; [ volth ];
     platforms   = platforms.linux;
-    license     = licenses.postgresql;
+    license     = licenses.asl20;
   };
 }
-- 
GitLab


From 423f4f478ed57fbfa6faebb7de24680fccee690b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 4 Nov 2018 05:51:13 -0600
Subject: [PATCH 1004/1065] xapian: 1.4.8 -> 1.4.9

https://xapian.org/docs/xapian-core-1.4.9/NEWS
---
 pkgs/development/libraries/xapian/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 7b92c1c66cd..2d7289ca664 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -36,5 +36,5 @@ let
 in {
   # xapian-ruby needs 1.2.22 as of 2017-05-06
   xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
-  xapian_1_4 = generic "1.4.8" "0528841hn5lddaa317ax3i3d01zf1izpzh4njiz6s84mxpn06q6s";
+  xapian_1_4 = generic "1.4.9" "1k7m7m9jld96k16ansfw2w3c354pvd8ibhnrb6dw012g06fw7sfd";
 }
-- 
GitLab


From 05f368b60a68cdb76a70a499c2c413e16bf7ab51 Mon Sep 17 00:00:00 2001
From: Jonathan Queiroz <github@johnjq.com>
Date: Sun, 4 Nov 2018 11:00:21 -0300
Subject: [PATCH 1005/1065] pythonPackages.sslib: init at 0.2.0 (#47985)

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

diff --git a/pkgs/development/python-modules/sslib/default.nix b/pkgs/development/python-modules/sslib/default.nix
new file mode 100644
index 00000000000..3e5be211d42
--- /dev/null
+++ b/pkgs/development/python-modules/sslib/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k }:
+
+buildPythonPackage rec {
+  pname = "sslib";
+  version = "0.2.0";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0b5zrjkvx4klmv57pzhcmvbkdlyn745mn02k7hp811hvjrhbz417";
+  };
+
+  # No tests available
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/jqueiroz/python-sslib;
+    description = "A Python3 library for sharing secrets";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jqueiroz ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cc608eacb1a..41631a7dba2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -662,6 +662,8 @@ in {
 
   spglib = callPackage ../development/python-modules/spglib { };
 
+  sslib = callPackage ../development/python-modules/sslib { };
+
   statistics = callPackage ../development/python-modules/statistics { };
 
   sumo = callPackage ../development/python-modules/sumo { };
-- 
GitLab


From 0de150e0f2878995716f398eec04ddca220d6cfc Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 4 Nov 2018 14:28:53 +0100
Subject: [PATCH 1006/1065] nixos/prometheus: add `package` option

With a package option we can let the user decide what package to use for
prometheus without requiring an overlay.
---
 .../services/monitoring/prometheus/default.nix        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index e2ee995cea8..63b7d1c0bd4 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -376,6 +376,15 @@ in {
         '';
       };
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.prometheus;
+        defaultText = "pkgs.prometheus";
+        description = ''
+          The prometheus package that should be used.
+        '';
+      };
+
       listenAddress = mkOption {
         type = types.str;
         default = "0.0.0.0:9090";
@@ -495,7 +504,7 @@ in {
       after    = [ "network.target" ];
       script = ''
         #!/bin/sh
-        exec ${pkgs.prometheus}/bin/prometheus \
+        exec ${cfg.package}/bin/prometheus \
           ${concatStringsSep " \\\n  " cmdlineArgs}
       '';
       serviceConfig = {
-- 
GitLab


From 6795bdd58ca1f1504833428365f32bd023bb1aeb Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 4 Nov 2018 14:30:47 +0100
Subject: [PATCH 1007/1065] nixos/prometheus: check configuration before
 starting service

With `promtool` we can check the validity of a configuration before
deploying it. This avoids situations where you would end up with a
broken monitoring system without noticing it - since the monitoring
broke down. :-)
---
 .../services/monitoring/prometheus/default.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index 63b7d1c0bd4..bf4dfc666bb 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -10,6 +10,13 @@ let
   # Get a submodule without any embedded metadata:
   _filter = x: filterAttrs (k: v: k != "_module") x;
 
+  # a wrapper that verifies that the configuration is valid
+  promtoolCheck = what: name: file: pkgs.runCommand "${name}-${what}-checked"
+    { buildInputs = [ cfg.package ]; } ''
+    ln -s ${file} $out
+    promtool ${what} $out
+  '';
+
   # Pretty-print JSON to a file
   writePrettyJSON = name: x:
     pkgs.runCommand name { } ''
@@ -19,18 +26,19 @@ let
   # This becomes the main config file
   promConfig = {
     global = cfg.globalConfig;
-    rule_files = cfg.ruleFiles ++ [
+    rule_files = map (promtoolCheck "check-rules" "rules") (cfg.ruleFiles ++ [
       (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules))
-    ];
+    ]);
     scrape_configs = cfg.scrapeConfigs;
   };
 
   generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig;
 
-  prometheusYml =
-    if cfg.configText != null then
+  prometheusYml = let
+    yml =  if cfg.configText != null then
       pkgs.writeText "prometheus.yml" cfg.configText
-    else generatedPrometheusYml;
+      else generatedPrometheusYml;
+    in promtoolCheck "check-config" "prometheus.yml" yml;
 
   cmdlineArgs = cfg.extraFlags ++ [
     "-storage.local.path=${cfg.dataDir}/metrics"
-- 
GitLab


From da0db2102917c6e53aafc77781f61f497b438d02 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Sun, 4 Nov 2018 13:23:26 +0100
Subject: [PATCH 1008/1065] vim-plugins: add jedi-vim

As this is a python3 plugin it'd be nice to check for python3 support in
the used vim, but apparently nobody else does this.
---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/overrides.nix    |  9 +++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  3 ++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index bd3458b98c8..9a131b3afab 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -718,6 +718,17 @@
     };
   };
 
+  jedi-vim = buildVimPluginFrom2Nix {
+    name = "jedi-vim-2018-10-14";
+    src = fetchFromGitHub {
+      owner = "davidhalter";
+      repo = "jedi-vim";
+      rev = "b6dfc5fd49c26d4dbe9f54c814956567a7a9b3a8";
+      sha256 = "11wvynjl1m23vdp4wvirhmm7vnpji5affbyhwz67yjkvh6c42xqa";
+      fetchSubmodules = true;
+    };
+  };
+
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
     name = "Jenkinsfile-vim-syntax-2018-09-25";
     src = fetchFromGitHub {
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 6b8bf42c795..8ed7a944671 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -334,4 +334,13 @@ with generated;
     };
   });
 
+  jedi-vim = jedi-vim.overrideAttrs(old: {
+    # checking for python3 support in vim would be neat, too, but nobody else seems to care
+    buildInputs = [ python3Packages.jedi ];
+    meta = {
+      description = "code-completion for python using python-jedi";
+      license = stdenv.lib.licenses.mit;
+    };
+  });
+
 }
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index bccb97b72d2..33049c834a2 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -37,14 +37,15 @@ ctjhoa/spacevim
 ctrlpvim/ctrlp.vim
 dag/vim2hs
 dannyob/quickfixstatus
+davidhalter/jedi-vim
 derekelkins/agda-vim
 derekwyatt/vim-scala
 dhruvasagar/vim-table-mode
 digitaltoad/vim-jade
 dleonard0/pony-vim-syntax
 dracula/vim
-dylanaraps/wal.vim
 drmingdrmer/xptemplate
+dylanaraps/wal.vim
 eagletmt/ghcmod-vim
 eagletmt/neco-ghc
 easymotion/vim-easymotion
-- 
GitLab


From f6b41dd3d1cca1182ebcbddbe2974c9dd92102c4 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Sun, 4 Nov 2018 13:24:44 +0100
Subject: [PATCH 1009/1065] vim-plugins: automatic version bumps

The recommended ./update.py script for adding new plugins also bumps the
version of already existing plugins.
---
 pkgs/misc/vim-plugins/generated.nix | 96 ++++++++++++++---------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 9a131b3afab..d9ceb20e941 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -53,12 +53,12 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-10-29";
+    name = "ale-2018-10-31";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "cae40e1c347064bd3ab5eb4c04e9e357d3d82105";
-      sha256 = "0f7qsp0gpafk7fimcbivx2cm53hpjz6hr6lzdg8wnxcm0gdw7827";
+      rev = "4b841b55869e3ec5b02806f9b2fe962ffdca2750";
+      sha256 = "0wa8phv4b6n1akaii8qy9c0lr17vm4bqgz5chjx28zs73jfxsf2i";
     };
   };
 
@@ -93,12 +93,12 @@
   };
 
   awesome-vim-colorschemes = buildVimPluginFrom2Nix {
-    name = "awesome-vim-colorschemes-2018-01-20";
+    name = "awesome-vim-colorschemes-2018-10-30";
     src = fetchFromGitHub {
       owner = "rafi";
       repo = "awesome-vim-colorschemes";
-      rev = "8d2b6657bdbe4f7253e320c741bc4c1fc2f2f41d";
-      sha256 = "1wfm6rsmyqldxwcz0ic4rq7kf00fgsx00rg42cl9yya35nqiri2z";
+      rev = "21d1c93da95d58bead99f3226f9447f5b035afe1";
+      sha256 = "1niwwyxgq7k7mbi05lnpz12lbmn9mam9x4qvzxcbvxsqqp2zzsj8";
     };
   };
 
@@ -910,12 +910,12 @@
   };
 
   neco-vim = buildVimPluginFrom2Nix {
-    name = "neco-vim-2017-10-01";
+    name = "neco-vim-2018-10-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neco-vim";
-      rev = "f5397c5e800d65a58c56d8f1b1b92686b05f4ca9";
-      sha256 = "0yb7ja6qgrazszk4i01cwjj00j9vd43zs2r11b08iy8n10jnzr73";
+      rev = "4c0203b44f8daa7e2f72e2514488d637e8a766a4";
+      sha256 = "03v3h2ks6y9pl960lnvzxlfhnn6l2pcn6d6012znw2wqpralrjq2";
     };
   };
 
@@ -960,12 +960,12 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-10-28";
+    name = "neomake-2018-10-29";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "35f4c002d55d5f722a08eb9acf126f7717072812";
-      sha256 = "0ad5dqyjpwn78nadg90jd03n0mkllm0r4jxq72h77dwxsd1prgl9";
+      rev = "c15d51ea9f622b8bce469a18833a6ac64f6a1193";
+      sha256 = "1l15y0di6k4v0vrwpd86lp2n5ljfjnzncgpxwmbhqb2xznr7caq7";
     };
   };
 
@@ -1020,12 +1020,12 @@
   };
 
   nerdtree = buildVimPluginFrom2Nix {
-    name = "nerdtree-2018-10-25";
+    name = "nerdtree-2018-10-31";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "91e0f2253fbecefa7e14f095950341584877ef19";
-      sha256 = "1lkmxplrv211drzmwi93v1fmicdjm146vl471s3h21y77k0hd2f5";
+      rev = "8d005db94f8d1a214d172aeb1008d016c3d201e2";
+      sha256 = "0f8dljl45ph668kwjf0py0891i3aqfdijplarxnblbkp2zn5ij7g";
     };
   };
 
@@ -1490,12 +1490,12 @@
   };
 
   tsuquyomi = buildVimPluginFrom2Nix {
-    name = "tsuquyomi-2018-08-03";
+    name = "tsuquyomi-2018-10-31";
     src = fetchFromGitHub {
       owner = "Quramy";
       repo = "tsuquyomi";
-      rev = "05e6515f6d21545959ac4eb570c917e1d225b1f1";
-      sha256 = "0hbd2d8zb86c8ncrrm4zyj92j523xay2lwk2k9arwacn8fj42hir";
+      rev = "bdd034d06ed47176ec1ee0bd3dae5bc0aeb053e3";
+      sha256 = "119dxmkarbh0b0k4l59mxr19shks4mv96j3mbz02q0kdq18bgrdq";
     };
   };
 
@@ -1550,12 +1550,12 @@
   };
 
   vim = buildVimPluginFrom2Nix {
-    name = "vim-2018-10-27";
+    name = "vim-2018-10-30";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "854886980635eb70e119d2bd3bb94a0ce46fc71d";
-      sha256 = "1ff88clly227cj83ng6bwc8jn3zp20614agg94izqhsxr5bpdp5z";
+      rev = "66755a9cb9bdea62720812a1165132de6ff62468";
+      sha256 = "0zca3spgnf00rxa0h5x79ydycz41b0xli7bgwpnbxannzxqswhiy";
     };
   };
 
@@ -1760,12 +1760,12 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-10-22";
+    name = "vim-airline-2018-11-01";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "08e9aa5386eecfd6a6cbde1eff240619cd81beed";
-      sha256 = "0g9rlr6067sqyp0l4yacnr14phx1wn2jvjcq2x2zwkc0b28hxyrs";
+      rev = "6516b1b4dccef543d489177431050fe8a5c5c99c";
+      sha256 = "0x4vdxz31vqyd3qy8vr4gcdc649nz72axris5fxj8ln5zphlr6ll";
     };
   };
 
@@ -1980,12 +1980,12 @@
   };
 
   vim-dispatch = buildVimPluginFrom2Nix {
-    name = "vim-dispatch-2018-10-02";
+    name = "vim-dispatch-2018-10-31";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
-      rev = "ab7470d4b03bae9880bf2b5cef60fc0fb51b1101";
-      sha256 = "01slb3lcbdba0a4xky6i5xflh1cjm0aq6g8yyfzrgn4w8pq50h9p";
+      rev = "d4b8940fd1cd77fc6d300f003b18745a584295b2";
+      sha256 = "06g0xc55z9jpa5rl8c5af5apb8b2agahsxxzayl2vn763v9p1n6b";
     };
   };
 
@@ -2210,12 +2210,12 @@
   };
 
   vim-grepper = buildVimPluginFrom2Nix {
-    name = "vim-grepper-2018-10-29";
+    name = "vim-grepper-2018-10-30";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-grepper";
-      rev = "54cb4c55bd8d80fc046f62b8f6486db2de424399";
-      sha256 = "1bzzyh2yav9f54gn17ny8gpi5h70yvjqdyg9lg0b1rglvirjpb1r";
+      rev = "a55a14b97dc8ac848eeb95e71d095b75197ba665";
+      sha256 = "08p5dp43z9bxllr5fvl3hgnyqyxlvpbfczw1ydncmzvrqqccrx08";
     };
   };
 
@@ -2641,12 +2641,12 @@
   };
 
   vim-operator-surround = buildVimPluginFrom2Nix {
-    name = "vim-operator-surround-2017-12-22";
+    name = "vim-operator-surround-2018-11-01";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "vim-operator-surround";
-      rev = "001c0da077b5b38a723151b19760d220e02363db";
-      sha256 = "0c6w6id57faw6sjf5wvw9qp2a4i7xj65q0c4hjs0spgzycv2wpkh";
+      rev = "80337a40a829cfc77b065a71d8a609e2ad7d2c8b";
+      sha256 = "0f9shg81bl39hz67ahbi6k6gbhky7gzp8by16fhiz75hbjgp9lq2";
     };
   };
 
@@ -2841,12 +2841,12 @@
   };
 
   vim-rhubarb = buildVimPluginFrom2Nix {
-    name = "vim-rhubarb-2018-09-20";
+    name = "vim-rhubarb-2018-10-31";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-rhubarb";
-      rev = "3a9ddb8ffa46b9fa49f3d9372bbb5d64bdc5fd23";
-      sha256 = "1swybc30vyf309w1a34jf94xja1kikvrr3xpixfban50s6aiyips";
+      rev = "42072cc349c46db79c0a4411d399a2fe31cfda7e";
+      sha256 = "020fshfrwbycs4saci58k625330i2ndfh6lqnxz5h0pp2m5y6jp8";
     };
   };
 
@@ -2921,12 +2921,12 @@
   };
 
   vim-signify = buildVimPluginFrom2Nix {
-    name = "vim-signify-2018-10-01";
+    name = "vim-signify-2018-10-31";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
-      rev = "ce2dd937bf3a394ef2fbeda8ab56d2b4437be3c3";
-      sha256 = "08ah81bn0cmqphi2lw2y7pjdg8sw2wjwc3p3j6pj0gyqx2bsf408";
+      rev = "4e7faba8d32d56d80090dedc5328849a7128b73a";
+      sha256 = "0wm1kgklvd4b52lrqb9l7n511p8kaw8y9707962l4nrp8cbrbs31";
     };
   };
 
@@ -2991,22 +2991,22 @@
   };
 
   vim-speeddating = buildVimPluginFrom2Nix {
-    name = "vim-speeddating-2017-05-24";
+    name = "vim-speeddating-2018-10-31";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-speeddating";
-      rev = "a418667791f03694065948342f2d6c5cca8d0f32";
-      sha256 = "1wm33izawazh0dy70zjk6rkg30yrlldba5r1gypnr4barps702gw";
+      rev = "799cd3473bc64adcb6b556bf349f549570666b62";
+      sha256 = "0vyla4lslf1hycx1mvgydhlar2f6bwnwbcp39s1f0m65fqs25rhz";
     };
   };
 
   vim-startify = buildVimPluginFrom2Nix {
-    name = "vim-startify-2018-10-02";
+    name = "vim-startify-2018-10-31";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
-      rev = "556bf1d507dfaddfba4b5795716ea20f8ba902ac";
-      sha256 = "1jjj7iij08455rlc705m3pnbjg87r2l29jclzkiy7nsvjjh3dfwx";
+      rev = "356562270684d8d1647daf0faaf76ac90740990c";
+      sha256 = "0qc9ifq4blixda0kyc0zhmqi6cqz44xnk9x17p0p9qqidf1s1l1r";
     };
   };
 
@@ -3301,12 +3301,12 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-10-29";
+    name = "vimtex-2018-11-01";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "8a32372e4fc3c628d36b8215c6d30bd05eeade28";
-      sha256 = "1h1fp0jnv4wj96mam9dgnr5y1i4a4bdi4law3y1qh937bx7nk2vd";
+      rev = "2aae07e67034f4806d45500a967bf5775ab22baf";
+      sha256 = "1ng1ps5f2vh7xs5lfkid7zwvcjglynw53xvd301zpjbgln2gv3fz";
     };
   };
 
-- 
GitLab


From 965ae0246a2ee176cba658503afe8cd78e01f087 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Nov 2018 14:14:16 +0000
Subject: [PATCH 1010/1065] pulseaudio-modules-bt: unstable-2018-10-16 ->
 unstable-2018-11-01

---
 .../audio/pulseaudio-modules-bt/default.nix       | 10 ++++++----
 .../pulseaudio-modules-bt/fix-install-path.patch  | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index b377db65c0c..cb267d8bbb6 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -5,6 +5,7 @@
 , pkgconfig
 , ffmpeg_4
 , patchelf
+, fdk_aac
 , libtool
 , cmake
 , bluez
@@ -22,13 +23,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "pulseaudio-modules-bt-${version}";
-  version = "unstable-2018-10-16";
+  version = "unstable-2018-11-01";
 
   src = fetchFromGitHub {
     owner = "EHfive";
     repo = "pulseaudio-modules-bt";
-    rev = "552c2b48c0cc7dd44d0746b261f7c7d5559e8e30";
-    sha256 = "052jb1hjx1in7bafx4zpn78s7r6f2y7djriwi36dzqy9wmalmyjy";
+    rev = "a2f62fcaa702bb883c07d074ebca8d7135520ab8";
+    sha256 = "1fhg7q9064zikhy0xxldn4fvh49pc47mgikcbd9yhsk66gcn6zj3";
     fetchSubmodules = true;
   };
 
@@ -45,6 +46,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     pulseaudio
     ffmpeg_4
+    fdk_aac
     libtool
     bluez
     dbus
@@ -72,7 +74,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/EHfive/pulseaudio-modules-bt;
-    description = "SBC, Sony LDAC codec (A2DP Audio) support for Pulseaudio";
+    description = "LDAC, aptX, aptX HD, AAC codecs (A2DP Audio) support for Linux PulseAudio";
     platforms = platforms.linux;
     license = licenses.mit;
     maintainers = with maintainers; [ adisbladis ];
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
index 2b4ff86ab71..e500d1fb133 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
@@ -1,11 +1,20 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0f5baa0..1f35cce 100644
+index d869979..185144d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -122,5 +121,4 @@ INSTALL(TARGETS
+@@ -143,13 +143,13 @@ INSTALL(TARGETS
          module-bluez5-device
          module-bluetooth-discover
          module-bluetooth-policy
 -        LIBRARY DESTINATION ${PulseAudio_modlibexecdir})
--
 +        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/)
+ 
+ if(NOT ${HAVE_SYSTEM_LDAC})
+ 
+ INSTALL(TARGETS
+         ldacBT_enc
+         ldacBT_abr
+-        LIBRARY DESTINATION ${PulseAudio_modlibexecdir})
++        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/)
+ 
+ endif()
-- 
GitLab


From 4569ee7d74d505f0a9b3fb8754951393e8be7e6f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 4 Nov 2018 08:21:07 -0600
Subject: [PATCH 1011/1065] plv8: unbreak build, bump to version 2.3.8

ee58a5b30d6e60407b44fbb02ddade6c20fd8763 broke the plv8 build because it
upgraded the v8_6_x expression everywhere to the 6.9 branch, which came
with API changes. Notably, it seems plv8 only supports up-to v8 6.4.x at
this time.

This keeps a copy of the plv8_6_x expression inside the same directory
as the other v8 versions (so patches, etc are easy to apply), but it is
not exposed to the top-level of all-packages.nix.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/v8/plv8_6_x.nix   | 187 +++++++++++++++++++
 pkgs/servers/sql/postgresql/plv8/default.nix |  12 +-
 pkgs/top-level/all-packages.nix              |   4 +-
 3 files changed, 198 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/v8/plv8_6_x.nix

diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix
new file mode 100644
index 00000000000..8d2276def70
--- /dev/null
+++ b/pkgs/development/libraries/v8/plv8_6_x.nix
@@ -0,0 +1,187 @@
+# NOTE: this expression is NOT exported from the top-level of all-packages.nix,
+# it is exclusively used by the 'plv8' PostgreSQL extension, which requires a
+# very exact version.
+
+{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig
+, doCheck ? false
+, snapshot ? true
+}:
+
+let
+  arch = if stdenv.isAarch32
+         then if stdenv.is64bit
+              then"arm64"
+              else "arm"
+         else if stdenv.is64bit
+              then"x64"
+              else "ia32";
+  git_url = "https://chromium.googlesource.com";
+
+  # This data is from the DEPS file in the root of a V8 checkout
+  deps = {
+    "base/trace_event/common" = fetchgit {
+      url    = "${git_url}/chromium/src/base/trace_event/common.git";
+      rev    = "0e9a47d74970bee1bbfc063c47215406f8918699";
+      sha256 = "07rbzrlscp8adh4z86yl5jxdnvgkc3xs950xldpk318wf9i3bh6c";
+    };
+    "build" = fetchgit {
+      url    = "${git_url}/chromium/src/build.git";
+      rev    = "9338ce52d0b9bcef34c38285fbd5023b62739fac";
+      sha256 = "1s2sa8dy3waidsirjylc82ggb18l1108bczjc8z0v4ywyj4k0cvh";
+    };
+    "buildtools" = fetchgit {
+      url    = "${git_url}/chromium/buildtools.git";
+      rev    = "505de88083136eefd056e5ee4ca0f01fe9b33de8";
+      sha256 = "0vj216nhb803bggsl0hnyagj8njrm96pn8sim6xcnqb7nhz1vabw";
+    };
+    "test/benchmarks/data" = fetchgit {
+      url    = "${git_url}/v8/deps/third_party/benchmarks.git";
+      rev    = "05d7188267b4560491ff9155c5ee13e207ecd65f";
+      sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl";
+    };
+    "test/mozilla/data" = fetchgit {
+      url    = "${git_url}/v8/deps/third_party/mozilla-tests.git";
+      rev    = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be";
+      sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn";
+    };
+    "test/test262/data" = fetchgit {
+      url    = "${git_url}/external/github.com/tc39/test262.git";
+      rev    = "5d4c667b271a9b39d0de73aef5ffe6879c6f8811";
+      sha256 = "0q9iwb2nkybf9np95wgf5m372aw2lhx9wlsw41a2a80kbkvb2kqg";
+    };
+    "test/test262/harness" = fetchgit {
+      url    = "${git_url}/external/github.com/test262-utils/test262-harness-py.git";
+      rev    = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd";
+      sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp";
+    };
+    "test/wasm-js" = fetchgit {
+      url    = "${git_url}/external/github.com/WebAssembly/spec.git";
+      rev    = "a7e226a92e660a3d5413cfea4269824f513259d2";
+      sha256 = "0z3aybj3ykajwh2bv5fwd6pwqjjsq8dnwrqc2wncb6r9xcjwbgxp";
+    };
+    "testing/gtest" = fetchgit {
+      url    = "${git_url}/external/github.com/google/googletest.git";
+      rev    = "6f8a66431cb592dad629028a50b3dd418a408c87";
+      sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw";
+    };
+    "third_party/icu" = fetchgit {
+      url    = "${git_url}/chromium/deps/icu.git";
+      rev    = "741688ebf328da9adc52505248bf4e2ef868722c";
+      sha256 = "02ifm18qjlrkn5nm2rxkf9yz9bdlyq7c65jfjndv63vi1drqh1r9";
+    };
+    "third_party/instrumented_libraries" = fetchgit {
+      url    = "${git_url}/chromium/src/third_party/instrumented_libraries.git";
+      rev    = "28417458ac4dc79f68915079d0f283f682504cc0";
+      sha256 = "1qf5c2946n37p843yriv7xawi6ss6samabghq43s49cgd4wq8dc3";
+    };
+    "third_party/jinja2" = fetchgit {
+      url    = "${git_url}/chromium/src/third_party/jinja2.git";
+      rev    = "d34383206fa42d52faa10bb9931d6d538f3a57e0";
+      sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd";
+    };
+    "third_party/markupsafe" = fetchgit {
+      url    = "${git_url}/chromium/src/third_party/markupsafe.git";
+      rev    = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";
+      sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz";
+    };
+    "tools/clang" = fetchgit {
+      url    = "${git_url}/chromium/src/tools/clang.git";
+      rev    = "8688d267571de76a56746324dcc249bf4232b85a";
+      sha256 = "0krq4zz1vnwp064bm517gwr2napy18wyccdh8w5s4qgkjwwxd63s";
+    };
+    "tools/gyp" = fetchgit {
+      url    = "${git_url}/external/gyp.git";
+      rev    = "d61a9397e668fa9843c4aa7da9e79460fe590bfb";
+      sha256 = "1z081h72mjy285jb1kj5xd0pb4p12n9blvsimsavyn3ldmswv0r0";
+    };
+    "tools/luci-go" = fetchgit {
+      url    = "${git_url}/chromium/src/tools/luci-go.git";
+      rev    = "45a8a51fda92e123619a69e7644d9c64a320b0c1";
+      sha256 = "0r7736gqk7r0i7ig0b5ib10d9q8a8xzsmc0f0fbkm9k78v847vpj";
+    };
+    "tools/swarming_client" = fetchgit {
+      url    = "${git_url}/infra/luci/client-py.git";
+      rev    = "4bd9152f8a975d57c972c071dfb4ddf668e02200";
+      sha256 = "03zk91gzvqv01g1vbl8d7h8al7vs4ymrrdc8ipg9wpq52yh65smh";
+    };
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "v8-${version}";
+  version = "6.4.388.40";
+
+  inherit doCheck;
+
+  src = fetchFromGitHub {
+    owner = "v8";
+    repo = "v8";
+    rev = version;
+    sha256 = "1lq239cgqyidrynz8g3wbdv70ymzv6s0ppad8s219gb3jnizm16a";
+  };
+
+  postUnpack = ''
+    ${lib.concatStringsSep "\n" (
+      lib.mapAttrsToList (n: v: ''
+        mkdir -p $sourceRoot/${n}
+        cp -r ${v}/* $sourceRoot/${n}
+      '') deps)}
+  '';
+
+  prePatch = ''
+    # use our gn, not the bundled one
+    sed -i -e 's#gn_path = .*#gn_path = "${gn}/bin/gn"#' tools/mb/mb.py
+
+    # disable tests
+    if [ "$doCheck" = "" ]; then sed -i -e '/"test:gn_all",/d' BUILD.gn; fi
+
+    # disable sysroot usage
+    chmod u+w build/config build/config/sysroot.gni
+    sed -i build/config/sysroot.gni \
+        -e '/use_sysroot =/ { s#\(use_sysroot =\).*#\1 false#; :a  n; /current_cpu/ { s/^/#/; ba };  }'
+
+    # patch shebangs (/usr/bin/env)
+    patchShebangs tools/dev/v8gen.py
+  '';
+
+  configurePhase = ''
+    tools/dev/v8gen.py -vv ${arch}.release -- \
+        is_component_build=true               \
+        ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false"} \
+        is_clang=false                        \
+        linux_use_bundled_binutils=false      \
+        treat_warnings_as_errors=false        \
+        use_custom_libcxx=false               \
+        use_custom_libcxx_for_host=false
+  '';
+
+  nativeBuildInputs = [ gn ninja pkgconfig ];
+  buildInputs = [ python glib ];
+
+  buildPhase = ''
+    ninja -C out.gn/${arch}.release/
+  '';
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    install -vD out.gn/${arch}.release/d8 "$out/bin/d8"
+    install -vD out.gn/${arch}.release/mksnapshot "$out/bin/mksnapshot"
+    mkdir -p "$out/lib"
+    for f in libicui18n.so libicuuc.so libv8_libbase.so libv8_libplatform.so libv8.so; do
+        install -vD out.gn/${arch}.release/$f "$out/lib/$f"
+    done
+    install -vD out.gn/${arch}.release/icudtl.dat "$out/lib/icudtl.dat"
+    mkdir -p "$out/include"
+    cp -vr include/*.h "$out/include"
+    cp -vr include/libplatform "$out/include"
+  '';
+
+  meta = with lib; {
+    description = "Google's open source JavaScript engine";
+    maintainers = with maintainers; [ cstrahan proglodyte ];
+    platforms = platforms.linux;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/plv8/default.nix b/pkgs/servers/sql/postgresql/plv8/default.nix
index 009f65b9d81..dae3b2fd1af 100644
--- a/pkgs/servers/sql/postgresql/plv8/default.nix
+++ b/pkgs/servers/sql/postgresql/plv8/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "plv8-${version}";
-  version = "2.1.0";
+  version = "2.3.8";
 
   nativeBuildInputs = [ perl ];
   buildInputs = [ v8 postgresql ];
@@ -11,16 +11,20 @@ stdenv.mkDerivation rec {
     owner = "plv8";
     repo = "plv8";
     rev = "v${version}";
-    sha256 = "1sfpxz0zcbinn6822j12lkwgrw9kfacrs83ic968rm489rl9w241";
+    sha256 = "0hrmn1zzzdf52zwldg6axv57p0f3b279l9s8lbpijcv60fqrzx16";
   };
 
+  makeFlags = [ "--makefile=Makefile.shared" ];
+
   preConfigure = ''
-    substituteInPlace Makefile --replace '-lv8_libplatform' '-lv8_libplatform -lv8_libbase'
+    patchShebangs ./generate_upgrade.sh
   '';
 
+  buildPhase = "make -f Makefile.shared all";
+
   installPhase = ''
     mkdir -p $out/bin
-    install -D plv8.so                                         -t $out/lib
+    install -D plv8*.so                                        -t $out/lib
     install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/extension
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fb3351f981..9709ad87104 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11699,7 +11699,9 @@ with pkgs;
   pgroonga = callPackage ../servers/sql/postgresql/pgroonga {};
 
   plv8 = callPackage ../servers/sql/postgresql/plv8 {
-    v8 = v8_6_x;
+    v8 = callPackage ../development/libraries/v8/plv8_6_x.nix {
+      inherit (python2Packages) python;
+    };
   };
 
   phonon = callPackage ../development/libraries/phonon {};
-- 
GitLab


From 6f3425804c9b41d0450714c4e06cb45879bc1dc7 Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Thu, 1 Nov 2018 11:08:43 +0200
Subject: [PATCH 1012/1065] brightnessctl: fix udev, cleanup & meta update

---
 pkgs/misc/brightnessctl/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix
index f90baee91fc..6292b8183b2 100644
--- a/pkgs/misc/brightnessctl/default.nix
+++ b/pkgs/misc/brightnessctl/default.nix
@@ -11,20 +11,18 @@ stdenv.mkDerivation rec {
     sha256 = "1n1gb8ldgqv3vs565yhk1w4jfvrviczp94r8wqlkv5q6ab43c8w9";
   };
 
-  makeFlags = [ "MODE=0755" "PREFIX=" "DESTDIR=$(out)" ];
-  installTargets = [ "install" "install_udev_rules" ];
+  makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ];
 
   postPatch = ''
     substituteInPlace 90-brightnessctl.rules --replace /bin/ ${coreutils}/bin/
-    substituteInPlace 90-brightnessctl.rules --replace %k '*'
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/Hummer12007/brightnessctl";
-    maintainers = [ stdenv.lib.maintainers.Dje4321 ];
-    license = stdenv.lib.licenses.mit;
     description = "This program allows you read and control device brightness";
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.mit;
+    maintainers = with maintainers; [ megheaiulian ];
+    platforms = platforms.linux;
   };
 
 }
-- 
GitLab


From 354379d6ffb5276d1d49301b408b8a6ce386af5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Th=C3=B6rne?= <notrupertthorne@gmail.com>
Date: Sun, 4 Nov 2018 15:33:32 +0100
Subject: [PATCH 1013/1065] git-big-picture: 0.9.0 -> 0.10.1

https://github.com/esc/git-big-picture/blob/master/README.rst#Changelog
---
 .../git-and-tools/git-big-picture/default.nix               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
index 6918f048eae..7a47ed9a992 100644
--- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
@@ -2,7 +2,7 @@
 
 python2Packages.buildPythonApplication rec {
   pname = "git-big-picture";
-  version = "0.9.0";
+  version = "0.10.1";
 
   name = "${pname}-${version}";
 
@@ -10,7 +10,7 @@ python2Packages.buildPythonApplication rec {
     owner = "esc";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1h283gzs4nx8lrarmr454zza52cilmnbdrqn1n33v3cn1rayl3c9";
+    sha256 = "0b0zdq7d7k7f6p3wwc799347fraphbr20rxd1ysnc4xi1cj4wpmi";
   };
 
   buildInputs = [ git graphviz ];
@@ -21,7 +21,7 @@ python2Packages.buildPythonApplication rec {
     '';
 
   meta = {
-    description = "Tool for visualization of Git repositories.";
+    description = "Tool for visualization of Git repositories";
     homepage = https://github.com/esc/git-big-picture;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
-- 
GitLab


From bb860565750483d9da007fbfe8310c162764c735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Fri, 2 Nov 2018 01:48:40 +0900
Subject: [PATCH 1014/1065] matrix-synapse: 0.33.6 -> 0.33.8

Also reworked dependencies:
 * blist and ujson are marked as no longer needed
 * pytz has no mention throughout `git log -p` on synapse's repository
 * systemd and affinity are optional (but turned on by default)
---
 pkgs/servers/matrix-synapse/default.nix | 51 +++++++++++++++++++------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index dab58d2edd6..e0c666b002a 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, python2Packages, fetchurl, fetchFromGitHub }:
+{ lib, stdenv, python2Packages, fetchurl, fetchFromGitHub
+, enableSystemd ? true
+}:
 let
   matrix-angular-sdk = python2Packages.buildPythonPackage rec {
     name = "matrix-angular-sdk-${version}";
@@ -26,13 +28,13 @@ let
   };
 in python2Packages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.33.6";
+  version = "0.33.8";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "0c1dr09f1msv6xvpmdlncx7yyj6qxnpihd93lqckd115fds12g5h";
+    sha256 = "122ba09xkc1x35qaajcynkjikg342259rgy81m8abz0l8mcg4mkm";
   };
 
   patches = [
@@ -40,16 +42,41 @@ in python2Packages.buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with python2Packages; [
-    blist canonicaljson daemonize dateutil frozendict pillow pyasn1
-    pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests
-    signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client
-    matrix-angular-sdk bleach netaddr jinja2 psycopg2
-    psutil msgpack-python lxml matrix-synapse-ldap3
-    phonenumbers jsonschema affinity bcrypt sortedcontainers treq
-  ];
+    bcrypt
+    bleach
+    canonicaljson
+    daemonize
+    dateutil
+    frozendict
+    jinja2
+    jsonschema
+    lxml
+    matrix-angular-sdk
+    matrix-synapse-ldap3
+    msgpack-python
+    netaddr
+    phonenumbers
+    pillow
+    prometheus_client
+    psutil
+    psycopg2
+    pyasn1
+    pydenticon
+    pymacaroons-pynacl
+    pynacl
+    pyopenssl
+    pysaml2
+    pyyaml
+    requests
+    signedjson
+    sortedcontainers
+    treq
+    twisted
+    unpaddedbase64
+  ] ++ lib.optional enableSystemd systemd;
 
-  # Checks fail because of Tox.
-  doCheck = false;
+  doCheck = true;
+  checkPhase = "python -m twisted.trial test";
 
   buildInputs = with python2Packages; [
     mock setuptoolsTrial
-- 
GitLab


From fc84be03be74bac998f0413f62236830ff800453 Mon Sep 17 00:00:00 2001
From: Frank Doepper <github@woffs.de>
Date: Sun, 4 Nov 2018 15:45:44 +0100
Subject: [PATCH 1015/1065] phototonic: 1.7.1 -> 2.1

---
 pkgs/applications/graphics/phototonic/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix
index ce300eaf9f6..7da1d4b612f 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/pkgs/applications/graphics/phototonic/default.nix
@@ -2,15 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "phototonic-${version}";
-  version = "1.7.1";
+  version = "2.1";
 
   src = fetchFromGitHub {
     repo = "phototonic";
     owner = "oferkv";
-    # There is currently no tag for 1.7.1 see
-    # https://github.com/oferkv/phototonic/issues/214
-    rev = "c37070e4a068570d34ece8de1e48aa0882c80c5b";
-    sha256 = "1agd3bsrpljd019qrjvlbim5l0bhpx53dhpc0gvyn0wmcdzn92gj";
+    rev = "v${version}";
+    sha256 = "0csidmxl1sfmn6gq81vn9f9jckb4swz3sgngnwqa4f75lr6604h7";
   };
 
   buildInputs = [ qtbase exiv2 ];
-- 
GitLab


From 34bf218b16da946e15f5f5e8ea2e7c6044ed7bf7 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 25 Oct 2018 21:10:03 +0200
Subject: [PATCH 1016/1065] Add dhallPackages and add current Prelude

Dhall is a non-turing complete programming language.
---
 .github/CODEOWNERS                            |  4 +++
 pkgs/development/dhall-modules/default.nix    |  9 +++++++
 pkgs/development/dhall-modules/prelude/v3.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/dhall-modules/default.nix
 create mode 100644 pkgs/development/dhall-modules/prelude/v3.nix

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e819d451fd5..17b830e5fad 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -113,3 +113,7 @@
 /nixos/modules/services/databases/postgresql.xml @thoughtpolice
 /nixos/modules/services/databases/postgresql.nix @thoughtpolice
 /nixos/tests/postgresql.nix @thoughtpolice
+
+# Dhall
+/pkgs/development/dhall-modules      @Gabriel439 @Profpatsch
+/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch
diff --git a/pkgs/development/dhall-modules/default.nix b/pkgs/development/dhall-modules/default.nix
new file mode 100644
index 00000000000..b6632a86f31
--- /dev/null
+++ b/pkgs/development/dhall-modules/default.nix
@@ -0,0 +1,9 @@
+{ pkgs }:
+
+# TODO: add into the toplevel fixpoint instead of using rec
+rec {
+
+  prelude = prelude_3_0_0;
+  prelude_3_0_0 = pkgs.callPackage ./prelude/v3.nix {};
+
+}
diff --git a/pkgs/development/dhall-modules/prelude/v3.nix b/pkgs/development/dhall-modules/prelude/v3.nix
new file mode 100644
index 00000000000..ef673310ceb
--- /dev/null
+++ b/pkgs/development/dhall-modules/prelude/v3.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  name = "dhall-prelude";
+
+  src = fetchFromGitHub {
+    owner = "dhall-lang";
+    repo = "dhall-lang";
+    # Commit where the v3.0.0 prelude folder was merged into dhall-lang
+    # and a LICENSE file has been added.
+    rev = "f6aa9399f1ac831d66c34104abe6856023c5b2df";
+    sha256 = "0kqjgh3y1l3cb3rj381j7c09547g1vh2dsfzpm08y1qajhhf9vgf";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    cp -r Prelude $out
+  '';
+
+  meta = {
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ Profpatsch ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9709ad87104..75bd3c191c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7549,6 +7549,8 @@ with pkgs;
 
   dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text;
 
+  dhallPackages = import ../development/dhall-modules { inherit pkgs; };
+
   duktape = callPackage ../development/interpreters/duktape { };
 
   beam = callPackage ./beam-packages.nix { };
-- 
GitLab


From 0ff9a7a2cd58bb306c7bb7fb97ddedac8702dcb9 Mon Sep 17 00:00:00 2001
From: Falco Peijnenburg <fpeijnenburg@gmail.com>
Date: Sun, 4 Nov 2018 17:03:35 +0100
Subject: [PATCH 1017/1065] haskellPackages.*.env: Fixed shellHook being
 ignored

The problem was introduced in 2bafa93b75464eee5744653319d8046e05cf141a
---
 pkgs/development/haskell-modules/generic-builder.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 8f230c92aaa..a0bf655a67b 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -443,6 +443,7 @@ stdenv.mkDerivation ({
 
     env = shellFor {
       packages = p: [ drv ];
+      inherit shellHook;
     };
 
   };
-- 
GitLab


From df8817087ef2ad53dd1df3b0dbcf036c4c07e15a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 3 Nov 2018 22:18:08 -0400
Subject: [PATCH 1018/1065] graalvm: 1.0.0-rc3 -> 1.0.0-rc8

---
 pkgs/development/compilers/graalvm/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 7721ce06a56..349c2ead3ad 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -11,6 +11,7 @@ let
                                   install -D ${fetchurl { inherit url sha1; }} $out/${name}
                                   echo -n ${sha1} > $out/${name}.sha1
                                 '') list}
+        find $out -exec touch -c -m -r '{}' --date="1980-01-01" '{}' \;
       '';
     };
 
@@ -61,13 +62,13 @@ let
 in rec {
 
   mx = stdenv.mkDerivation rec {
-    version = "5.176.4";
+    version = "5.192.0";
     name = "mx";
     src = fetchFromGitHub {
       owner  = "graalvm";
       repo   = "mx";
       rev    = version;
-      sha256 = "0xmx4hpnd6m9hk49lgwnvwd0q11s2m4d8axwq7zzc8wm10d692xw";
+      sha256 = "04gdf1gzlc8a6li8lcnrs2j9zicj11fs1vqqf7cmhb4pm2h72hml";
     };
     nativeBuildInputs = [ makeWrapper ];
     buildPhase = ''
@@ -86,6 +87,7 @@ in rec {
       wrapProgram $out/bin/mx \
         --prefix PATH : ${lib.makeBinPath [ python27 mercurial ]} \
         --set    FINDBUGS_HOME ${findbugs}
+      find $out -exec touch -c -m -r '{}' --date="1980-01-01" '{}' \;
     '';
     meta = with stdenv.lib; {
       homepage = https://github.com/graalvm/mx;
@@ -97,9 +99,9 @@ in rec {
 
   # copy of pkgs.oraclejvm8 with JVMCI interface (TODO: it should work with pkgs.openjdk8 too)
   jvmci8 = stdenv.mkDerivation rec {
-    version = "0.45";
+    version = "0.49";
     name = let
-             n = "jvmci8u171-${version}";
+             n = "jvmci8u191-${version}";
            in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then
                 n
               else
@@ -108,7 +110,7 @@ in rec {
       owner  = "graalvm";
       repo   = "graal-jvmci-8";
       rev    = "jvmci-${version}";
-      sha256 = "1nppk9dpamisiadss1iy82i3rf6igndbf1vax85w9lz310kh0d12";
+      sha256 = "1zgin0w1qa7wmfhcisx470fhnmddfxxp5nyyix31yaa7dznql82k";
     };
     buildInputs = [ mx mercurial ];
     postUnpack = ''
@@ -132,6 +134,7 @@ in rec {
 
       export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
       export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache}
+      find $NIX_BUILD_TOP -exec touch -c -m -r '{}' --date="1980-01-01" '{}' \;
       mx --java-home $(pwd)/writable-copy-of-jdk build
     '';
     installPhase = ''
@@ -146,7 +149,7 @@ in rec {
   };
 
   graalvm8 = stdenv.mkDerivation rec {
-    version = "1.0.0-rc3";
+    version = "1.0.0-rc8";
     name = let
              n = "graal-${version}";
            in if (lib.stringLength n) == (lib.stringLength jvmci8.name) then
@@ -157,7 +160,7 @@ in rec {
       owner  = "oracle";
       repo   = "graal";
       rev    = "vm-${version}";
-      sha256 = "1hcs4m6ailapgi3bikav1i517vqn5pn595cyqqjfvlnkjwihbnc3";
+      sha256 = "1fada4awrr8bhw294xdiq4bagvgrlcr44mw6338gaal0ky3vkm0p";
     };
     buildInputs = [ mx zlib mercurial jvmci8 ];
     postUnpack = ''
@@ -178,6 +181,7 @@ in rec {
 
       export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
       export MX_CACHE_DIR=${makeMxCache graal-mxcache}
+
       ( cd substratevm
 
         mkdir -p clibraries
-- 
GitLab


From 7bd773832c93d3fae33676d8567eb295d547465e Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sun, 4 Nov 2018 03:27:58 +0000
Subject: [PATCH 1019/1065] graalvm 1.0.0-rc8 fixes

---
 .../development/compilers/graalvm/default.nix | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 349c2ead3ad..37c23e81b42 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -11,7 +11,6 @@ let
                                   install -D ${fetchurl { inherit url sha1; }} $out/${name}
                                   echo -n ${sha1} > $out/${name}.sha1
                                 '') list}
-        find $out -exec touch -c -m -r '{}' --date="1980-01-01" '{}' \;
       '';
     };
 
@@ -51,6 +50,9 @@ let
     rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}/libffi.tar.gz";                                                    url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; }
     rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar";                                             url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar; }
     rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar";                                       url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/checkstyle-8.8-all.jar; }
+    rec { sha1 = "a828a4f32caf9ac0b74f2548f87310959558c526"; name = "VISUALVM_COMMON_${sha1}/visualvm-common.tar.gz";                                  url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm-612.tar.gz; }
+    rec { sha1 = "7ac829f0c9a37f5cc39afd2265588a365480720d"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz";            url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm-612-linux-amd64.tar.gz; }
+    rec { sha1 = "e6e60889b7211a80b21052a249bd7e0f88f79fee"; name = "Java-WebSocket_${sha1}/java-websocket.jar";                                       url = mirror://maven/org/java-websocket/Java-WebSocket/1.3.9/Java-WebSocket-1.3.9.jar; }
   ];
 
   findbugs = fetchzip {
@@ -80,6 +82,11 @@ in rec {
         'def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False):
           print("FAKE download(path={} urls={} verbose={} abortOnError={} verifyOnly={})".format(path, urls, verbose, abortOnError, verifyOnly))
           return True'
+
+      # avoid crash with 'ValueError: ZIP does not support timestamps before 1980'
+      substituteInPlace mx.py --replace \
+        'zipfile.ZipInfo(arcname, time.localtime(os.path.getmtime(join(root, f)))[:6])' \
+        'zipfile.ZipInfo(arcname, time.strptime ("1 Jan 1980", "%d %b %Y"       )[:6])'
     '';
     installPhase = ''
       mkdir -p $out/bin
@@ -87,7 +94,6 @@ in rec {
       wrapProgram $out/bin/mx \
         --prefix PATH : ${lib.makeBinPath [ python27 mercurial ]} \
         --set    FINDBUGS_HOME ${findbugs}
-      find $out -exec touch -c -m -r '{}' --date="1980-01-01" '{}' \;
     '';
     meta = with stdenv.lib; {
       homepage = https://github.com/graalvm/mx;
@@ -101,7 +107,7 @@ in rec {
   jvmci8 = stdenv.mkDerivation rec {
     version = "0.49";
     name = let
-             n = "jvmci8u191-${version}";
+             n = "jvmci${/*"8u191"*/ lib.removePrefix "oraclejdk-" oraclejdk8.name}-${version}";
            in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then
                 n
               else
@@ -134,7 +140,6 @@ in rec {
 
       export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
       export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache}
-      find $NIX_BUILD_TOP -exec touch -c -m -r '{}' --date="1980-01-01" '{}' \;
       mx --java-home $(pwd)/writable-copy-of-jdk build
     '';
     installPhase = ''
@@ -173,6 +178,12 @@ in rec {
         hg checkout ${lib.escapeShellArg src.rev}
       )
     '';
+    postPatch = ''
+      substituteInPlace substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/PosixDirectives.java \
+        --replace '<zlib.h>' '<${zlib.dev}/include/zlib.h>'
+      substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \
+        --replace 'cmd.add("-v");' 'cmd.add("-v"); cmd.add("-L${zlib}/lib");'
+    '';
     buildPhase = ''
       # make a copy of jvmci8
       cp -dpR ${jvmci8} $out
@@ -188,7 +199,7 @@ in rec {
         mx --java-home $out build
 
         # bootstrap native-image (that was removed from mx build in https://github.com/oracle/graal/commit/140d7a7edf54ec5872a8ff45869cd1ae499efde4)
-        mx --java-home $out native-image -cp $MX_ALT_OUTPUT_ROOT/substratevm/dists/svm-driver.jar com.oracle.svm.driver.NativeImage
+        mx --java-home $out native-image -cp $MX_ALT_OUTPUT_ROOT/substratevm/dists/jdk1.8/svm-driver.jar com.oracle.svm.driver.NativeImage
       )
       ( cd tools
         mx --java-home $out build
@@ -199,17 +210,17 @@ in rec {
       mkdir -p $out/jre/tools/{profiler,chromeinspector,truffle/builder} $out/jre/lib/{graal,include,truffle/include}
       cp -vpLR substratevm/svmbuild/native-image-root/lib/*                         $out/jre/lib/           || true # ignore "same file" error when dereferencing symlinks
       cp -vp   $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/bin/*     $out/jre/lib/amd64/
-      cp -vp   $MX_ALT_OUTPUT_ROOT/compiler/dists/graal-*processor*.jar             $out/jre/lib/graal/
+      cp -vp   $MX_ALT_OUTPUT_ROOT/compiler/dists/jdk1.8/graal-*processor*.jar      $out/jre/lib/graal/
       cp -vp   $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/include/
-      cp -vp   $MX_ALT_OUTPUT_ROOT/compiler/dists/graal-management.jar              $out/jre/lib/jvmci/
+      cp -vp   $MX_ALT_OUTPUT_ROOT/compiler/dists/jdk1.8/graal-management.jar       $out/jre/lib/jvmci/
       cp -vdpR $out/jre/lib/svm/clibraries                                          $out/jre/lib/svm/builder/
-      cp -vpR  $MX_ALT_OUTPUT_ROOT/truffle/dists/*                                  $out/jre/lib/truffle/
+      cp -vpR  $MX_ALT_OUTPUT_ROOT/truffle/dists/jdk1.8/*                           $out/jre/lib/truffle/
       cp -vp   $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/truffle/include/
       cp -vpLR substratevm/svmbuild/native-image-root/tools/*                       $out/jre/tools/
       cp -vpR  $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector*                     $out/jre/tools/chromeinspector/
       cp -vpR  $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler*                    $out/jre/tools/profiler/
       cp -vpR  $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/*         $out/jre/tools/truffle/
-      cp -vp   $MX_ALT_OUTPUT_ROOT/truffle/dists/truffle-nfi.jar                    $out/jre/tools/truffle/builder/
+      cp -vp   $MX_ALT_OUTPUT_ROOT/truffle/dists/jdk1.8/truffle-nfi.jar             $out/jre/tools/truffle/builder/
 
       echo "name=GraalVM ${version}"                                              > $out/jre/lib/amd64/server/vm.properties
       echo -n "graal"                                                             > $out/jre/lib/jvmci/compiler-name
-- 
GitLab


From 23deb67b7c0862521382e9814d304c434495c0e1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 4 Nov 2018 11:23:51 -0500
Subject: [PATCH 1020/1065] graalvm: More fixes

---
 pkgs/development/compilers/graalvm/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 37c23e81b42..a35143b4349 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -183,6 +183,11 @@ in rec {
         --replace '<zlib.h>' '<${zlib.dev}/include/zlib.h>'
       substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \
         --replace 'cmd.add("-v");' 'cmd.add("-v"); cmd.add("-L${zlib}/lib");'
+      substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java \
+        --replace 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "gcc");' \
+          'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${stdenv.cc}/bin/gcc");'
+      substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \
+        --replace 'protected String compilerCommand = "cc";' 'protected String compilerCommand = "${stdenv.cc}/bin/cc";'
     '';
     buildPhase = ''
       # make a copy of jvmci8
-- 
GitLab


From 26f3e8a3678e4e07f2384350472e8b8fe3a7441c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 4 Nov 2018 11:36:24 -0500
Subject: [PATCH 1021/1065] linux: 4.14.78 -> 4.14.79

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 pkgs/top-level/all-packages.nix              | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index f4a728c9d25..a5170edfa26 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.78";
+  version = "4.14.79";
 
   # 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 = "0v2cwykgd2hxlqja4yl4pq45nhd5x8917ixqq7hj1r3ry304vnpl";
+    sha256 = "0flkkgfjzs6z7hkr15lga8jvxgwn6wi885yf5wyr0zxjrqg0f6an";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75bd3c191c4..3a3f1b30147 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14278,11 +14278,6 @@ with pkgs;
         # when adding a new linux version
         kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
-        # https://github.com/NixOS/nixpkgs/issues/42755
-        # Remove these xen-netfront patches once they're included in
-        # upstream! Fixes https://github.com/NixOS/nixpkgs/issues/42755
-        kernelPatches.xen-netfront_fix_mismatched_rtnl_unlock
-        kernelPatches.xen-netfront_update_features_after_registering_netdev
       ];
   };
 
-- 
GitLab


From 260aa8089df6d18f099524292b52ef075fcfd031 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 4 Nov 2018 11:36:37 -0500
Subject: [PATCH 1022/1065] linux: 4.18.16 -> 4.18.17

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
index d6c4b58b980..add98cfb2fa 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.18.16";
+  version = "4.18.17";
 
   # 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 = "1rjjkhl8lz4y4sn7icy8mp6p1x7rvapybp51p92sanbjy3i19fmy";
+    sha256 = "0353ns09i5y0fcygvly20z0qrp6gcqd453186ihm4r7ajgh43bz2";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From 3e1ca4f1761bb401d54b1fbcfa698a31512e130a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 4 Nov 2018 11:36:54 -0500
Subject: [PATCH 1023/1065] linux: 4.19 -> 4.19.1

---
 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 5aa033348d4..d597818dab6 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";
+  version = "4.19.1";
 
   # 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 = "18a92z17alh5kkvjv7l9z8wk5jgdb6raawdfkpwx9bi8amjzas0c";
+    sha256 = "0ac8w310p83z11ksmyad7by7cmacwg4vq68pzxchc88bbk33gmk4";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From ef9b17b48475f8d75e8a5d90ee3a30b1d461fdd2 Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <pmidden+github@secure.mailbox.org>
Date: Sun, 4 Nov 2018 18:32:33 +0100
Subject: [PATCH 1024/1065] pythonPackages.imageio: 1.6 -> 2.4.1 (#49147)

---
 .../python-modules/imageio/default.nix        | 32 +++++++++++++------
 .../python-modules/moviepy/default.nix        |  1 +
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index cdbcfee7180..de838028067 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -1,28 +1,42 @@
 { stdenv
 , buildPythonPackage
-, fetchurl
+, fetchPypi
+, pillow
+, psutil
 , pytest
 , numpy
+, isPy3k
+, futures
+, enum34
 }:
 
 buildPythonPackage rec {
   pname = "imageio";
-  version = "1.6";
+  version = "2.4.1";
 
-  src = fetchurl {
-    url = "https://github.com/imageio/imageio/archive/v${version}.tar.gz";
-    sha256 = "195snkk3fsbjqd5g1cfsd9alzs5q45gdbi2ka9ph4yxqb31ijrbv";
+  src = fetchPypi {
+    sha256 = "0jjiwf6wjipmykh33prjh448qv8mpgngfi77ndc7mym5r1xhgf0n";
+    inherit pname version;
   };
 
-  buildInputs = [ pytest ];
-  propagatedBuildInputs = [ numpy ];
+  checkInputs = [ pytest psutil ];
+  propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [
+    futures
+    enum34
+  ];
 
   checkPhase = ''
+    export IMAGEIO_USERDIR="$TMP"
+    export IMAGEIO_NO_INTERNET="true"
+    export HOME="$(mktemp -d)"
     py.test
   '';
 
-  # Tries to write in /var/tmp/.imageio
-  doCheck = false;
+  # For some reason, importing imageio also imports xml on Nix, see
+  # https://github.com/imageio/imageio/issues/395
+  postPatch = ''
+    substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\""
+  '';
 
   meta = with stdenv.lib; {
     description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats";
diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
index 63613b51686..637c014cb1a 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -4,6 +4,7 @@
 , numpy
 , decorator
 , imageio
+, isPy3k
 , tqdm
 }:
 
-- 
GitLab


From 76f803f44e2d085c929be6ac78f41631b5adfd35 Mon Sep 17 00:00:00 2001
From: Sander Hollaar <github@humilis.net>
Date: Sun, 4 Nov 2018 18:35:17 +0100
Subject: [PATCH 1025/1065] tmux: fix tmux sha256 hash (#49327)

* tmux: fix tmux sha256 hash

* pin to upstream commit
---
 pkgs/tools/misc/tmux/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 038b3206ac2..192c5eb0823 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "tmux";
     repo = "tmux";
-    rev = version;
-    sha256 = "0n8sjddy00xgh1rvvw968hh72pyslg1gahmzajfc4b3xax87drpi";
+    rev = "01918cb0170e07288d3aec624516e6470bf5b7fc";
+    sha256 = "1fy87wvxn7r7jzqapvjisc1iizic3kxqk2lv83giqmw1y4g3s7rl";
   };
 
   postPatch = ''
-- 
GitLab


From b1bdce07931dc69e3e3ba7738fac707b66f0f4cf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 08:17:31 +0100
Subject: [PATCH 1026/1065] python34: remove

Python 3.4 will receive it's final patch release in March 2019 and there won't
be any releases anymore after that, so also not during NixOS 2019.03.

Python 3.4 is not used anymore in Nixpkgs. In any case, migrating code from
3.4 to 3.4+ is trivial.
---
 doc/languages-frameworks/python.section.md    |   9 +-
 .../python/cpython/3.4/default.nix            | 214 ------------------
 .../python/cpython/3.4/ld_library_path.patch  |  51 -----
 .../python/cpython/3.4/no-ldconfig.patch      | 147 ------------
 .../3.4/use-correct-tcl-tk-on-darwin.patch    |  48 ----
 pkgs/top-level/all-packages.nix               |   6 -
 6 files changed, 4 insertions(+), 471 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.4/default.nix
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index e6c8ab37d68..907f4d9152a 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -483,8 +483,8 @@ and in this case the `python35` interpreter is automatically used.
 
 ### Interpreters
 
-Versions 2.7, 3.4, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
-respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter
+Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
+respectively `python27`, `python35` and `python36`. The PyPy interpreter
 is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
 `python35`. The default interpreter, `python`, maps to `python2`.
 The Nix expressions for the interpreters can be found in
@@ -507,7 +507,7 @@ Each interpreter has the following attributes:
 - `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation.
 - `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation.
 - `sitePackages`. Alias for `lib/${libPrefix}/site-packages`.
-- `executable`. Name of the interpreter executable, e.g. `python3.4`.
+- `executable`. Name of the interpreter executable, e.g. `python3.7`.
 - `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`.
 
 ### Building packages and applications
@@ -529,7 +529,6 @@ attribute set is created for each available Python interpreter. The available
 sets are
 
 * `pkgs.python27Packages`
-* `pkgs.python34Packages`
 * `pkgs.python35Packages`
 * `pkgs.python36Packages`
 * `pkgs.python37Packages`
@@ -837,7 +836,7 @@ community to help save time. No tool is preferred at the moment.
 
 ### Deterministic builds
 
-Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.
+The Python interpreters are now built deterministically.
 Minor modifications had to be made to the interpreters in order to generate
 deterministic bytecode. This has security implications and is relevant for
 those using Python in a `nix-shell`.
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
deleted file mode 100644
index 18b90cd1da4..00000000000
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ /dev/null
@@ -1,214 +0,0 @@
-{ stdenv, fetchurl, fetchpatch
-, bzip2
-, expat
-, libffi
-, gdbm
-, lzma
-, ncurses
-, openssl
-, readline
-, sqlite
-, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
-, zlib
-, callPackage
-, self
-, CF, configd
-, python-setup-hook
-# For the Python package set
-, packageOverrides ? (self: super: {})
-}:
-
-assert x11Support -> tcl != null
-                  && tk != null
-                  && xproto != null
-                  && libX11 != null;
-
-with stdenv.lib;
-
-let
-  majorVersion = "3.4";
-  minorVersion = "9";
-  minorVersionSuffix = "";
-  version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
-  libPrefix = "python${majorVersion}";
-  sitePackages = "lib/${libPrefix}/site-packages";
-
-  buildInputs = filter (p: p != null) [
-    zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ]
-    ++ optionals x11Support [ tcl tk libX11 xproto ]
-    ++ optionals stdenv.isDarwin [ CF configd ];
-
-  hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
-
-in stdenv.mkDerivation {
-  name = "python3-${version}";
-  pythonVersion = majorVersion;
-  inherit majorVersion version;
-
-  inherit buildInputs;
-
-  src = fetchurl {
-    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
-    sha256 = "1n9b1kavmw8b7rc3gkrka4fjzrbfq9iqy791yncaf09bp9v9cqjr";
-  };
-
-  NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
-
-  # Determinism: The interpreter is patched to write null timestamps when compiling python files.
-  # This way python doesn't try to update them when we freeze timestamps in nix store.
-  DETERMINISTIC_BUILD=1;
-  # Determinism: We fix the hashes of str, bytes and datetime objects.
-  PYTHONHASHSEED=0;
-
-  prePatch = optionalString stdenv.isDarwin ''
-    substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
-    substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
-  '';
-
-  patches = [
-    ./no-ldconfig.patch
-    ./ld_library_path.patch
-  ] ++ optionals (x11Support && stdenv.isDarwin) [
-    ./use-correct-tcl-tk-on-darwin.patch
-  ] ++ optionals hasDistutilsCxxPatch [
-    # Fix for http://bugs.python.org/issue1222585
-    # Upstream distutils is calling C compiler to compile C++ code, which
-    # only works for GCC and Apple Clang. This makes distutils to call C++
-    # compiler when needed.
-    (fetchpatch {
-      url = "https://bugs.python.org/file47046/python-3.x-distutils-C++.patch";
-      sha256 = "0dgdn9k2kmw4wh90vdnjcrnn97ylxgx7mbn9l87fwz6j501jqvk8";
-      extraPrefix = "";
-    })
-  ];
-
-  postPatch = ''
-    # Determinism
-    substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
-    # Determinism. This is done unconditionally
-    substituteInPlace "Lib/importlib/_bootstrap.py" --replace "source_mtime = int(source_stats['mtime'])" "source_mtime = 1"
-  '' + optionalString (x11Support && (tix != null)) ''
-    substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
-  ''
-    # Avoid picking up getentropy() from glibc >= 2.25, as that would break
-    # on older kernels.  http://bugs.python.org/issue29157
-    + optionalString stdenv.isLinux ''
-        substituteInPlace Python/random.c --replace 'defined(HAVE_GETENTROPY)' '0'
-        cat Python/random.c
-  '';
-
-  CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}";
-  LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}";
-  LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}";
-
-  configureFlags = [
-    "--enable-shared"
-    "--with-threads"
-    "--without-ensurepip"
-    "--with-system-expat"
-    "--with-system-ffi"
-  ]
-    # Never even try to use lchmod on linux,
-    # don't rely on detecting glibc-isms.
-  ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no";
-
-  preConfigure = ''
-    for i in /usr /sw /opt /pkg; do	# improve purity
-      substituteInPlace ./setup.py --replace $i /no-such-path
-    done
-    ${optionalString stdenv.isDarwin ''
-       export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
-       export MACOSX_DEPLOYMENT_TARGET=10.6
-     ''
-     + optionalString stdenv.hostPlatform.isMusl ''
-      export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
-     ''}
-  '';
-
-  setupHook = python-setup-hook sitePackages;
-
-  postInstall = ''
-    # needed for some packages, especially packages that backport functionality
-    # to 2.x from 3.x
-    for item in $out/lib/python${majorVersion}/test/*; do
-      if [[ "$item" != */test_support.py*
-         && "$item" != */test/support
-         && "$item" != */test/libregrtest
-         && "$item" != */test/regrtest.py* ]]; then
-        rm -rf "$item"
-      else
-        echo $item
-      fi
-    done
-    touch $out/lib/python${majorVersion}/test/__init__.py
-
-    ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
-    paxmark E $out/bin/python${majorVersion}
-
-    # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
-    echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
-
-    # Determinism: Windows installers were not deterministic.
-    # We're also not interested in building Windows installers.
-    find "$out" -name 'wininst*.exe' | xargs -r rm -f
-
-    # Use Python3 as default python
-    ln -s "$out/bin/idle3" "$out/bin/idle"
-    ln -s "$out/bin/pydoc3" "$out/bin/pydoc"
-    ln -s "$out/bin/python3" "$out/bin/python"
-    ln -s "$out/bin/python3-config" "$out/bin/python-config"
-    ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
-
-    # Get rid of retained dependencies on -dev packages, and remove
-    # some $TMPDIR references to improve binary reproducibility.
-    # Note that the .pyc file of _sysconfigdata.py should be regenerated!
-    for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
-      sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
-    done
-
-    # Determinism: rebuild all bytecode
-    # We exclude lib2to3 because that's Python 2 code which fails
-    # We rebuild three times, once for each optimization level
-    find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i -
-    find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i -
-    find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
-  '';
-
-  passthru = let
-    pythonPackages = callPackage ../../../../../top-level/python-packages.nix {
-      python = self;
-      overrides = packageOverrides;
-    };
-  in rec {
-    inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch;
-    executable = "${libPrefix}m";
-    buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
-    withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
-    pkgs = pythonPackages;
-    isPy3 = true;
-    isPy34 = true;
-    is_py3k = true;  # deprecated
-    interpreter = "${self}/bin/${executable}";
-  };
-
-  enableParallelBuilding = true;
-
-  doCheck = false; # expensive, and fails
-
-  meta = {
-    homepage = http://python.org;
-    description = "A high-level dynamically-typed programming language";
-    longDescription = ''
-      Python is a remarkably powerful dynamic programming language that
-      is used in a wide variety of application domains. Some of its key
-      distinguishing features include: clear, readable syntax; strong
-      introspection capabilities; intuitive object orientation; natural
-      expression of procedural code; full modularity, supporting
-      hierarchical packages; exception-based error handling; and very
-      high level dynamic data types.
-    '';
-    license = licenses.psfl;
-    platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ fridh ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch b/pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch
deleted file mode 100644
index 3172eb6d18e..00000000000
--- a/pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 85991e0d7f0e631240f3f6233bd65d1128a66dec Mon Sep 17 00:00:00 2001
-From: Frederik Rietdijk <fridh@fridh.nl>
-Date: Thu, 14 Sep 2017 10:00:31 +0200
-Subject: [PATCH] ctypes.util: support LD_LIBRARY_PATH
-
-Backports support for LD_LIBRARY_PATH from 3.6
----
- Lib/ctypes/util.py | 26 +++++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 780cd5d21b..d7ac15070f 100644
---- a/Lib/ctypes/util.py
-+++ b/Lib/ctypes/util.py
-@@ -181,8 +181,32 @@ elif os.name == "posix":
-         def _findSoname_ldconfig(name):
-             return None
- 
-+        def _findLib_ld(name):
-+            # See issue #9998 for why this is needed
-+            expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)
-+            cmd = ['ld', '-t']
-+            libpath = os.environ.get('LD_LIBRARY_PATH')
-+            if libpath:
-+                for d in libpath.split(':'):
-+                    cmd.extend(['-L', d])
-+            cmd.extend(['-o', os.devnull, '-l%s' % name])
-+            result = None
-+            try:
-+                p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-+                                     stderr=subprocess.PIPE,
-+                                     universal_newlines=True)
-+                out, _ = p.communicate()
-+                res = re.search(expr, os.fsdecode(out))
-+                if res:
-+                    result = res.group(0)
-+            except Exception as e:
-+                pass  # result will be None
-+            return result
-+
-         def find_library(name):
--            return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
-+            # See issue #9998
-+            return _findSoname_ldconfig(name) or \
-+                   _get_soname(_findLib_gcc(name) or _findLib_ld(name))
- 
- ################################################################
- # test code
--- 
-2.14.1
-
diff --git a/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch
deleted file mode 100644
index 3cb77a10725..00000000000
--- a/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 81bd99ad9058feb1d0361bc8862e8567c21a6142 Mon Sep 17 00:00:00 2001
-From: Frederik Rietdijk <fridh@fridh.nl>
-Date: Mon, 28 Aug 2017 09:24:06 +0200
-Subject: [PATCH] Don't use ldconfig and speed up uuid load
-
----
- Lib/ctypes/util.py | 52 ++--------------------------------------------------
- Lib/uuid.py        | 50 ++------------------------------------------------
- 2 files changed, 4 insertions(+), 98 deletions(-)
-
-diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 595113bffd..780cd5d21b 100644
---- a/Lib/ctypes/util.py
-+++ b/Lib/ctypes/util.py
-@@ -88,28 +88,7 @@ elif os.name == "posix":
-     import re, tempfile
- 
-     def _findLib_gcc(name):
--        expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)
--        fdout, ccout = tempfile.mkstemp()
--        os.close(fdout)
--        cmd = 'if type gcc >/dev/null 2>&1; then CC=gcc; elif type cc >/dev/null 2>&1; then CC=cc;else exit 10; fi;' \
--              'LANG=C LC_ALL=C $CC -Wl,-t -o ' + ccout + ' 2>&1 -l' + name
--        try:
--            f = os.popen(cmd)
--            try:
--                trace = f.read()
--            finally:
--                rv = f.close()
--        finally:
--            try:
--                os.unlink(ccout)
--            except FileNotFoundError:
--                pass
--        if rv == 10:
--            raise OSError('gcc or cc command not found')
--        res = re.search(expr, trace)
--        if not res:
--            return None
--        return res.group(0)
-+        return None
- 
- 
-     if sys.platform == "sunos5":
-@@ -200,34 +179,7 @@ elif os.name == "posix":
-     else:
- 
-         def _findSoname_ldconfig(name):
--            import struct
--            if struct.calcsize('l') == 4:
--                machine = os.uname().machine + '-32'
--            else:
--                machine = os.uname().machine + '-64'
--            mach_map = {
--                'x86_64-64': 'libc6,x86-64',
--                'ppc64-64': 'libc6,64bit',
--                'sparc64-64': 'libc6,64bit',
--                's390x-64': 'libc6,64bit',
--                'ia64-64': 'libc6,IA-64',
--                }
--            abi_type = mach_map.get(machine, 'libc6')
--
--            # XXX assuming GLIBC's ldconfig (with option -p)
--            regex = os.fsencode(
--                '\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type))
--            try:
--                with subprocess.Popen(['/sbin/ldconfig', '-p'],
--                                      stdin=subprocess.DEVNULL,
--                                      stderr=subprocess.DEVNULL,
--                                      stdout=subprocess.PIPE,
--                                      env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
--                    res = re.search(regex, p.stdout.read())
--                    if res:
--                        return os.fsdecode(res.group(1))
--            except OSError:
--                pass
-+            return None
- 
-         def find_library(name):
-             return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
-diff --git a/Lib/uuid.py b/Lib/uuid.py
-index 1061bffc43..846f5819f5 100644
---- a/Lib/uuid.py
-+++ b/Lib/uuid.py
-@@ -451,57 +451,11 @@ def _netbios_getnode():
-         return ((bytes[0]<<40) + (bytes[1]<<32) + (bytes[2]<<24) +
-                 (bytes[3]<<16) + (bytes[4]<<8) + bytes[5])
- 
--# Thanks to Thomas Heller for ctypes and for his help with its use here.
- 
--# If ctypes is available, use it to find system routines for UUID generation.
--# XXX This makes the module non-thread-safe!
- _uuid_generate_random = _uuid_generate_time = _UuidCreate = None
--try:
--    import ctypes, ctypes.util
- 
--    # The uuid_generate_* routines are provided by libuuid on at least
--    # Linux and FreeBSD, and provided by libc on Mac OS X.
--    for libname in ['uuid', 'c']:
--        try:
--            lib = ctypes.CDLL(ctypes.util.find_library(libname))
--        except:
--            continue
--        if hasattr(lib, 'uuid_generate_random'):
--            _uuid_generate_random = lib.uuid_generate_random
--        if hasattr(lib, 'uuid_generate_time'):
--            _uuid_generate_time = lib.uuid_generate_time
--            if _uuid_generate_random is not None:
--                break  # found everything we were looking for
--
--    # The uuid_generate_* functions are broken on MacOS X 10.5, as noted
--    # in issue #8621 the function generates the same sequence of values
--    # in the parent process and all children created using fork (unless
--    # those children use exec as well).
--    #
--    # Assume that the uuid_generate functions are broken from 10.5 onward,
--    # the test can be adjusted when a later version is fixed.
--    import sys
--    if sys.platform == 'darwin':
--        import os
--        if int(os.uname().release.split('.')[0]) >= 9:
--            _uuid_generate_random = _uuid_generate_time = None
--
--    # On Windows prior to 2000, UuidCreate gives a UUID containing the
--    # hardware address.  On Windows 2000 and later, UuidCreate makes a
--    # random UUID and UuidCreateSequential gives a UUID containing the
--    # hardware address.  These routines are provided by the RPC runtime.
--    # NOTE:  at least on Tim's WinXP Pro SP2 desktop box, while the last
--    # 6 bytes returned by UuidCreateSequential are fixed, they don't appear
--    # to bear any relationship to the MAC address of any network device
--    # on the box.
--    try:
--        lib = ctypes.windll.rpcrt4
--    except:
--        lib = None
--    _UuidCreate = getattr(lib, 'UuidCreateSequential',
--                          getattr(lib, 'UuidCreate', None))
--except:
--    pass
-+_uuid_generate_time = _UuidCreate = None
-+
- 
- def _unixdll_getnode():
-     """Get the hardware address on Unix using ctypes."""
--- 
-2.14.1
-
diff --git a/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch
deleted file mode 100644
index b73f62b97ec..00000000000
--- a/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2779658..902d0eb 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext):
-         # Rather than complicate the code below, detecting and building
-         # AquaTk is a separate method. Only one Tkinter will be built on
-         # Darwin - either AquaTk, if it is found, or X11 based Tk.
--        if (host_platform == 'darwin' and
--            self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
--            return
-
-         # Assume we haven't found any of the libraries or include files
-         # The versions with dots are used on Unix, and the versions without
-@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext):
-             if dir not in include_dirs:
-                 include_dirs.append(dir)
-
--        # Check for various platform-specific directories
--        if host_platform == 'sunos5':
--            include_dirs.append('/usr/openwin/include')
--            added_lib_dirs.append('/usr/openwin/lib')
--        elif os.path.exists('/usr/X11R6/include'):
--            include_dirs.append('/usr/X11R6/include')
--            added_lib_dirs.append('/usr/X11R6/lib64')
--            added_lib_dirs.append('/usr/X11R6/lib')
--        elif os.path.exists('/usr/X11R5/include'):
--            include_dirs.append('/usr/X11R5/include')
--            added_lib_dirs.append('/usr/X11R5/lib')
--        else:
--            # Assume default location for X11
--            include_dirs.append('/usr/X11/include')
--            added_lib_dirs.append('/usr/X11/lib')
--
-         # If Cygwin, then verify that X is installed before proceeding
-         if host_platform == 'cygwin':
-             x11_inc = find_file('X11/Xlib.h', [], include_dirs)
-@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext):
-         if host_platform in ['aix3', 'aix4']:
-             libs.append('ld')
-
--        # Finally, link with the X11 libraries (not appropriate on cygwin)
--        if host_platform != "cygwin":
--            libs.append('X11')
--
-         ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-                         define_macros=[('WITH_APPINIT', 1)] + defs,
-                         include_dirs = include_dirs,
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46d32435114..03aab60f40d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7788,7 +7788,6 @@ with pkgs;
   python2Full = python2.override{x11Support=true;};
   python27Full = python27.override{x11Support=true;};
   python3Full = python3.override{x11Support=true;};
-  python34Full = python34.override{x11Support=true;};
   python35Full = python35.override{x11Support=true;};
   python36Full = python36.override{x11Support=true;};
   python37Full = python37.override{x11Support=true;};
@@ -7802,10 +7801,6 @@ with pkgs;
     self = python27;
     inherit (darwin) CF configd;
   };
-  python34 = callPackage ../development/interpreters/python/cpython/3.4 {
-    inherit (darwin) CF configd;
-    self = python34;
-  };
   python35 = callPackage ../development/interpreters/python/cpython/3.5 {
     inherit (darwin) CF configd;
     self = python35;
@@ -7827,7 +7822,6 @@ with pkgs;
 
   # Python package sets.
   python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
-  python34Packages = python34.pkgs;
   python35Packages = python35.pkgs;
   python36Packages = recurseIntoAttrs python36.pkgs;
   python37Packages = python37.pkgs;
-- 
GitLab


From 795f4b31b9438cc2c070da12b1c949afe0f05ed6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:08:47 +0100
Subject: [PATCH 1027/1065] canto-{curses,daemon}: use python3 instead of
 python34

---
 .../networking/feedreaders/canto-curses/default.nix      | 6 +++---
 .../networking/feedreaders/canto-daemon/default.nix      | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
index 0190d5f9798..36b4732ca2e 100644
--- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }:
+{ stdenv, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }:
 
-python34Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   version = "0.9.9";
-  name = "canto-curses-${version}";
+  pname = "canto-curses";
 
   src = fetchFromGitHub {
     owner = "themoken";
diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
index 4b1721278e3..e700c5634ad 100644
--- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, fetchFromGitHub, python34Packages, }:
+{ stdenv, fetchFromGitHub, python3Packages, }:
 
-python34Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   version = "0.9.7";
-  name = "canto-daemon-${version}";
-  namePrefix = "";
+  pname = "canto-daemon";
 
   src = fetchFromGitHub {
     owner = "themoken";
@@ -12,7 +11,7 @@ python34Packages.buildPythonApplication rec {
     sha256 = "1si53r8cd4avfc56r315zyrghkppnjd6n125z1agfv59i7hdmk3n";
   };
 
-  propagatedBuildInputs = with python34Packages; [ feedparser ];
+  propagatedBuildInputs = with python3Packages; [ feedparser ];
 
   meta = {
     description = "Daemon for the canto Atom/RSS feed reader";
-- 
GitLab


From 3059cf7f0c9e6bd6560164723059c10c223b03a9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:11:39 +0100
Subject: [PATCH 1028/1065] retroarch: use python3 instead of python34

---
 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 a37d299fbf7..24b46c8f9ca 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper
-, ffmpeg, libGLU_combined, freetype, libxml2, python34
+, ffmpeg, libGLU_combined, freetype, libxml2, python3
 , libobjc, AppKit, Foundation
 , alsaLib ? null
 , libpulseaudio ? null
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ]
                       ++ optional withVulkan [ makeWrapper ];
 
-  buildInputs = [ ffmpeg freetype libxml2 libGLU_combined python34 SDL2 which ]
+  buildInputs = [ ffmpeg freetype libxml2 libGLU_combined python3 SDL2 which ]
                 ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
                 ++ optional withVulkan [ vulkan-loader ]
                 ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ]
-- 
GitLab


From 6a0b1b13b6119e90fce8b024fef99fd27bb883b6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Nov 2018 11:15:26 +0100
Subject: [PATCH 1029/1065] haskellPackages.cpython: set to null

because these are bindings for cpython 3.4 which we no longer distribute.
---
 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 56ffd6ee54e..1a6d38ba5d8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -893,6 +893,9 @@ self: super: {
   # https://github.com/aisamanra/config-ini/issues/12
   config-ini = dontCheck super.config-ini;
 
+  # We've remove cpython 3.4 from nixpkgs
+  cpython = null;
+
   # doctest >=0.9 && <0.12
   genvalidity-property = doJailbreak super.genvalidity-property;
   path = dontCheck super.path;
-- 
GitLab


From 17e863d0176f76712b4d12e58364e80bedbf7285 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 4 Nov 2018 20:43:41 +0100
Subject: [PATCH 1030/1065] Remove incorrect sentence from make-channel comment

Besides being incorrect, claims like these tend to stick around
after they become incorrect.
---
 nixos/lib/make-channel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix
index 0db4a46151d..9b920b989fc 100644
--- a/nixos/lib/make-channel.nix
+++ b/nixos/lib/make-channel.nix
@@ -1,6 +1,6 @@
 /* Build a channel tarball. These contain, in addition to the nixpkgs
  * expressions themselves, files that indicate the version of nixpkgs
- * that they represent. This only seems to be used by Travis.
+ * that they represent.
  */
 { pkgs, nixpkgs, version, versionSuffix }:
 
-- 
GitLab


From d2c38d1eefdb7e55f6bd75617e6f9c6e3943123d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 30 Oct 2018 10:47:44 +0000
Subject: [PATCH 1031/1065] coqPackages.mathcomp: refactor

---
 .../coq-modules/mathcomp/default.nix          | 46 +++++++++++++++++--
 .../coq-modules/mathcomp/generic.nix          | 42 -----------------
 2 files changed, 41 insertions(+), 47 deletions(-)
 delete mode 100644 pkgs/development/coq-modules/mathcomp/generic.nix

diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 92c3c87774a..99a6fe311a0 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -1,6 +1,8 @@
-{ callPackage, fetchurl, coq }:
+{ stdenv, fetchurl, coq, ncurses, which
+, graphviz, withDoc ? false
+}:
 
-let param =
+let params =
 
   let param_1_7 = {
       version = "1.7.0";
@@ -16,14 +18,48 @@ let param =
     "8.6" = param_1_7;
     "8.7" = param_1_7;
     "8.8" = param_1_7;
+    "8.9" = param_1_7;
 
-  }."${coq.coq-version}"
-; in
+  };
+  param = params."${coq.coq-version}";
+in
 
-callPackage ./generic.nix {
+stdenv.mkDerivation {
   name = "coq${coq.coq-version}-mathcomp-${param.version}";
+
   src = fetchurl {
     url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz";
     inherit (param) sha256;
   };
+
+  nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
+  buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
+
+  enableParallelBuilding = true;
+
+  buildFlags = stdenv.lib.optionalString withDoc "doc";
+
+  preBuild = ''
+    patchShebangs etc/utils/ssrcoqdep || true
+    cd mathcomp
+    export COQBIN=${coq}/bin/
+  '';
+
+  installPhase = ''
+    make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
+  '' + stdenv.lib.optionalString withDoc ''
+    make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://ssr.msr-inria.inria.fr/;
+    license = licenses.cecill-b;
+    maintainers = [ maintainers.vbgl maintainers.jwiegley ];
+    platforms = coq.meta.platforms;
+  };
+
+  passthru = {
+    compatibleCoqVersions = v: builtins.hasAttr v params;
+  };
+
 }
diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix
deleted file mode 100644
index 2a602711965..00000000000
--- a/pkgs/development/coq-modules/mathcomp/generic.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, coq, ncurses, which
-, graphviz, withDoc ? false
-, src, name
-}:
-
-stdenv.mkDerivation {
-
-  inherit name;
-  inherit src;
-
-  nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
-  buildInputs = with coq.ocamlPackages; [ ocaml findlib camlp5 ncurses which ];
-  propagatedBuildInputs = [ coq ];
-
-  enableParallelBuilding = true;
-
-  buildFlags = stdenv.lib.optionalString withDoc "doc";
-
-  preBuild = ''
-    patchShebangs etc/utils/ssrcoqdep || true
-    cd mathcomp
-    export COQBIN=${coq}/bin/
-  '';
-
-  installPhase = ''
-    make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
-  '' + stdenv.lib.optionalString withDoc ''
-    make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://ssr.msr-inria.inria.fr/;
-    license = licenses.cecill-b;
-    maintainers = [ maintainers.vbgl maintainers.jwiegley ];
-    platforms = coq.meta.platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
-  };
-
-}
-- 
GitLab


From b3f6840d8e8ddba9ce5aa3d5a07479e3663cb38a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Nov 2018 07:07:46 +0000
Subject: [PATCH 1032/1065] coqPackages.ssreflect: refactor

---
 .../coq-modules/ssreflect/default.nix         | 47 ++++++++++++++++--
 .../coq-modules/ssreflect/generic.nix         | 49 -------------------
 2 files changed, 42 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/development/coq-modules/ssreflect/generic.nix

diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index 9e9c3c7957a..840189e347a 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -1,6 +1,8 @@
-{ callPackage, fetchurl, coq }:
+{ stdenv, fetchurl, coq, ncurses, which
+, graphviz, withDoc ? false
+}:
 
-let param =
+let params =
 
   let param_1_7 = {
     version = "1.7.0";
@@ -16,14 +18,49 @@ let param =
     "8.6" = param_1_7;
     "8.7" = param_1_7;
     "8.8" = param_1_7;
+    "8.9" = param_1_7;
 
-  }."${coq.coq-version}"
-; in
+  };
+  param = params."${coq.coq-version}";
+in
+
+stdenv.mkDerivation {
 
-callPackage ./generic.nix {
   name = "coq${coq.coq-version}-ssreflect-${param.version}";
   src = fetchurl {
     url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz";
     inherit (param) sha256;
   };
+
+  nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
+  buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
+
+  enableParallelBuilding = true;
+
+  preBuild = ''
+    patchShebangs etc/utils/ssrcoqdep || true
+    cd mathcomp/ssreflect
+    export COQBIN=${coq}/bin/
+  '';
+
+  installPhase = ''
+    make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
+  '';
+
+  postInstall = stdenv.lib.optionalString withDoc ''
+    mkdir -p $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
+    cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://ssr.msr-inria.inria.fr/;
+    license = licenses.cecill-b;
+    maintainers = with maintainers; [ vbgl jwiegley ];
+    inherit (coq.meta) platforms;
+  };
+
+  passthru = {
+    compatibleCoqVersions = v: builtins.hasAttr v params;
+  };
+
 }
diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix
deleted file mode 100644
index 23e364cd960..00000000000
--- a/pkgs/development/coq-modules/ssreflect/generic.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, coq, ncurses, which
-, graphviz, withDoc ? false
-, src, name, patches ? []
-}:
-
-stdenv.mkDerivation {
-
-  inherit name;
-  inherit src;
-
-  nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
-  buildInputs = with coq.ocamlPackages; [ ocaml findlib camlp5 ncurses which ];
-  propagatedBuildInputs = [ coq ];
-
-  enableParallelBuilding = true;
-
-  inherit patches;
-
-  preBuild = ''
-    patchShebangs etc/utils/ssrcoqdep || true
-    cd mathcomp/ssreflect
-    export COQBIN=${coq}/bin/
-  '';
-
-  installPhase = ''
-    make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
-  '';
-
-  postInstall = ''
-    # mkdir -p $out/bin
-    # cp -p bin/ssrcoq $out/bin
-    # cp -p bin/ssrcoq.byte $out/bin
-  '' + stdenv.lib.optionalString withDoc ''
-    mkdir -p $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
-    cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://ssr.msr-inria.inria.fr/;
-    license = licenses.cecill-b;
-    maintainers = with maintainers; [ vbgl jwiegley ];
-    platforms = coq.meta.platforms;
-  };
-
-  passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
-  };
-
-}
-- 
GitLab


From e338d801e207a888e3125d88108e8166c94034ac Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 4 Nov 2018 17:39:09 +0000
Subject: [PATCH 1033/1065] =?UTF-8?q?mkCoqPackages:=20look=20for=20?=
 =?UTF-8?q?=E2=80=9CdontFilter=E2=80=9D=20in=20coq=20derivation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/top-level/coq-packages.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 3ba90f3b594..2084140c3fd 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -48,9 +48,18 @@ let
 
 in rec {
 
+  /* The function `mkCoqPackages` takes as input a derivation for Coq and produces
+   * a set of libraries built with that specific Coq. More libraries are known to
+   * this function than what is compatible with that version of Coq. Therefore,
+   * libraries that are not known to be compatible are removed (filtered out) from
+   * the resulting set. For meta-programming purposes (inpecting the derivations
+   * rather than building the libraries) this filtering can be disabled by setting
+   * a `dontFilter` attribute into the Coq derivation.
+   */
   mkCoqPackages = coq:
     let self = mkCoqPackages' self coq; in
-    filterCoqPackages coq self;
+    if coq.dontFilter or false then self
+    else filterCoqPackages coq self;
 
   coq_8_5 = callPackage ../applications/science/logic/coq {
     ocamlPackages = ocamlPackages_4_05;
-- 
GitLab


From fa30c8cfca9519944beb063cffea816979a57c55 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 4 Nov 2018 22:36:45 +0100
Subject: [PATCH 1034/1065] lombok: 1.16.22 -> 1.18.4

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

diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix
index 5ec4634d632..7f932d52dc4 100644
--- a/pkgs/development/libraries/java/lombok/default.nix
+++ b/pkgs/development/libraries/java/lombok/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "lombok-1.16.22";
+  name = "lombok-1.18.4";
 
   src = fetchurl {
     url = "https://projectlombok.org/downloads/${name}.jar";
-    sha256 = "1hr2jjlqdnxrw7ablqkf7ljc6n2q6a04ww14di06zs6i3l82zzpa";
+    sha256 = "0hlpycnmzd71ihn59hzf445dvwky2lkv57jimx91i6v7xcnr5wrr";
   };
 
   buildCommand = ''
-- 
GitLab


From 1d077e6286edd27f57f5ca9a81956a1d0bd5d491 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 5 Nov 2018 00:09:22 +0100
Subject: [PATCH 1035/1065] remmina: fix version

---
 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 81ced3e641b..dc17ccc4a37 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -11,7 +11,7 @@
 
 with stdenv.lib;
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "remmina-${version}";
   version = "1.2.32";
 
-- 
GitLab


From 69522a0acf8e840e8b6ac0a9752a034ab74eb3c0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 5 Nov 2018 00:08:46 +0100
Subject: [PATCH 1036/1065] svtplay-dl: 1.9.11 -> 2.1

---
 pkgs/tools/misc/svtplay-dl/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index e29e799898c..5502f2542f1 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, makeWrapper, python3Packages, perl, zip
-, rtmpdump }:
+, rtmpdump, gitMinimal }:
 
 let
-  inherit (python3Packages) python nose pycrypto requests mock;
+  inherit (python3Packages) python nose pycrypto pyyaml requests mock;
 in stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "1.9.11";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "14p2362rzyblma9321z4zrcbzfs9m269ry6sz44ly0bv5fik7gdy";
+    sha256 = "1cnc32gbhs955391hs1x1jpjsl3b6pqy7ysdydmp9q1i2rw105ln";
   };
 
-  pythonPaths = [ pycrypto requests ];
+  pythonPaths = [ pycrypto pyyaml requests ];
   buildInputs = [ python perl nose mock rtmpdump makeWrapper ] ++ pythonPaths;
-  nativeBuildInputs = [ zip ];
+  nativeBuildInputs = [ gitMinimal zip ];
 
   postPatch = ''
     substituteInPlace lib/svtplay_dl/fetcher/rtmp.py \
-- 
GitLab


From 4056c436c983763ed848d0e35ffafc7509d07b73 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 4 Nov 2018 20:01:48 -0600
Subject: [PATCH 1037/1065] http-parser: cleanup

---
 .../libraries/http-parser/default.nix         | 40 +++++--------------
 1 file changed, 10 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index 5d4eae4e063..02d76700068 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages, utillinux, fixDarwinDylibNames }:
+{ stdenv, fetchurl }:
 
 let
   version = "2.8.1";
@@ -10,38 +10,18 @@ in stdenv.mkDerivation {
     sha256 = "15ids8k2f0xhnnxh4m85w2f78pg5ndiwrpl24kyssznnp1l5yqai";
   };
 
+  NIX_CFLAGS_COMPILE = "-Wno-error";
   patches = [ ./build-shared.patch ];
+  makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ];
+  buildFlags = "library";
+  doCheck = true;
+  checkTarget = "test";
 
-  configurePhase = "gyp -f make --depth=`pwd` http_parser.gyp";
-
-  buildFlags = [ "BUILDTYPE=Release" ];
-
-  buildInputs =
-    [ python2Packages.gyp ]
-    ++ stdenv.lib.optional stdenv.isLinux utillinux
-    ++ stdenv.lib.optionals stdenv.isDarwin [ python2Packages.python fixDarwinDylibNames ];
-
-  doCheck = !stdenv.isDarwin;
-
-  checkPhase = ''
-    out/Release/test-nonstrict
-    out/Release/test-strict
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib
-    mv out/Release/${if stdenv.isDarwin then "*.dylib" else "lib.target/*"} $out/lib
-
-    mkdir -p $out/include
-    mv http_parser.h $out/include
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "An HTTP message parser written in C";
-
     homepage = https://github.com/joyent/http-parser;
-
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ matthewbauer ];
+    license = licenses.mit;
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From 95486ca306fc72d23ed4568b91afe35b6af9fab1 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Mon, 5 Nov 2018 08:58:08 +0000
Subject: [PATCH 1038/1065] Revert "NixOS tests: Wait for shell for 10x longer
 (50m)"

This reverts commit 9bc10e12916979c5c620be5b521b9218a0077cba.
---
 nixos/lib/test-driver/Machine.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index abcc1c50d4d..a00fe25c2b8 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -250,8 +250,7 @@ sub connect {
         $self->start;
 
         local $SIG{ALRM} = sub { die "timed out waiting for the VM to connect\n"; };
-        # 50 minutes -- increased as a test, see #49441
-        alarm 3000;
+        alarm 300;
         readline $self->{socket} or die "the VM quit before connecting\n";
         alarm 0;
 
-- 
GitLab


From 4f45edbd9aa4a0c3589de5f01c81185f00362c40 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Nov 2018 10:02:54 +0100
Subject: [PATCH 1039/1065] haskell-cpython: revert "set to null"

This reverts commit 6a0b1b13b6119e90fce8b024fef99fd27bb883b6. Please don't null
out the entire package just because its build is broken at the moment. If you
want to prevent users from compiling cpython, then haskell.lib.markBroken (or,
even better: markBrokenVersion) are the way to do it.
---
 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 1a6d38ba5d8..56ffd6ee54e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -893,9 +893,6 @@ self: super: {
   # https://github.com/aisamanra/config-ini/issues/12
   config-ini = dontCheck super.config-ini;
 
-  # We've remove cpython 3.4 from nixpkgs
-  cpython = null;
-
   # doctest >=0.9 && <0.12
   genvalidity-property = doJailbreak super.genvalidity-property;
   path = dontCheck super.path;
-- 
GitLab


From b854f78991d8bbdf5801984bd17989f89c1c30a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Nov 2018 10:27:57 +0100
Subject: [PATCH 1040/1065] ghc-8.4.4: disable integer-simple variant build

The build fails: https://hydra.nixos.org/build/83750830
---
 pkgs/top-level/haskell-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 13250ea8814..87adff4bf13 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -7,6 +7,7 @@ let
   integerSimpleExcludes = [
     "ghc7103Binary"
     "ghc821Binary"
+    "ghc844"
     "ghcjs"
     "ghcjs82"
     "ghcjs84"
-- 
GitLab


From 20078fd5b2ec8af70b039515d7bd6deaea6d0c31 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 5 Nov 2018 10:41:38 +0100
Subject: [PATCH 1041/1065] nixos/rngd: do not pass --version flag

---
 nixos/modules/security/rngd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix
index 63e00b54812..a54ef2e6fca 100644
--- a/nixos/modules/security/rngd.nix
+++ b/nixos/modules/security/rngd.nix
@@ -29,7 +29,7 @@ with lib;
 
       description = "Hardware RNG Entropy Gatherer Daemon";
 
-      serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v";
+      serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f";
     };
   };
 }
-- 
GitLab


From 4745250bd35b2cbdee248abc0aa60876c8f71ae5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 5 Nov 2018 07:09:41 -0500
Subject: [PATCH 1042/1065] linux: 4.19-rc8 -> 4.20-rc1

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

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


From ff060e74b830465cdfad73f6ff0aa39f8f1d5b05 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Nov 2018 14:03:43 +0100
Subject: [PATCH 1043/1065] haskell-cpython: don't bind the obsolete name
 "python34"

Fixes the evaluation error introduced by 4f45edbd9aa4a0c3589de5f01c81185f00362c40.
---
 pkgs/development/haskell-modules/hackage-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 34c63821756..2583fa1c449 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -54425,7 +54425,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings for libpython";
        license = stdenv.lib.licenses.gpl3;
-     }) {inherit (pkgs) python34;};
+     }) {python34 = null;};
 
   "cql" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, Decimal
-- 
GitLab


From 3bcdb3945ac63d756f3fde30220e1b81aff910eb Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Sat, 3 Nov 2018 17:26:28 +0100
Subject: [PATCH 1044/1065] ghc-8.2.1-binary: Patch shebang causing failures in
 Centos 6

---
 pkgs/development/compilers/ghc/8.2.1-binary.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix
index 6caeaf20f64..626c0d8ca9c 100644
--- a/pkgs/development/compilers/ghc/8.2.1-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix
@@ -75,6 +75,7 @@ stdenv.mkDerivation rec {
     # Some scripts used during the build need to have their shebangs patched
     ''
       patchShebangs ghc-${version}/utils/
+      patchShebangs ghc-${version}/configure
     '' +
 
     # Strip is harmful, see also below. It's important that this happens
-- 
GitLab


From 68b1d626fbf97a224cff1b5f7c339fcbc2d3724d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Nov 2018 10:23:08 +0100
Subject: [PATCH 1045/1065] hackage2nix: disable failing Hydra builds

---
 .../configuration-hackage2nix.yaml            | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index aa96bebc21b..0a2770cc4c0 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2886,6 +2886,7 @@ dont-distribute-packages:
   arpa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   arpack:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   array-forth:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arraylist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ArrayRef:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrow-improve:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrowapply-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3032,6 +3033,7 @@ dont-distribute-packages:
   barrie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrier-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrier:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  base-compat-migrate:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-feature-macros:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3055,6 +3057,7 @@ dont-distribute-packages:
   beam-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   beam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   beamable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bearriver:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   beautifHOL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bed-and-breakfast:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   beeminder-api:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3361,6 +3364,7 @@ dont-distribute-packages:
   campfire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   canon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   canonical-filepath:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  canonical-json:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-http:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-listen-http:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-log:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3614,6 +3618,7 @@ dont-distribute-packages:
   combinatorial-problems:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Combinatorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   combobuffer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  comfort-array:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   comic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Command:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   commander:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3680,6 +3685,7 @@ dont-distribute-packages:
   conduit-tokenize-attoparsec:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-zstd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   conf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  confcrypt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   conffmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   confide:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   config-parser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3838,6 +3844,7 @@ dont-distribute-packages:
   ctpl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cube:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cubical:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cuboid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cudd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   currency-convert:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   curry-base:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4247,6 +4254,7 @@ dont-distribute-packages:
   ehaskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ehs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   eibd-client-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eigen:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Eight-Ball-Pool-Hack-Cheats:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   either-list-functions:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   EitherT:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4297,6 +4305,7 @@ dont-distribute-packages:
   enummapmap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   enummapset-th:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   env-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  envstatus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   epanet-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   epass:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   epic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4368,6 +4377,7 @@ dont-distribute-packages:
   execs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   executor:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   exference:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exhaustive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   exherbo-cabal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   exif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-aeson:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4897,6 +4907,7 @@ dont-distribute-packages:
   goatee-gtk:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   goatee:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gochan:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  godot-haskell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gofer-prelude:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-adexchange-buyer:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-adexchange-seller:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5352,6 +5363,7 @@ dont-distribute-packages:
   haskell-course-preludes:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-dap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-docs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-eigen-util:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-formatter:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-ftp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-generate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5447,6 +5459,14 @@ dont-distribute-packages:
   haskore:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskRel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasktags:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasktorch-ffi-th:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasktorch-ffi-thc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasktorch-indef:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasktorch-signatures-partial:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasktorch-signatures-support:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasktorch-signatures:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasktorch-zoo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasktorch:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskus-binary:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskus-system-build:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskus-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5480,6 +5500,7 @@ dont-distribute-packages:
   HaTeX-meta:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaTeX-qq:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hats:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hatt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haverer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaVSA:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hawitter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5591,6 +5612,7 @@ dont-distribute-packages:
   Hermes:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hermit-syb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hermit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  herms:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   herringbone-embed:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   herringbone-wai:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   herringbone:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5614,6 +5636,7 @@ dont-distribute-packages:
   hexquote:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hext:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   heyefi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  heyting-algebras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hF2:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hfann:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hfd:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5923,6 +5946,7 @@ dont-distribute-packages:
   hsbencher-codespeed:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbencher-fusion:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbencher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc2hs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-auditor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-cairo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-data:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6501,6 +6525,8 @@ dont-distribute-packages:
   KiCS-prophecy:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   KiCS:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   kif-parser:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kind-apply:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kind-generics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   kit:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   kmeans-par:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   kmeans-vector:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6652,6 +6678,7 @@ dont-distribute-packages:
   lens-time:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-toml-parser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-tutorial:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lens-typelevel:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lensref:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   level-monad:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Level0:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6694,6 +6721,7 @@ dont-distribute-packages:
   life-sync:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifted-base-tf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifted-protolude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lifted-stm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifter:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ligature:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lightning-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6995,6 +7023,8 @@ dont-distribute-packages:
   MetaHDBC:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   MetaObject:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   metaplug:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  metar-http:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  metar:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   metric:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Metrics:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   metricsd-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7134,6 +7164,7 @@ dont-distribute-packages:
   monoid-subclasses:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoidplus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoids:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monopati:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   monte-carlo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monzo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   moo:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7153,6 +7184,7 @@ dont-distribute-packages:
   mp3decoder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mp:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpdmate:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mpi-hs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpppc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpretty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpris:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7672,6 +7704,7 @@ dont-distribute-packages:
   persistent-qq:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-ratelimit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-relational-record:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-template-classy:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-vector:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-zookeeper:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   persona-idp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7755,6 +7788,7 @@ dont-distribute-packages:
   plan-b:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   planar-graph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   planb-token-introspection:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  planet-mitchell-test:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   planet-mitchell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   plankton:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   plat:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8341,6 +8375,7 @@ dont-distribute-packages:
   rosmsg-bin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   rosmsg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rosso:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rounded:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rounding:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   roundtrip-aeson:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   roundtrip-string:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8543,6 +8578,7 @@ dont-distribute-packages:
   servant-github:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-haxl-client:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-hmac-auth:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-http2-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-iCalendar:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-jquery:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-js:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8562,6 +8598,8 @@ dont-distribute-packages:
   servant-snap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-streaming-client:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-subscriber:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-swagger-ui-jensoleg:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-swagger-ui-redoc:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-xml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-zeppelin-client:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-zeppelin-server:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8610,6 +8648,7 @@ dont-distribute-packages:
   shaker:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   shakespeare-babel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   shakespeare-sass:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shannon-fano:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   shapely-data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   shapes-demo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   shared-buffer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8628,6 +8667,7 @@ dont-distribute-packages:
   shellish:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellmate-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellmate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shh:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   shikensu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   shivers-cfg:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   shoap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8648,6 +8688,7 @@ dont-distribute-packages:
   simd:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   simgi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-actors:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-affine-space:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-atom:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-bluetooth:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-c-value:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8884,6 +8925,7 @@ dont-distribute-packages:
   spoonutil:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   spoty:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Sprig:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sprinkles:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   spritz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   spsa:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   spy:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8908,6 +8950,7 @@ dont-distribute-packages:
   sssp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   sstable:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   SSTG:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  st2:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-heap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-maps:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-marriage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8953,6 +8996,7 @@ dont-distribute-packages:
   stats:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   statsd-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   statsd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  statsdi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   stb-image-redux:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stb-truetype:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdata:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9697,6 +9741,7 @@ dont-distribute-packages:
   visualize-cbn:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vk-aws-route53:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   VKHS:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  voicebase:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   vorbiscomment:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vowpal-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   voyeur:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9708,6 +9753,7 @@ dont-distribute-packages:
   vty-menu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-ui-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-ui:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  waargonaut:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wacom-daemon:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   waddle:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wahsp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9825,6 +9871,7 @@ dont-distribute-packages:
   winio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wire-streams:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wiring:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  witty:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wkt-geom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wkt:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wl-pprint-ansiterm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9884,6 +9931,7 @@ dont-distribute-packages:
   X11-rm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-xdamage:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-xfixes:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  x509-util:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   x86-64bit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcb-types:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcffib:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9975,10 +10023,15 @@ dont-distribute-packages:
   yaml-rpc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml2owl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yamlkeysdiff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yampa-canvas:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-glfw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yampa-gloss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-glut:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-sdl2:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yampa-test:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa2048:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Yampa:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  YampaSynth:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yandex-translate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaop:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yap:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10079,6 +10132,7 @@ dont-distribute-packages:
   yjftp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yjsvg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yoctoparsec:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yoda:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yoga:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yogurt-Standalone:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yogurt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-- 
GitLab


From d15d64352acc01f7d7774983141d13b274ea204a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Nov 2018 20:38:35 +0100
Subject: [PATCH 1046/1065] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1-3-gc8d18e2 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/01afc16a4386a534828580aa03853581be2a61bc.
---
 .../haskell-modules/hackage-packages.nix      | 727 +++++++++++++-----
 1 file changed, 522 insertions(+), 205 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2583fa1c449..7fd4df278f1 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1229,8 +1229,8 @@ self: {
      }:
      mkDerivation {
        pname = "BNFC";
-       version = "2.8.1";
-       sha256 = "082r1arj76563q1grc9ivpzfip8ghdffm87fj4q830s40dffl6rc";
+       version = "2.8.2";
+       sha256 = "1n4zgm6gls6lpasn8y5hy0m75qkkbk6mj18g2yhjrw8514a5860h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
@@ -12316,10 +12316,8 @@ self: {
      }:
      mkDerivation {
        pname = "MiniAgda";
-       version = "0.2017.2.18";
-       sha256 = "0s3xp18y4kcjd1qq87vbhijbbpi9d1p08dgxw7521xlr3gmxkqxw";
-       revision = "1";
-       editedCabalFile = "0n4sd1b0c9fmgn7xqbhbms6y3ffkdgpa4fw7xcx31vgql2adxb0n";
+       version = "0.2018.11.4";
+       sha256 = "179f7kf355bkmpz1xjlf072axwsixjafh77m0anqx6q3g7qd0b36";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -19673,17 +19671,20 @@ self: {
      }) {};
 
   "Yampa" = callPackage
-    ({ mkDerivation, base, deepseq, random }:
+    ({ mkDerivation, base, deepseq, random, simple-affine-space }:
      mkDerivation {
        pname = "Yampa";
-       version = "0.12";
-       sha256 = "077fnazzcv7gckpklmdgk4hz6nnfnims11c1r4dwpnb0z6n31wcg";
+       version = "0.13";
+       sha256 = "1rxy8vky3wmqn4awr6v7r40ghk6nr27y11jnzbkj1bdp1948irc0";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base deepseq random ];
+       libraryHaskellDepends = [
+         base deepseq random simple-affine-space
+       ];
        testHaskellDepends = [ base ];
-       description = "Library for programming hybrid systems";
+       description = "Elegant Functional Reactive Programming Language for Hybrid Systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Yampa-core" = callPackage
@@ -19715,6 +19716,7 @@ self: {
        ];
        description = "Software synthesizer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Yocto" = callPackage
@@ -27123,8 +27125,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-athena";
-       version = "6.1.1";
-       sha256 = "1scshv7whw3ylp9nq8zgz12rbkvwq6hmcwn04s8h7ygnb9k3zy21";
+       version = "6.1.2";
+       sha256 = "0af1sd3hhi2j2bsglqi5vqs7cjh719zbzkjcxi68sy4h3783vqc2";
        libraryHaskellDepends = [
          amazonka amazonka-athena amazonka-core base lens resourcet text
          unliftio-core
@@ -27140,8 +27142,8 @@ self: {
     ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
      mkDerivation {
        pname = "antiope-contract";
-       version = "6.1.1";
-       sha256 = "14nvb786w4cqam3nd3wjfr7m0ysbr07vjm0ivwsxyvda3mwkn7pz";
+       version = "6.1.2";
+       sha256 = "1s9xikffc3l6q7l2fmi5yz6shw90w8zgb8sc1s3d85z7kfsi87rp";
        libraryHaskellDepends = [
          aeson antiope-s3 avro base bytestring text
        ];
@@ -27156,8 +27158,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-core";
-       version = "6.1.1";
-       sha256 = "0vmqyhxwfs45x3cqrlm1nij0cfnw2bk6sq3ldq6vrfpzm892g6py";
+       version = "6.1.2";
+       sha256 = "0bn975bcr1fm8w63m641iip22hw5alam28z73p3cjcx9wkzkfca4";
        libraryHaskellDepends = [
          amazonka amazonka-core base bytestring generic-lens http-client
          lens monad-logger mtl resourcet transformers unliftio-core
@@ -27177,8 +27179,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-dynamodb";
-       version = "6.1.1";
-       sha256 = "1kjsqka70bnkjzgdi427jqihlnm997ii147nzj8w04w5d6ynm2ly";
+       version = "6.1.2";
+       sha256 = "04ik6ms66yiq934dqhadw4fhb5js08q6czpgb8vqsv8pvm3cj30f";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-dynamodb antiope-core base
          generic-lens lens text unliftio-core unordered-containers
@@ -27198,8 +27200,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-messages";
-       version = "6.1.1";
-       sha256 = "0nklh0wi1y6drpm7i4ssjc8xx4b20knpnghn2yv839ph6w0f0r13";
+       version = "6.1.2";
+       sha256 = "1vkjflqi2k4d74hwagfaff4gyjx5809d2yjijhmgwk5aldyydw9m";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3
          base generic-lens lens lens-aeson monad-loops network-uri text
@@ -27223,8 +27225,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-s3";
-       version = "6.1.1";
-       sha256 = "0aq0qk377wvxm3kgy63zk382rnvjxx8csxj63vnmc5gikz5i2ya7";
+       version = "6.1.2";
+       sha256 = "1lrawihlnl1kmhqimcf59d7a2ad916ss83zjllx3x8cy6br68b4r";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-s3 antiope-core base bytestring
          conduit conduit-extra exceptions generic-lens http-types lens
@@ -27246,8 +27248,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sns";
-       version = "6.1.1";
-       sha256 = "0jdlm3sl7w5cq2hpikm73763np56g16z48b34wavg9yblrdfvvn7";
+       version = "6.1.2";
+       sha256 = "0b6blhcc1dplc16v9k12jn9s9ii5575sj9hm4kbla8483j24rd3k";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sns base generic-lens lens
          text unliftio-core
@@ -27267,8 +27269,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sqs";
-       version = "6.1.1";
-       sha256 = "189wgl3qpmf4amgc571zv88zpdblaqcbcnw93a6lk6i7rzc6h40r";
+       version = "6.1.2";
+       sha256 = "1d508kcsm1bxz768fxin5jc6y7jqskdxxpgl1z5n1579aq7wb0ia";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 amazonka-sqs
          antiope-messages antiope-s3 base generic-lens lens lens-aeson
@@ -29044,6 +29046,7 @@ self: {
        ];
        description = "Memory-efficient ArrayList implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arrow-extras" = callPackage
@@ -32475,17 +32478,16 @@ self: {
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , directory, errors, exceptions, filepath, lens, mmap, mtl, pipes
      , pipes-interleave, QuickCheck, tasty, tasty-quickcheck
-     , transformers, vector
+     , transformers, vector, vector-binary-instances
      }:
      mkDerivation {
        pname = "b-tree";
-       version = "0.1.3";
-       sha256 = "0r1bgcjsykd9qzzr6chxw8bfnmvk32p9663j6h11wmq6nq7nrlkb";
-       revision = "3";
-       editedCabalFile = "1i9qadxdq215j6dimyrmdkzl3d95l4gb65d2visf8rq1jfmdz62n";
+       version = "0.1.4";
+       sha256 = "17hcv85020dm5h3449bfa763bcbl723h17chah4418dby2ql5lxg";
        libraryHaskellDepends = [
          base binary bytestring containers directory errors exceptions
          filepath lens mmap mtl pipes pipes-interleave transformers vector
+         vector-binary-instances
        ];
        testHaskellDepends = [
          base binary containers pipes QuickCheck tasty tasty-quickcheck
@@ -33123,6 +33125,7 @@ self: {
        doHaddock = false;
        description = "Helps migrating projects to base-compat(-batteries)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-encoding" = callPackage
@@ -34119,13 +34122,14 @@ self: {
     ({ mkDerivation, base, dunai, MonadRandom, mtl, transformers }:
      mkDerivation {
        pname = "bearriver";
-       version = "0.10.4.3";
-       sha256 = "0d8yhccsg66163cjkdccdjf26rkzv4i7fv454fj9vhylxcggzjin";
+       version = "0.10.4.4";
+       sha256 = "14aqp6jqca5b4z0bf5q18pq5l9q43bzz18zjwn3j0ns1fakrq5bb";
        libraryHaskellDepends = [
          base dunai MonadRandom mtl transformers
        ];
        description = "A replacement of Yampa based on Monadic Stream Functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beautifHOL" = callPackage
@@ -43095,6 +43099,7 @@ self: {
        ];
        description = "Canonical JSON for signing and hashing JSON values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "canteven-config" = callPackage
@@ -49854,6 +49859,7 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Arrays where the index type is a function of the shape type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comfort-graph" = callPackage
@@ -51952,8 +51958,8 @@ self: {
      }:
      mkDerivation {
        pname = "confcrypt";
-       version = "0.1.0.3";
-       sha256 = "0fj40m3yncrwb3z2dznvls17v40xm1kh0i4ig16mpb9qj7ww8chl";
+       version = "0.1.0.4";
+       sha256 = "1c25xjpnw802pqfjksx5fxjq9ynwfjkkmyad169bvfasry98cdbb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -51976,6 +51982,7 @@ self: {
          text transformers
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "confetti" = callPackage
@@ -56631,6 +56638,7 @@ self: {
        executableHaskellDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cuckoo-filter" = callPackage
@@ -61971,8 +61979,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "descrilo";
-       version = "0.1.0.6";
-       sha256 = "166x7j8q5wg8iq1bf2qz01ps0b1pbfgizsy1zfhjd98a3zl9fid2";
+       version = "0.1.0.7";
+       sha256 = "00rk7m54igmrsi8j2fmql7c5wgyg7x5ws8397753470x5k2qv2ap";
        libraryHaskellDepends = [ base ];
        description = "Loads a list of items with fields";
        license = stdenv.lib.licenses.gpl3;
@@ -65584,8 +65592,8 @@ self: {
      }:
      mkDerivation {
        pname = "dmcc";
-       version = "1.0.0.1";
-       sha256 = "1qlw3jx9nn2by757kqask1ib2wi32zgdj53kinj2lnjn5f9qs466";
+       version = "1.1.0.0";
+       sha256 = "1lrscg4b13wd4gnkg3nsl2ala851lk03p9jxmlxmf2hbf4cl6cnc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67290,8 +67298,8 @@ self: {
     ({ mkDerivation, base, text, xml-types }:
      mkDerivation {
        pname = "dtd-types";
-       version = "0.3.0.1";
-       sha256 = "1w2ni9b8kn242grdqb4wxvgxqpkpp9qy66d57n33l5jghlg8b0s7";
+       version = "0.4.0.0";
+       sha256 = "1h5ypjnpjim2lwlc6jfp8ixqg7zbkj7fg2kpnlwnyj29n9g58rka";
        libraryHaskellDepends = [ base text xml-types ];
        description = "Basic types for representing XML DTDs";
        license = stdenv.lib.licenses.bsd3;
@@ -67507,6 +67515,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dunai_0_5_1" = callPackage
+    ({ mkDerivation, base, MonadRandom, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "dunai";
+       version = "0.5.1";
+       sha256 = "07bkjp7z5lbm6466nc99p4ngiqkh5mgbczwl7rflxzis4w1vm997";
+       libraryHaskellDepends = [
+         base MonadRandom transformers transformers-base
+       ];
+       description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dunai-core" = callPackage
     ({ mkDerivation, base, MonadRandom, transformers, transformers-base
      }:
@@ -68986,6 +69009,7 @@ self: {
        ];
        description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "either" = callPackage
@@ -70745,6 +70769,7 @@ self: {
        ];
        description = "Display efficiently the state of the local environment";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "envy" = callPackage
@@ -72780,6 +72805,7 @@ self: {
        ];
        description = "Compile time checks that a computation considers producing data through all possible constructors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exherbo-cabal" = callPackage
@@ -73556,26 +73582,30 @@ self: {
      }) {};
 
   "extensible-effects-concurrent" = callPackage
-    ({ mkDerivation, base, containers, data-default, deepseq, directory
-     , extensible-effects, filepath, HUnit, lens, logging-effect
-     , monad-control, mtl, parallel, process, QuickCheck, random, stm
-     , tagged, tasty, tasty-discover, tasty-hunit, time, transformers
+    ({ mkDerivation, async, base, containers, data-default, deepseq
+     , directory, enclosed-exceptions, extensible-effects, filepath
+     , HUnit, lens, logging-effect, monad-control, mtl, parallel
+     , process, QuickCheck, random, stm, tagged, tasty, tasty-discover
+     , tasty-hunit, time, transformers
      }:
      mkDerivation {
        pname = "extensible-effects-concurrent";
-       version = "0.8";
-       sha256 = "17xag4qcdgv7fihyigmi48kf4mb9f3dbxqlh7a7s1xqdfh9l6mc2";
+       version = "0.9.0";
+       sha256 = "0y6rf1whjwhrzkjw70sayl95lf8b6dhn5l9pxhwp05gnz3ll81ka";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers data-default deepseq directory extensible-effects
-         filepath lens logging-effect monad-control mtl parallel process
-         QuickCheck random stm tagged time transformers
+         async base containers data-default deepseq directory
+         enclosed-exceptions extensible-effects filepath lens logging-effect
+         monad-control mtl parallel process QuickCheck random stm tagged
+         time transformers
+       ];
+       executableHaskellDepends = [
+         base data-default extensible-effects lens
        ];
-       executableHaskellDepends = [ base extensible-effects ];
        testHaskellDepends = [
-         base containers deepseq extensible-effects HUnit lens QuickCheck
-         stm tasty tasty-discover tasty-hunit
+         base containers data-default deepseq extensible-effects HUnit lens
+         QuickCheck stm tasty tasty-discover tasty-hunit
        ];
        testToolDepends = [ tasty-discover ];
        description = "Message passing concurrency as extensible-effect";
@@ -79142,8 +79172,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-algebras";
-       version = "0.0.5.1";
-       sha256 = "1h8966am7j0xdqq2vmfj2cyrzmkd70bs1kx9fpx1bgn1acdpg1xa";
+       version = "0.0.6.0";
+       sha256 = "1332awl3aps1zw537ym18jp1d5igwsnpk3acmrznks7vfsdr27as";
        libraryHaskellDepends = [
          base constraints containers data-fix dlist free groups
          kan-extensions mtl natural-numbers transformers
@@ -79157,6 +79187,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "free-category" = callPackage
+    ({ mkDerivation, base, free-algebras }:
+     mkDerivation {
+       pname = "free-category";
+       version = "0.0.1.0";
+       sha256 = "0cpcn10kbsx1xvvxvvcx5hpa0p9vhkrjf7cmzva2zpmhdj4jp5rg";
+       libraryHaskellDepends = [ base free-algebras ];
+       description = "Free category";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "free-concurrent" = callPackage
     ({ mkDerivation, base, type-aligned }:
      mkDerivation {
@@ -88229,6 +88270,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "godot-haskell" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, c2hs
+     , casing, colour, containers, lens, linear, mtl, parsec, parsers
+     , stm, template-haskell, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "godot-haskell";
+       version = "0.1.0.0";
+       sha256 = "02nvs84bq4nif235iycjwkxmabvs0avwm2xilpwv8kddv95z1f8i";
+       revision = "3";
+       editedCabalFile = "0dpvraw31gpzzlsy7j7mv99jvmwhldycll1hnbw2iscb5zs2g409";
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint base bytestring casing colour containers lens
+         linear mtl parsec parsers stm template-haskell text
+         unordered-containers vector
+       ];
+       libraryToolDepends = [ c2hs ];
+       doHaddock = false;
+       description = "Haskell bindings for the Godot game engine API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gofer-prelude" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -89707,8 +89771,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-maps-geocoding";
-       version = "0.4.0.1";
-       sha256 = "1icya5sh7psr2m12wdx6a5dq9897lp92gq1skxp6s55sksqvglw8";
+       version = "0.4.0.2";
+       sha256 = "0q5zack0lcmn8wsksdlmd0vch1lizia9h4sqax7ydx09is39jzxm";
        libraryHaskellDepends = [
          aeson base google-static-maps http-client servant servant-client
          text
@@ -89834,8 +89898,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-static-maps";
-       version = "0.5.0.2";
-       sha256 = "05gxk4xnxlshcais8ljzp2wbr93kfi97bjbk2rasj5s2mbvw7rvi";
+       version = "0.5.0.3";
+       sha256 = "18c4s9nvpwv34djf7m2jq5mdpyjplp1hcxrfrp5cdyglk6j0j13b";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytedump bytestring cryptonite
          double-conversion http-client JuicyPixels memory network-uri
@@ -97998,6 +98062,7 @@ self: {
        testHaskellDepends = [ base eigen vector ];
        description = "Some utility functions for haskell-eigen library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-exp-parser" = callPackage
@@ -100600,6 +100665,7 @@ self: {
        doHaddock = false;
        description = "Torch for tensors and neural networks in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasktorch-codegen" = callPackage
@@ -100659,6 +100725,7 @@ self: {
        ];
        description = "Bindings to Torch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {ATen = null;};
 
   "hasktorch-ffi-thc" = callPackage
@@ -100681,6 +100748,7 @@ self: {
        ];
        description = "Bindings to Cutorch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {ATen = null;};
 
   "hasktorch-indef" = callPackage
@@ -100709,6 +100777,7 @@ self: {
        doHaddock = false;
        description = "Core Hasktorch abstractions wrapping FFI bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasktorch-signatures" = callPackage
@@ -100734,6 +100803,7 @@ self: {
        doHaddock = false;
        description = "Backpack signatures for Tensor operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasktorch-signatures-partial" = callPackage
@@ -100749,6 +100819,7 @@ self: {
        ];
        description = "Functions to partially satisfy tensor signatures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasktorch-signatures-support" = callPackage
@@ -100765,6 +100836,7 @@ self: {
        doHaddock = false;
        description = "Signatures for support tensors in hasktorch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasktorch-signatures-types" = callPackage
@@ -100803,6 +100875,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hasktorch-zoo" = callPackage
+    ({ mkDerivation, backprop, base, deepseq, dimensions, directory
+     , filepath, generic-lens, ghc-typelits-natnormalise, hashable
+     , hasktorch, JuicyPixels, microlens, mtl, mwc-random, primitive
+     , safe-exceptions, singletons, transformers, vector
+     }:
+     mkDerivation {
+       pname = "hasktorch-zoo";
+       version = "0.0.1.0";
+       sha256 = "1cpk2q1m68y7wljaki1d4a4y45hqh34ia8r6zfw0b62f9b6zihjm";
+       libraryHaskellDepends = [
+         backprop base deepseq dimensions directory filepath generic-lens
+         ghc-typelits-natnormalise hashable hasktorch JuicyPixels microlens
+         mtl mwc-random primitive safe-exceptions singletons transformers
+         vector
+       ];
+       description = "Neural architectures in hasktorch";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskus-binary" = callPackage
     ({ mkDerivation, base, bytestring, cereal, criterion, haskus-utils
      , mtl, QuickCheck, tasty, tasty-quickcheck
@@ -100898,8 +100991,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskus-utils-variant";
-       version = "2.0.1";
-       sha256 = "1rg4m1iq2fnnjxd6vbxsqnv21h8rnqisvxxfhns7hc167aydfwwp";
+       version = "2.0.3";
+       sha256 = "0yxlpznmc5yyv9ibx38f2slcj8r70qcz963j2fsbi5xr88ih7and";
        libraryHaskellDepends = [
          base haskus-utils-data haskus-utils-types template-haskell
        ];
@@ -101643,6 +101736,7 @@ self: {
        ];
        description = "A truth table generator for classical propositional logic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haven" = callPackage
@@ -103973,6 +104067,7 @@ self: {
        ];
        description = "A command-line manager for delicious kitchen recipes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hero-club-five-tenets" = callPackage
@@ -104653,6 +104748,7 @@ self: {
        ];
        description = "Heyting and Boolean algebras";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hfann" = callPackage
@@ -107513,17 +107609,17 @@ self: {
      }) {};
 
   "hmatrix-quadprogpp" = callPackage
-    ({ mkDerivation, base, hmatrix, quadprog, vector }:
+    ({ mkDerivation, base, hmatrix, QuadProgpp, vector }:
      mkDerivation {
        pname = "hmatrix-quadprogpp";
        version = "0.4.0.0";
        sha256 = "0bvgph7x5niryn4f1ah6726np2nv8xnrvqn3hbiw8f5m7314iv5l";
        libraryHaskellDepends = [ base hmatrix vector ];
-       librarySystemDepends = [ quadprog ];
+       librarySystemDepends = [ QuadProgpp ];
        description = "Bindings to the QuadProg++ quadratic programming library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {quadprog = null;};
+     }) {inherit (pkgs) QuadProgpp;};
 
   "hmatrix-repa" = callPackage
     ({ mkDerivation, base, hmatrix, repa, vector }:
@@ -109113,17 +109209,14 @@ self: {
      }) {};
 
   "hopenssl" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest
-     , HUnit, openssl
-     }:
+    ({ mkDerivation, base, bytestring, HUnit, openssl }:
      mkDerivation {
        pname = "hopenssl";
-       version = "2.2.1";
-       sha256 = "1pxbs1k8sizvvz1nn1zv2i5grn0w11s9g09z07w5f80kbz0slcbh";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       version = "2.2.2";
+       sha256 = "0k589mi4sny88jaqxcqd0jgy6kmbzslxk6y1bk8xkvq73nvjxnjl";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base doctest HUnit ];
+       testHaskellDepends = [ base HUnit ];
        description = "FFI Bindings to OpenSSL's EVP Digest Interface";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -109715,7 +109808,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hpack_0_31_0" = callPackage
+  "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
@@ -109725,8 +109818,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.31.0";
-       sha256 = "0lh60zqjzbjq0hkdia97swz0g1r3ihj84fph9jq9936fpb7hm1n9";
+       version = "0.31.1";
+       sha256 = "0fipbmmj4x588z7vh635mizhym9krydfxr49bgaf7xir4fsb4fmc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111606,6 +111699,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "A preprocessor that helps with writing Haskell bindings to C code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3" = callPackage
@@ -113236,14 +113330,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec_2_5_8" = callPackage
+  "hspec_2_6_0" = callPackage
     ({ mkDerivation, base, hspec-core, hspec-discover
      , hspec-expectations, QuickCheck
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.5.8";
-       sha256 = "061k4r1jlzcnl0mzvk5nvamw1bx36rs2a38958m2hlh2mmfnfnsr";
+       version = "2.6.0";
+       sha256 = "0qwla0bff2q52v27rxjgcp8g3yw0r2iyggp8ggmmabxkk983db6i";
        libraryHaskellDepends = [
          base hspec-core hspec-discover hspec-expectations QuickCheck
        ];
@@ -113294,6 +113388,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-contrib_0_5_1" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }:
+     mkDerivation {
+       pname = "hspec-contrib";
+       version = "0.5.1";
+       sha256 = "0hhzxaa3fxz5mk5qcsrnfr98a7bn3szx2ydgr0x9mbqmm1jg06rc";
+       revision = "1";
+       editedCabalFile = "0vjmyrsb878914b4khwdy3fcn9n217q8k5xnszlrp7dl1jnbqyi4";
+       libraryHaskellDepends = [ base hspec-core HUnit ];
+       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
     ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq
      , directory, filepath, hspec-expectations, hspec-meta, HUnit
@@ -113351,7 +113460,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_5_8" = callPackage
+  "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
@@ -113359,8 +113468,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.5.8";
-       sha256 = "08y6rhzc2vwmrxzl3bc8iwklkhgzv7x90mf9fnjnddlyaj7wcjg5";
+       version = "2.6.0";
+       sha256 = "0f3fb6cgfp0yywxi9ii2vzmkrj669nprphcs1piad7bacsk12y6r";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -113435,13 +113544,13 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-discover_2_5_8" = callPackage
+  "hspec-discover_2_6_0" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.5.8";
-       sha256 = "001i0ldxi88qcww2hh3mkdr6svw4kj23lf65camk9bgn5zwvq5aj";
+       version = "2.6.0";
+       sha256 = "17q5g5z7pylw8ghx1jbwk5qrafcg2cblpckvkwla1y3dzry43nc2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -117999,8 +118108,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-streams";
-       version = "0.0.0.5";
-       sha256 = "0qhpkgxip9bnx6bcg1cnz9gbnwifkp9vinvp89152h720rsawh4i";
+       version = "0.0.0.6";
+       sha256 = "1pfzg1xq39x1mw91nkmswc3sprjh58cygblsqi69x7msgfjdl116";
        libraryHaskellDepends = [
          base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups
          transformers vector
@@ -124962,8 +125071,8 @@ self: {
     ({ mkDerivation, alex, array, base, happy, pretty }:
      mkDerivation {
        pname = "java-adt";
-       version = "0.2016.11.28";
-       sha256 = "1p4j42nzsbd2dsag2gfnngvbdn5vx9cp8lmli6x05sdywabyckc7";
+       version = "0.2018.11.4";
+       sha256 = "1pdp7yvq0gpbxw7gp61r5mkrhdiff0cvlxssxzvg770idp46j6p5";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -128627,6 +128736,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utilities to work with lists of types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kind-generics" = callPackage
@@ -128638,6 +128748,7 @@ self: {
        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;
      }) {};
 
   "kinds" = callPackage
@@ -130439,11 +130550,12 @@ self: {
      }:
      mkDerivation {
        pname = "language-elm";
-       version = "0.1.1.0";
-       sha256 = "0hg9b8cyw08gwbsdmqhadnx0clj3rvjavrd3hw597bh2iss3rafl";
+       version = "0.1.1.3";
+       sha256 = "11g8jf7pbkb6gjwxjrwnk6hx38hjfymm421qnqd41cm0w2xmxbhh";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base MissingH mtl pretty protolude ];
        libraryToolDepends = [ doctest ];
-       testHaskellDepends = [ base hspec mtl pretty protolude ];
+       testHaskellDepends = [ base doctest hspec mtl pretty protolude ];
        testToolDepends = [ doctest ];
        description = "Generate elm code";
        license = stdenv.lib.licenses.bsd3;
@@ -130946,45 +131058,44 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-puppet_1_4_0" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
+  "language-puppet_1_4_1" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, async, 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, parser-combinators, pcre-utils, process
-     , protolude, random, regex-pcre-builtin, scientific, servant
-     , servant-client, split, stm, strict-base-types, temporary, text
-     , time, transformers, unix, unordered-containers, vector, yaml
+     , cryptonite, directory, filecache, filepath, formatting, Glob
+     , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data
+     , http-client, lens, lens-aeson, megaparsec, memory, mtl
+     , operational, optparse-applicative, parsec, parser-combinators
+     , pcre-utils, 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.4.0";
-       sha256 = "169kzd6csar170j0zqzisa82jxs5xfang17ys6aa4m1jx0nbh4mz";
+       version = "1.4.1";
+       sha256 = "1az4lalx2qb9wf0n99zjd9agy20x8369f80411mhj11rcnnl1a66";
        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 parser-combinators pcre-utils process protolude
-         random regex-pcre-builtin scientific servant servant-client split
-         stm strict-base-types text time transformers unix
-         unordered-containers vector yaml
+         case-insensitive containers cryptonite directory filecache filepath
+         formatting hashable hruby hslogger http-api-data http-client lens
+         lens-aeson megaparsec memory mtl operational parsec
+         parser-combinators pcre-utils 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
+         aeson ansi-wl-pprint async base bytestring containers Glob hslogger
+         http-client lens mtl optparse-applicative 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
+         pcre-utils scientific strict-base-types temporary text transformers
+         unordered-containers vector
        ];
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
@@ -132739,6 +132850,7 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Type-level lenses using singletons";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-utils" = callPackage
@@ -134061,6 +134173,7 @@ self: {
        ];
        description = "STM operations lifted through monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-threads" = callPackage
@@ -137637,8 +137750,8 @@ self: {
        pname = "lrucaching";
        version = "0.3.3";
        sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma";
-       revision = "4";
-       editedCabalFile = "11zfnngp3blx8c3sgy5cva1g9bp69wqz7ys23gdm905i7sjjs6a9";
+       revision = "5";
+       editedCabalFile = "0dfrgg60nd7l7pfjar1s1g380r4591y6ccv9fyh0n34ymhizk84y";
        libraryHaskellDepends = [
          base base-compat deepseq hashable psqueues vector
        ];
@@ -137758,8 +137871,8 @@ self: {
      }:
      mkDerivation {
        pname = "ltext";
-       version = "0.1.2.2";
-       sha256 = "12ql2p9zkib4m7hbfxzn8pxg0n9rgf35bhf1csrf48b6kzl9z28f";
+       version = "0.1.3";
+       sha256 = "1sd8iqcfm7qsp8rq1ckixi8lss8mwi4siqqgsybbxjg6ajs9m2x6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137773,8 +137886,9 @@ self: {
          transformers unordered-containers
        ];
        testHaskellDepends = [
-         base QuickCheck quickcheck-combinators quickcheck-instances tasty
-         tasty-quickcheck text
+         attoparsec base directory exceptions extra mtl pretty QuickCheck
+         quickcheck-combinators quickcheck-instances tasty tasty-quickcheck
+         text transformers unordered-containers
        ];
        description = "Parameterized file evaluator";
        license = stdenv.lib.licenses.bsd3;
@@ -141088,17 +141202,15 @@ self: {
      }:
      mkDerivation {
        pname = "mcm";
-       version = "0.6.5.0";
-       sha256 = "1vf54aziyybxyc9bwnn57pfcjmgli2hjjd2kzij8vy2g64ipip9m";
-       revision = "2";
-       editedCabalFile = "0xgnh356qwc1zdailqr3m6hbv7q5gc36ycqfz31z6l5kphmbblsc";
+       version = "0.6.8.1";
+       sha256 = "1nn6s15c6wwi7b0afzqfczdmc0ivrc8ncychmjym93lw967vjm67";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base blaze-html bytestring containers directory filepath hostname
          MissingH polyparse process text unix
        ];
-       description = "Manages the contents of files and directories";
+       description = "Machine Configuration Manager";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -142306,6 +142418,7 @@ self: {
        ];
        description = "Australian METAR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "metar-http" = callPackage
@@ -142330,6 +142443,7 @@ self: {
        ];
        description = "HTTP for METAR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "metric" = callPackage
@@ -142634,6 +142748,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens_0_4_10" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "microlens";
+       version = "0.4.10";
+       sha256 = "1v277yyy4p9q57xr2lfp6qs24agglfczmcabrapxrzci3jfshmcw";
+       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
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
      , deepseq, hashable, lens, lens-aeson, microlens, scientific, tasty
@@ -142699,6 +142825,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-ghc_0_4_10" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, microlens
+     , transformers
+     }:
+     mkDerivation {
+       pname = "microlens-ghc";
+       version = "0.4.10";
+       sha256 = "102dbrdsdadxbbhvx8avv1wbk84767a7lkb8ckp3zxk9g7qlly33";
+       libraryHaskellDepends = [
+         array base bytestring containers microlens transformers
+       ];
+       description = "microlens + array, bytestring, containers, transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-mtl" = callPackage
     ({ mkDerivation, base, microlens, mtl, transformers
      , transformers-compat
@@ -142730,6 +142872,23 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "microlens-platform";
+       version = "0.3.11";
+       sha256 = "18950lxgmsg5ksvyyi3zs1smjmb1qf1q73a3p3g44bh21miz0xwb";
+       libraryHaskellDepends = [
+         base hashable microlens microlens-ghc microlens-mtl microlens-th
+         text unordered-containers vector
+       ];
+       description = "Feature-complete microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-th" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell
      , th-abstraction, transformers
@@ -144272,6 +144431,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "modular" = callPackage
+    ({ mkDerivation, base, ghc-typelits-knownnat }:
+     mkDerivation {
+       pname = "modular";
+       version = "0.1.0.0";
+       sha256 = "1md01c9rzw24nymllkabckv46l7076kac6c317h5jindsncm7b8i";
+       libraryHaskellDepends = [ base ghc-typelits-knownnat ];
+       description = "Type-safe modular arithmetic";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "modular-arithmetic" = callPackage
     ({ mkDerivation, base, doctest, Glob }:
      mkDerivation {
@@ -146275,6 +146445,7 @@ self: {
        ];
        description = "Well-typed paths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "montage" = callPackage
@@ -146833,16 +147004,18 @@ self: {
      }) {inherit (pkgs) mpg123;};
 
   "mpi-hs" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, criterion, monad-loops
-     , openmpi, store
+    ({ mkDerivation, base, binary, bytestring, c2hs, criterion
+     , monad-loops, openmpi, packman, store
      }:
      mkDerivation {
        pname = "mpi-hs";
-       version = "0.3.1.0";
-       sha256 = "1ka212z51ga82fwjj6jz6aiidn4fyvf0b5p9xma67fnv9a7cs4v2";
+       version = "0.4.1.0";
+       sha256 = "0bf0ghzvakww5slvfd3fq0sa0972i6y60lg6ibby49nslfkl52wd";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base bytestring monad-loops store ];
+       libraryHaskellDepends = [
+         base binary bytestring monad-loops packman store
+       ];
        librarySystemDepends = [ openmpi ];
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base ];
@@ -146850,6 +147023,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "MPI bindings for Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openmpi;};
 
   "mpppc" = callPackage
@@ -147700,33 +147874,37 @@ self: {
      }:
      mkDerivation {
        pname = "multilinear";
-       version = "0.2.2.1";
-       sha256 = "0clqjf37gsgkc2lghrvdqjpzxxx1ly4zymkcflaph5x3klqlv4xy";
+       version = "0.2.3.0";
+       sha256 = "0kx9a7iysihkaapgz8hwa5sn0c1z69yiagxmw0n5i1bjmslzssvb";
        libraryHaskellDepends = [
          base containers deepseq mwc-random primitive statistics vector
        ];
-       testHaskellDepends = [ base criterion deepseq ];
-       benchmarkHaskellDepends = [ base criterion deepseq ];
+       testHaskellDepends = [ base criterion ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "Comprehensive and efficient (multi)linear algebra implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "multilinear-io" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cereal, cereal-vector
-     , criterion, csv-enumerator, deepseq, either, multilinear
-     , transformers, vector, zlib
+    ({ mkDerivation, aeson, base, bytestring, cassava, cereal
+     , cereal-vector, conduit, criterion, deepseq, directory, either
+     , multilinear, transformers, vector, zlib
      }:
      mkDerivation {
        pname = "multilinear-io";
-       version = "0.2.1.2";
-       sha256 = "12kydrh8rzvwlgd634x6swd1yv9pyxa23yh2yxj86mnisb467llj";
+       version = "0.2.3";
+       sha256 = "1ymlx7pg0w33a703mqdr4rd93f828xp6ygs4az1y9j0miwax9y97";
+       revision = "1";
+       editedCabalFile = "0xpf219r7n7hqh7b37mr9scy965mxfh9j871ayaab1mb0s7rglw9";
        libraryHaskellDepends = [
-         aeson base bytestring cereal cereal-vector csv-enumerator either
+         aeson base bytestring cassava cereal cereal-vector conduit either
          multilinear transformers vector zlib
        ];
-       testHaskellDepends = [ base either multilinear transformers ];
+       testHaskellDepends = [
+         base directory either multilinear transformers
+       ];
        benchmarkHaskellDepends = [
-         base criterion deepseq either multilinear transformers
+         base criterion deepseq directory either multilinear transformers
        ];
        description = "Input/output capability for multilinear package";
        license = stdenv.lib.licenses.bsd3;
@@ -152530,8 +152708,8 @@ self: {
      }:
      mkDerivation {
        pname = "nix-derivation";
-       version = "1.0.1";
-       sha256 = "1z36ihzcnll6vpvv8hr95j9vx0j69v7nir6bxgd6wmidpzigkdmc";
+       version = "1.0.2";
+       sha256 = "16xx4817ncgqvhmydbfr35lhgiw34js2n5liyfing3qvbfprmscw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -152548,18 +152726,18 @@ self: {
 
   "nix-diff" = callPackage
     ({ mkDerivation, attoparsec, base, containers, Diff, mtl
-     , nix-derivation, optparse-generic, system-filepath, text, unix
+     , nix-derivation, optparse-applicative, system-filepath, text, unix
      , vector
      }:
      mkDerivation {
        pname = "nix-diff";
-       version = "1.0.4";
-       sha256 = "1ggsqm8bcfvx3l2nji90gwllkq2v832wihf8msfi9br4mqwx234j";
+       version = "1.0.5";
+       sha256 = "1gs19y4k4aykm3hzpkygdx5wqblcnqxbh3jq3hl18sm8h4cf9871";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         attoparsec base containers Diff mtl nix-derivation optparse-generic
-         system-filepath text unix vector
+         attoparsec base containers Diff mtl nix-derivation
+         optparse-applicative system-filepath text unix vector
        ];
        description = "Explain why two Nix derivations differ";
        license = stdenv.lib.licenses.bsd3;
@@ -157690,7 +157868,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_3_1" = callPackage
+  "pandoc_2_4" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , binary, blaze-html, blaze-markup, bytestring, Cabal
      , case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -157700,13 +157878,14 @@ self: {
      , http-types, JuicyPixels, mtl, network, network-uri, pandoc-types
      , parsec, process, QuickCheck, random, safe, SHA, skylighting
      , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, temporary, texmath, text, time, unix
-     , unordered-containers, vector, weigh, xml, zip-archive, zlib
+     , tasty-quickcheck, temporary, texmath, text, time
+     , unicode-transforms, unix, unordered-containers, vector, weigh
+     , xml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.3.1";
-       sha256 = "1wf38mqny53ygpaii0vfjrk0889ya7mlsi7hvvqjakjndcyqflbl";
+       version = "2.4";
+       sha256 = "1kf1v7zfifh5i1hw5bwdbd78ncp946kx1s501c077vwzdzvcz2ck";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -157719,8 +157898,8 @@ self: {
          Glob haddock-library hslua hslua-module-text HsYAML HTTP
          http-client http-client-tls http-types JuicyPixels mtl network
          network-uri pandoc-types parsec process random safe SHA skylighting
-         split syb tagsoup temporary texmath text time unix
-         unordered-containers vector xml zip-archive zlib
+         split syb tagsoup temporary texmath text time unicode-transforms
+         unix unordered-containers vector xml zip-archive zlib
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -159725,8 +159904,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.8.1.1";
-       sha256 = "19nnf08szakwivm7zqv85hr0vwpflpk455373a3hwhcjgkzdfy19";
+       version = "0.8.1.2";
+       sha256 = "0lvgb0jl0bfzjqpap3gxlhn0mhbwbd15h33l1idpghxqpmzgvczy";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -160353,12 +160532,14 @@ self: {
        pname = "pcre-heavy";
        version = "1.0.0.2";
        sha256 = "1lfbjgvl55jh226n307c2w8mrb3l1myzbkjh4j0jfcb8nybzcp4a";
+       revision = "1";
+       editedCabalFile = "14pprgwxkiaji3rqhsm0fv454wic6qxm7vy4a475yigadb1vz1ls";
        libraryHaskellDepends = [
          base base-compat bytestring pcre-light semigroups
          string-conversions template-haskell
        ];
        testHaskellDepends = [ base doctest Glob ];
-       description = "A regexp library on top of pcre-light you can actually use";
+       description = "A regexp (regex) library on top of pcre-light you can actually use";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
@@ -162001,6 +162182,7 @@ self: {
        ];
        description = "Generate classy lens field accessors for persistent models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-test" = callPackage
@@ -164050,18 +164232,16 @@ self: {
   "pipes-s3" = callPackage
     ({ mkDerivation, aws, base, bytestring, exceptions, http-client
      , http-client-tls, http-types, pipes, pipes-bytestring, pipes-safe
-     , QuickCheck, resourcet, tasty, tasty-quickcheck, text
+     , QuickCheck, resourcet, semigroups, tasty, tasty-quickcheck, text
      , transformers
      }:
      mkDerivation {
        pname = "pipes-s3";
-       version = "0.3.0.3";
-       sha256 = "16gm7xjc8vbbajwmq91fj1l5cgd6difrz5g30b8czac4gdgqfppa";
-       revision = "3";
-       editedCabalFile = "14cz2sfyz0q0jrpjwj9a25flvcm7mhjhihg4pr356niyvnx1b01p";
+       version = "0.3.1";
+       sha256 = "1z32mgx3w5xiiaxcc22v492f03xlgkprn3pv1hqfqcfgsnxqbj5l";
        libraryHaskellDepends = [
          aws base bytestring http-client http-client-tls http-types pipes
-         pipes-bytestring pipes-safe resourcet text transformers
+         pipes-bytestring pipes-safe resourcet semigroups text transformers
        ];
        testHaskellDepends = [
          base bytestring exceptions pipes pipes-bytestring pipes-safe
@@ -164672,6 +164852,7 @@ self: {
        ];
        description = "Planet Mitchell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plankton" = callPackage
@@ -166100,13 +166281,13 @@ self: {
      }) {};
 
   "port-utils" = callPackage
-    ({ mkDerivation, async, base, hspec, network, stm }:
+    ({ mkDerivation, async, base, hspec, network, stm, transformers }:
      mkDerivation {
        pname = "port-utils";
-       version = "0.1.0.2";
-       sha256 = "0a27xsz4agm4bf1i8nrsmlz509yv65fvf3a8pzaqm6qxj7ir7g8i";
+       version = "0.2.0.0";
+       sha256 = "1lvalwbizmvrrpbl2l1lblbv0c3qln1ln61x61zn26jxq2h8p7g1";
        libraryHaskellDepends = [ base network ];
-       testHaskellDepends = [ async base hspec network stm ];
+       testHaskellDepends = [ async base hspec network stm transformers ];
        description = "Utilities for creating and waiting on ports";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168140,14 +168321,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "pretty-show_1_9_1" = callPackage
+  "pretty-show_1_9_2" = callPackage
     ({ mkDerivation, array, base, filepath, ghc-prim, happy
      , haskell-lexer, pretty, text
      }:
      mkDerivation {
        pname = "pretty-show";
-       version = "1.9.1";
-       sha256 = "0b5diwdkfb2wi6q872fjjnrvysgww7c8nhq55bvccp50n9vs4jhz";
+       version = "1.9.2";
+       sha256 = "01vqa5z364cgj73360rpb4rcysfgfyil9l7gxfp96vzcca3gi37a";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -171439,8 +171620,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript-iso";
-       version = "0.0.3";
-       sha256 = "15y761jk2r95gdkv85p7ij9npf3a6dlsyidf8y8djzk3m7j8ya2g";
+       version = "0.0.4";
+       sha256 = "1yqr8yfrc8vjn6h1wsfn0167ca6xj9wcl5a46zn9dklpkx995zyq";
        libraryHaskellDepends = [
          aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
          base bytestring containers deepseq emailaddress monad-control mtl
@@ -172768,10 +172949,9 @@ self: {
     ({ mkDerivation, base, QuickCheck, unfoldable-restricted }:
      mkDerivation {
        pname = "quickcheck-combinators";
-       version = "0.0.4";
-       sha256 = "0i5hv58b8vgqbmwb7j8c9xr6qv0v5n2zjh3a9rab8x6hsdlb0mvv";
+       version = "0.0.5";
+       sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd";
        libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
-       description = "Simple type-level combinators for augmenting QuickCheck instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -181471,6 +181651,7 @@ self: {
        testHaskellDepends = [ base long-double ];
        description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;};
 
   "rounding" = callPackage
@@ -187580,6 +187761,7 @@ self: {
        ];
        description = "Generate HTTP2 clients from Servant API descriptions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-iCalendar" = callPackage
@@ -188474,6 +188656,7 @@ self: {
        ];
        description = "Servant swagger ui: Jens-Ole Graulund theme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-swagger-ui-redoc" = callPackage
@@ -188490,6 +188673,7 @@ self: {
        ];
        description = "Servant swagger ui: ReDoc theme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-tracing" = callPackage
@@ -190001,6 +190185,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shannon-fano" = callPackage
+    ({ mkDerivation, base, bytestring, QuickCheck, split }:
+     mkDerivation {
+       pname = "shannon-fano";
+       version = "0.1.0.1";
+       sha256 = "11xpz5mi1yk9zcy22fhn6j4xnyifxgn07nd6nrx588h1g6w8r2df";
+       libraryHaskellDepends = [ base bytestring split ];
+       testHaskellDepends = [ base QuickCheck ];
+       description = "Shannon-fano compression algorithm implementation in Haskell";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shapefile" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-binary-ieee754, dbf
      , filepath, rwlock
@@ -190468,6 +190665,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Simple shell scripting from Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shift" = callPackage
@@ -191169,6 +191367,7 @@ self: {
        ];
        description = "A simple library for affine and vector spaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-atom" = callPackage
@@ -192958,15 +193157,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "slave-thread_1_0_2_2" = callPackage
+  "slave-thread_1_0_2_3" = callPackage
     ({ mkDerivation, base, deferred-folds, foldl, HTF, mmorph
      , partial-handler, QuickCheck, quickcheck-instances, rerebase
      , SafeSemaphore, stm-containers, transformers
      }:
      mkDerivation {
        pname = "slave-thread";
-       version = "1.0.2.2";
-       sha256 = "1jf8n989gsxbqkyxj8kd523dxp5bxs9cs4s6jd4j95mvij6pgpgl";
+       version = "1.0.2.3";
+       sha256 = "131zq1lb38mmavzdb2ysmnifmhvglb438q1p31pp5x4pmhdhnglj";
        libraryHaskellDepends = [
          base deferred-folds foldl mmorph partial-handler stm-containers
          transformers
@@ -196993,6 +197192,7 @@ self: {
        ];
        description = "JSON API to HTML website wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spritz" = callPackage
@@ -197734,11 +197934,12 @@ self: {
     ({ mkDerivation, base, gdp, ghc-prim, primitive }:
      mkDerivation {
        pname = "st2";
-       version = "0.1.0.0";
-       sha256 = "0gly0l191cwnahdrmgi1i2rx4430b9d684kl9s5frxa3k1711agj";
+       version = "0.1.0.2";
+       sha256 = "0i7v9yacwgf6aj67c4r2n8zcm07jrcff9nl52sx7ylsjs65ym2qz";
        libraryHaskellDepends = [ base gdp ghc-prim primitive ];
        description = "shared heap regions between local mutable state threads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stable-heap" = callPackage
@@ -199217,6 +199418,7 @@ self: {
        ];
        description = "A lovely [Dog]StatsD implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "status-notifier-item" = callPackage
@@ -203187,15 +203389,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {};
 
-  "swish_0_10_0_0" = callPackage
+  "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
      }:
      mkDerivation {
        pname = "swish";
-       version = "0.10.0.0";
-       sha256 = "1dm388lwfxrpdbqm3fdk9gjr8pp8y8s02wl9aan86av956g2kr4h";
+       version = "0.10.0.1";
+       sha256 = "1ikqqyra9r79vw2s969kyqh1vgijcr33y7irriylsp51n7pspagk";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -212453,8 +212655,8 @@ self: {
      }:
      mkDerivation {
        pname = "toodles";
-       version = "0.1.1";
-       sha256 = "1g806bdm6l52yg6q3jni94iacp7sfdacfx6rddnsdzqb0cj6ym0w";
+       version = "0.1.2";
+       sha256 = "0s4smdh8y308a6bwp21k070qc1xnzabab6hv2wrrmdkmmc36wfws";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -219175,7 +219377,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "urlpath_9_0_0_1" = callPackage
+  "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
@@ -219183,8 +219385,8 @@ self: {
      }:
      mkDerivation {
        pname = "urlpath";
-       version = "9.0.0.1";
-       sha256 = "009836gw2gmmjb08nqqdklpr967gfnnnk1r5lpy3wjyspky03vgv";
+       version = "9.0.1";
+       sha256 = "0acflpvb0imf2qc2gqbqziv4lk6a5p9gxkvbm0mv3kszqslh7rrg";
        libraryHaskellDepends = [
          attoparsec-uri base exceptions mmorph monad-control
          monad-control-aligned monad-logger mtl path path-extra resourcet
@@ -220992,6 +221194,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-binary-instances_0_2_5_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, deepseq, gauge, tasty
+     , tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "vector-binary-instances";
+       version = "0.2.5.1";
+       sha256 = "04n5cqm1v95pw1bp68l9drjkxqiy2vswxdq0fy1rqcgxisgvji9r";
+       libraryHaskellDepends = [ base binary vector ];
+       testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
+       benchmarkHaskellDepends = [
+         base binary bytestring deepseq gauge vector
+       ];
+       description = "Instances of Data.Binary for vector";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-buffer" = callPackage
     ({ mkDerivation, base, deepseq, vector }:
      mkDerivation {
@@ -222250,6 +222470,7 @@ self: {
        testHaskellDepends = [ aeson base hspec roundtrip-aeson ];
        description = "Upload audio files to voicebase to get a transcription";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "void" = callPackage
@@ -222406,7 +222627,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vty_5_25" = callPackage
+  "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
@@ -222417,8 +222638,8 @@ self: {
      }:
      mkDerivation {
        pname = "vty";
-       version = "5.25";
-       sha256 = "1m37q8l4ynnhyln1hkwxrmgysslb5d6nvnvx667q4q004dhrcr91";
+       version = "5.25.1";
+       sha256 = "1x15jlf9x6c8nhdbp6alr17vigclkaf5qy5jpp14g5n568p7karw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -222563,6 +222784,7 @@ self: {
        ];
        description = "JSON wrangling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wacom-daemon" = callPackage
@@ -226512,6 +226734,7 @@ self: {
        executableHaskellDepends = [ base bytestring network unix ];
        description = "A network server to show bottlenecks of GHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wizard" = callPackage
@@ -227581,6 +227804,31 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "ws";
+       version = "0.0.5";
+       sha256 = "1qj4yq2z7ml88jgcqfy8i1cn1cbmdv56vg7v6b2inh4b4h41yax6";
+       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-chans" = callPackage
     ({ mkDerivation, async, base, http-types, HUnit, network
      , QuickCheck, quickcheck-instances, test-framework
@@ -228057,6 +228305,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509_1_7_5" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
+     , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
+     , tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "x509";
+       version = "1.7.5";
+       sha256 = "1j67c35g8334jx7x32hh6awhr43dplp0qwal5gnlkmx09axzrc5i";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-parse asn1-types base bytestring containers
+         cryptonite hourglass memory mtl pem
+       ];
+       testHaskellDepends = [
+         asn1-types base bytestring cryptonite hourglass mtl tasty
+         tasty-quickcheck
+       ];
+       description = "X509 reader and writer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x509-store" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
      , containers, cryptonite, directory, filepath, mtl, pem, tasty
@@ -228075,6 +228345,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509-store_1_6_7" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
+     , containers, cryptonite, directory, filepath, mtl, pem, tasty
+     , tasty-hunit, x509
+     }:
+     mkDerivation {
+       pname = "x509-store";
+       version = "1.6.7";
+       sha256 = "1y8yyr1i95jkllg8k0z54k5v4vachp848clc07m33xpxidn3b1lp";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base bytestring containers cryptonite
+         directory filepath mtl pem x509
+       ];
+       testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ];
+       description = "X.509 collection accessing and storing methods";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x509-system" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pem, process, x509, x509-store
@@ -228093,21 +228382,22 @@ self: {
 
   "x509-util" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
-     , cryptonite, directory, hourglass, pem, x509, x509-store
+     , cryptonite, directory, hourglass, memory, pem, x509, x509-store
      , x509-system, x509-validation
      }:
      mkDerivation {
        pname = "x509-util";
-       version = "1.6.4";
-       sha256 = "0qv33r1p1mdl8yskl0hzy3s989y929lk2q23i9qb9fb6w63g6nfb";
+       version = "1.6.5";
+       sha256 = "1d8s1aaymc0bim871cblv1jpy6vnkadxz4spd7wpr90vswkd2hl7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          asn1-encoding asn1-types base bytestring cryptonite directory
-         hourglass pem x509 x509-store x509-system x509-validation
+         hourglass memory pem x509 x509-store x509-system x509-validation
        ];
        description = "Utility for X509 certificate and chain";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x509-validation" = callPackage
@@ -228133,6 +228423,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509-validation_1_6_11" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
+     , containers, cryptonite, data-default-class, hourglass, memory
+     , mtl, pem, tasty, tasty-hunit, x509, x509-store
+     }:
+     mkDerivation {
+       pname = "x509-validation";
+       version = "1.6.11";
+       sha256 = "16yihzljql3z8w5rgdl95fv3hgk7yd86kbl9b3glllsark5j2hzr";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base bytestring containers cryptonite
+         data-default-class hourglass memory mtl pem x509 x509-store
+       ];
+       testHaskellDepends = [
+         asn1-encoding asn1-types base bytestring cryptonite
+         data-default-class hourglass memory tasty tasty-hunit x509
+         x509-store
+       ];
+       description = "X.509 Certificate and CRL validation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x86-64bit" = callPackage
     ({ mkDerivation, base, deepseq, monads-tf, QuickCheck, tardis
      , vector
@@ -229798,6 +230111,8 @@ self: {
        pname = "xmonad-wallpaper";
        version = "0.0.1.4";
        sha256 = "0f6214kqp86xnk1zginjiprnqlj2fzcvh3w5sv3yvqg98mwdd0cg";
+       revision = "1";
+       editedCabalFile = "1vxgv702wgr0k0kzd602v8xv11q5dap4mfhqifnr928bwf9scp28";
        libraryHaskellDepends = [ base magic mtl random unix xmonad ];
        description = "xmonad wallpaper extension";
        license = stdenv.lib.licenses.lgpl3;
@@ -230738,15 +231053,14 @@ self: {
     ({ mkDerivation, base, blank-canvas, stm, time, Yampa }:
      mkDerivation {
        pname = "yampa-canvas";
-       version = "0.2.2";
-       sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n";
-       revision = "7";
-       editedCabalFile = "1bj5ncrkwjpvjvrx0s23ksvwwsrybj7zl3sghl1d034wd9r89mxx";
+       version = "0.2.3";
+       sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
        description = "blank-canvas frontend for Yampa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa-glfw" = callPackage
@@ -230778,6 +231092,7 @@ self: {
        libraryHaskellDepends = [ base gloss Yampa ];
        description = "A GLOSS backend for Yampa";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa-glut" = callPackage
@@ -230833,6 +231148,7 @@ self: {
        ];
        description = "Testing library for Yampa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa2048" = callPackage
@@ -233913,6 +234229,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Parser combinators for young padawans";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yoga" = callPackage
@@ -234344,8 +234661,8 @@ self: {
      }:
      mkDerivation {
        pname = "zephyr";
-       version = "0.2.0";
-       sha256 = "0n0z7s71gjlpra4ghfd51rcz5yqddzzwfdpjnhlxciakrabc5m3f";
+       version = "0.2.1";
+       sha256 = "0yhpy1dwh1axbh3xgxn97vnh616pywz56r7gy6sfvqaxj9bqviha";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-- 
GitLab


From db203c84e3cdb2be97f94659c09cb05312f14c1e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 Nov 2018 12:24:39 +0100
Subject: [PATCH 1047/1065] haskell-hpack: update overrides for the new version

---
 pkgs/development/haskell-modules/configuration-common.nix    | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 56ffd6ee54e..a34f510ccb9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1065,11 +1065,11 @@ self: super: {
 
   # The tool needs a newer hpack version than the one mandated by LTS-12.x.
   cabal2nix = super.cabal2nix.overrideScope (self: super: {
-    hpack = self.hpack_0_31_0;
+    hpack = self.hpack_0_31_1;
     yaml = self.yaml_0_11_0_0;
   });
   stack2nix = super.stack2nix.overrideScope (self: super: {
-    hpack = self.hpack_0_31_0;
+    hpack = self.hpack_0_31_1;
     yaml = self.yaml_0_11_0_0;
   });
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 213651405f3..226b437d58b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -63,11 +63,11 @@ self: super: {
   # more verbose but friendlier for Hydra.
   stack = (doJailbreak super.stack).override {
     Cabal = self.Cabal_2_4_0_1;
-    hpack = self.hpack_0_31_0.override { Cabal = self.Cabal_2_4_0_1; };
+    hpack = self.hpack_0_31_1.override { Cabal = self.Cabal_2_4_0_1; };
     yaml = self.yaml_0_11_0_0;
     hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_0_1; };
   };
-  hpack_0_31_0 = super.hpack_0_31_0.override {
+  hpack_0_31_1 = super.hpack_0_31_1.override {
     yaml = self.yaml_0_11_0_0;
   };
 
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 bf021956593..ea1ca1175f4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -56,7 +56,7 @@ self: super: {
   hledger = doJailbreak super.hledger;
   hledger-lib = doJailbreak super.hledger-lib;
   hledger-ui = doJailbreak super.hledger-ui;
-  hpack = self.hpack_0_31_0;
+  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_5_8;
-- 
GitLab


From 748ea69fab60ad99f875c7a390f084150cabb17f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 Nov 2018 12:26:07 +0100
Subject: [PATCH 1048/1065] haskell-hspec: 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 ea1ca1175f4..38ead50e57d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -59,7 +59,7 @@ self: super: {
   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_5_8;
+  hspec = self.hspec_2_5_9;
   hspec-core = self.hspec-core_2_5_8;
   hspec-discover = self.hspec-discover_2_5_8;
   hspec-megaparsec = doJailbreak super.hspec-megaparsec;  # newer versions need megaparsec 7.x
-- 
GitLab


From 627624f5cd8089aa1aedb0170613088fa585f819 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 Nov 2018 12:43:48 +0100
Subject: [PATCH 1049/1065] haskell-hspec-core: 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 38ead50e57d..e012b8317b5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -60,7 +60,7 @@ self: super: {
   hslua = self.hslua_1_0_1;
   hslua-module-text = self.hslua-module-text_0_2_0;
   hspec = self.hspec_2_5_9;
-  hspec-core = self.hspec-core_2_5_8;
+  hspec-core = self.hspec-core_2_5_9;
   hspec-discover = self.hspec-discover_2_5_8;
   hspec-megaparsec = doJailbreak super.hspec-megaparsec;  # newer versions need megaparsec 7.x
   hspec-meta = self.hspec-meta_2_5_6;
-- 
GitLab


From 72825b5e3908ea4e768f0783415a589439c6c00f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 Nov 2018 21:13:21 +0100
Subject: [PATCH 1050/1065] haskell-hspec-discover: 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 e012b8317b5..03793960da9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -61,7 +61,7 @@ self: super: {
   hslua-module-text = self.hslua-module-text_0_2_0;
   hspec = self.hspec_2_5_9;
   hspec-core = self.hspec-core_2_5_9;
-  hspec-discover = self.hspec-discover_2_5_8;
+  hspec-discover = self.hspec-discover_2_5_9;
   hspec-megaparsec = doJailbreak super.hspec-megaparsec;  # newer versions need megaparsec 7.x
   hspec-meta = self.hspec-meta_2_5_6;
   JuicyPixels = self.JuicyPixels_3_3_2;
-- 
GitLab


From 0a74322a5dc52e71e0bdb28c3220d6beb821a6d0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Nov 2018 09:47:25 +0100
Subject: [PATCH 1051/1065] haskell-hspec: update overrides for the new version
 some more

---
 .../development/haskell-modules/configuration-ghc-8.6.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 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 03793960da9..e1af093b269 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -59,9 +59,9 @@ self: super: {
   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_5_9;
-  hspec-core = self.hspec-core_2_5_9;
-  hspec-discover = self.hspec-discover_2_5_9;
+  hspec = self.hspec_2_6_0;
+  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_5_6;
   JuicyPixels = self.JuicyPixels_3_3_2;
-- 
GitLab


From 90acab51fecbdd2a2df5627bb04a55ac272b30b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Nov 2018 09:48:46 +0100
Subject: [PATCH 1052/1065] haskell-vty: 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 e1af093b269..48f8ca0ef90 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -74,7 +74,7 @@ self: super: {
   QuickCheck = self.QuickCheck_2_12_6_1;
   semigroupoids = self.semigroupoids_5_3_1;
   tagged = self.tagged_0_8_6;
-  vty = self.vty_5_25;
+  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;
-- 
GitLab


From 2b9916c715d23ebfb13850e9d990370697220d98 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Nov 2018 09:49:11 +0100
Subject: [PATCH 1053/1065] haskell-pandoc: 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 48f8ca0ef90..4276de9f90d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -107,7 +107,7 @@ self: super: {
   skylighting-core = dontCheck super.skylighting-core;
 
   # https://github.com/jgm/pandoc/issues/4974
-  pandoc = doJailbreak super.pandoc_2_3_1;
+  pandoc = doJailbreak super.pandoc_2_4;
 
   # Break out of "yaml >=0.10.4.0 && <0.11".
   stack = doJailbreak super.stack;
-- 
GitLab


From cd05d5a112c83b80d8b9432842c97c27a9d03a90 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 5 Nov 2018 14:53:19 +0000
Subject: [PATCH 1054/1065] coqPackages.autosubst: fix build

---
 pkgs/development/coq-modules/autosubst/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix
index 9c24e77e0f7..bffa5172b0e 100644
--- a/pkgs/development/coq-modules/autosubst/default.nix
+++ b/pkgs/development/coq-modules/autosubst/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "06pcjbngzwqyncvfwzz88j33wvdj9kizxyg5adp7y6186h8an341";
   };
 
+  buildInputs = [ coq ];
   propagatedBuildInputs = [ mathcomp ];
 
   patches = [./0001-changes-to-work-with-Coq-8.6.patch];
-- 
GitLab


From b162b400073c5f526686c67306dbd324503160ea Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 5 Nov 2018 16:29:24 +0100
Subject: [PATCH 1055/1065] ip2unix: init at 1.0.0

This tool was initially built specifically for nixcloud to prevent a few
annoying programs from binding to IP sockets.

While initially only accepting a JSON file as input, the tool now has a
proper command line interface and it's also generally usable to turn IP
sockets of any program into Unix sockets.

Another thing that might be even useful for NixOS modules is the
possibility to bend programs into using systemd socket activation.

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/tools/networking/ip2unix/default.nix | 32 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/networking/ip2unix/default.nix

diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix
new file mode 100644
index 00000000000..14f8599f7e9
--- /dev/null
+++ b/pkgs/tools/networking/ip2unix/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, libyamlcpp, systemd
+, asciidoctor, python3Packages
+}:
+
+stdenv.mkDerivation rec {
+  name = "ip2unix-${version}";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "nixcloud";
+    repo = "ip2unix";
+    rev = "v${version}";
+    sha256 = "1s6gyrrzgifr6gagcw4vx9xznxvdl14y14r0d1xc72j69b00zc4q";
+  };
+
+  nativeBuildInputs = [
+    meson ninja pkgconfig asciidoctor
+    python3Packages.pytest python3Packages.pytest-timeout
+  ];
+
+  buildInputs = [ libyamlcpp systemd ];
+
+  doCheck = true;
+
+  meta = {
+    homepage = https://github.com/nixcloud/ip2unix;
+    description = "Turn IP sockets into Unix domain sockets";
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.lgpl3;
+    maintainers = [ stdenv.lib.maintainers.aszlig ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cd0cc4887a..e8aa4618fad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3417,6 +3417,8 @@ with pkgs;
 
   ip2location = callPackage ../tools/networking/ip2location { };
 
+  ip2unix = callPackage ../tools/networking/ip2unix { };
+
   ipad_charge = callPackage ../tools/misc/ipad_charge { };
 
   iperf2 = callPackage ../tools/networking/iperf/2.nix { };
-- 
GitLab


From 8d99a3455b1e47018b10cb1394576341713c6010 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 5 Nov 2018 11:27:50 -0500
Subject: [PATCH 1056/1065] release-lib: Fix `pkgsFor`

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

diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index ac11de698b5..957de2dcc30 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -48,7 +48,7 @@ rec {
       else if system == "x86_64-cygwin" then pkgs_x86_64_cygwin
       else abort "unsupported system type: ${system}";
 
-  inherit (pkgsForCross null) pkgsFor;
+  pkgsFor = pkgsForCross null;
 
 
   # More poor man's memoisation
-- 
GitLab


From 21eeb00a08d53df3e55f98d0fd09ef3ba9db73af Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 4 Nov 2018 20:15:05 -0600
Subject: [PATCH 1057/1065] treewide: get rid of osx cmake flags

Flags that we now set globally:

- CMAKE_OSX_SYSROOT
- CMAKE_OSX_DEPLOYMENT_TARGET

can now be removed.

(cherry picked from commit 8742d5de30dfe2447c0fb56a2e7410b402effc80)
---
 pkgs/development/libraries/libui/default.nix | 6 +-----
 pkgs/development/libraries/pcl/default.nix   | 1 -
 pkgs/development/libraries/vtk/default.nix   | 2 --
 pkgs/development/mobile/xpwn/default.nix     | 4 ----
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix
index 9eb2fe04fe6..150e299ac42 100644
--- a/pkgs/development/libraries/libui/default.nix
+++ b/pkgs/development/libraries/libui/default.nix
@@ -13,7 +13,7 @@ in
       sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn";
     };
 
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ cmake ] ++
       (if backend == "darwin" then [darwin.apple_sdk.frameworks.Cocoa]
        else if backend == "unix" then [gtk3]
@@ -22,10 +22,6 @@ in
     preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
       sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt
     '';
-    cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
-      "-DCMAKE_OSX_SYSROOT="
-      "-DCMAKE_OSX_DEPLOYMENT_TARGET="
-    ];
 
     installPhase = ''
       mkdir -p $out/{include,lib}
diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index 9fb2e0b7fed..14eff45e4a1 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
 
     ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ];
   cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
-    "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET="
     "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
   ];
 
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index b85d76640cf..afd29aeb006 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -41,8 +41,6 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ]
     ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
     ++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF"
-                                  "-DCMAKE_OSX_SYSROOT="
-                                  "-DCMAKE_OSX_DEPLOYMENT_TARGET="
                                   "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ];
 
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix
index d5ffb7f6c01..d62902e4f6e 100644
--- a/pkgs/development/mobile/xpwn/default.nix
+++ b/pkgs/development/mobile/xpwn/default.nix
@@ -20,10 +20,6 @@ stdenv.mkDerivation {
 
   buildInputs = [ cmake zlib libpng bzip2 libusb openssl ];
 
-  cmakeFlags = [
-    "-DCMAKE_OSX_DEPLOYMENT_TARGET="
-  ];
-
   meta = with stdenv.lib; {
     homepage    = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn";
     description = "Custom NOR firmware loader/IPSW generator for the iPhone";
-- 
GitLab


From ada49ba736f65dfe444bbf4585eb16c10409b128 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 5 Nov 2018 12:34:24 -0600
Subject: [PATCH 1058/1065] talloc: use fixDarwinDylibNames
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The makefile isn’t setting install_name properly causing issues on
macOS. fixDarwinDylibNames seems to fix this.
---
 pkgs/development/libraries/talloc/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 77c3c6458ad..7c758d29835 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, pkgconfig, readline, libxslt
-, docbook_xsl, docbook_xml_dtd_42
+, docbook_xsl, docbook_xml_dtd_42, fixDarwinDylibNames
 }:
 
 stdenv.mkDerivation rec {
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
     sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig fixDarwinDylibNames ];
   buildInputs = [
     python readline libxslt docbook_xsl docbook_xml_dtd_42
   ];
 
-  preConfigure = ''
-    sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf
+  prePatch = ''
+    patchShebangs buildtools/bin/waf
   '';
 
   configureFlags = [
-- 
GitLab


From a35dae70c31924253dc26eb62f862cf1f18e6ce0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 5 Nov 2018 12:47:10 -0600
Subject: [PATCH 1059/1065] notmuch: cleanup

---
 .../mailreaders/notmuch/default.nix           | 57 +++++--------------
 1 file changed, 14 insertions(+), 43 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index c2c5d18e2f0..69de3ef5d51 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, fixDarwinDylibNames
+{ fetchurl, stdenv
 , pkgconfig, gnupg
 , xapian, gmime, talloc, zlib
 , doxygen, perl
@@ -34,18 +34,11 @@ stdenv.mkDerivation rec {
     bash-completion  # (optional) dependency to install bash completion
     emacs  # (optional) to byte compile emacs code, also needed for tests
     ruby  # (optional) ruby bindings
-    which dtach openssl bash  # test dependencies
-  ]
-  ++ optional stdenv.isDarwin fixDarwinDylibNames
-  ++ optionals (!stdenv.isDarwin) [ gdb man ]; # test dependencies
+  ];
 
   postPatch = ''
     patchShebangs configure
-
-    find test/ -type f -exec \
-      sed -i \
-        -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \
-        "{}" ";"
+    patchShebangs test/
 
     for src in \
       util/crypto.c \
@@ -54,6 +47,9 @@ stdenv.mkDerivation rec {
       substituteInPlace "$src" \
         --replace \"gpg\" \"${gnupg}/bin/gpg\"
     done
+
+    substituteInPlace lib/Makefile.local \
+      --replace '-install_name $(libdir)' "-install_name $out/lib"
   '';
 
   configureFlags = [ "--zshcompletiondir=$(out)/share/zsh/site-functions" ];
@@ -64,33 +60,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   makeFlags = "V=1";
 
-  preFixup = optionalString stdenv.isDarwin ''
-    set -e
-
-    die() {
-      >&2 echo "$@"
-      exit 1
-    }
-
-    prg="$out/bin/notmuch"
-    lib="$(find "$out/lib" -name 'libnotmuch.?.dylib')"
-
-    [[ -s "$prg" ]] || die "couldn't find notmuch binary"
-    [[ -s "$lib" ]] || die "couldn't find libnotmuch"
-
-    badname="$(otool -L "$prg" | awk '$1 ~ /libtalloc/ { print $1 }')"
-    goodname="$(find "${talloc}/lib" -name 'libtalloc.*.*.*.dylib')"
-
-    [[ -n "$badname" ]]  || die "couldn't find libtalloc reference in binary"
-    [[ -n "$goodname" ]] || die "couldn't find libtalloc in nix store"
-
-    echo "fixing libtalloc link in $lib"
-    install_name_tool -change "$badname" "$goodname" "$lib"
-
-    echo "fixing libtalloc link in $prg"
-    install_name_tool -change "$badname" "$goodname" "$prg"
-  '';
-
   preCheck = let
     test-database = fetchurl {
       url = "https://notmuchmail.org/releases/test-databases/database-v1.tar.xz";
@@ -99,12 +68,14 @@ stdenv.mkDerivation rec {
   in ''
     ln -s ${test-database} test/test-databases/database-v1.tar.xz
   '';
-  doCheck = !stdenv.isDarwin && (versionAtLeast gmime.version "3.0");
-  checkTarget = "test V=1";
-
-  postInstall = ''
-    make install-man
-  '';
+  doCheck = !stdenv.hostPlatform.isDarwin && (versionAtLeast gmime.version "3.0");
+  checkTarget = "test";
+  checkInputs = [
+    which dtach openssl bash
+    gdb man
+  ];
+
+  installTargets = "install install-man";
 
   dontGzipMan = true; # already compressed
 
-- 
GitLab


From 7eaba9af5e4819913ae0ec97c6c6b8ce0143ef4e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 5 Nov 2018 20:27:31 +0100
Subject: [PATCH 1060/1065] scdoc: Use $SOURCE_DATE_EPOCH to produce
 reproducible man pages

Use this patch until something like it is in the upstream repository.
Without it, the current date is used for the man pages, which makes them
non-reproducible.
---
 pkgs/tools/typesetting/scdoc/default.nix      |  2 +
 .../scdoc/use-source-date-epoch.patch         | 75 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/tools/typesetting/scdoc/use-source-date-epoch.patch

diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix
index 5789f51abd9..a5bf2d261e1 100644
--- a/pkgs/tools/typesetting/scdoc/default.nix
+++ b/pkgs/tools/typesetting/scdoc/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0a9sxifzsbj24kjnpc0525i91ni2vkwizhgvwx1m9shvfkiisnc6";
   };
 
+  patches = [ ./use-source-date-epoch.patch ];
+
   postPatch = ''
     substituteInPlace Makefile \
       --replace "-static" "" \
diff --git a/pkgs/tools/typesetting/scdoc/use-source-date-epoch.patch b/pkgs/tools/typesetting/scdoc/use-source-date-epoch.patch
new file mode 100644
index 00000000000..5a2496d6358
--- /dev/null
+++ b/pkgs/tools/typesetting/scdoc/use-source-date-epoch.patch
@@ -0,0 +1,75 @@
+diff --git a/src/main.c b/src/main.c
+index 14b08d2..e2cc33e 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -3,6 +3,7 @@
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#define __USE_XOPEN
+ #include <time.h>
+ #include <unistd.h>
+ #include "string.h"
+@@ -66,10 +67,17 @@ static void parse_preamble(struct parser *p) {
+ 	int section = -1;
+ 	uint32_t ch;
+ 	char date[256];
+-	time_t now;
+-	time(&now);
+-	struct tm *now_tm = localtime(&now);
+-	strftime(date, sizeof(date), "%F", now_tm);
++	char *source_date_epoch = getenv("SOURCE_DATE_EPOCH");
++	if (source_date_epoch != NULL) {
++		struct tm source_date_epoch_tm;
++		strptime(source_date_epoch, "%s", &source_date_epoch_tm);
++		strftime(date, sizeof(date), "%F", &source_date_epoch_tm);
++	} else {
++		time_t now;
++		time(&now);
++		struct tm *now_tm = localtime(&now);
++		strftime(date, sizeof(date), "%F", now_tm);
++	}
+ 	while ((ch = parser_getch(p)) != UTF8_INVALID) {
+ 		if ((ch < 0x80 && isalnum(ch)) || ch == '_' || ch == '-' || ch == '.') {
+ 			assert(str_append_ch(name, ch) != -1);
+diff --git a/test/preamble b/test/preamble
+index 03e2d0c..eeb734b 100755
+--- a/test/preamble
++++ b/test/preamble
+@@ -38,31 +38,31 @@ EOF
+ end 0
+ 
+ begin "Writes the appropriate header"
+-scdoc <<EOF | grep '^\.TH "test" "8" "'"$(date +'%F')"'"' >/dev/null
++scdoc <<EOF | grep '^\.TH "test" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'"' >/dev/null
+ test(8)
+ EOF
+ end 0
+ 
+ begin "Preserves dashes"
+-scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F')"'"' >/dev/null
++scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'"' >/dev/null
+ test-manual(8)
+ EOF
+ end 0
+ 
+ begin "Handles extra footer field"
+-scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F')"'" "Footer"' >/dev/null
++scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'" "Footer"' >/dev/null
+ test-manual(8) "Footer"
+ EOF
+ end 0
+ 
+ begin "Handles both extra fields"
+-scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F')"'" "Footer" "Header"' >/dev/null
++scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'" "Footer" "Header"' >/dev/null
+ test-manual(8) "Footer" "Header"
+ EOF
+ end 0
+ 
+ begin "Emits empty footer correctly"
+-scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F')"'" "" "Header"' >/dev/null
++scdoc <<EOF | grep '^\.TH "test-manual" "8" "'"$(date +'%F' --date=@${SOURCE_DATE_EPOCH:-$(date +'%s')})"'" "" "Header"' >/dev/null
+ test-manual(8) "" "Header"
+ EOF
+ end 0
-- 
GitLab


From 9e1b883144af1fc7c7444c4c18e7b6c24072d9ac Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 12 Oct 2018 00:03:46 +0000
Subject: [PATCH 1061/1065] meson: fix cross compilation of systemd

Co-authored-by: Robin Gloster <mail@glob.in>
---
 .../tools/build-managers/meson/default.nix    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 35ae59af617..0ba44b1b17a 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 }:
+{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }:
 
 python3Packages.buildPythonApplication rec {
   version = "0.46.1";
@@ -47,20 +47,20 @@ python3Packages.buildPythonApplication rec {
 
   crossFile = writeTextDir "cross-file.conf" ''
     [binaries]
-    c = '${stdenv.cc.targetPrefix}cc'
-    cpp = '${stdenv.cc.targetPrefix}c++'
-    ar = '${stdenv.cc.bintools.targetPrefix}ar'
-    strip = '${stdenv.cc.bintools.targetPrefix}strip'
+    c = '${targetPackages.stdenv.cc.targetPrefix}cc'
+    cpp = '${targetPackages.stdenv.cc.targetPrefix}c++'
+    ar = '${targetPackages.stdenv.cc.bintools.targetPrefix}ar'
+    strip = '${targetPackages.stdenv.cc.bintools.targetPrefix}strip'
     pkgconfig = 'pkg-config'
 
     [properties]
     needs_exe_wrapper = true
 
     [host_machine]
-    system = '${stdenv.targetPlatform.parsed.kernel.name}'
-    cpu_family = '${stdenv.targetPlatform.parsed.cpu.family}'
-    cpu = '${stdenv.targetPlatform.parsed.cpu.name}'
-    endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"}
+    system = '${targetPackages.stdenv.targetPlatform.parsed.kernel.name}'
+    cpu_family = '${targetPackages.stdenv.targetPlatform.parsed.cpu.family}'
+    cpu = '${targetPackages.stdenv.targetPlatform.parsed.cpu.name}'
+    endian = ${if targetPackages.stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"}
   '';
 
   # 0.45 update enabled tests but they are failing
@@ -70,7 +70,7 @@ python3Packages.buildPythonApplication rec {
 
   inherit (stdenv) cc;
 
-  isCross = stdenv.buildPlatform != stdenv.hostPlatform;
+  isCross = stdenv.targetPlatform != stdenv.hostPlatform;
 
   meta = with lib; {
     homepage = http://mesonbuild.com;
-- 
GitLab


From a06177e65ac17ca0f043f81f6eeb5223290cbaca Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 5 Nov 2018 21:54:32 +0100
Subject: [PATCH 1062/1065] jekyll: 3.8.4 -> 3.8.5

---
 .../misc/jekyll/basic/Gemfile.lock            | 18 +++++-----
 .../applications/misc/jekyll/basic/gemset.nix | 32 ++++++++---------
 .../misc/jekyll/full/Gemfile.lock             | 20 +++++------
 pkgs/applications/misc/jekyll/full/gemset.nix | 36 +++++++++----------
 4 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index a714cdbb0d0..6841bc14c38 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     colorator (1.1.0)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
@@ -23,7 +23,7 @@ GEM
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.4)
+    jekyll (3.8.5)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -47,14 +47,14 @@ GEM
       jekyll (~> 3.3)
     jekyll-sitemap (1.2.0)
       jekyll (~> 3.3)
-    jekyll-watch (2.0.0)
+    jekyll-watch (2.1.2)
       listen (~> 3.0)
     jemoji (0.10.1)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (~> 3.0)
     kramdown (1.17.0)
-    liquid (4.0.0)
+    liquid (4.0.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -62,18 +62,18 @@ GEM
     mercenary (0.3.6)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
-    pathutil (0.16.1)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (3.0.3)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rouge (3.2.1)
+    rouge (3.3.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    sass (3.5.7)
+    sass (3.6.0)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -96,4 +96,4 @@ DEPENDENCIES
   rouge
 
 BUNDLED WITH
-   1.16.3
+   1.16.4
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index 7ab1c70a98b..d680f925590 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -28,10 +28,10 @@
   concurrent-ruby = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+      sha256 = "1bnr2dlj2a11qy3rwh6m1mv5419vy32j2axk3ln7bphyvwn7pli0";
       type = "gem";
     };
-    version = "1.0.5";
+    version = "1.1.1";
   };
   em-websocket = {
     dependencies = ["eventmachine" "http_parser.rb"];
@@ -104,10 +104,10 @@
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01rnf0y7wx4rzh2ag74bg37vkxbg8m4nf450lypgh4khrarr3bhw";
+      sha256 = "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3";
       type = "gem";
     };
-    version = "3.8.4";
+    version = "3.8.5";
   };
   jekyll-avatar = {
     dependencies = ["jekyll"];
@@ -158,10 +158,10 @@
     dependencies = ["listen"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0m7scvj3ki8bmyx5v8pzibpg6my10nycnc28lip98dskf8iakprp";
+      sha256 = "1s9ly83sp8albvgdff12xy2h4xd8lm6z2fah4lzmk2yvp85jzdzv";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "2.1.2";
   };
   jemoji = {
     dependencies = ["gemoji" "html-pipeline" "jekyll"];
@@ -183,10 +183,10 @@
   liquid = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17fa0jgwm9a935fyvzy8bysz7j5n1vf1x2wzqkdfd5k08dbw3x2y";
+      sha256 = "0bs9smxgj29s4k76zfj09f7mhd35qwm9zki1yqa4jfwiki8v97nw";
       type = "gem";
     };
-    version = "4.0.0";
+    version = "4.0.1";
   };
   listen = {
     dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
@@ -225,19 +225,19 @@
     dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
+      sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
       type = "gem";
     };
-    version = "1.8.4";
+    version = "1.8.5";
   };
   pathutil = {
     dependencies = ["forwardable-extended"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wc18ms1rzi44lpjychyw2a96jcmgxqdvy2949r4vvb5f4p0lgvz";
+      sha256 = "12fm93ljw9fbxmv2krki5k5wkvr7560qy8p4spvb9jiiaqv78fz4";
       type = "gem";
     };
-    version = "0.16.1";
+    version = "0.16.2";
   };
   public_suffix = {
     source = {
@@ -267,10 +267,10 @@
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
+      sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
       type = "gem";
     };
-    version = "3.2.1";
+    version = "3.3.0";
   };
   ruby_dep = {
     source = {
@@ -292,10 +292,10 @@
     dependencies = ["sass-listen"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61";
+      sha256 = "18c6prbw9wl8bqhb2435pd9s0lzarl3g7xf8pmyla28zblvwxmyh";
       type = "gem";
     };
-    version = "3.5.7";
+    version = "3.6.0";
   };
   sass-listen = {
     dependencies = ["rb-fsevent" "rb-inotify"];
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index 01e4f368223..5fe2d108500 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -16,7 +16,7 @@ GEM
       execjs
     coffee-script-source (1.11.1)
     colorator (1.1.0)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
@@ -34,7 +34,7 @@ GEM
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.4)
+    jekyll (3.8.5)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -68,14 +68,14 @@ GEM
       jekyll (~> 3.3)
     jekyll-sitemap (1.2.0)
       jekyll (~> 3.3)
-    jekyll-watch (2.0.0)
+    jekyll-watch (2.1.2)
       listen (~> 3.0)
     jemoji (0.10.1)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (~> 3.0)
     kramdown (1.17.0)
-    liquid (4.0.0)
+    liquid (4.0.1)
     liquid-c (3.0.0)
       liquid (>= 3.0.0)
     listen (3.1.5)
@@ -90,11 +90,11 @@ GEM
     minitest (5.11.3)
     multi_json (1.13.1)
     multipart-post (2.0.0)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
-    octokit (4.12.0)
+    octokit (4.13.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    pathutil (0.16.1)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (3.0.3)
     pygments.rb (1.2.1)
@@ -105,10 +105,10 @@ GEM
     rdiscount (2.2.0.1)
     rdoc (6.0.4)
     redcarpet (3.4.0)
-    rouge (3.2.1)
+    rouge (3.3.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    sass (3.5.7)
+    sass (3.6.0)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -152,4 +152,4 @@ DEPENDENCIES
   yajl-ruby (~> 1.3.1)
 
 BUNDLED WITH
-   1.16.3
+   1.16.4
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index 3e92d3f28a0..4e33cd6ccdc 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -62,10 +62,10 @@
   concurrent-ruby = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+      sha256 = "1bnr2dlj2a11qy3rwh6m1mv5419vy32j2axk3ln7bphyvwn7pli0";
       type = "gem";
     };
-    version = "1.0.5";
+    version = "1.1.1";
   };
   em-websocket = {
     dependencies = ["eventmachine" "http_parser.rb"];
@@ -163,10 +163,10 @@
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01rnf0y7wx4rzh2ag74bg37vkxbg8m4nf450lypgh4khrarr3bhw";
+      sha256 = "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3";
       type = "gem";
     };
-    version = "3.8.4";
+    version = "3.8.5";
   };
   jekyll-avatar = {
     dependencies = ["jekyll"];
@@ -261,10 +261,10 @@
     dependencies = ["listen"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0m7scvj3ki8bmyx5v8pzibpg6my10nycnc28lip98dskf8iakprp";
+      sha256 = "1s9ly83sp8albvgdff12xy2h4xd8lm6z2fah4lzmk2yvp85jzdzv";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "2.1.2";
   };
   jemoji = {
     dependencies = ["gemoji" "html-pipeline" "jekyll"];
@@ -286,10 +286,10 @@
   liquid = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17fa0jgwm9a935fyvzy8bysz7j5n1vf1x2wzqkdfd5k08dbw3x2y";
+      sha256 = "0bs9smxgj29s4k76zfj09f7mhd35qwm9zki1yqa4jfwiki8v97nw";
       type = "gem";
     };
-    version = "4.0.0";
+    version = "4.0.1";
   };
   liquid-c = {
     dependencies = ["liquid"];
@@ -370,28 +370,28 @@
     dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
+      sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
       type = "gem";
     };
-    version = "1.8.4";
+    version = "1.8.5";
   };
   octokit = {
     dependencies = ["sawyer"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lki5vlsiijdmhaqdvr29zmcyvrlmkgi0x92hgan2194l2ikfjlh";
+      sha256 = "1yh0yzzqg575ix3y2l2261b9ag82gv2v4f1wczdhcmfbxcz755x6";
       type = "gem";
     };
-    version = "4.12.0";
+    version = "4.13.0";
   };
   pathutil = {
     dependencies = ["forwardable-extended"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wc18ms1rzi44lpjychyw2a96jcmgxqdvy2949r4vvb5f4p0lgvz";
+      sha256 = "12fm93ljw9fbxmv2krki5k5wkvr7560qy8p4spvb9jiiaqv78fz4";
       type = "gem";
     };
-    version = "0.16.1";
+    version = "0.16.2";
   };
   public_suffix = {
     source = {
@@ -454,10 +454,10 @@
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
+      sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
       type = "gem";
     };
-    version = "3.2.1";
+    version = "3.3.0";
   };
   ruby_dep = {
     source = {
@@ -479,10 +479,10 @@
     dependencies = ["sass-listen"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61";
+      sha256 = "18c6prbw9wl8bqhb2435pd9s0lzarl3g7xf8pmyla28zblvwxmyh";
       type = "gem";
     };
-    version = "3.5.7";
+    version = "3.6.0";
   };
   sass-listen = {
     dependencies = ["rb-fsevent" "rb-inotify"];
-- 
GitLab


From 0d30f7b02307e39d0544022a03b450a1679ed068 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 5 Nov 2018 15:16:45 -0600
Subject: [PATCH 1063/1065] Update sandbox-shell.nix

---
 pkgs/os-specific/linux/busybox/sandbox-shell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/pkgs/os-specific/linux/busybox/sandbox-shell.nix
index de8865ba3ac..c2d82ebc487 100644
--- a/pkgs/os-specific/linux/busybox/sandbox-shell.nix
+++ b/pkgs/os-specific/linux/busybox/sandbox-shell.nix
@@ -3,7 +3,7 @@
 # Minimal shell for use as basic /bin/sh in sandbox builds
 busybox.override {
   # musl roadmap has RISC-V support projected for 1.1.20
-  useMusl = !stdenv.hostPlatform.isRiscV;
+  useMusl = !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic";
   enableStatic = true;
   enableMinimal = true;
   extraConfig = ''
-- 
GitLab


From d9f8cf734e800f61e3007939b8812ed6e1e90540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Sun, 4 Nov 2018 01:28:17 +0100
Subject: [PATCH 1064/1065] SDL2: 2.0.8 -> 2.0.9

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

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 7d8f5b2caee..d445e1ab917 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -21,11 +21,11 @@ assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null);
 
 stdenv.mkDerivation rec {
   name = "SDL2-${version}";
-  version = "2.0.8";
+  version = "2.0.9";
 
   src = fetchurl {
     url = "https://www.libsdl.org/release/${name}.tar.gz";
-    sha256 = "1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd";
+    sha256 = "1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 290dd06d1422fbac5c1439af6f55ddea3cb5f044 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 5 Nov 2018 21:48:42 +0100
Subject: [PATCH 1065/1065] dwarf-fortress: fix most of customization options

see #49779
close #49803
---
 pkgs/games/dwarf-fortress/wrapper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 058bb5f72ae..c1e81bf2b3a 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -33,7 +33,7 @@ let
          ++ lib.optional enableTWBT twbt.art
          ++ [ dwarf-fortress ];
 
-  fixup = lib.singleton (runCommand "fixup" {} ''
+  fixup = lib.singleton (runCommand "fixup" {} (''
     mkdir -p $out/data/init
     cp ${dwarf-fortress}/data/init/init.txt $out/data/init/init.txt
   '' + lib.optionalString enableDFHack ''
@@ -60,7 +60,7 @@ let
       --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \
       --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \
       --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]'
-  '');
+  ''));
 
   env = buildEnv {
     name = "dwarf-fortress-env-${dwarf-fortress.dfVersion}";
-- 
GitLab